1 files changed, 28 insertions, 10 deletions
diff --git a/tests/rep-fetch.testscript b/tests/rep-fetch.testscript
index fdb14f9..b713c0c 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
 
@@ -620,11 +631,15 @@ if! $remote
 
       : unchanged-external
       :
+      : Test that iteration is still incremented when a non-external package
+      : from a pkg repository is switched to the same unedited external
+      : package.
+      :
       {
         $clone_cfg && $rep_add $src/libhello-1.0.0;
         $* 2>!;
 
-        $pkg_status libhello >'libhello unpacked 1.0.0'
+        $pkg_status libhello >'libhello unpacked 1.0.0 available 1.0.0#1'
       }
 
       : changed-external
@@ -644,6 +659,9 @@ if! $remote
 
     : git-rep
     :
+    : Test that iteration is still incremented when a non-external package
+    : from a git repository is switched to the same unedited external package.
+    :
     if ($git_supported && !$remote)
     {
       rep = $canonicalize([dir_path] $out_git/state0);
@@ -657,7 +675,7 @@ if! $remote
       $rep_add $rep/style.git;
       $* 2>!;
 
-      $pkg_status style >"style unpacked 1.0.0";
+      $pkg_status style >"style unpacked 1.0.0 available 1.0.0#1";
 
       $pkg_purge style 2>"purged style/1.0.0"
     }
@@ -764,7 +782,7 @@ else
 
     $clone_root_cfg;
 
-    rep = ($cxx.target.class != 'windows' \
+    rep = ($posix \
            ? "file:$~" \
            : "file:/$regex.replace($~, '\\', '/')");