diff options
Diffstat (limited to 'tests/buildtab')
| -rw-r--r-- | tests/buildtab/driver.cxx | 12 | ||||
| -rw-r--r-- | tests/buildtab/testscript | 22 |
2 files changed, 20 insertions, 14 deletions
diff --git a/tests/buildtab/driver.cxx b/tests/buildtab/driver.cxx index 13d0d71..1ea4331 100644 --- a/tests/buildtab/driver.cxx +++ b/tests/buildtab/driver.cxx @@ -2,12 +2,14 @@ // license : MIT; see accompanying LICENSE file #include <ios> // ios::failbit, ios::badbit -#include <cassert> #include <iostream> -#include <libbutl/utility.mxx> // operator<<(ostream,exception) +#include <libbutl/utility.hxx> // operator<<(ostream,exception) + +#include <libbbot/build-target-config.hxx> -#include <libbbot/build-config.hxx> +#undef NDEBUG +#include <cassert> using namespace std; using namespace butl; @@ -25,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 c9b5389..6c8b054 100644 --- a/tests/buildtab/testscript +++ b/tests/buildtab/testscript @@ -6,11 +6,13 @@ : Roundtrip buildtab. : { - : all-fileds-combinations + : all-fields-combinations : $* <<EOI >>EOO - windows*-vc_14* windows-vc_14-32 i686-microsoft-win32-msvc14.0 all - windows*-vc_14* windows-vc_14-32-debug i686-microsoft-win32-msvc14.0 "" config.cc.coptions=/Z7 config.cc.loptions=/DEBUG ~"warning C4\d{3}: " + windows*-vc_14* windows-vc_14 i686-microsoft-win32-msvc14.0 all + windows*-vc_14* windows-vc_14-debug i686-microsoft-win32-msvc14.0 "" config.cc.coptions=/Z7 config.cc.loptions=/DEBUG ~"warning C4\d{3}: " + + windows*-vc_14* windows-vc_14 x86_64-microsoft-win32-msvc14.0 all linux_debian_8*-gcc_4.9 linux_debian_8-gcc_4.9 x86_64-linux-gnu "all default linux gcc gcc-4+:gcc-3+" - - - gcc-5+:gcc-4+ @@ -21,8 +23,9 @@ windows_10*-clang_9.0_msvc_16.3 windows_10-clang_9.0_msvc_16.3_lld x86_64-microsoft-win32-msvc14.2/lld "all default windows clang" EOI - windows*-vc_14* windows-vc_14-32 i686-microsoft-win32-msvc14.0 all - windows*-vc_14* windows-vc_14-32-debug i686-microsoft-win32-msvc14.0 "" config.cc.coptions=/Z7 config.cc.loptions=/DEBUG ~"warning C4\d{3}: " + windows*-vc_14* windows-vc_14 i686-microsoft-win32-msvc14.0 all + windows*-vc_14* windows-vc_14-debug i686-microsoft-win32-msvc14.0 "" config.cc.coptions=/Z7 config.cc.loptions=/DEBUG ~"warning C4\d{3}: " + windows*-vc_14* windows-vc_14 x86_64-microsoft-win32-msvc14.0 all linux_debian_8*-gcc_4.9 linux_debian_8-gcc_4.9 x86_64-linux-gnu "all default linux gcc gcc-4+:gcc-3+" linux_debian_9*-gcc_7.3 linux_debian_9-gcc_7.3 x86_64-linux-gnu "all default linux gcc gcc-7+:gcc-6+" linux_debian_9*-gcc_7.3 linux_debian_9-gcc_7.3-O3 x86_64-linux-gnu "all default linux gcc optimized gcc-7+:gcc-6+" config.cc.coptions=-O3 @@ -52,14 +55,15 @@ $* <<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:2:17: error: duplicate configuration name' == 1 - windows*-vc_14* windows-vc_14-32 i686-microsoft-win32-msvc14.0 default - windows*-vc_14* windows-vc_14-32 i686-microsoft-win32-msvc14.0 default + $* <<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 EOI } |