Use dir_name_view for script environment working and sandbox directories

4 files changed, 16 insertions, 16 deletions

diff --git a/tests/test/script/builtin/mv.testscript b/tests/test/script/builtin/mv.testscript
index 31e2603..764c1e0 100644
--- a/tests/test/script/builtin/mv.testscript
+++ b/tests/test/script/builtin/mv.testscript
@@ -21,8 +21,8 @@
       : Moving path outside the testscript working directory fails.
       :
       $c <<EOI && $b
-        mv ../../a/b/c ./c 2>>/~%EOE% == 1
-        %mv: '.+/fail/a/b/c' is out of working directory '.+/fail/test'%
+        mv ../../a/b/c ./c 2>>/EOE == 1
+        mv: 'a/b/c' is out of working directory 'test/'
         EOE
         EOI
 
@@ -84,14 +84,14 @@
       : src
       :
       $c <<EOI && $b
-        mv $~ b 2>"mv: '$~' contains test working directory '$~'" != 0
+        mv $~ b 2>/"mv: 'test/1/' contains test working directory 'test/1/'" != 0
         EOI
 
       : dst
       :
       $c <<EOI && $b
         mkdir a;
-        mv a "$~" 2>"mv: '$~' contains test working directory '$~'" != 0
+        mv a "$~" 2>/"mv: 'test/1' contains test working directory 'test/1/'" != 0
         EOI
     }
 
diff --git a/tests/test/script/builtin/rm.testscript b/tests/test/script/builtin/rm.testscript
index 5b00042..21ec2a9 100644
--- a/tests/test/script/builtin/rm.testscript
+++ b/tests/test/script/builtin/rm.testscript
@@ -11,7 +11,7 @@
   : Removing scope directory fails.
   :
   $c <<EOI && $b
-    rm -r ./ 2>"rm: '$~' contains test working directory '$~'" == 1
+    rm -r ./ 2>/"rm: 'test/1/' contains test working directory 'test/1/'" == 1
     EOI
 }
 
@@ -28,8 +28,8 @@
     : Removing path outside the testscript working directory fails.
     :
     $c <<EOI && $b
-      rm ../../a/b/c 2>>/~%EOE% == 1
-      %rm: '.+/path/outside-scope/fail/a/b/c' is out of working directory '.+/path/outside-scope/fail/test'%
+      rm ../../a/b/c 2>>/EOE == 1
+      rm: 'a/b/c' is out of working directory 'test/'
       EOE
       EOI
 
diff --git a/tests/test/script/builtin/rmdir.testscript b/tests/test/script/builtin/rmdir.testscript
index 269dd58..a63a5dd 100644
--- a/tests/test/script/builtin/rmdir.testscript
+++ b/tests/test/script/builtin/rmdir.testscript
@@ -11,7 +11,7 @@
   : Removing scope directory fails.
   :
   $c <<EOI && $b
-  rmdir ./ 2>"rmdir: '$~' contains test working directory '$~'" == 1
+  rmdir ./ 2>/"rmdir: 'test/1/' contains test working directory 'test/1/'" == 1
   EOI
 
   : outside-scope
@@ -24,8 +24,8 @@
     : Removing directory outside the testscript working directory fails.
     :
     $c <<EOI && $b
-    rmdir ../../a/b/c 2>>/~%EOE% == 1
-    %rmdir: '.+/dir/outside-scope/fail/a/b/c/' is out of working directory '.+/dir/outside-scope/fail/test'%
+    rmdir ../../a/b/c 2>>/EOE == 1
+    rmdir: 'a/b/c/' is out of working directory 'test/'
     EOE
     EOI
 
diff --git a/tests/test/script/runner/cleanup.testscript b/tests/test/script/runner/cleanup.testscript
index fcbdfc2..03153e4 100644
--- a/tests/test/script/runner/cleanup.testscript
+++ b/tests/test/script/runner/cleanup.testscript
@@ -56,7 +56,7 @@ b += --no-column
   : Test explicit cleanup of a file out of the testscript working directory.
   :
   $c <'$* &../../a' && $b 2>>/EOE != 0
-  testscript:1: error: file cleanup ../../a is out of working directory test/
+  testscript:1: error: file cleanup ../../a is out of working directory 'test/'
     info: test id: 1
   EOE
 
@@ -116,7 +116,7 @@ b += --no-column
   : Test cleanup of a directory out of the testscript working directory.
   :
   $c <'$* &../../a/' && $b 2>>/EOE != 0
-  testscript:1: error: directory cleanup ../../a/ is out of working directory test/
+  testscript:1: error: directory cleanup ../../a/ is out of working directory 'test/'
     info: test id: 1
   EOE
 
@@ -150,7 +150,7 @@ b += --no-column
     : dir
     :
     $c <'$* -d a/b' && $b 2>>/EOE != 0
-    testscript:1: error: working directory test/1/ is not empty
+    testscript:1: error: test working directory 'test/1/' is not empty
     a/
       info: test id: 1
     EOE
@@ -220,7 +220,7 @@ b += --no-column
       : Test cleanup of a wildcard out of the testscript working directory.
       :
       $c <'$* &../../a/***' && $b 2>>/EOE != 0
-      testscript:1: error: wildcard cleanup ../../a/*** is out of working directory test/
+      testscript:1: error: wildcard cleanup ../../a/*** is out of working directory 'test/'
         info: test id: 1
       EOE
 
@@ -346,7 +346,7 @@ EOI
 : Test an implicit cleanup being overwritten with the explicit one,
 :
 $c <'$* -o foo >=a &!a' && $b 2>>/EOE != 0
-testscript:1: error: working directory test/1/ is not empty
+testscript:1: error: test working directory 'test/1/' is not empty
 a
   info: test id: 1
 EOE
@@ -359,7 +359,7 @@ $c <<EOO && $b 2>>/EOE != 0
 $* &!a;
 $* -o foo >=a
 EOO
-testscript:2: error: working directory test/1/ is not empty
+testscript:2: error: test working directory 'test/1/' is not empty
 a
   info: test id: 1
 EOE