diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/manifest/task-request.testscript | 2 | ||||
| -rw-r--r-- | tests/manifest/task.testscript | 112 |
2 files changed, 79 insertions, 35 deletions
diff --git a/tests/manifest/task-request.testscript b/tests/manifest/task-request.testscript index cee21fb..85801a9 100644 --- a/tests/manifest/task-request.testscript +++ b/tests/manifest/task-request.testscript @@ -155,7 +155,7 @@ EOI { : mode : - $* <<EOI 2>'stdin:2:19: error: invalid task request interactive mode' == 1 + $* <<EOI 2>"stdin:2:19: error: invalid task request interactive mode 'on'" == 1 : 1 interactive-mode: on EOI diff --git a/tests/manifest/task.testscript b/tests/manifest/task.testscript index b5ca66a..704ca20 100644 --- a/tests/manifest/task.testscript +++ b/tests/manifest/task.testscript @@ -12,13 +12,14 @@ test.options += -t : $* <<EOF >>EOF : 1 - name: libfoo + 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 - test-exclude: libfoo-tests/1.0 - test-exclude: libfoo-examples/1.0 + requires: host + tests: foo-tests + examples: foo-examples machine: windows_10-msvc_14 target: x86_64-microsoft-win32-msvc14.0 environment: lld @@ -68,6 +69,37 @@ test.options += -t target: x86_64-microsoft-win32-msvc14.0 EOO + : requires + : + { + $* <<EOF >>EOF + : 1 + name: foo + version: 1.0 + repository-url: http://pkg.example.org/1/math + requires: c++14 + requires: host + machine: windows + target: x86_64-microsoft-win32-msvc14.0 + EOF + } + + : tests + : + { + $* <<EOF >>EOF + : 1 + name: libfoo + version: 1.0 + repository-url: http://pkg.example.org/1/math + tests: libfoo-tests + examples: libfoo-examples == 1.2.3 + benchmarks: libfoo-benchmarks ~1.2.0 + machine: windows + target: x86_64-microsoft-win32-msvc14.0 + EOF + } + : config : { @@ -96,6 +128,34 @@ test.options += -t EOF } + : host + : + { + : true + : + $* <<EOF >>EOF + : 1 + name: libfoo + version: 1.0 + repository-url: http://pkg.example.org/1/math + machine: windows + target: x86_64-microsoft-win32-msvc14.0 + host: true + EOF + + : false + : + $* <<EOF >>EOF + : 1 + name: libfoo + version: 1.0 + repository-url: http://pkg.example.org/1/math + machine: windows + target: x86_64-microsoft-win32-msvc14.0 + host: false + EOF + } + : trust-yes : $* <<EOF >>EOF @@ -161,6 +221,14 @@ test.options += -t config: config.cc.loptions=/DEBUG EOI + : host + : + $* <<EOI 2>'stdin:3:1: error: task host value redefinition' == 1 + : 1 + host: true + host: false + EOI + : warning-regex : $* <<EOI 2>'stdin:3:1: error: task warning regex redefinition' == 1 @@ -233,37 +301,6 @@ test.options += -t EOE } - : test-exclude - : - { - : invalid-name - : - $* <<EOI 2>>EOE == 1 - : 1 - test-exclude: 0ibfoo-tests/1.0 - EOI - stdin:2:15: error: invalid test exclusion package name: illegal first character (must be alphabetic) - EOE - - : no-version - : - $* <<EOI 2>>EOE == 1 - : 1 - test-exclude: libfoo-tests - EOI - stdin:2:15: error: invalid test exclusion package: '/' is expected - EOE - - : invalid-version - : - $* <<EOI 2>>EOE == 1 - : 1 - test-exclude: libfoo-tests/+1 - EOI - stdin:2:15: error: invalid test exclusion package version: unexpected end - EOE - } - : machine-empty : $* <<EOI 2>'stdin:2:9: error: empty task machine' == 1 @@ -309,6 +346,13 @@ test.options += -t } } + : host + : + $* <<EOI 2>"stdin:2:7: error: invalid task host value 'yes'" == 1 + : 1 + host: yes + EOI + : warning-regex : { |