diff options
| author | Karen Arutyunov <karen@codesynthesis.com> | 2017-07-18 13:36:04 +0300 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2017-07-18 13:36:04 +0300 |
| commit | bf4822a17eed8bdaf9d337caf806c63c82b06a89 (patch) | |
| tree | 5885d17a2d8d88e6b0f18f44c4bc3871670534e2 /tests/buildtab | |
| parent | 0e7c846f7b971366ea0dc5fb81477165495bebb9 (diff) | |
Make buildtab target to be non-optional
Diffstat (limited to 'tests/buildtab')
| -rw-r--r-- | tests/buildtab/driver.cxx | 8 | ||||
| -rw-r--r-- | tests/buildtab/testscript | 22 |
2 files changed, 18 insertions, 12 deletions
diff --git a/tests/buildtab/driver.cxx b/tests/buildtab/driver.cxx index e470780..9ee6e34 100644 --- a/tests/buildtab/driver.cxx +++ b/tests/buildtab/driver.cxx @@ -28,14 +28,14 @@ try for (const auto& c: parse_buildtab (cin, "cin")) { - cout << c.machine_pattern << ' ' << c.name; - - if (c.target) - cout << ' ' << *c.target; + cout << c.machine_pattern << ' ' << c.name << ' ' << c.target; for (const auto& v: c.vars) cout << ' ' << v; + for (const auto& r: c.warning_regexes) + cout << " ~" << r; + cout << '\n'; } diff --git a/tests/buildtab/testscript b/tests/buildtab/testscript index 6bf76bc..8180d85 100644 --- a/tests/buildtab/testscript +++ b/tests/buildtab/testscript @@ -10,20 +10,18 @@ : all-fileds-combinations : $* <<EOF >>EOF - windows*-vc_14* windows-vc_14 windows*-vc_14* windows-vc_14-32 i686-microsoft-win32-msvc14.0 - windows*-vc_14* windows-vc_14debug config.cc.coptions=/Z7 config.cc.loptions=/DEBUG - windows*-vc_14* windows-vc_14-32-debug i686-microsoft-win32-msvc14.0 config.cc.coptions=/Z7 config.cc.loptions=/DEBUG + 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}: " EOF : empty-lines : $* <<EOI >>EOO - windows*-vc_14* windows-vc_14-32-debug + windows*-vc_14* windows-vc_14-32-debug i686-microsoft-win32-msvc14.0 # abc EOI - windows*-vc_14* windows-vc_14-32-debug + windows*-vc_14* windows-vc_14-32-debug i686-microsoft-win32-msvc14.0 EOO } @@ -38,6 +36,14 @@ cin:1:16: error: no configuration name found EOE + : no-target + : + $* <<EOI 2>>EOE == 1 + windows*-vc_14* windows-vc_14-32 + EOI + cin:1:33: error: no target found + EOE + : invalid-target : $* <<EOI 2>>EOE == 1 @@ -52,9 +58,9 @@ : unquoted : $* <<EOI 2>>EOE == 1 - windows*-vc_14* windows-vc_14-32 config.cc.coptions="/Z7 + windows*-vc_14* windows-vc_14-32 i686-microsoft-win32-msvc14.0 config.cc.coptions="/Z7 EOI - cin:1:57: error: unterminated quoted string + cin:1:87: error: unterminated quoted string EOE : no-value @@ -69,7 +75,7 @@ : dup-config-name : $* <<EOI 2>'cin:2:17: error: duplicate configuration name' == 1 - windows*-vc_14* windows-vc_14-32 + windows*-vc_14* windows-vc_14-32 i686-microsoft-win32-msvc14.0 windows*-vc_14* windows-vc_14-32 i686-microsoft-win32-msvc14.0 EOI } |