From eb91adfd16bc160c592659594de0dd09336293d4 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Fri, 15 Oct 2021 10:28:27 +0300
Subject: Fix broken pkg-drop tests

---
 tests/pkg-drop.testscript | 33 +++++++++++++--------------------
 1 file changed, 13 insertions(+), 20 deletions(-)

diff --git a/tests/pkg-drop.testscript b/tests/pkg-drop.testscript
index d875543..8a7672c 100644
--- a/tests/pkg-drop.testscript
+++ b/tests/pkg-drop.testscript
@@ -442,6 +442,8 @@ $* libfoo/1.0.0 2>>~%EOE% != 0
 : linked-configs
 :
 {
+  pkg_build = $0 pkg-build --yes 2>!
+
   : 3-configs
   :
   {
@@ -460,15 +462,12 @@ $* libfoo/1.0.0 2>>~%EOE% != 0
       cp -pr ../cfg-bar ./;
       cp -pr ../cfg-foo ./;
 
-      pkg_build = $regex.apply($pkg_build, cfg, cfg-bar);
-
-      $pkg_build libbar@"$rep/t4b" ?libfoo +{ --config-id 2 } --trust-yes;
+      $pkg_build -d cfg-bar libbar@"$rep/t4b" ?libfoo +{ --config-id 2 } \
+                 --trust-yes;
 
-      pkg_build = $regex.apply($pkg_build, cfg-bar, cfg);
+      $pkg_build -d cfg libbaz;
 
-      $pkg_build libbaz;
-
-      $pkg_build '?libbar' +{ --config-id 1 };
+      $pkg_build -d cfg '?libbar' +{ --config-id 1 };
 
       $* libbaz <<EOI 2>>/~%EOE%
           y
@@ -496,19 +495,16 @@ $* libfoo/1.0.0 2>>~%EOE% != 0
       cp -pr ../cfg-bar ./;
       cp -pr ../cfg-foo ./;
 
-      pkg_build = $regex.apply($pkg_build, cfg, cfg-bar);
-
-      $pkg_build libbar@"$rep/t4b" ?libfoo +{ --config-id 2 } --trust-yes;
+      $pkg_build -d cfg-bar libbar@"$rep/t4b" ?libfoo +{ --config-id 2 } \
+                 --trust-yes;
 
-      pkg_build = $regex.apply($pkg_build, cfg-bar, cfg);
-
-      $pkg_build libbaz;
+      $pkg_build -d cfg libbaz;
 
       # Make sure that dependents of a package being dropped can be found in
       # implicitly linked configurations recursively. Note that configuring
       # libbar as system, we make libbaz an only dependent of libfoo.
       #
-      $pkg_build '?sys:libbar' +{ --config-id 1 };
+      $pkg_build -d cfg '?sys:libbar' +{ --config-id 1 };
 
       $pkg_status -r libbaz >>/EOO;
         !libbaz configured 1.1.0
@@ -559,13 +555,10 @@ $* libfoo/1.0.0 2>>~%EOE% != 0
       $cfg_link -d cfg-bar cfg;
       $cfg_link -d cfg-foo cfg-bar;
 
-      pkg_build = $regex.apply($pkg_build, cfg, cfg-bar);
-
-      $pkg_build libbar@"$rep/t4b" ?libfoo +{ --config-id 2 } --trust-yes;
-
-      pkg_build = $regex.apply($pkg_build, cfg-bar, cfg);
+      $pkg_build -d cfg-bar libbar@"$rep/t4b" ?libfoo +{ --config-id 2 } \
+                 --trust-yes;
 
-      $pkg_build libbaz;
+      $pkg_build -d cfg libbaz;
 
       $pkg_status -r libbaz >>/EOO;
         !libbaz configured 1.1.0
-- 
cgit v1.1