From 48535328c0171725d7c5ac2641b33f3c37a7b649 Mon Sep 17 00:00:00 2001 From: "Alejandro R. Mosteo" Date: Tue, 27 Feb 2024 15:51:07 +0100 Subject: [PATCH] Fix optionally appearing address in error location --- src/alire/os_windows/alire-platforms-current__windows.adb | 8 ++++---- testsuite/tests/debug/enabled-dump-exception/test.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/alire/os_windows/alire-platforms-current__windows.adb b/src/alire/os_windows/alire-platforms-current__windows.adb index a2abe24f4..bc136d106 100644 --- a/src/alire/os_windows/alire-platforms-current__windows.adb +++ b/src/alire/os_windows/alire-platforms-current__windows.adb @@ -352,8 +352,8 @@ package body Alire.Platforms.Current is exception when E : Checked_Error => Log_Exception (E); - Recoverable_Error ("While updating msys2 after installation: " - & Errors.Get (E, Clear => False)); + Recoverable_User_Error ("While updating msys2 after installation: " + & Errors.Get (E, Clear => False)); end; return Alire.Outcome_Success; @@ -384,7 +384,7 @@ package body Alire.Platforms.Current is if not Alire.Check_Absolute_Path (Cfg_Install_Dir) then -- This error is recoverable as msys2 is not required for alr to -- work. - Alire.Recoverable_Error + Alire.Recoverable_User_Error ("Invalid absolute install path for msys2 in configuration:" & " '" & Cfg_Install_Dir & "'"); return; @@ -398,7 +398,7 @@ package body Alire.Platforms.Current is if not Result.Success then -- This error is recoverable as msys2 is not required for alr to -- work. - Alire.Recoverable_Error (Message (Result)); + Alire.Recoverable_User_Error (Message (Result)); return; end if; diff --git a/testsuite/tests/debug/enabled-dump-exception/test.py b/testsuite/tests/debug/enabled-dump-exception/test.py index f023ad567..242edc6c6 100644 --- a/testsuite/tests/debug/enabled-dump-exception/test.py +++ b/testsuite/tests/debug/enabled-dump-exception/test.py @@ -11,7 +11,7 @@ def check_output(dump): assert_match('''\ .* -ERROR: Location : Alr.Commands.Dev.Execute at alr-commands-dev.adb:.* +ERROR: Location : .*Alr.Commands.Dev.Execute at alr-commands-dev.adb:.* ERROR: Extra info: Raising forcibly ERROR: Report at : .* ERROR: Re-run with `-vv -d` for a full log and stack trace.\