diff options
Diffstat (limited to 'test cases')
8 files changed, 19 insertions, 4 deletions
diff --git a/test cases/failing/100 no lang/test.json b/test cases/failing/100 no lang/test.json index 58dc1ac2e..a74adaf60 100644 --- a/test cases/failing/100 no lang/test.json +++ b/test cases/failing/100 no lang/test.json @@ -1,7 +1,7 @@ { "stdout": [ { - "line": "test cases/failing/100 no lang/meson.build:2:0: ERROR: No host machine compiler for \"main.c\"" + "line": "test cases/failing/100 no lang/meson.build:2:0: ERROR: No host machine compiler for 'main.c'" } ] } diff --git a/test cases/failing/123 missing compiler/meson.build b/test cases/failing/123 missing compiler/meson.build new file mode 100644 index 000000000..19bdd0c66 --- /dev/null +++ b/test cases/failing/123 missing compiler/meson.build @@ -0,0 +1,3 @@ +project('main project', 'c') + +subproject('sub') diff --git a/test cases/failing/123 missing compiler/subprojects/sub/main.c b/test cases/failing/123 missing compiler/subprojects/sub/main.c new file mode 100644 index 000000000..44e82e227 --- /dev/null +++ b/test cases/failing/123 missing compiler/subprojects/sub/main.c @@ -0,0 +1 @@ +int main(int argc, char *argv[]) { return 0; } diff --git a/test cases/failing/123 missing compiler/subprojects/sub/meson.build b/test cases/failing/123 missing compiler/subprojects/sub/meson.build new file mode 100644 index 000000000..b60850c9c --- /dev/null +++ b/test cases/failing/123 missing compiler/subprojects/sub/meson.build @@ -0,0 +1,4 @@ +project('sub') + +# Should fail because we did not add C language, even if parent project did. +executable('app', 'main.c') diff --git a/test cases/failing/123 missing compiler/test.json b/test cases/failing/123 missing compiler/test.json new file mode 100644 index 000000000..915df164c --- /dev/null +++ b/test cases/failing/123 missing compiler/test.json @@ -0,0 +1,7 @@ +{ + "stdout": [ + { + "line": "test cases/failing/123 missing compiler/subprojects/sub/meson.build:4:0: ERROR: No host machine compiler for 'subprojects/sub/main.c'" + } + ] +} diff --git a/test cases/failing/54 wrong shared crate type/meson.build b/test cases/failing/54 wrong shared crate type/meson.build index b9fcad4e5..90020faf8 100644 --- a/test cases/failing/54 wrong shared crate type/meson.build +++ b/test cases/failing/54 wrong shared crate type/meson.build @@ -4,4 +4,4 @@ if not add_languages('rust', required: false) error('MESON_SKIP_TEST test requires rust compiler') endif -shared_library('test', 'foo.rs', rust_crate_type : 'staticlib') +shared_library('mytest', 'foo.rs', rust_crate_type : 'staticlib') diff --git a/test cases/failing/55 wrong static crate type/meson.build b/test cases/failing/55 wrong static crate type/meson.build index 109907f96..179d7cd53 100644 --- a/test cases/failing/55 wrong static crate type/meson.build +++ b/test cases/failing/55 wrong static crate type/meson.build @@ -4,4 +4,4 @@ if not add_languages('rust', required: false) error('MESON_SKIP_TEST test requires rust compiler') endif -static_library('test', 'foo.rs', rust_crate_type : 'cdylib') +static_library('mytest', 'foo.rs', rust_crate_type : 'cdylib') diff --git a/test cases/unit/35 dist script/subprojects/sub/meson.build b/test cases/unit/35 dist script/subprojects/sub/meson.build index 612861310..a41a3b685 100644 --- a/test cases/unit/35 dist script/subprojects/sub/meson.build +++ b/test cases/unit/35 dist script/subprojects/sub/meson.build @@ -1,4 +1,4 @@ -project('sub') +project('sub', 'c') if get_option('broken_dist_script') # Make sure we can add a dist script in a subproject, but it won't be run |