diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/buildtab/driver.cxx | 6 | ||||
| -rw-r--r-- | tests/buildtab/testscript | 4 | ||||
| -rw-r--r-- | tests/manifest/task.testscript | 31 |
3 files changed, 33 insertions, 8 deletions
diff --git a/tests/buildtab/driver.cxx b/tests/buildtab/driver.cxx index df23dbc..1ea4331 100644 --- a/tests/buildtab/driver.cxx +++ b/tests/buildtab/driver.cxx @@ -6,7 +6,7 @@ #include <libbutl/utility.hxx> // operator<<(ostream,exception) -#include <libbbot/build-config.hxx> +#include <libbbot/build-target-config.hxx> #undef NDEBUG #include <cassert> @@ -27,9 +27,9 @@ try cin.exceptions (ios::failbit | ios::badbit); cout.exceptions (ios::failbit | ios::badbit); - const build_configs& configs (parse_buildtab (cin, "cin")); + const build_target_configs& configs (parse_buildtab (cin, "cin")); - for (const build_config& c: configs) + for (const build_target_config& c: configs) { cout << c.machine_pattern << ' ' << c.name << ' ' << c.target; diff --git a/tests/buildtab/testscript b/tests/buildtab/testscript index 5631527..6c8b054 100644 --- a/tests/buildtab/testscript +++ b/tests/buildtab/testscript @@ -55,12 +55,12 @@ $* <<EOI 2>>EOE == 1 windows*-vc_14* EOI - cin:1:16: error: no configuration name found + cin:1:16: error: no target configuration name found EOE : dup : - $* <<EOI 2>'cin:3:31: error: duplicate configuration name/target' == 1 + $* <<EOI 2>'cin:3:31: error: duplicate target configuration name/target' == 1 windows*-vc_14* windows-vc_14 i686-microsoft-win32-msvc14.0 default windows*-vc_14* windows-vc_14 x86_64-microsoft-win32-msvc14.0 default windows*-vc_14* windows-vc_14 i686-microsoft-win32-msvc14.0 default diff --git a/tests/manifest/task.testscript b/tests/manifest/task.testscript index bd1a365..d224124 100644 --- a/tests/manifest/task.testscript +++ b/tests/manifest/task.testscript @@ -24,6 +24,31 @@ test.options += -t machine: windows_10-msvc_14 target: x86_64-microsoft-win32-msvc14.0 environment: lld + target-config: config.cc.coptions=/Z7 config.cc.loptions=/DEBUG + package-config: config.foo.network=true + warning-regex: '^warning: ' '^.+: warning: ' + interactive: error + worker-checksum: 1 + EOF + + # @@ TMP Remove when toolchain 0.16.0 is released. + # + : no-package-config + : + $* <<EOF >>EOF + : 1 + name: foo + version: 1.0 + repository-url: http://pkg.example.org/1/math + trust: AB:0D:3F:C1:B0:13:E4:0E:AD:4A:08:06:AE:F3:85:DB:E2:27:5F:83:11:47:A2:7\ + 8:64:3C:73:60:F8:66:3A:A4 + requires: host + tests: foo-tests + examples: foo-examples + dependency-checksum: 12345 + machine: windows_10-msvc_14 + target: x86_64-microsoft-win32-msvc14.0 + environment: lld config: config.cc.coptions=/Z7 config.cc.loptions=/DEBUG warning-regex: '^warning: ' '^.+: warning: ' interactive: error @@ -233,7 +258,7 @@ test.options += -t : config : - $* <<EOI 2>'stdin:3:1: error: task configuration redefinition' == 1 + $* <<EOI 2>'stdin:3:1: error: task target configuration redefinition' == 1 : 1 config: config.cc.coptions=/Z7 config: config.cc.loptions=/DEBUG @@ -341,12 +366,12 @@ test.options += -t target: EOI - : config + : target-config : { : empty : - $* <<EOI 2>'stdin:2:8: error: empty task configuration' == 1 + $* <<EOI 2>'stdin:2:8: error: empty task target configuration' == 1 : 1 config: EOI |