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-build.testscript | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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

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