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

---
 tests/curl/testscript    | 16 ++++++++--------
 tests/mventry/testscript |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/curl/testscript b/tests/curl/testscript
index 7d187b6..466558e 100644
--- a/tests/curl/testscript
+++ b/tests/curl/testscript
@@ -25,16 +25,16 @@ sudo /usr/sbin/in.tftpd \
 
   $* 'tftp' &foo &bar 2>>EOE;
 
-  curl -s -S tftp://localhost:55123/test-driver/tftp/foo
+  curl -sS tftp://localhost:55123/test-driver/tftp/foo
   curl: (68) TFTP: File Not Found
 
-  curl -s -S --upload-file foo-src tftp://localhost:55123/test-driver/tftp/foo
+  curl -sS --upload-file foo-src tftp://localhost:55123/test-driver/tftp/foo
 
-  curl -s -S --upload-file - tftp://localhost:55123/test-driver/tftp/bar
+  curl -sS --upload-file - tftp://localhost:55123/test-driver/tftp/bar
 
-  curl -s -S tftp://localhost:55123/test-driver/tftp/foo
+  curl -sS tftp://localhost:55123/test-driver/tftp/foo
 
-  curl -s -S tftp://localhost:55123/test-driver/tftp/foo
+  curl -sS tftp://localhost:55123/test-driver/tftp/foo
   EOE
 
   diff -u foo-src foo;
@@ -46,12 +46,12 @@ sudo /usr/sbin/in.tftpd \
 {
   $* 'http' 2>>EOE
 
-  curl -s -S --fail --location https://build2.org/bogus
+  curl -sS --fail --location https://build2.org/bogus
   curl: (22) The requested URL returned error: 404 Not Found
 
-  curl -s -S --fail --location https://build2.org
+  curl -sS --fail --location https://build2.org
 
-  curl -s -S --fail --location --data-binary @- https://build2.org/bogus
+  curl -sS --fail --location --data-binary @- https://build2.org/bogus
   curl: (22) The requested URL returned error: 404 Not Found
   EOE
 }
diff --git a/tests/mventry/testscript b/tests/mventry/testscript
index 9cf6858..32c9ced 100644
--- a/tests/mventry/testscript
+++ b/tests/mventry/testscript
@@ -194,7 +194,7 @@ if ($test.target == $build.host)
 if! $empty($config.libbutl.test.rename.dir)
 {
   wd = $config.libbutl.test.rename.dir/libbutl-rename
-  +rm -r -f $wd
+  +rm -rf $wd
   +mkdir $wd
 
   : file
@@ -241,5 +241,5 @@ if! $empty($config.libbutl.test.rename.dir)
     $* a $b 2>- == 1
   }
 
-  -rm -r -f $wd
+  -rm -rf $wd
 }
-- 
cgit v1.1