Remove trailing '/' separator in extra prj paths

This is to match the output of full path normalization by Ada.Directories.
alire-project · Jul 2, 2020 · 36b54ec · 36b54ec
1 parent 5575cb9
commit 36b54ec
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/alire/alire-releases.adb b/src/alire/alire-releases.adb
@@ -426,7 +426,10 @@ package body Alire.Releases is
          for File of Files loop
             if Contains (File, "/") then
                Paths.Include
-                 (File (File'First .. Fixed.Index (File, "/", Backward)));
+                 (File (File'First .. Fixed.Index (File, "/", Backward) - 1));
+               --  To match the output of root crate paths and Ada.Directories
+               --  full path normalization, a path separator in the last
+               --  position is not included.
             end if;
          end loop;
       end return;

diff --git a/testsuite/tests/setenv/linked-paths/test.py b/testsuite/tests/setenv/linked-paths/test.py
@@ -20,7 +20,7 @@
 # Check paths are proper (base and one extra nested)
 p = run_alr("setenv")
 assert_match(('export GPR_PROJECT_PATH=".*/my_index/crates/crate_1234' +
-             path_separator() + '.*/my_index/crates/crate_1234/nested/"\n' +
+             path_separator() + '.*/my_index/crates/crate_1234/nested"\n' +
              'export ALIRE="True"\n').replace('/', re.escape(dir_separator())),
              p.out)