aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2021-06-29 19:11:26 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2021-07-01 11:19:12 +0300
commitede8a15c2e310b2ae30894dd640f58d87a8a9408 (patch)
treef3556b9eb1c14ce3710874618c2ee8b187941f70 /tests
parenta6ea97b9844c9b78c7e9b24c241fc16be22e4176 (diff)
Fix selection of build entry between two in pkg-build
Diffstat (limited to 'tests')
-rw-r--r--tests/pkg-build.testscript50
-rw-r--r--tests/pkg-system.testscript4
2 files changed, 50 insertions, 4 deletions
diff --git a/tests/pkg-build.testscript b/tests/pkg-build.testscript
index a13d454..e06df77 100644
--- a/tests/pkg-build.testscript
+++ b/tests/pkg-build.testscript
@@ -792,10 +792,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
@@ -2297,6 +2297,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