From 0a9b30024ee486bb1631f75cbc559d0df1852e27 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Wed, 31 Jul 2019 22:05:59 +0300
Subject: Combine multiple single-character options into a single argument for
 testscript commands

---
 tests/pkg-purge.testscript | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'tests/pkg-purge.testscript')

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;
-- 
cgit v1.1