aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2019-07-31 19:05:59 (GMT)
committerKaren Arutyunov <karen@codesynthesis.com>2019-07-31 19:27:10 (GMT)
commit0a9b30024ee486bb1631f75cbc559d0df1852e27 (patch)
treee424bc3a961a455bab098efe9597a75a26194d6e
parent88da1215cc9c1790f3cd111417dae72910c8f2fc (diff)
Combine multiple single-character options into a single argument for testscript commands
-rw-r--r--tests/config.testscript4
-rw-r--r--tests/pkg-build.testscript8
-rw-r--r--tests/pkg-fetch.testscript2
-rw-r--r--tests/pkg-purge.testscript10
-rw-r--r--tests/pkg-unpack.testscript10
5 files changed, 17 insertions, 17 deletions
diff --git a/tests/config.testscript b/tests/config.testscript
index e2e7498..fabdbde 100644
--- a/tests/config.testscript
+++ b/tests/config.testscript
@@ -15,12 +15,12 @@
# The most commonly used configuration cloning command that copies it from the
# parent scope working directory.
#
-clone_cfg = cp -p -r ../cfg ./
+clone_cfg = cp -pr ../cfg ./
# Clones the original (presumably empty) configuration from the root scope
# working directory.
#
-clone_root_cfg = cp -p -r $~/cfg ./
+clone_root_cfg = cp -pr $~/cfg ./
# Setup a test command to use a cloned configuration directory by default.
#
diff --git a/tests/pkg-build.testscript b/tests/pkg-build.testscript
index 17fa313..c75da0b 100644
--- a/tests/pkg-build.testscript
+++ b/tests/pkg-build.testscript
@@ -3401,7 +3401,7 @@ test.options += --no-progress
{
$clone_cfg;
$pkg_disfigure libhello --keep-out 2>!;
- $pkg_unpack -r -e ../../../libhello;
+ $pkg_unpack -re ../../../libhello;
$* libhello 2>>~%EOE%;
configured libhello/1.0.1
@@ -3419,7 +3419,7 @@ test.options += --no-progress
: Test that libhello is fully rebuilt, as the resulted package is not
: external.
{
- clone_cfg = cp -p --no-cleanup -r ../../cfg ./
+ clone_cfg = cp -pr --no-cleanup ../../cfg ./
+$build 'dist(../../libhello/@./out/)' \
"config.cxx=$config.cxx" config.dist.root=./ \
@@ -3455,7 +3455,7 @@ test.options += --no-progress
$clone_cfg;
$pkg_disfigure libhello 2>!;
- $pkg_fetch -r -e ../libhello-1.0.1.tar.gz;
+ $pkg_fetch -re ../libhello-1.0.1.tar.gz;
$pkg_unpack libhello;
$* libhello 2>>~%EOE%;
@@ -3507,7 +3507,7 @@ test.options += --no-progress
updated libfoo/1.1.0
EOE
- cp -p -r $src/libfoo-1.1.0 libfoo;
+ cp -pr $src/libfoo-1.1.0 libfoo;
$* libfoo/ 2>>~%EOE%;
disfigured libfoo/1.1.0
diff --git a/tests/pkg-fetch.testscript b/tests/pkg-fetch.testscript
index 22fcc0c..bf53b3d 100644
--- a/tests/pkg-fetch.testscript
+++ b/tests/pkg-fetch.testscript
@@ -170,7 +170,7 @@ $* libfoo/1.0.0 2>>/EOE != 0
$clone_cfg;
cp --no-cleanup $src/t1/libfoo-1.0.0.tar.gz ./;
- $* -p -e libfoo-1.0.0.tar.gz 2>'using libfoo/1.0.0 (external)';
+ $* -pe libfoo-1.0.0.tar.gz 2>'using libfoo/1.0.0 (external)';
$pkg_purge libfoo 2>'purged libfoo/1.0.0'
}
diff --git a/tests/pkg-purge.testscript b/tests/pkg-purge.testscript
index 7b8f5c0..098541f 100644
--- a/tests/pkg-purge.testscript
+++ b/tests/pkg-purge.testscript
@@ -63,7 +63,7 @@ $* libfoo 2>>/EOE != 0
{
$clone_cfg;
cp --no-cleanup $src/libfoo-1.0.0.tar.gz cfg/;
- $pkg_fetch -e -p cfg/libfoo-1.0.0.tar.gz;
+ $pkg_fetch -ep cfg/libfoo-1.0.0.tar.gz;
$* libfoo 2>'purged libfoo/1.0.0';
$pkg_status libfoo 1>'libfoo unknown';
@@ -122,7 +122,7 @@ $* libfoo 2>>/EOE != 0
$clone_cfg;
cp --no-cleanup -r $src/libfoo-1.1.0 cfg/;
- $pkg_unpack -e -p cfg/libfoo-1.1.0;
+ $pkg_unpack -ep cfg/libfoo-1.1.0;
$* libfoo 2>'purged libfoo/1.1.0';
$pkg_status libfoo 1>'libfoo unknown';
@@ -134,7 +134,7 @@ $* libfoo 2>>/EOE != 0
{
$clone_cfg;
cp --no-cleanup $src/libfoo-1.0.0.tar.gz cfg/;
- $pkg_fetch -e -p cfg/libfoo-1.0.0.tar.gz && $pkg_unpack libfoo;
+ $pkg_fetch -ep cfg/libfoo-1.0.0.tar.gz && $pkg_unpack libfoo;
$* libfoo 2>'purged libfoo/1.0.0';
$pkg_status libfoo 1>'libfoo unknown';
@@ -148,7 +148,7 @@ if ($posix && "$uid" != '0')
{
$clone_cfg;
cp --no-cleanup $src/libfoo-1.0.0.tar.gz cfg/;
- $pkg_fetch -e -p cfg/libfoo-1.0.0.tar.gz;
+ $pkg_fetch -ep cfg/libfoo-1.0.0.tar.gz;
$pkg_unpack libfoo;
chmod 000 cfg/libfoo-1.0.0;
@@ -159,7 +159,7 @@ if ($posix && "$uid" != '0')
$pkg_status libfoo/1.0.0 >'libfoo broken 1.0.0';
- $* -f -k libfoo 2>'error: cannot keep broken package libfoo' != 0;
+ $* -fk libfoo 2>'error: cannot keep broken package libfoo' != 0;
$pkg_status libfoo/1.0.0 >'libfoo broken 1.0.0';
$* -f libfoo 2>>/EOE != 0;
diff --git a/tests/pkg-unpack.testscript b/tests/pkg-unpack.testscript
index a56168d..834e0df 100644
--- a/tests/pkg-unpack.testscript
+++ b/tests/pkg-unpack.testscript
@@ -132,8 +132,8 @@ $* 2>>EOE != 0
info: use 'pkg-unpack --replace|-r' to replace
EOE
- $* -r -e $src/libfoo-1.1.0 2>'using libfoo/1.1.0 (external)';
- $pkg_status libfoo/1.1.0 1>'libfoo unpacked 1.1.0';
+ $* -re $src/libfoo-1.1.0 2>'using libfoo/1.1.0 (external)';
+ $pkg_status libfoo/1.1.0 1>'libfoo unpacked 1.1.0';
$pkg_purge libfoo 2>'purged libfoo/1.1.0'
}
@@ -151,8 +151,8 @@ $* 2>>EOE != 0
info: use 'pkg-unpack --replace|-r' to replace
EOE
- $* -r -e $src/libfoo-1.1.0 2>'using libfoo/1.1.0 (external)';
- $pkg_status libfoo/1.1.0 1>'libfoo unpacked 1.1.0';
+ $* -re $src/libfoo-1.1.0 2>'using libfoo/1.1.0 (external)';
+ $pkg_status libfoo/1.1.0 1>'libfoo unpacked 1.1.0';
$pkg_purge libfoo 2>'purged libfoo/1.1.0'
}
@@ -198,7 +198,7 @@ $* 2>>EOE != 0
$clone_cfg;
cp --no-cleanup -r $src/libfoo-1.1.0 ./;
- $* -p -e libfoo-1.1.0 2>'using libfoo/1.1.0 (external)';
+ $* -pe libfoo-1.1.0 2>'using libfoo/1.1.0 (external)';
$pkg_purge libfoo 2>'purged libfoo/1.1.0'
}