Fixes for CI-detected issues

alire-project · Aug 31, 2023 · 1c5aac2 · 1c5aac2
1 parent 8059b10
commit 1c5aac2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/src/alire/alire-builds-hashes.adb b/src/alire/alire-builds-hashes.adb
@@ -289,7 +289,7 @@ package body Alire.Builds.Hashes is
             return Lines.To_Set;
          end;
       else
-         return AAA.Strings.Empty;
+         return AAA.Strings.Empty_Set;
       end if;
    end Stored_Inputs;
 

diff --git a/testsuite/tests/build_profile/alr_build_switches/test.py b/testsuite/tests/build_profile/alr_build_switches/test.py
@@ -17,15 +17,17 @@ def check_config(path, profile):
     conf = content_of(path)
     assert_match('.*Build_Profile : Build_Profile_Kind := "%s"' % profile,
                  conf)
-    match profile.lower():
-        case 'development':
-            assert_match('.*"-Og"', conf)
-        case 'release':
-            assert_match('.*"-O3"', conf)
-        case 'validation':
-            assert_match('.*"-gnata"', conf)
-        case _:
-            raise Exception("Unknown profile: %s" % profile)
+
+    # Extra check for the compiler switches
+    profile = profile.lower()
+    if profile == 'development':
+        assert_match('.*"-Og"', conf)
+    elif profile == 'release':
+        assert_match('.*"-O3"', conf)
+    elif profile == 'validation':
+        assert_match('.*"-gnata"', conf)
+    else:
+        raise Exception("Unknown profile: %s" % profile)
 
 
 lib1_config = "../lib_1/config/lib_1_config.gpr"