Rename dir_separator/path_separator to match GNAT...

... in the Python testsuite

testsuite/drivers/helpers.py

@@ -34,6 +34,10 @@ def check_line_in(filename, line):
 
 
 def path_separator():
+    return ':' if os.name != 'nt' else ';'
+
+
+def dir_separator():
     return '/' if os.name != 'nt' else '\\'
 
 

testsuite/tests/pin/change-type/test.py

@@ -7,7 +7,7 @@
 
 from drivers.alr import run_alr
 from drivers.asserts import assert_match
-from drivers.helpers import path_separator
+from drivers.helpers import dir_separator
 
 
 def check_version_pin():
@@ -33,7 +33,7 @@ def check_version_pin():
 
 # Check that it shows as such in the solution
 p = run_alr('show', '--solve')
-s = re.escape(path_separator())  # platform-dependent
+s = re.escape(dir_separator())  # platform-dependent
 assert_match('.*Dependencies \(external\):.*'
              'libhello\* \(direct,linked'
              ',pin=.*' + s + 'my_index' + s +

testsuite/tests/pin/dir-crate/test.py

@@ -7,7 +7,7 @@
 
 from drivers.alr import run_alr
 from drivers.asserts import assert_match
-from drivers.helpers import path_separator
+from drivers.helpers import dir_separator
 from glob import glob
 
 # Retrieve a crate
@@ -25,7 +25,7 @@
 # Pin the hello crate as local dir dependency. The version in the folder is
 # different to the one we had in the solution, so this should cause a downgrade
 # but with complete solution. Now hello=1 --> libhello=1.1.
-run_alr('pin', 'hello', '--use', '..' + path_separator() + target)
+run_alr('pin', 'hello', '--use', '..' + dir_separator() + target)
 
 # Verify that hello dependencies are detected and used, and are the ones
 # corresponding to the linked dir versions.

testsuite/tests/pin/dir-mismatch/test.py

@@ -7,7 +7,7 @@
 
 from drivers.alr import run_alr
 from drivers.asserts import assert_match
-from drivers.helpers import path_separator
+from drivers.helpers import dir_separator
 from glob import glob
 
 # Retrieve a crate
@@ -22,7 +22,7 @@
 run_alr('with', 'nothello', '--use', '..')
 
 # Try to repin to a dir with valid crate metadata
-p = run_alr('with', 'nothello', '--use', '..' + path_separator() + target,
+p = run_alr('with', 'nothello', '--use', '..' + dir_separator() + target,
             complain_on_error=False)
 
 # Expected error

testsuite/tests/pin/pin-dir-with-regular/test.py

@@ -7,7 +7,6 @@
 
 from drivers.alr import run_alr
 from drivers.asserts import assert_match
-from drivers.helpers import path_separator, with_project
 
 # Initialize a workspace, enter, and add a regular dependency
 run_alr('init', '--bin', 'xxx')

testsuite/tests/pin/pin-dir/test.py

@@ -7,7 +7,7 @@
 
 from drivers.alr import run_alr
 from drivers.asserts import assert_match
-from drivers.helpers import path_separator, with_project
+from drivers.helpers import dir_separator, with_project
 
 # Initialize a workspace, enter, and add a regular dependency
 run_alr('init', '--bin', 'xxx')
@@ -29,7 +29,7 @@
 p = run_alr('with', '--solve')
 # For this match we don't know where the test is temporarily put, so we skip
 # over some parts of the output
-s = re.escape(path_separator())  # platform-dependent
+s = re.escape(dir_separator())  # platform-dependent
 assert_match('.*Dependencies \(external\):.*'
              'libhello\* \(direct,linked'
              ',pin=.*' + s + 'my_index' + s +

testsuite/tests/setenv/env-during-fetch/test.py

@@ -7,7 +7,6 @@
 
 from drivers.alr import run_alr
 from drivers.asserts import assert_match
-from drivers.helpers import path_separator
 
 
 def verify_output(text):

testsuite/tests/setenv/linked-paths/test.py

@@ -8,7 +8,7 @@
 
 from drivers.alr import run_alr
 from drivers.asserts import assert_match
-from drivers.helpers import path_separator
+from drivers.helpers import dir_separator, path_separator
 
 # Initialize test crate
 run_alr("init", "--bin", "xxx")
@@ -18,11 +18,10 @@
 run_alr("with", "--use=../my_index/crates/crate_1234")
 
 # Check paths are proper (base and one extra nested)
-s = path_separator()
 p = run_alr("setenv")
-assert_match('export GPR_PROJECT_PATH=".*/my_index/crates/crate_1234'
-             ':.*/my_index/crates/crate_1234/nested/"\n'
-             'export ALIRE="True"\n'.replace('/', re.escape(path_separator())),
+assert_match(('export GPR_PROJECT_PATH=".*/my_index/crates/crate_1234' +
+             path_separator() + '.*/my_index/crates/crate_1234/nested/"\n' +
+             'export ALIRE="True"\n').replace('/', re.escape(dir_separator())),
              p.out)
 
 

testsuite/tests/with/pin-dir-crate-autodetect/test.py

@@ -8,7 +8,7 @@
 
 from drivers.alr import run_alr
 from drivers.asserts import assert_match
-from drivers.helpers import path_separator
+from drivers.helpers import dir_separator
 from glob import glob
 
 # Retrieve a crate
@@ -21,7 +21,7 @@
 
 # Add the directory as pinned crate, with autodetection (no crate given,
 # inferred from the crate metadata found at target).
-run_alr('with', '--use', '..' + path_separator() + target)
+run_alr('with', '--use', '..' + dir_separator() + target)
 
 # Verify that hello^1 is a new dependency and also that hello dependencies are
 # in the solution.

testsuite/tests/with/pin-dir-crate/test.py

@@ -7,7 +7,7 @@
 
 from drivers.alr import run_alr
 from drivers.asserts import assert_match
-from drivers.helpers import path_separator
+from drivers.helpers import dir_separator
 from glob import glob
 
 # Retrieve a crate
@@ -19,7 +19,7 @@
 os.chdir('xxx')
 
 # Pin the hello crate as local dir dependency
-run_alr('with', 'hello', '--use', '..' + path_separator() + target)
+run_alr('with', 'hello', '--use', '..' + dir_separator() + target)
 
 # Verify that hello dependencies are detected and used
 p = run_alr('with', '--solve')

testsuite/tests/with/pin-dir-mismatch/test.py

@@ -7,7 +7,7 @@
 
 from drivers.alr import run_alr
 from drivers.asserts import assert_match
-from drivers.helpers import path_separator
+from drivers.helpers import dir_separator
 from glob import glob
 
 # Retrieve a crate
@@ -19,7 +19,7 @@
 os.chdir('xxx')
 
 # Try to pin the hello crate as local dir dependency
-p = run_alr('with', 'nothello', '--use', '..' + path_separator() + target,
+p = run_alr('with', 'nothello', '--use', '..' + dir_separator() + target,
             complain_on_error=False)
 
 # Expected error

testsuite/tests/with/pin-dir/test.py

@@ -7,7 +7,7 @@
 
 from drivers.alr import run_alr
 from drivers.asserts import assert_match
-from drivers.helpers import path_separator, with_project
+from drivers.helpers import dir_separator, with_project
 
 # Initialize a workspace, enter, and add a pinned dependency
 run_alr('init', '--bin', 'xxx')
@@ -28,7 +28,7 @@
 p = run_alr('with', '--solve')
 # For this match we don't know where the test is temporarily put, so we skip
 # over some parts of the output
-s = re.escape(path_separator())  # platform-dependent
+s = re.escape(dir_separator())  # platform-dependent
 assert_match('.*Dependencies \(external\):.*'
              'libhello\* \(direct,linked'
              ',pin=.*' + s + 'my_index' + s +