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/cc/modules/headers.testscript         | 2 +-
 tests/test/script/builtin/cp.testscript     | 2 +-
 tests/test/script/builtin/test.testscript   | 2 +-
 tests/test/script/runner/cleanup.testscript | 2 +-
 tests/test/script/runner/set.testscript     | 8 ++++----
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/cc/modules/headers.testscript b/tests/cc/modules/headers.testscript
index 439c919..8eeb81a 100644
--- a/tests/cc/modules/headers.testscript
+++ b/tests/cc/modules/headers.testscript
@@ -164,7 +164,7 @@ $* 'test:' ./@$out/remapped/ \
   ./: exe{test-inc}: cxx{driver-inc} hxx{core}
   hxx{core}: in{core}
   EOI
-rm -r -f $out
+rm -rf $out
 
 # Clean module sidebuilds.
 #
diff --git a/tests/test/script/builtin/cp.testscript b/tests/test/script/builtin/cp.testscript
index 46828df..60497b1 100644
--- a/tests/test/script/builtin/cp.testscript
+++ b/tests/test/script/builtin/cp.testscript
@@ -340,7 +340,7 @@ if ($cxx.target.class != 'windows')
       ls -l $src_base | sed -n -e '$ds' | \
       set t;
 
-      cp -p -r $src_base/cp-dir ./;
+      cp -pr $src_base/cp-dir ./;
       ls -l | sed -n -e '$ds' >"\$t"
       EOI
     }
diff --git a/tests/test/script/builtin/test.testscript b/tests/test/script/builtin/test.testscript
index dceb229..9fde142 100644
--- a/tests/test/script/builtin/test.testscript
+++ b/tests/test/script/builtin/test.testscript
@@ -60,7 +60,7 @@
   : both-file-dir
   :
   $c <<EOI && $b
-  test -f -d 2>"test: both -f|--file and -d|--directory specified" == 2
+  test -fd 2>"test: both -f|--file and -d|--directory specified" == 2
   EOI
 }
 
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