1 files changed, 30 insertions, 30 deletions

diff --git a/tests/test/script/runner/cleanup.test b/tests/test/script/runner/cleanup.test
index 3dfd73e..ed724ee 100644
--- a/tests/test/script/runner/cleanup.test
+++ b/tests/test/script/runner/cleanup.test
@@ -56,8 +56,8 @@ b += --no-column
   : Test cleanup of non-existing file.
   :
   $c <'$* &a';
-  $b 2>>~%EOE% != 0
-  %testscript:1: error: registered for cleanup file test[/\\]1[/\\]a does not exist%
+  $b 2>>/EOE != 0
+  testscript:1: error: registered for cleanup file test/1/a does not exist
   EOE
 
   : out-wd
@@ -65,8 +65,8 @@ 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[/\\]%
+  $b 2>>/EOE != 0
+  testscript:1: error: file cleanup ../../a is out of working directory test/
   EOE
 
   : in-wd
@@ -75,8 +75,8 @@ b += --no-column
   : directory but inside the script working directory.
   :
   $c <'$* &../a';
-  $b 2>>~%EOE% != 0
-  %testscript:1: error: registered for cleanup file test[/\\]a does not exist%
+  $b 2>>/EOE != 0
+  testscript:1: error: registered for cleanup file test/a does not exist
   EOE
 
   : not-file
@@ -84,8 +84,8 @@ b += --no-column
   : Test cleanup of a directory as a file.
   :
   $c <'$* -d a &a';
-  $b 2>>~%EOE% != 0
-  %error: unable to remove file test[/\\]1[/\\]a: .+%
+  $b 2>>/~%EOE% != 0
+  %error: unable to remove file test/1/a: .+%
   EOE
 }
 
@@ -119,8 +119,8 @@ b += --no-column
   : Test cleanup of non-existing directory.
   :
   $c <'$* &a/';
-  $b 2>>~%EOE% != 0
-  %testscript:1: error: registered for cleanup directory test[/\\]1[/\\]a[/\\] does not exist%
+  $b 2>>/EOE != 0
+  testscript:1: error: registered for cleanup directory test/1/a/ does not exist
   EOE
 
   : out-wd
@@ -128,8 +128,8 @@ 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[/\\]%
+  $b 2>>/EOE != 0
+  testscript:1: error: directory cleanup ../../a/ is out of working directory test/
   EOE
 
   : in-wd
@@ -138,8 +138,8 @@ b += --no-column
   : working directory but inside the testscript working directory.
   :
   $c <'$* &../a/';
-  $b 2>>~%EOE% != 0
-  %testscript:1: error: registered for cleanup directory test[/\\]a[/\\] does not exist%
+  $b 2>>/EOE != 0
+  testscript:1: error: registered for cleanup directory test/a/ does not exist
   EOE
 
   : not-empty
@@ -147,8 +147,8 @@ b += --no-column
   : Test cleanup of a non-empty directory.
   :
   $c <'$* -d a -f a/b &a/';
-  $b 2>>~%EOE% != 0
-  %testscript:1: error: registered for cleanup directory test[/\\]1[/\\]a[/\\] is not empty%
+  $b 2>>/EOE != 0
+  testscript:1: error: registered for cleanup directory test/1/a/ is not empty
   EOE
 
   : not-dir
@@ -156,8 +156,8 @@ b += --no-column
   : Test cleanup of a file as a directory.
   :
   $c <'$* -f a &a/';
-  $b 2>>~%EOE% != 0
-  %error: unable to remove directory test[/\\]1[/\\]a[/\\]: .+%
+  $b 2>>/~%EOE% != 0
+  %error: unable to remove directory test/1/a/: .+%
   EOE
 }
 
@@ -179,8 +179,8 @@ b += --no-column
   : Test cleanup of a wildcard not matching any directory.
   :
   $c <'$* &a/***';
-  $b 2>>~%EOE% != 0
-  %testscript:1: error: registered for cleanup wildcard test[/\\]1[/\\]a[/\\]\*\*\* doesn't match a directory%
+  $b 2>>/EOE != 0
+  testscript:1: error: registered for cleanup wildcard test/1/a/*** doesn't match a directory
   EOE
 
   : out-wd
@@ -188,8 +188,8 @@ 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[/\\]%
+  $b 2>>/EOE != 0
+  testscript:1: error: wildcard cleanup ../../a/*** is out of working directory test/
   EOE
 
   : in-wd
@@ -199,8 +199,8 @@ b += --no-column
   : directory.
   :
   $c <'$* &../a/***';
-  $b 2>>~%EOE% != 0
-  %testscript:1: error: registered for cleanup wildcard test[/\\]a[/\\]\*\*\* doesn't match a directory%
+  $b 2>>/EOE != 0
+  testscript:1: error: registered for cleanup wildcard test/a/*** doesn't match a directory
   EOE
 
   : not-dir
@@ -208,8 +208,8 @@ b += --no-column
   : Test cleanup of a file as a wildcard.
   :
   $c <'$* -f a &a/***';
-  $b 2>>~%EOE% != 0
-  %error: unable to remove directory test[/\\]1[/\\]a[/\\]: .+%
+  $b 2>>/~%EOE% != 0
+  %error: unable to remove directory test/1/a/: .+%
   EOE
 }
 
@@ -225,8 +225,8 @@ $b
 : Test an implicit cleanup being overwritten with the explicit one,
 :
 $c <'$* -o foo >>>a &!a';
-$b 2>>~%EOE% != 0
-%testscript:1: error: registered for cleanup directory test[/\\]1[/\\] is not empty%
+$b 2>>/EOE != 0
+testscript:1: error: registered for cleanup directory test/1/ is not empty
 EOE
 
 : explicit-overwrite
@@ -237,6 +237,6 @@ $c <<EOO;
 $* &!a;
 $* -o foo >>>a
 EOO
-$b 2>>~%EOE% != 0
-%testscript:2: error: registered for cleanup directory test[/\\]1[/\\] is not empty%
+$b 2>>/EOE != 0
+testscript:2: error: registered for cleanup directory test/1/ is not empty
 EOE