aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2022-12-06 20:57:09 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2022-12-07 13:35:29 +0300
commit1c28876c1357d332951b27a1db09a5fc37f7abea (patch)
tree0846e2f072f5541c0c9e1f0b78fc55e5a14e7293 /tests
parentd6f50b34977cead4bd1e0bd4fe49e5e5b6f2bdd3 (diff)
Add support for *-build-config override
Diffstat (limited to 'tests')
-rw-r--r--tests/overrides/driver.cxx2
-rw-r--r--tests/overrides/testscript43
2 files changed, 42 insertions, 3 deletions
diff --git a/tests/overrides/driver.cxx b/tests/overrides/driver.cxx
index 62ac7f8..c4a09ef 100644
--- a/tests/overrides/driver.cxx
+++ b/tests/overrides/driver.cxx
@@ -86,7 +86,7 @@ main (int argc, char* argv[])
{
package_manifest::validate_overrides (overrides, name);
}
- catch (const manifest_parsing& e)
+ catch (const manifest_parsing&)
{
assert (false); // Validation must never fail if override succeeds.
}
diff --git a/tests/overrides/testscript b/tests/overrides/testscript
index 95a5593..07c1451 100644
--- a/tests/overrides/testscript
+++ b/tests/overrides/testscript
@@ -100,6 +100,9 @@
:
$* 'network-builds: all' 'network-build-include: windows*' 'network-build-exclude: *' \
'cache-build-include: freebsd*' 'cache-build-exclude: *' 'cache-builds: legacy' \
+ 'cache-build-config: config.libfoo.cache=true config.libfoo.buffer=1028' \
+ 'deprecated-api-build-config: config.libfoo.deprecated_api=true' 'deprecated-api-builds: windows' \
+ 'experimental-api-build-config: config.libfoo.experimental_api=true' \
'sys-build-include: linux*' 'sys-build-exclude: *' \
'fancy-builds: gcc' <<EOI >>EOO
: 1
@@ -148,7 +151,7 @@
network-builds: all
network-build-include: windows*
network-build-exclude: *
- cache-build-config: config.libfoo.cache=true
+ cache-build-config: config.libfoo.cache=true config.libfoo.buffer=1028
cache-builds: legacy
cache-build-include: freebsd*
cache-build-exclude: *
@@ -160,9 +163,12 @@
older-builds: none
fancy-build-config: config.libfoo.fancy=true
fancy-builds: gcc
+ deprecated-api-build-config: config.libfoo.deprecated_api=true
+ deprecated-api-builds: windows
+ experimental-api-build-config: config.libfoo.experimental_api=true
+ experimental-api-builds: none
EOO
-
: build-config-default
:
$* 'default-builds: all' 'default-build-include: windows*' 'default-build-exclude: *' <<EOI >>EOO
@@ -186,6 +192,27 @@
network-builds: none
EOO
+ : add-build-config
+ :
+ $* 'experimental-api-build-config: config.libfoo.experimental_api=true' <<EOI >>EOO
+ : 1
+ name: libfoo
+ version: 2.0.0
+ summary: Modern C++ parser
+ license: LGPLv2
+ network-build-config: config.libfoo.network=true
+ network-builds: all
+ EOI
+ : 1
+ name: libfoo
+ version: 2.0.0
+ summary: Modern C++ parser
+ license: LGPLv2
+ network-build-config: config.libfoo.network=true
+ network-builds: all
+ experimental-api-build-config: config.libfoo.experimental_api=true
+ EOO
+
: none
:
$* <<EOI >>EOO
@@ -306,4 +333,16 @@
EOI
'build-exclude' override specified together with 'network-builds' override
EOE
+
+ : build-config-after-config-builds
+ :
+ $* 'deprecated-api-builds: windows' 'deprecated-api-build-config: config.libfoo.deprecated-api=true' <<EOI 2>>EOE != 0
+ : 1
+ name: libfoo
+ version: 2.0.0
+ summary: Modern C++ parser
+ license: LGPLv2
+ EOI
+ cannot override 'deprecated-api-builds' value: no build package configuration 'deprecated-api'
+ EOE
}