self-review

alire-project · Mar 24, 2023 · 421c381 · 421c381
1 parent e2aa0da
commit 421c381
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 5 deletions.
diff --git a/alire.toml b/alire.toml
@@ -50,5 +50,5 @@ ada_toml = { url = "https://github.com/mosteo/ada-toml", commit = "da4e59c382ceb
 clic = { url = "https://github.com/alire-project/clic", commit = "102bc38c7e9469112145e12100449664b5c74764" }
 gnatcoll = { url = "https://github.com/alire-project/gnatcoll-core.git", commit = "92bb91130a9ec628b4c48b7ef9fe7f24d9dc25fa" }
 semantic_versioning = { url = "https://github.com/alire-project/semantic_versioning", commit = "c2345fca8b685d6d3fc9334fac81140a0cdbea89" }
-simple_logging = { url = "https://github.com/alire-project/simple_logging", commit = "2b62010b6d66c106c65eb9ae604aabcf64522fac" }
+simple_logging = { url = "https://github.com/alire-project/simple_logging", commit = "3505dc645f3eef6799a486aae223d37e88cfc4d5" }
 stopwatch = { url = "https://github.com/mosteo/stopwatch", commit = "f607a63b714f09bbf6126de9851cbc21cf8666c9" }
diff --git a/deps/clic b/deps/clic
diff --git a/src/alr/alr-commands-test.adb b/src/alr/alr-commands-test.adb
@@ -498,6 +498,10 @@ package body Alr.Commands.Test is
    is
       No_Args : constant Boolean := Args.Count = 0;
 
+      ---------------
+      -- Not_Empty --
+      ---------------
+
       procedure Not_Empty (Item : Ada.Directories.Directory_Entry_Type;
                            Stop : in out Boolean)
       is
@@ -638,12 +642,13 @@ package body Alr.Commands.Test is
 
       --  When doing testing over index contents, we request an empty dir
       if not No_Args then
-         Alire.Directories.Traverse_Tree
-           (Ada.Directories.Current_Directory, Not_Empty'Access);
          if Cmd.Cont then
             Trace.Detail ("Resuming tests");
          elsif Cmd.Redo then
             Trace.Detail ("Redoing tests");
+         else
+            Alire.Directories.Traverse_Tree
+              (Ada.Directories.Current_Directory, Not_Empty'Access);
          end if;
       end if;
 

diff --git a/src/alr/alr-commands.ads b/src/alr/alr-commands.ads
@@ -69,7 +69,7 @@ package Alr.Commands is
    --  is created. If Error, replace the first generic error message with it.
 
    function Has_Root (Cmd : in out Command'Class) return Boolean;
-   --  True when Requires_Valide_Session would succeed, false otherwise
+   --  True when Requires_Valid_Session would succeed, false otherwise
 
    procedure Load (Cmd       : Command'Class;
                    Crate     : Alire.Crate_Name;

diff --git a/testsuite/tests/test/local-release/test.py b/testsuite/tests/test/local-release/test.py
@@ -21,6 +21,10 @@
 os.chdir("src")
 run_alr("test") # Ending with success is enough
 
+# Check the expected log files exist
+assert_file_exists(os.path.join("..", "alire", "alr_test_local.log"))
+assert_file_exists(os.path.join("..", "alire", "alr_test_local.xml"))
+
 # Check testing with a test action instead of default build
 os.chdir("..")
 init_local_crate("zzz")
+3 −3		.github/workflows/main.yml
+1 −1		alire.toml
+1 −2		clic.gpr
+1 −1		config/clic_config.ads
+3 −30		config/clic_config.gpr
+1 −1		config/clic_config.h
+44 −0		src/clic-config-edit.adb
+11 −0		src/clic-config-edit.ads
+17 −0		src/clic-config.adb
+5 −0		src/clic-config.ads
+0 −1		src/clic-subcommand-instance.adb
+5 −5		src/clic-tty.ads
+1 −1		src/clic-user_input.adb
+1 −1		src/clic.ads