From cd090e741cdee437632554d22c5ae84572c7267f Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Thu, 1 Aug 2019 12:10:26 +0300
Subject: Combine multiple single-character flags into a single argument for
 testscript commands

---
 tests/test/script/runner/cleanup.testscript | 2 +-
 tests/test/script/runner/set.testscript     | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'tests/test/script/runner')

diff --git a/tests/test/script/runner/cleanup.testscript b/tests/test/script/runner/cleanup.testscript
index b9f0934..429efb3 100644
--- a/tests/test/script/runner/cleanup.testscript
+++ b/tests/test/script/runner/cleanup.testscript
@@ -100,7 +100,7 @@ b += --no-column
   :
   $c <<EOI && $b
   mkdir ../../a;
-  rm -r -f ../../a
+  rm -rf ../../a
   EOI
 
   : not-exists
diff --git a/tests/test/script/runner/set.testscript b/tests/test/script/runner/set.testscript
index edbff3e..20263e0 100644
--- a/tests/test/script/runner/set.testscript
+++ b/tests/test/script/runner/set.testscript
@@ -106,7 +106,7 @@
     : trailing-ws
     :
     $c <<EOI && $b
-    set -e -w baz <' foo   bar ';
+    set --exact --whitespace baz <' foo   bar ';
     echo $baz >'foo bar '
     EOI
 
@@ -116,7 +116,7 @@
     : ':' modifier.
     :
     $c <<EOI && $b
-    set -e -w baz <:' foo bar';
+    set --exact --whitespace baz <:' foo bar';
     echo $baz >'foo bar'
     EOI
   }
@@ -144,7 +144,7 @@
     : trailing-newline
     :
     $c <<EOI && $b
-    set -e -n baz <<EOF;
+    set --exact --newline baz <<EOF;
 
     foo
 
@@ -157,7 +157,7 @@
     : no-trailing-newline
     :
     $c <<EOI && $b
-    set -e -n baz <<:EOF;
+    set --exact --newline baz <<:EOF;
 
     foo
 
-- 
cgit v1.1