diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2020-02-29 00:46:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-29 00:46:04 +0200 |
| commit | 9823db5e2a2c56210b942e9e56a1ccf552340dc2 (patch) | |
| tree | e76d39ba018e9ec3c40d8e906546da9519d609af | |
| parent | 9787de59d4ae28a1d8aedf255d98a432c6bb6045 (diff) | |
| parent | b89116a93c642b877b1e45cf97d6cd88621619ba (diff) | |
| download | meson-9823db5e2a2c56210b942e9e56a1ccf552340dc2.zip meson-9823db5e2a2c56210b942e9e56a1ccf552340dc2.tar.gz meson-9823db5e2a2c56210b942e9e56a1ccf552340dc2.tar.bz2 | |
Merge pull request #6707 from jon-turney/bogus-failing-tests
Fix various failing-meson tests
8 files changed, 5 insertions, 9 deletions
diff --git a/test cases/failing/19 target clash/meson.build b/test cases/failing/19 target clash/meson.build index fbc757c..ca09fb5 100644 --- a/test cases/failing/19 target clash/meson.build +++ b/test cases/failing/19 target clash/meson.build @@ -12,4 +12,4 @@ if host_machine.system() == 'windows' or host_machine.system() == 'cygwin' endif executable('clash', 'clash.c') -run_target('clash', 'echo', 'clash 1') +run_target('clash', command: ['echo', 'clash 1']) diff --git a/test cases/failing/30 invalid man extension/foo.a1 b/test cases/failing/30 invalid man extension/foo.a1 new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/test cases/failing/30 invalid man extension/foo.a1 diff --git a/test cases/failing/31 no man extension/foo b/test cases/failing/31 no man extension/foo new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/test cases/failing/31 no man extension/foo diff --git a/test cases/failing/71 invalid escape char/meson.build b/test cases/failing/71 invalid escape char/meson.build deleted file mode 100644 index b4e9196..0000000 --- a/test cases/failing/71 invalid escape char/meson.build +++ /dev/null @@ -1,4 +0,0 @@ -# Make sure meson exits on invalid string -# The string below contains an invalid unicode code point - -'my name is what \uxyzo who are you' diff --git a/test cases/failing/81 framework dependency with version/meson.build b/test cases/failing/81 framework dependency with version/meson.build index 714ad3b..1ead388 100644 --- a/test cases/failing/81 framework dependency with version/meson.build +++ b/test cases/failing/81 framework dependency with version/meson.build @@ -1,4 +1,4 @@ -project('framework dependency with version') +project('framework dependency with version', 'c') # do individual frameworks have a meaningful version to test? And multiple frameworks might be listed... # otherwise we're not on OSX and this will definitely fail dep = dependency('appleframeworks', modules: 'foundation', version: '>0') diff --git a/test cases/failing/86 dub libray/meson.build b/test cases/failing/86 dub libray/meson.build index 7921718..5b0ccac 100644 --- a/test cases/failing/86 dub libray/meson.build +++ b/test cases/failing/86 dub libray/meson.build @@ -1,3 +1,3 @@ -project('dub', 'd', meson_version: '0.48.0') +project('dub', 'd') dependency('dubtestproject', method: 'dub') # Not library (none) diff --git a/test cases/failing/87 dub executable/meson.build b/test cases/failing/87 dub executable/meson.build index a44f1be..63fd631 100644 --- a/test cases/failing/87 dub executable/meson.build +++ b/test cases/failing/87 dub executable/meson.build @@ -1,3 +1,3 @@ -project('dub', 'd', meson_version: '0.48.0') +project('dub', 'd') dependency('dubtestproject:test1', method: 'dub') # Not library (executable) diff --git a/test cases/failing/88 dub compiler/meson.build b/test cases/failing/88 dub compiler/meson.build index 2f0b801..c93ccbc 100644 --- a/test cases/failing/88 dub compiler/meson.build +++ b/test cases/failing/88 dub compiler/meson.build @@ -1,4 +1,4 @@ -project('dub', 'd', meson_version: '0.48.0') +project('dub', 'd') if meson.get_compiler('d').get_id() == 'dmd' if host_machine.system() == 'windows' or host_machine.system() == 'cygwin' |