diff options
| author | Karen Arutyunov <karen@codesynthesis.com> | 2021-06-29 19:11:26 +0300 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2021-07-09 13:12:35 +0300 |
| commit | 50a5c7b14250dab7941e8b0a67dfe6c442d2c5a9 (patch) | |
| tree | 8c85c9a949673d8516d1b6fa44817db31db0238e /tests | |
| parent | ce6b3c9c1f0b550181ca1f5a89d732fc3df8fdf4 (diff) | |
Fix selection of build entry between two in pkg-build
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/pkg-build.testscript | 50 | ||||
| -rw-r--r-- | tests/pkg-system.testscript | 4 |
2 files changed, 50 insertions, 4 deletions
diff --git a/tests/pkg-build.testscript b/tests/pkg-build.testscript index 50db679..64e6af8 100644 --- a/tests/pkg-build.testscript +++ b/tests/pkg-build.testscript @@ -746,10 +746,10 @@ test.options += --no-progress $clone_cfg; $* libfoo/1.0.0 libbaz 2>>EOE != 0 error: unable to satisfy constraints on package libfoo - info: libbar depends on (libfoo == 1.1.0) info: command line depends on (libfoo == 1.0.0) - info: available libfoo/1.1.0 + info: libbar depends on (libfoo == 1.1.0) info: available libfoo/1.0.0 + info: available libfoo/1.1.0 info: explicitly specify libfoo version to manually satisfy both constraints info: while satisfying libbar/1.1.0 info: while satisfying libbaz/1.1.0 @@ -2170,6 +2170,52 @@ test.options += --no-progress $pkg_drop libbar } + + : sys-to-src-unhold + : + { + $clone_cfg; + + $* 'sys:libbaz/1.2.0' 2>>EOE; + configured sys:libbaz/1.2.0 + EOE + + $* ?libbaz libbar/0.0.3 2>>EOE; + purged libbaz/1.2.0 + fetched libbaz/0.1.0 + unpacked libbaz/0.1.0 + fetched libbar/0.0.3 + unpacked libbar/0.0.3 + configured libbaz/0.1.0 + configured libbar/0.0.3 + EOE + + $pkg_drop libbar libbaz + } + + : sys-to-src + : + : As above but keep held. + : + { + $clone_cfg; + + $* 'sys:libbaz/1.2.0' 2>>EOE; + configured sys:libbaz/1.2.0 + EOE + + $* libbaz libbar/0.0.3 2>>EOE; + purged libbaz/1.2.0 + fetched libbaz/0.1.0 + unpacked libbaz/0.1.0 + fetched libbar/0.0.3 + unpacked libbar/0.0.3 + configured libbaz/0.1.0 + configured libbar/0.0.3 + EOE + + $pkg_drop libbar libbaz + } } : source diff --git a/tests/pkg-system.testscript b/tests/pkg-system.testscript index 26d6893..3ff1b55 100644 --- a/tests/pkg-system.testscript +++ b/tests/pkg-system.testscript @@ -711,10 +711,10 @@ rep_remove += -d cfg 2>! # $pkg_build foo 'sys:libbar/1' 2>>EOE != 0; error: unable to satisfy constraints on package libbar - info: foo depends on (libbar >= 2) info: command line depends on (libbar == 1) - info: available sys:libbar/2 + info: foo depends on (libbar >= 2) info: available sys:libbar/1 + info: available sys:libbar/2 info: explicitly specify libbar version to manually satisfy both constraints info: while satisfying foo/2 EOE |