Adapt tests to converting repo canonical name path part to lower case on Windows

2 files changed, 34 insertions, 11 deletions

diff --git a/tests/pkg-build.testscript b/tests/pkg-build.testscript
index dad2df3..6fe5eb9 100644
--- a/tests/pkg-build.testscript
+++ b/tests/pkg-build.testscript
@@ -118,6 +118,8 @@
 #     |-- libbaz.git
 #     `-- style-basic.git
 
+posix = ($cxx.target.class != 'windows')
+
 # Prepare repositories used by tests if running in the local mode.
 #
 +if! $remote
@@ -3321,7 +3323,7 @@ test.options += --no-progress
       $clone_root_cfg;
 
       if! $remote
-        rep = ($cxx.target.class != 'windows' \
+        rep = ($posix \
                ? "file:$rep" \
                : "file:/$regex.replace($rep, '\\', '/')")
 
@@ -3473,8 +3475,11 @@ test.options += --no-progress
 
     d = $canonicalize([dir_path] $src/libfoo-1.1.0);
 
+    # Note that on Windows the local repository canonical name path part is
+    # converted to lower case.
+    #
     $* "libfoo@$d" 2>>~"%EOE%";
-      fetching dir:$d
+      fetching dir:($posix ? "$d" : $string.lcase("$d"))
       using libfoo/1.1.0 \(external\)
       configured libfoo/1.1.0
       %info: .+ is up to date%
@@ -3498,7 +3503,14 @@ test.options += --no-progress
     $clone_root_cfg;
     $rep_fetch $rep/t4a;
     $rep_add $src/libfoo-1.1.0 --type dir;
-    $rep_fetch "dir:$canonicalize([dir_path] $src/libfoo-1.1.0)";
+
+    d = $canonicalize([dir_path] $src/libfoo-1.1.0);
+
+    if! $posix
+      d = [dir_path] $string.lcase($d)
+    end;
+
+    $rep_fetch "dir:$d";
 
     $* libfoo 2>>~%EOE%;
       using libfoo/1.1.0 (external)
diff --git a/tests/rep-fetch.testscript b/tests/rep-fetch.testscript
index fdb14f9..b9b9e05 100644
--- a/tests/rep-fetch.testscript
+++ b/tests/rep-fetch.testscript
@@ -66,6 +66,8 @@
 # |
 # `-- git/* (see rep-fetch-git.testscript)
 
+posix = ($cxx.target.class != 'windows')
+
 # Prepare repositories used by tests if running in the local mode.
 #
 +if! $remote
@@ -474,14 +476,23 @@ if! $remote
 
   +$clone_cfg && $rep_add $rep/libbar.git
 
+  d = $canonicalize($rep)
+
+  # Note that on Windows the local repository canonical name path part is
+  # converted to lower case.
+  #
+  if! $posix
+    d = [dir_path] $string.lcase($d)
+  end
+
   : prerequisites
   :
   {
     $clone_cfg;
 
     $* 2>>"EOE";
-      fetching dir:($rep/libbar.git)
-      fetching dir:($rep/style-basic.git) \(prerequisite of dir:($rep/libbar.git)\)
+      fetching dir:($d/libbar.git)
+      fetching dir:($d/style-basic.git) \(prerequisite of dir:($d/libbar.git)\)
       3 package\(s\) in 2 repository\(s\)
       EOE
 
@@ -500,8 +511,8 @@ if! $remote
     $clone_cfg;
     $* 2>!;
 
-    $* "dir:($rep/libbar.git)" 2>>"EOE";
-      fetching dir:($rep/style-basic.git) \(prerequisite of dir:($rep/libbar.git)\)
+    $* "dir:($d/libbar.git)" 2>>"EOE";
+      fetching dir:($d/style-basic.git) \(prerequisite of dir:($d/libbar.git)\)
       3 package\(s\) in 2 repository\(s\)
       EOE
 
@@ -522,7 +533,7 @@ if! $remote
       $clone_cfg;
       $* 2>!;
 
-      $* --shallow "dir:($rep/libbar.git)" 2>>"EOE";
+      $* --shallow "dir:($d/libbar.git)" 2>>"EOE";
         3 package\(s\) in 2 repository\(s\)
         EOE
 
@@ -538,8 +549,8 @@ if! $remote
       $clone_cfg;
 
       $* --shallow 2>>"EOE";
-        fetching dir:($rep/libbar.git)
-        fetching dir:($rep/style-basic.git) \(prerequisite of dir:($rep/libbar.git)\)
+        fetching dir:($d/libbar.git)
+        fetching dir:($d/style-basic.git) \(prerequisite of dir:($d/libbar.git)\)
         3 package\(s\) in 2 repository\(s\)
         EOE
 
@@ -764,7 +775,7 @@ else
 
     $clone_root_cfg;
 
-    rep = ($cxx.target.class != 'windows' \
+    rep = ($posix \
            ? "file:$~" \
            : "file:/$regex.replace($~, '\\', '/')");