diff options
author | Karen Arutyunov <karen@codesynthesis.com> | 2019-08-01 12:10:26 +0300 |
---|---|---|
committer | Karen Arutyunov <karen@codesynthesis.com> | 2019-08-01 16:41:08 +0300 |
commit | cd090e741cdee437632554d22c5ae84572c7267f (patch) | |
tree | 0a1bd864633d925297edc2e55b1cb51ae089d50e /tests/test | |
parent | d3514286b136691279f104c92fe08dada1f042ab (diff) |
Combine multiple single-character flags into a single argument for testscript commands
Diffstat (limited to 'tests/test')
-rw-r--r-- | tests/test/script/builtin/cp.testscript | 2 | ||||
-rw-r--r-- | tests/test/script/builtin/test.testscript | 2 | ||||
-rw-r--r-- | tests/test/script/runner/cleanup.testscript | 2 | ||||
-rw-r--r-- | tests/test/script/runner/set.testscript | 8 |
4 files changed, 7 insertions, 7 deletions
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 |