aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2019-08-01 16:34:28 (GMT)
committerKaren Arutyunov <karen@codesynthesis.com>2019-08-02 17:22:21 (GMT)
commit5d81c755c77ab6b182ab713de29826bace79f466 (patch)
tree12899bc65027c4b92674a63484915911ce86ff70
parent0e920ebda6b4e69da318cf5e9c4288c283f1e636 (diff)
Replace some testscript commands single-character options with their long variants for clarity
-rw-r--r--tests/pkg-build.testscript4
-rw-r--r--tests/pkg-fetch.testscript2
-rw-r--r--tests/pkg-purge.testscript10
-rw-r--r--tests/pkg-unpack.testscript6
4 files changed, 11 insertions, 11 deletions
diff --git a/tests/pkg-build.testscript b/tests/pkg-build.testscript
index c75da0b..824a4bb 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 -re ../../../libhello;
+ $pkg_unpack --replace --existing ../../../libhello;
$* libhello 2>>~%EOE%;
configured libhello/1.0.1
@@ -3455,7 +3455,7 @@ test.options += --no-progress
$clone_cfg;
$pkg_disfigure libhello 2>!;
- $pkg_fetch -re ../libhello-1.0.1.tar.gz;
+ $pkg_fetch --replace --existing ../libhello-1.0.1.tar.gz;
$pkg_unpack libhello;
$* libhello 2>>~%EOE%;
diff --git a/tests/pkg-fetch.testscript b/tests/pkg-fetch.testscript
index bf53b3d..b37ba73 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 ./;
- $* -pe libfoo-1.0.0.tar.gz 2>'using libfoo/1.0.0 (external)';
+ $* --purge --existing 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 098541f..e48590c 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 -ep cfg/libfoo-1.0.0.tar.gz;
+ $pkg_fetch --purge --existing 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 -ep cfg/libfoo-1.1.0;
+ $pkg_unpack --purge --existing 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 -ep cfg/libfoo-1.0.0.tar.gz && $pkg_unpack libfoo;
+ $pkg_fetch --purge --existing 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 -ep cfg/libfoo-1.0.0.tar.gz;
+ $pkg_fetch --purge --existing 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';
- $* -fk libfoo 2>'error: cannot keep broken package libfoo' != 0;
+ $* --force --keep 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 834e0df..40f8695 100644
--- a/tests/pkg-unpack.testscript
+++ b/tests/pkg-unpack.testscript
@@ -132,7 +132,7 @@ $* 2>>EOE != 0
info: use 'pkg-unpack --replace|-r' to replace
EOE
- $* -re $src/libfoo-1.1.0 2>'using libfoo/1.1.0 (external)';
+ $* --replace --existing $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,7 +151,7 @@ $* 2>>EOE != 0
info: use 'pkg-unpack --replace|-r' to replace
EOE
- $* -re $src/libfoo-1.1.0 2>'using libfoo/1.1.0 (external)';
+ $* --replace --existing $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 ./;
- $* -pe libfoo-1.1.0 2>'using libfoo/1.1.0 (external)';
+ $* --purge --existing libfoo-1.1.0 2>'using libfoo/1.1.0 (external)';
$pkg_purge libfoo 2>'purged libfoo/1.1.0'
}