From 22165c649ca2c5ef216ae3f99fbfb2dc0fff99ab Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Mon, 30 Aug 2021 23:24:52 +0300 Subject: Make pkg-build to accept multiple current configurations --- tests/pkg-drop.testscript | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) (limited to 'tests/pkg-drop.testscript') diff --git a/tests/pkg-drop.testscript b/tests/pkg-drop.testscript index 7a93c2d..c9b629b 100644 --- a/tests/pkg-drop.testscript +++ b/tests/pkg-drop.testscript @@ -460,7 +460,12 @@ $* libfoo/1.0.0 2>>~%EOE% != 0 cp -pr ../cfg-bar ./; cp -pr ../cfg-foo ./; - $pkg_build libbar@"$rep/t4b" -d cfg-bar ?libfoo +{ --config-id 2 } --trust-yes; + 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 libbaz; $pkg_build '?libbar' +{ --config-id 1 }; @@ -491,7 +496,12 @@ $* libfoo/1.0.0 2>>~%EOE% != 0 cp -pr ../cfg-bar ./; cp -pr ../cfg-foo ./; - $pkg_build libbar@"$rep/t4b" -d cfg-bar ?libfoo +{ --config-id 2 } --trust-yes; + 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 libbaz; # Make sure that dependents of a package being dropped can be found in @@ -549,7 +559,12 @@ $* libfoo/1.0.0 2>>~%EOE% != 0 $cfg_link -d cfg-bar cfg; $cfg_link -d cfg-foo cfg-bar; - $pkg_build libbar@"$rep/t4b" -d cfg-bar ?libfoo +{ --config-id 2 } --trust-yes; + 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 libbaz; $pkg_status -r libbaz >>/EOO; -- cgit v1.1