1 files changed, 39 insertions, 32 deletions
diff --git a/tests/test/script/builtin/rm.test b/tests/test/script/builtin/rm.test
index a6de003..937633b 100644
--- a/tests/test/script/builtin/rm.test
+++ b/tests/test/script/builtin/rm.test
@@ -37,21 +37,25 @@
 
   : not-exists
   :
-  : Removing non-existing file fails.
-  :
-  $c <<EOI;
-  rm a 2>>/~%EOE% == 1
-  %rm: unable to remove '.+/test/rm/file/not-exists/test/1/a': .+%
-  EOE
-  EOI
-  $b
+  {
+    : fail
+    :
+    : Removing non-existing file fails.
+    :
+    $c <<EOI;
+    rm a 2>>/~%EOE% == 1
+    %rm: unable to remove '.+/file/not-exists/fail/test/1/a': .+%
+    EOE
+    EOI
+    $b
 
-  : not-exists-force
-  :
-  : Removing non-existing file succeeds with -f option.
-  :
-  $c <'rm -f a';
-  $b
+    : force
+    :
+    : Removing non-existing file succeeds with -f option.
+    :
+    $c <'rm -f a';
+    $b
+  }
 }
 
 : dir
@@ -101,23 +105,26 @@
 
   : outside-scope
   :
-  : Removing path outside the testscript working directory fails. Need to use
-  : a path that unlikely exists (not to remove something useful).
-  :
-  :
-  $c <<EOI;
-  rm ../../a/b/c 2>>/~%EOE% == 1
-  %rm: '.+/path/outside-scope/a/b/c' is out of working directory '.+/outside-scope/test'%
-  EOE
-  EOI
-  $b
+  : Need to use a path that unlikely exists (not to remove something useful).
+  :
+  {
+    : fail
+    :
+    : Removing path outside the testscript working directory fails.
+    :
+    $c <<EOI;
+    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'%
+    EOE
+    EOI
+    $b
 
-  : outside-scope-force
-  :
-  : Removing path outside the testscript working directory succeeds with -f
-  : option. Need to use a path that unlikely exists (not to remove something
-  : useful).
-  :
-  $c <'rm -f ../../a/b/c';
-  $b
+    : force
+    :
+    : Removing path outside the testscript working directory succeeds with -f
+    : option.
+    :
+    $c <'rm -f ../../a/b/c';
+    $b
+  }
 }