diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/buildtab/driver.cxx | 8 | ||||
| -rw-r--r-- | tests/buildtab/testscript | 22 | ||||
| -rw-r--r-- | tests/manifest/task-response.test | 2 | ||||
| -rw-r--r-- | tests/manifest/task.test | 24 |
4 files changed, 32 insertions, 24 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 } diff --git a/tests/manifest/task-response.test b/tests/manifest/task-response.test index ff5ae88..58c880c 100644 --- a/tests/manifest/task-response.test +++ b/tests/manifest/task-response.test @@ -24,6 +24,7 @@ test.options += -ts version: 1.0 repository: http://pkg.example.org/1/math machine: windows_10-msvc_14 + target: x86_64-microsoft-win32-msvc14.0 EOF : no-challenge @@ -37,6 +38,7 @@ test.options += -ts version: 1.0 repository: http://pkg.example.org/1/math machine: windows_10-msvc_14 + target: x86_64-microsoft-win32-msvc14.0 EOF } diff --git a/tests/manifest/task.test b/tests/manifest/task.test index 95bb749..c2783cf 100644 --- a/tests/manifest/task.test +++ b/tests/manifest/task.test @@ -24,18 +24,6 @@ test.options += -t warning-regex: '^warning: ' '^.+: warning: ' EOF - : no-target - : - $* <<EOF >>EOF - : 1 - name: libfoo - version: 1.0 - repository: http://pkg.example.org/1/math - machine: windows_10-msvc_14 - config: config.cc.coptions=/Z7 config.cc.loptions=/DEBUG - warning-regex: '^warning: ' '^.+: warning: ' - EOF - : no-config-no-regex : $* <<EOF >>EOF @@ -58,6 +46,7 @@ test.options += -t version: 1.0 repository: http://pkg.example.org/1/math machine: windows + target: x86_64-microsoft-win32-msvc14.0 config: abc= EOF @@ -69,6 +58,7 @@ test.options += -t version: 1.0 repository: http://pkg.example.org/1/math machine: windows + target: x86_64-microsoft-win32-msvc14.0 config: abc='a "b '"d\e x y=" EOF } @@ -320,4 +310,14 @@ EOI version: 1.0 repository: http://pkg.example.org/1/math EOI + + : target + : + $* <<EOI 2>'stdin:6:1: error: no task target specified' == 1 + : 1 + name: libfoo + version: 1.0 + repository: http://pkg.example.org/1/math + machine: windows_10-msvc_14 + EOI } |