aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2024-06-06 19:22:10 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2024-06-07 11:57:49 +0300
commitc8a08cc0ce55b309ef30cf367a625eb86457a0e2 (patch)
treedd7da2bf1a425cb2ba5bd914c51ec16260f3f875 /tests
parentdfc89ec51c26d6226d767b79fe42e64af55e2b89 (diff)
Allow to combine [*-]builds overrides with --{target,build,package}-config and --interactive bdep-ci options (GH issue #384)
Diffstat (limited to 'tests')
-rw-r--r--tests/ci.testscript40
1 files changed, 32 insertions, 8 deletions
diff --git a/tests/ci.testscript b/tests/ci.testscript
index 4f1a883..7f3e538 100644
--- a/tests/ci.testscript
+++ b/tests/ci.testscript
@@ -608,9 +608,21 @@ windows = ($cxx.target.class == 'windows')
{
$clone_prj;
- $* --target-config 'linux_debian_8-gcc_4.9' --builds '&gcc' 2>>EOE != 0
- error: invalid --builds option value: 'builds' override specified together with --target-config
- info: override: builds: &gcc
+ $* --target-config 'linux_debian_8-gcc_4.9' \
+ --override 'build-include: linux_debian_12-gcc_13' 2>>EOE != 0
+ error: invalid --override option value: 'build-include' override specified together with --target-config
+ info: override: build-include: linux_debian_12-gcc_13
+ EOE
+ }
+
+ : builds-overrides
+ :
+ {
+ $clone_prj;
+
+ $* --target-config 'linux_debian_8-gcc_4.9' --builds '&gcc' 2>>~%EOE%
+ %CI request is queued.*%
+ %reference: .+%
EOE
}
@@ -733,8 +745,8 @@ windows = ($cxx.target.class == 'windows')
$clone_prj;
$* --build-config 'default/linux_debian_8-gcc_4.9' --builds '&gcc' 2>>EOE != 0
- error: invalid --builds option value: 'builds' override specified together with --build-config
- info: override: builds: &gcc
+ error: invalid --build-config option value: 'default-builds' override specified together with 'builds' override
+ info: override: default-builds: all
EOE
}
@@ -856,9 +868,21 @@ windows = ($cxx.target.class == 'windows')
{
$clone_prj;
- $* --interactive 'linux_debian_8-gcc_4.9' --builds '&gcc' 2>>EOE != 0
- error: invalid --builds option value: 'builds' override specified together with --interactive|-i
- info: override: builds: &gcc
+ $* --interactive 'linux_debian_8-gcc_4.9' \
+ --override 'build-include: linux_debian_12-gcc_13' 2>>EOE != 0
+ error: invalid --override option value: 'build-include' override specified together with --interactive|-i
+ info: override: build-include: linux_debian_12-gcc_13
+ EOE
+ }
+
+ : overrides-builds
+ :
+ {
+ $clone_prj;
+
+ $* --interactive 'linux_debian_8-gcc_4.9' --builds '&gcc' 2>>~%EOE%
+ %CI request is queued.*%
+ %reference: .+%
EOE
}
}