diff options
| author | Karen Arutyunov <karen@codesynthesis.com> | 2021-08-30 23:24:52 +0300 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2021-09-06 11:46:55 +0300 |
| commit | 22165c649ca2c5ef216ae3f99fbfb2dc0fff99ab (patch) | |
| tree | bcf026fd8d2e036d061fa38aed3b71ec481e2455 /tests/pkg-drop.testscript | |
| parent | ad8d50be4016e68a4ab8d765bd9b45a9fdae1a6d (diff) | |
Make pkg-build to accept multiple current configurations
Diffstat (limited to 'tests/pkg-drop.testscript')
| -rw-r--r-- | tests/pkg-drop.testscript | 21 |
1 files changed, 18 insertions, 3 deletions
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; |