From 5d815d5959fd4be096423772a8019f3dbdd536af Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Sat, 24 Jun 2023 14:05:49 +0300 Subject: Search for stubs in all configurations/repositories as a fallback when build system package to hold --- tests/pkg-system.testscript | 42 ++++++++++++++++++------------------------ 1 file changed, 18 insertions(+), 24 deletions(-) (limited to 'tests/pkg-system.testscript') diff --git a/tests/pkg-system.testscript b/tests/pkg-system.testscript index fc4f707..0da2bc9 100644 --- a/tests/pkg-system.testscript +++ b/tests/pkg-system.testscript @@ -849,11 +849,6 @@ rep_remove += -d cfg 2>! info: while satisfying foo/2 EOE - $pkg_build 'sys:libbar' 2>>EOE != 0; - error: unknown package sys:libbar - info: consider specifying sys:libbar/* - EOE - $pkg_build foo 'sys:libbar/1' 2>>EOE != 0; error: dependency libbar >= 2 of package foo is not available in source info: sys:libbar/1 does not satisfy the constrains @@ -872,11 +867,26 @@ rep_remove += -d cfg 2>! $pkg_status libbar >'libbar unknown' } + : find-all + : + : Test that sys:libbar can be built to hold even if its stub package is not + : available from the configured repository but only from its prerequisite + : repository. + : + { + $clone_cfg; + + $pkg_build 'sys:libbar' 2>>EOE; + configured sys:libbar/* + EOE + + $pkg_status libbar >'!libbar configured,system !*' + } + : syslibbar1-foo-syslibbar-drop-foo : - : The overall plan is to build foo ?sys:libbar/2, fail to build sys:libbar - : and foo 'sys:libbar', but succeed to build foo ?sys:libbar/3 and foo - : ?sys:libbar. + : The overall plan is to build foo ?sys:libbar/2, then foo ?sys:libbar/3, + : and then foo ?sys:libbar. : { $clone_cfg; @@ -896,22 +906,6 @@ rep_remove += -d cfg 2>! $pkg_status foo >'!foo configured 2'; $pkg_status libbar >'libbar configured,system !2'; - # Fail as libbar while being selected is still unknown (not present in t3 - # repo). - # - $pkg_build 'sys:libbar' 2>>EOE != 0; - error: unknown package sys:libbar - info: consider specifying sys:libbar/* - EOE - - $pkg_build foo 'sys:libbar' 2>>EOE != 0; - error: unknown package sys:libbar - info: consider specifying sys:libbar/* - EOE - - $pkg_status foo 1>'!foo configured 2'; - $pkg_status libbar 1>'libbar configured,system !2'; - # Build foo and ?sys:libbar/3. # $pkg_build foo '?sys:libbar/3' 2>>~%EOE%; -- cgit v1.1