From ac1d0aea582b225869732f53108754af2ccde7e1 Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Sun, 3 Mar 2024 22:05:33 +0200 Subject: Condense test dirs for rc2. --- test cases/failing/100 bool in combo/meson.build | 1 - .../failing/100 bool in combo/meson_options.txt | 5 ---- .../failing/100 bool in combo/nativefile.ini | 2 -- test cases/failing/100 bool in combo/test.json | 5 ---- .../failing/100 compiler no lang/meson.build | 2 ++ test cases/failing/100 compiler no lang/test.json | 7 +++++ .../failing/101 compiler no lang/meson.build | 2 -- test cases/failing/101 compiler no lang/test.json | 7 ----- test cases/failing/101 no fallback/meson.build | 2 ++ .../101 no fallback/subprojects/foob/meson.build | 2 ++ test cases/failing/101 no fallback/test.json | 8 +++++ test cases/failing/102 feature require/meson.build | 2 ++ .../failing/102 feature require/meson_options.txt | 1 + test cases/failing/102 feature require/test.json | 8 +++++ test cases/failing/102 no fallback/meson.build | 2 -- .../102 no fallback/subprojects/foob/meson.build | 2 -- test cases/failing/102 no fallback/test.json | 8 ----- .../failing/103 feature require.bis/meson.build | 2 ++ .../103 feature require.bis/meson_options.txt | 1 + .../failing/103 feature require.bis/test.json | 8 +++++ test cases/failing/103 feature require/meson.build | 2 -- .../failing/103 feature require/meson_options.txt | 1 - test cases/failing/103 feature require/test.json | 8 ----- .../failing/104 feature require.bis/meson.build | 2 -- .../104 feature require.bis/meson_options.txt | 1 - .../failing/104 feature require.bis/test.json | 8 ----- .../104 no build get_external_property/meson.build | 3 ++ .../104 no build get_external_property/test.json | 7 +++++ .../failing/105 enter subdir twice/meson.build | 3 ++ .../failing/105 enter subdir twice/sub/meson.build | 1 + .../failing/105 enter subdir twice/test.json | 7 +++++ .../105 no build get_external_property/meson.build | 3 -- .../105 no build get_external_property/test.json | 7 ----- .../failing/106 enter subdir twice/meson.build | 3 -- .../failing/106 enter subdir twice/sub/meson.build | 1 - .../failing/106 enter subdir twice/test.json | 7 ----- .../109 invalid fstring/meson.build | 4 +++ .../109 invalid fstring/test.json | 7 +++++ test cases/failing/106 invalid fstring/meson.build | 3 ++ test cases/failing/106 invalid fstring/test.json | 7 +++++ .../107 compiler argument checking/meson.build | 4 +++ .../107 compiler argument checking/test.json | 7 +++++ .../109 invalid fstring/meson.build | 4 --- .../109 invalid fstring/test.json | 7 ----- test cases/failing/107 invalid fstring/meson.build | 3 -- test cases/failing/107 invalid fstring/test.json | 7 ----- .../108 compiler argument checking/meson.build | 4 --- .../108 compiler argument checking/test.json | 7 ----- test cases/failing/108 empty fallback/meson.build | 6 ++++ .../108 empty fallback/subprojects/foo/meson.build | 3 ++ test cases/failing/108 empty fallback/test.json | 8 +++++ .../109 cmake executable dependency/meson.build | 9 ++++++ .../subprojects/cmlib/CMakeLists.txt | 5 ++++ .../subprojects/cmlib/main.c | 3 ++ .../109 cmake executable dependency/test.json | 10 +++++++ test cases/failing/109 empty fallback/meson.build | 6 ---- .../109 empty fallback/subprojects/foo/meson.build | 3 -- test cases/failing/109 empty fallback/test.json | 8 ----- .../110 allow_fallback with fallback/meson.build | 3 ++ .../110 allow_fallback with fallback/test.json | 8 +++++ .../110 cmake executable dependency/meson.build | 9 ------ .../subprojects/cmlib/CMakeLists.txt | 5 ---- .../subprojects/cmlib/main.c | 3 -- .../110 cmake executable dependency/test.json | 10 ------- .../111 allow_fallback with fallback/meson.build | 3 -- .../111 allow_fallback with fallback/test.json | 8 ----- .../failing/111 nonsensical bindgen/meson.build | 20 +++++++++++++ .../failing/111 nonsensical bindgen/src/header.h | 8 +++++ .../failing/111 nonsensical bindgen/src/source.c | 8 +++++ .../failing/111 nonsensical bindgen/test.json | 8 +++++ .../failing/112 nonsensical bindgen/meson.build | 20 ------------- .../failing/112 nonsensical bindgen/src/header.h | 8 ----- .../failing/112 nonsensical bindgen/src/source.c | 8 ----- .../failing/112 nonsensical bindgen/test.json | 8 ----- .../failing/112 run_target in test/meson.build | 7 +++++ .../failing/112 run_target in test/test.json | 8 +++++ .../failing/112 run_target in test/trivial.c | 6 ++++ .../meson.build | 7 +++++ .../113 run_target in add_install_script/test.json | 8 +++++ .../113 run_target in add_install_script/trivial.c | 11 +++++++ .../failing/113 run_target in test/meson.build | 7 ----- .../failing/113 run_target in test/test.json | 8 ----- .../failing/113 run_target in test/trivial.c | 6 ---- .../114 pathsep in install_symlink/meson.build | 3 ++ .../114 pathsep in install_symlink/test.json | 7 +++++ .../meson.build | 7 ----- .../114 run_target in add_install_script/test.json | 8 ----- .../114 run_target in add_install_script/trivial.c | 11 ------- .../115 pathsep in install_symlink/meson.build | 3 -- .../115 pathsep in install_symlink/test.json | 7 ----- .../115 subproject version conflict/meson.build | 4 +++ .../subprojects/A/meson.build | 4 +++ .../subprojects/B/meson.build | 3 ++ .../115 subproject version conflict/test.json | 7 +++++ .../116 structured source empty string/main.rs | 0 .../116 structured source empty string/meson.build | 13 +++++++++ .../116 structured source empty string/test.json | 7 +++++ .../116 subproject version conflict/meson.build | 4 --- .../subprojects/A/meson.build | 4 --- .../subprojects/B/meson.build | 3 -- .../116 subproject version conflict/test.json | 7 ----- .../117 structured source empty string/main.rs | 0 .../117 structured source empty string/meson.build | 13 --------- .../117 structured source empty string/test.json | 7 ----- .../117 structured_sources conflicts/main.rs | 0 .../117 structured_sources conflicts/meson.build | 17 +++++++++++ .../117 structured_sources conflicts/test.json | 7 +++++ .../failing/118 missing compiler/meson.build | 3 ++ .../118 missing compiler/subprojects/sub/main.c | 1 + .../subprojects/sub/meson.build | 4 +++ test cases/failing/118 missing compiler/test.json | 7 +++++ .../118 structured_sources conflicts/main.rs | 0 .../118 structured_sources conflicts/meson.build | 17 ----------- .../118 structured_sources conflicts/test.json | 7 ----- .../failing/119 cmake subproject error/meson.build | 8 +++++ .../subprojects/cmlib/CMakeLists.txt | 5 ++++ .../failing/119 cmake subproject error/test.json | 10 +++++++ .../failing/119 missing compiler/meson.build | 3 -- .../119 missing compiler/subprojects/sub/main.c | 1 - .../subprojects/sub/meson.build | 4 --- test cases/failing/119 missing compiler/test.json | 7 ----- .../failing/120 cmake subproject error/meson.build | 8 ----- .../subprojects/cmlib/CMakeLists.txt | 5 ---- .../failing/120 cmake subproject error/test.json | 10 ------- .../meson.build | 22 ++++++++++++++ .../test.json | 8 +++++ .../meson.build | 22 -------------- .../test.json | 8 ----- .../121 subproject sandbox violation/meson.build | 34 ++++++++++++++++++++++ .../meson_options.txt | 1 + .../subprojects/subproj1/file.txt | 0 .../subprojects/subproj1/meson.build | 4 +++ .../subprojects/subproj1/nested/meson.build | 5 ++++ .../subprojects/subproj2/file.txt | 0 .../subprojects/subproj2/meson.build | 7 +++++ .../subprojects/subproj2/nested/meson.build | 0 .../subprojects/subproj3/file.txt | 0 .../subprojects/subproj3/meson.build | 3 ++ .../121 subproject sandbox violation/test.json | 16 ++++++++++ .../inc/lib.h | 2 ++ .../122 override and add_project_dependency/lib.c | 3 ++ .../meson.build | 8 +++++ .../subprojects/a/meson.build | 10 +++++++ .../subprojects/a/prog.c | 6 ++++ .../test.json | 7 +++++ .../122 subproject sandbox violation/meson.build | 34 ---------------------- .../meson_options.txt | 1 - .../subprojects/subproj1/file.txt | 0 .../subprojects/subproj1/meson.build | 4 --- .../subprojects/subproj1/nested/meson.build | 5 ---- .../subprojects/subproj2/file.txt | 0 .../subprojects/subproj2/meson.build | 7 ----- .../subprojects/subproj2/nested/meson.build | 0 .../subprojects/subproj3/file.txt | 0 .../subprojects/subproj3/meson.build | 3 -- .../122 subproject sandbox violation/test.json | 16 ---------- .../inc/lib.h | 2 -- .../123 override and add_project_dependency/lib.c | 3 -- .../meson.build | 8 ----- .../subprojects/a/meson.build | 10 ------- .../subprojects/a/prog.c | 6 ---- .../test.json | 7 ----- .../inc/lib.h | 2 ++ .../lib.c | 3 ++ .../meson.build | 5 ++++ .../test.json | 7 +++++ .../failing/124 extract from unity/meson.build | 4 +++ test cases/failing/124 extract from unity/src1.c | 3 ++ test cases/failing/124 extract from unity/src2.c | 3 ++ .../failing/124 extract from unity/test.json | 7 +++++ .../inc/lib.h | 2 -- .../lib.c | 3 -- .../meson.build | 5 ---- .../test.json | 7 ----- .../failing/125 extract from unity/meson.build | 4 --- test cases/failing/125 extract from unity/src1.c | 3 -- test cases/failing/125 extract from unity/src2.c | 3 -- .../failing/125 extract from unity/test.json | 7 ----- .../125 subproject object as a dependency/main.c | 1 + .../meson.build | 4 +++ .../subprojects/sub/meson.build | 1 + .../test.json | 7 +++++ test cases/failing/126 generator host binary/exe.c | 1 + .../failing/126 generator host binary/lib.in | 1 + .../failing/126 generator host binary/meson.build | 14 +++++++++ .../failing/126 generator host binary/test.json | 5 ++++ .../126 subproject object as a dependency/main.c | 1 - .../meson.build | 4 --- .../subprojects/sub/meson.build | 1 - .../test.json | 7 ----- test cases/failing/127 generator host binary/exe.c | 1 - .../failing/127 generator host binary/lib.in | 1 - .../failing/127 generator host binary/meson.build | 14 --------- .../failing/127 generator host binary/test.json | 5 ---- test cases/failing/127 invalid ast/meson.build | 3 ++ test cases/failing/127 invalid ast/test.json | 9 ++++++ test cases/failing/128 invalid ast/meson.build | 3 -- test cases/failing/128 invalid ast/test.json | 9 ------ .../128 invalid project function/meson.build | 1 + .../failing/128 invalid project function/test.json | 9 ++++++ .../129 invalid project function/meson.build | 1 - .../failing/129 invalid project function/test.json | 9 ------ test cases/failing/129 utf8 with bom/meson.build | 3 ++ test cases/failing/129 utf8 with bom/test.json | 8 +++++ .../failing/130 utf8 with bom subdir/meson.build | 3 ++ .../130 utf8 with bom subdir/subdir/meson.build | 1 + .../failing/130 utf8 with bom subdir/test.json | 8 +++++ test cases/failing/130 utf8 with bom/meson.build | 3 -- test cases/failing/130 utf8 with bom/test.json | 8 ----- .../failing/131 utf8 with bom options/meson.build | 1 + .../131 utf8 with bom options/meson.options | 1 + .../failing/131 utf8 with bom options/test.json | 8 +++++ .../failing/131 utf8 with bom subdir/meson.build | 3 -- .../131 utf8 with bom subdir/subdir/meson.build | 1 - .../failing/131 utf8 with bom subdir/test.json | 8 ----- .../failing/132 utf8 with bom options/meson.build | 1 - .../132 utf8 with bom options/meson.options | 1 - .../failing/132 utf8 with bom options/test.json | 8 ----- .../meson.build | 16 ++++++++++ .../47 pkgconfig variables not key value/simple.c | 5 ++++ .../47 pkgconfig variables not key value/simple.h | 6 ++++ .../47 pkgconfig variables not key value/test.json | 7 +++++ .../failing/48 executable comparison/meson.build | 6 ++++ test cases/failing/48 executable comparison/prog.c | 1 + .../failing/48 executable comparison/test.json | 8 +++++ .../meson.build | 16 ---------- .../48 pkgconfig variables not key value/simple.c | 5 ---- .../48 pkgconfig variables not key value/simple.h | 6 ---- .../48 pkgconfig variables not key value/test.json | 7 ----- .../failing/49 executable comparison/meson.build | 6 ---- test cases/failing/49 executable comparison/prog.c | 1 - .../failing/49 executable comparison/test.json | 8 ----- .../failing/49 inconsistent comparison/meson.build | 7 +++++ .../failing/49 inconsistent comparison/test.json | 7 +++++ .../failing/50 inconsistent comparison/meson.build | 7 ----- .../failing/50 inconsistent comparison/test.json | 7 ----- test cases/failing/50 slashname/meson.build | 11 +++++++ test cases/failing/50 slashname/sub/meson.build | 1 + test cases/failing/50 slashname/sub/prog.c | 6 ++++ test cases/failing/50 slashname/test.json | 7 +++++ .../51 reserved meson prefix/meson-foo/meson.build | 0 .../failing/51 reserved meson prefix/meson.build | 3 ++ .../failing/51 reserved meson prefix/test.json | 7 +++++ test cases/failing/51 slashname/meson.build | 11 ------- test cases/failing/51 slashname/sub/meson.build | 1 - test cases/failing/51 slashname/sub/prog.c | 6 ---- test cases/failing/51 slashname/test.json | 7 ----- test cases/failing/52 or on new line/meson.build | 7 +++++ .../failing/52 or on new line/meson_options.txt | 1 + test cases/failing/52 or on new line/test.json | 7 +++++ .../52 reserved meson prefix/meson-foo/meson.build | 0 .../failing/52 reserved meson prefix/meson.build | 3 -- .../failing/52 reserved meson prefix/test.json | 7 ----- .../failing/53 link with executable/meson.build | 4 +++ .../failing/53 link with executable/module.c | 4 +++ test cases/failing/53 link with executable/prog.c | 5 ++++ .../failing/53 link with executable/test.json | 7 +++++ test cases/failing/53 or on new line/meson.build | 7 ----- .../failing/53 or on new line/meson_options.txt | 1 - test cases/failing/53 or on new line/test.json | 7 ----- .../54 assign custom target index/meson.build | 24 +++++++++++++++ .../54 assign custom target index/test.json | 7 +++++ .../failing/54 link with executable/meson.build | 4 --- .../failing/54 link with executable/module.c | 4 --- test cases/failing/54 link with executable/prog.c | 5 ---- .../failing/54 link with executable/test.json | 7 ----- .../55 assign custom target index/meson.build | 24 --------------- .../55 assign custom target index/test.json | 7 ----- test cases/failing/55 getoption prefix/meson.build | 5 ++++ .../subprojects/abc/meson.build | 1 + .../subprojects/abc/meson_options.txt | 1 + test cases/failing/55 getoption prefix/test.json | 7 +++++ .../failing/56 bad option argument/meson.build | 3 ++ .../56 bad option argument/meson_options.txt | 1 + .../failing/56 bad option argument/test.json | 7 +++++ test cases/failing/56 getoption prefix/meson.build | 5 ---- .../subprojects/abc/meson.build | 1 - .../subprojects/abc/meson_options.txt | 1 - test cases/failing/56 getoption prefix/test.json | 7 ----- .../failing/57 bad option argument/meson.build | 3 -- .../57 bad option argument/meson_options.txt | 1 - .../failing/57 bad option argument/test.json | 7 ----- test cases/failing/57 subproj filegrab/meson.build | 5 ++++ test cases/failing/57 subproj filegrab/prog.c | 1 + .../57 subproj filegrab/subprojects/a/meson.build | 3 ++ test cases/failing/57 subproj filegrab/test.json | 7 +++++ test cases/failing/58 grab subproj/meson.build | 7 +++++ .../58 grab subproj/subprojects/foo/meson.build | 3 ++ .../failing/58 grab subproj/subprojects/foo/sub.c | 6 ++++ test cases/failing/58 grab subproj/test.json | 7 +++++ test cases/failing/58 subproj filegrab/meson.build | 5 ---- test cases/failing/58 subproj filegrab/prog.c | 1 - .../58 subproj filegrab/subprojects/a/meson.build | 3 -- test cases/failing/58 subproj filegrab/test.json | 7 ----- test cases/failing/59 grab sibling/meson.build | 3 ++ .../59 grab sibling/subprojects/a/meson.build | 3 ++ .../59 grab sibling/subprojects/b/meson.build | 3 ++ .../failing/59 grab sibling/subprojects/b/sneaky.c | 6 ++++ test cases/failing/59 grab sibling/test.json | 7 +++++ test cases/failing/59 grab subproj/meson.build | 7 ----- .../59 grab subproj/subprojects/foo/meson.build | 3 -- .../failing/59 grab subproj/subprojects/foo/sub.c | 6 ---- test cases/failing/59 grab subproj/test.json | 7 ----- test cases/failing/60 grab sibling/meson.build | 3 -- .../60 grab sibling/subprojects/a/meson.build | 3 -- .../60 grab sibling/subprojects/b/meson.build | 3 -- .../failing/60 grab sibling/subprojects/b/sneaky.c | 6 ---- test cases/failing/60 grab sibling/test.json | 7 ----- .../failing/60 string as link target/meson.build | 2 ++ test cases/failing/60 string as link target/prog.c | 1 + .../failing/60 string as link target/test.json | 7 +++++ .../meson.build | 2 ++ .../61 dependency not-found and required/test.json | 7 +++++ .../failing/61 string as link target/meson.build | 2 -- test cases/failing/61 string as link target/prog.c | 1 - .../failing/61 string as link target/test.json | 7 ----- .../meson.build | 2 -- .../62 dependency not-found and required/test.json | 7 ----- .../failing/62 subproj different versions/main.c | 9 ++++++ .../62 subproj different versions/meson.build | 9 ++++++ .../subprojects/a/a.c | 5 ++++ .../subprojects/a/a.h | 1 + .../subprojects/a/meson.build | 11 +++++++ .../subprojects/b/b.c | 5 ++++ .../subprojects/b/b.h | 1 + .../subprojects/b/meson.build | 11 +++++++ .../subprojects/c/c.h | 3 ++ .../subprojects/c/meson.build | 5 ++++ .../62 subproj different versions/test.json | 7 +++++ .../failing/63 subproj different versions/main.c | 9 ------ .../63 subproj different versions/meson.build | 9 ------ .../subprojects/a/a.c | 5 ---- .../subprojects/a/a.h | 1 - .../subprojects/a/meson.build | 11 ------- .../subprojects/b/b.c | 5 ---- .../subprojects/b/b.h | 1 - .../subprojects/b/meson.build | 11 ------- .../subprojects/c/c.h | 3 -- .../subprojects/c/meson.build | 5 ---- .../63 subproj different versions/test.json | 7 ----- .../failing/63 wrong boost module/meson.build | 9 ++++++ test cases/failing/63 wrong boost module/test.json | 7 +++++ .../64 install_data rename bad size/file1.txt | 0 .../64 install_data rename bad size/file2.txt | 0 .../64 install_data rename bad size/meson.build | 3 ++ .../64 install_data rename bad size/test.json | 7 +++++ .../failing/64 wrong boost module/meson.build | 9 ------ test cases/failing/64 wrong boost module/test.json | 7 ----- .../65 install_data rename bad size/file1.txt | 0 .../65 install_data rename bad size/file2.txt | 0 .../65 install_data rename bad size/meson.build | 3 -- .../65 install_data rename bad size/test.json | 7 ----- test cases/failing/65 skip only subdir/meson.build | 8 +++++ .../failing/65 skip only subdir/subdir/meson.build | 3 ++ test cases/failing/65 skip only subdir/test.json | 7 +++++ test cases/failing/66 dual override/meson.build | 5 ++++ test cases/failing/66 dual override/overrides.py | 4 +++ test cases/failing/66 dual override/test.json | 7 +++++ test cases/failing/66 skip only subdir/meson.build | 8 ----- .../failing/66 skip only subdir/subdir/meson.build | 3 -- test cases/failing/66 skip only subdir/test.json | 7 ----- test cases/failing/67 dual override/meson.build | 5 ---- test cases/failing/67 dual override/overrides.py | 4 --- test cases/failing/67 dual override/test.json | 7 ----- test cases/failing/67 override used/meson.build | 5 ++++ test cases/failing/67 override used/other.py | 3 ++ test cases/failing/67 override used/something.py | 3 ++ test cases/failing/67 override used/test.json | 7 +++++ test cases/failing/68 override used/meson.build | 5 ---- test cases/failing/68 override used/other.py | 3 -- test cases/failing/68 override used/something.py | 3 -- test cases/failing/68 override used/test.json | 7 ----- .../68 run_command unclean exit/meson.build | 4 +++ .../68 run_command unclean exit/returncode.py | 4 +++ .../failing/68 run_command unclean exit/test.json | 8 +++++ .../69 int literal leading zero/meson.build | 5 ++++ .../failing/69 int literal leading zero/test.json | 8 +++++ .../69 run_command unclean exit/meson.build | 4 --- .../69 run_command unclean exit/returncode.py | 4 --- .../failing/69 run_command unclean exit/test.json | 8 ----- .../failing/70 configuration immutable/input | 0 .../failing/70 configuration immutable/meson.build | 12 ++++++++ .../failing/70 configuration immutable/test.json | 7 +++++ .../70 int literal leading zero/meson.build | 5 ---- .../failing/70 int literal leading zero/test.json | 8 ----- .../failing/71 configuration immutable/input | 0 .../failing/71 configuration immutable/meson.build | 12 -------- .../failing/71 configuration immutable/test.json | 7 ----- .../71 link with shared module on osx/meson.build | 8 +++++ .../71 link with shared module on osx/module.c | 3 ++ .../71 link with shared module on osx/prog.c | 4 +++ .../71 link with shared module on osx/test.json | 7 +++++ .../72 link with shared module on osx/meson.build | 8 ----- .../72 link with shared module on osx/module.c | 3 -- .../72 link with shared module on osx/prog.c | 4 --- .../72 link with shared module on osx/test.json | 7 ----- .../config9.h.in | 1 + .../meson.build | 10 +++++++ .../test.json | 8 +++++ .../config9.h.in | 1 - .../meson.build | 10 ------- .../test.json | 8 ----- .../meson.build | 2 ++ .../test.json | 7 +++++ .../meson.build | 2 -- .../test.json | 7 ----- test cases/failing/74 unfound run/meson.build | 4 +++ test cases/failing/74 unfound run/test.json | 7 +++++ .../meson.build | 8 +++++ .../75 framework dependency with version/test.json | 7 +++++ test cases/failing/75 unfound run/meson.build | 4 --- test cases/failing/75 unfound run/test.json | 7 ----- .../meson.build | 8 ----- .../76 framework dependency with version/test.json | 7 ----- test cases/failing/76 override exe config/foo.c | 3 ++ .../failing/76 override exe config/meson.build | 6 ++++ .../failing/76 override exe config/test.json | 7 +++++ .../77 gl dependency with version/meson.build | 9 ++++++ .../77 gl dependency with version/test.json | 7 +++++ test cases/failing/77 override exe config/foo.c | 3 -- .../failing/77 override exe config/meson.build | 6 ---- .../failing/77 override exe config/test.json | 7 ----- .../78 gl dependency with version/meson.build | 9 ------ .../78 gl dependency with version/test.json | 7 ----- .../78 threads dependency with version/meson.build | 3 ++ .../78 threads dependency with version/test.json | 7 +++++ .../79 gtest dependency with version/meson.build | 8 +++++ .../79 gtest dependency with version/test.json | 7 +++++ .../79 threads dependency with version/meson.build | 3 -- .../79 threads dependency with version/test.json | 7 ----- test cases/failing/80 dub library/meson.build | 11 +++++++ test cases/failing/80 dub library/test.json | 7 +++++ .../80 gtest dependency with version/meson.build | 8 ----- .../80 gtest dependency with version/test.json | 7 ----- test cases/failing/81 dub executable/meson.build | 11 +++++++ test cases/failing/81 dub executable/test.json | 7 +++++ test cases/failing/81 dub library/meson.build | 11 ------- test cases/failing/81 dub library/test.json | 7 ----- test cases/failing/82 dub compiler/meson.build | 17 +++++++++++ test cases/failing/82 dub compiler/test.json | 19 ++++++++++++ test cases/failing/82 dub executable/meson.build | 11 ------- test cases/failing/82 dub executable/test.json | 7 ----- test cases/failing/83 dub compiler/meson.build | 17 ----------- test cases/failing/83 dub compiler/test.json | 19 ------------ .../failing/83 subproj not-found dep/meson.build | 2 ++ .../subprojects/somesubproj/meson.build | 3 ++ .../failing/83 subproj not-found dep/test.json | 7 +++++ test cases/failing/84 invalid configure file/input | 0 .../failing/84 invalid configure file/meson.build | 9 ++++++ .../failing/84 invalid configure file/test.json | 7 +++++ .../failing/84 subproj not-found dep/meson.build | 2 -- .../subprojects/somesubproj/meson.build | 3 -- .../failing/84 subproj not-found dep/test.json | 7 ----- test cases/failing/85 invalid configure file/input | 0 .../failing/85 invalid configure file/meson.build | 9 ------ .../failing/85 invalid configure file/test.json | 7 ----- test cases/failing/85 kwarg dupe/meson.build | 6 ++++ test cases/failing/85 kwarg dupe/prog.c | 6 ++++ test cases/failing/85 kwarg dupe/test.json | 7 +++++ test cases/failing/86 kwarg dupe/meson.build | 6 ---- test cases/failing/86 kwarg dupe/prog.c | 6 ---- test cases/failing/86 kwarg dupe/test.json | 7 ----- test cases/failing/86 missing pch file/meson.build | 3 ++ test cases/failing/86 missing pch file/prog.c | 3 ++ test cases/failing/86 missing pch file/test.json | 8 +++++ test cases/failing/87 missing pch file/meson.build | 3 -- test cases/failing/87 missing pch file/prog.c | 3 -- test cases/failing/87 missing pch file/test.json | 8 ----- .../87 pch source different folder/include/pch.h | 0 .../87 pch source different folder/meson.build | 5 ++++ .../failing/87 pch source different folder/prog.c | 1 + .../87 pch source different folder/src/pch.c | 0 .../87 pch source different folder/test.json | 7 +++++ .../88 pch source different folder/include/pch.h | 0 .../88 pch source different folder/meson.build | 5 ---- .../failing/88 pch source different folder/prog.c | 1 - .../88 pch source different folder/src/pch.c | 0 .../88 pch source different folder/test.json | 7 ----- .../failing/88 unknown config tool/meson.build | 2 ++ .../failing/88 unknown config tool/test.json | 7 +++++ .../89 custom target install data/Info.plist.cpp | 1 + .../89 custom target install data/meson.build | 11 +++++++ .../89 custom target install data/preproc.py | 13 +++++++++ .../89 custom target install data/test.json | 7 +++++ .../failing/89 unknown config tool/meson.build | 2 -- .../failing/89 unknown config tool/test.json | 7 ----- .../failing/90 add dict non string key/meson.build | 9 ++++++ .../failing/90 add dict non string key/test.json | 7 +++++ .../90 custom target install data/Info.plist.cpp | 1 - .../90 custom target install data/meson.build | 11 ------- .../90 custom target install data/preproc.py | 13 --------- .../90 custom target install data/test.json | 7 ----- .../failing/91 add dict duplicate keys/meson.build | 9 ++++++ .../failing/91 add dict duplicate keys/test.json | 7 +++++ .../failing/91 add dict non string key/meson.build | 9 ------ .../failing/91 add dict non string key/test.json | 7 ----- .../failing/92 add dict duplicate keys/meson.build | 9 ------ .../failing/92 add dict duplicate keys/test.json | 7 ----- .../92 no host get_external_property/meson.build | 3 ++ .../92 no host get_external_property/test.json | 7 +++++ .../93 no host get_external_property/meson.build | 3 -- .../93 no host get_external_property/test.json | 7 ----- test cases/failing/93 no native compiler/main.c | 3 ++ .../failing/93 no native compiler/meson.build | 12 ++++++++ test cases/failing/93 no native compiler/test.json | 7 +++++ test cases/failing/94 no native compiler/main.c | 3 -- .../failing/94 no native compiler/meson.build | 12 -------- test cases/failing/94 no native compiler/test.json | 7 ----- .../failing/94 subdir parse error/meson.build | 2 ++ .../94 subdir parse error/subdir/meson.build | 1 + test cases/failing/94 subdir parse error/test.json | 7 +++++ .../failing/95 invalid option file/meson.build | 1 + .../95 invalid option file/meson_options.txt | 1 + .../failing/95 invalid option file/test.json | 7 +++++ .../failing/95 subdir parse error/meson.build | 2 -- .../95 subdir parse error/subdir/meson.build | 1 - test cases/failing/95 subdir parse error/test.json | 7 ----- .../failing/96 invalid option file/meson.build | 1 - .../96 invalid option file/meson_options.txt | 1 - .../failing/96 invalid option file/test.json | 7 ----- test cases/failing/96 no lang/main.c | 3 ++ test cases/failing/96 no lang/meson.build | 2 ++ test cases/failing/96 no lang/test.json | 7 +++++ .../97 no glib-compile-resources/meson.build | 8 +++++ .../failing/97 no glib-compile-resources/test.json | 7 +++++ .../trivial.gresource.xml | 3 ++ test cases/failing/97 no lang/main.c | 3 -- test cases/failing/97 no lang/meson.build | 2 -- test cases/failing/97 no lang/test.json | 7 ----- .../98 no glib-compile-resources/meson.build | 8 ----- .../failing/98 no glib-compile-resources/test.json | 7 ----- .../trivial.gresource.xml | 3 -- test cases/failing/98 number in combo/meson.build | 1 + .../failing/98 number in combo/nativefile.ini | 2 ++ test cases/failing/98 number in combo/test.json | 5 ++++ test cases/failing/99 bool in combo/meson.build | 1 + .../failing/99 bool in combo/meson_options.txt | 5 ++++ test cases/failing/99 bool in combo/nativefile.ini | 2 ++ test cases/failing/99 bool in combo/test.json | 5 ++++ test cases/failing/99 number in combo/meson.build | 1 - .../failing/99 number in combo/nativefile.ini | 2 -- test cases/failing/99 number in combo/test.json | 5 ---- 542 files changed, 1527 insertions(+), 1527 deletions(-) delete mode 100644 test cases/failing/100 bool in combo/meson.build delete mode 100644 test cases/failing/100 bool in combo/meson_options.txt delete mode 100644 test cases/failing/100 bool in combo/nativefile.ini delete mode 100644 test cases/failing/100 bool in combo/test.json create mode 100644 test cases/failing/100 compiler no lang/meson.build create mode 100644 test cases/failing/100 compiler no lang/test.json delete mode 100644 test cases/failing/101 compiler no lang/meson.build delete mode 100644 test cases/failing/101 compiler no lang/test.json create mode 100644 test cases/failing/101 no fallback/meson.build create mode 100644 test cases/failing/101 no fallback/subprojects/foob/meson.build create mode 100644 test cases/failing/101 no fallback/test.json create mode 100644 test cases/failing/102 feature require/meson.build create mode 100644 test cases/failing/102 feature require/meson_options.txt create mode 100644 test cases/failing/102 feature require/test.json delete mode 100644 test cases/failing/102 no fallback/meson.build delete mode 100644 test cases/failing/102 no fallback/subprojects/foob/meson.build delete mode 100644 test cases/failing/102 no fallback/test.json create mode 100644 test cases/failing/103 feature require.bis/meson.build create mode 100644 test cases/failing/103 feature require.bis/meson_options.txt create mode 100644 test cases/failing/103 feature require.bis/test.json delete mode 100644 test cases/failing/103 feature require/meson.build delete mode 100644 test cases/failing/103 feature require/meson_options.txt delete mode 100644 test cases/failing/103 feature require/test.json delete mode 100644 test cases/failing/104 feature require.bis/meson.build delete mode 100644 test cases/failing/104 feature require.bis/meson_options.txt delete mode 100644 test cases/failing/104 feature require.bis/test.json create mode 100644 test cases/failing/104 no build get_external_property/meson.build create mode 100644 test cases/failing/104 no build get_external_property/test.json create mode 100644 test cases/failing/105 enter subdir twice/meson.build create mode 100644 test cases/failing/105 enter subdir twice/sub/meson.build create mode 100644 test cases/failing/105 enter subdir twice/test.json delete mode 100644 test cases/failing/105 no build get_external_property/meson.build delete mode 100644 test cases/failing/105 no build get_external_property/test.json delete mode 100644 test cases/failing/106 enter subdir twice/meson.build delete mode 100644 test cases/failing/106 enter subdir twice/sub/meson.build delete mode 100644 test cases/failing/106 enter subdir twice/test.json create mode 100644 test cases/failing/106 invalid fstring/109 invalid fstring/meson.build create mode 100644 test cases/failing/106 invalid fstring/109 invalid fstring/test.json create mode 100644 test cases/failing/106 invalid fstring/meson.build create mode 100644 test cases/failing/106 invalid fstring/test.json create mode 100644 test cases/failing/107 compiler argument checking/meson.build create mode 100644 test cases/failing/107 compiler argument checking/test.json delete mode 100644 test cases/failing/107 invalid fstring/109 invalid fstring/meson.build delete mode 100644 test cases/failing/107 invalid fstring/109 invalid fstring/test.json delete mode 100644 test cases/failing/107 invalid fstring/meson.build delete mode 100644 test cases/failing/107 invalid fstring/test.json delete mode 100644 test cases/failing/108 compiler argument checking/meson.build delete mode 100644 test cases/failing/108 compiler argument checking/test.json create mode 100644 test cases/failing/108 empty fallback/meson.build create mode 100644 test cases/failing/108 empty fallback/subprojects/foo/meson.build create mode 100644 test cases/failing/108 empty fallback/test.json create mode 100644 test cases/failing/109 cmake executable dependency/meson.build create mode 100644 test cases/failing/109 cmake executable dependency/subprojects/cmlib/CMakeLists.txt create mode 100644 test cases/failing/109 cmake executable dependency/subprojects/cmlib/main.c create mode 100644 test cases/failing/109 cmake executable dependency/test.json delete mode 100644 test cases/failing/109 empty fallback/meson.build delete mode 100644 test cases/failing/109 empty fallback/subprojects/foo/meson.build delete mode 100644 test cases/failing/109 empty fallback/test.json create mode 100644 test cases/failing/110 allow_fallback with fallback/meson.build create mode 100644 test cases/failing/110 allow_fallback with fallback/test.json delete mode 100644 test cases/failing/110 cmake executable dependency/meson.build delete mode 100644 test cases/failing/110 cmake executable dependency/subprojects/cmlib/CMakeLists.txt delete mode 100644 test cases/failing/110 cmake executable dependency/subprojects/cmlib/main.c delete mode 100644 test cases/failing/110 cmake executable dependency/test.json delete mode 100644 test cases/failing/111 allow_fallback with fallback/meson.build delete mode 100644 test cases/failing/111 allow_fallback with fallback/test.json create mode 100644 test cases/failing/111 nonsensical bindgen/meson.build create mode 100644 test cases/failing/111 nonsensical bindgen/src/header.h create mode 100644 test cases/failing/111 nonsensical bindgen/src/source.c create mode 100644 test cases/failing/111 nonsensical bindgen/test.json delete mode 100644 test cases/failing/112 nonsensical bindgen/meson.build delete mode 100644 test cases/failing/112 nonsensical bindgen/src/header.h delete mode 100644 test cases/failing/112 nonsensical bindgen/src/source.c delete mode 100644 test cases/failing/112 nonsensical bindgen/test.json create mode 100644 test cases/failing/112 run_target in test/meson.build create mode 100644 test cases/failing/112 run_target in test/test.json create mode 100644 test cases/failing/112 run_target in test/trivial.c create mode 100644 test cases/failing/113 run_target in add_install_script/meson.build create mode 100644 test cases/failing/113 run_target in add_install_script/test.json create mode 100644 test cases/failing/113 run_target in add_install_script/trivial.c delete mode 100644 test cases/failing/113 run_target in test/meson.build delete mode 100644 test cases/failing/113 run_target in test/test.json delete mode 100644 test cases/failing/113 run_target in test/trivial.c create mode 100644 test cases/failing/114 pathsep in install_symlink/meson.build create mode 100644 test cases/failing/114 pathsep in install_symlink/test.json delete mode 100644 test cases/failing/114 run_target in add_install_script/meson.build delete mode 100644 test cases/failing/114 run_target in add_install_script/test.json delete mode 100644 test cases/failing/114 run_target in add_install_script/trivial.c delete mode 100644 test cases/failing/115 pathsep in install_symlink/meson.build delete mode 100644 test cases/failing/115 pathsep in install_symlink/test.json create mode 100644 test cases/failing/115 subproject version conflict/meson.build create mode 100644 test cases/failing/115 subproject version conflict/subprojects/A/meson.build create mode 100644 test cases/failing/115 subproject version conflict/subprojects/B/meson.build create mode 100644 test cases/failing/115 subproject version conflict/test.json create mode 100644 test cases/failing/116 structured source empty string/main.rs create mode 100644 test cases/failing/116 structured source empty string/meson.build create mode 100644 test cases/failing/116 structured source empty string/test.json delete mode 100644 test cases/failing/116 subproject version conflict/meson.build delete mode 100644 test cases/failing/116 subproject version conflict/subprojects/A/meson.build delete mode 100644 test cases/failing/116 subproject version conflict/subprojects/B/meson.build delete mode 100644 test cases/failing/116 subproject version conflict/test.json delete mode 100644 test cases/failing/117 structured source empty string/main.rs delete mode 100644 test cases/failing/117 structured source empty string/meson.build delete mode 100644 test cases/failing/117 structured source empty string/test.json create mode 100644 test cases/failing/117 structured_sources conflicts/main.rs create mode 100644 test cases/failing/117 structured_sources conflicts/meson.build create mode 100644 test cases/failing/117 structured_sources conflicts/test.json create mode 100644 test cases/failing/118 missing compiler/meson.build create mode 100644 test cases/failing/118 missing compiler/subprojects/sub/main.c create mode 100644 test cases/failing/118 missing compiler/subprojects/sub/meson.build create mode 100644 test cases/failing/118 missing compiler/test.json delete mode 100644 test cases/failing/118 structured_sources conflicts/main.rs delete mode 100644 test cases/failing/118 structured_sources conflicts/meson.build delete mode 100644 test cases/failing/118 structured_sources conflicts/test.json create mode 100644 test cases/failing/119 cmake subproject error/meson.build create mode 100644 test cases/failing/119 cmake subproject error/subprojects/cmlib/CMakeLists.txt create mode 100644 test cases/failing/119 cmake subproject error/test.json delete mode 100644 test cases/failing/119 missing compiler/meson.build delete mode 100644 test cases/failing/119 missing compiler/subprojects/sub/main.c delete mode 100644 test cases/failing/119 missing compiler/subprojects/sub/meson.build delete mode 100644 test cases/failing/119 missing compiler/test.json delete mode 100644 test cases/failing/120 cmake subproject error/meson.build delete mode 100644 test cases/failing/120 cmake subproject error/subprojects/cmlib/CMakeLists.txt delete mode 100644 test cases/failing/120 cmake subproject error/test.json create mode 100644 test cases/failing/120 pkgconfig not relocatable outside prefix/meson.build create mode 100644 test cases/failing/120 pkgconfig not relocatable outside prefix/test.json delete mode 100644 test cases/failing/121 pkgconfig not relocatable outside prefix/meson.build delete mode 100644 test cases/failing/121 pkgconfig not relocatable outside prefix/test.json create mode 100644 test cases/failing/121 subproject sandbox violation/meson.build create mode 100644 test cases/failing/121 subproject sandbox violation/meson_options.txt create mode 100644 test cases/failing/121 subproject sandbox violation/subprojects/subproj1/file.txt create mode 100644 test cases/failing/121 subproject sandbox violation/subprojects/subproj1/meson.build create mode 100644 test cases/failing/121 subproject sandbox violation/subprojects/subproj1/nested/meson.build create mode 100644 test cases/failing/121 subproject sandbox violation/subprojects/subproj2/file.txt create mode 100644 test cases/failing/121 subproject sandbox violation/subprojects/subproj2/meson.build create mode 100644 test cases/failing/121 subproject sandbox violation/subprojects/subproj2/nested/meson.build create mode 100644 test cases/failing/121 subproject sandbox violation/subprojects/subproj3/file.txt create mode 100644 test cases/failing/121 subproject sandbox violation/subprojects/subproj3/meson.build create mode 100644 test cases/failing/121 subproject sandbox violation/test.json create mode 100644 test cases/failing/122 override and add_project_dependency/inc/lib.h create mode 100644 test cases/failing/122 override and add_project_dependency/lib.c create mode 100644 test cases/failing/122 override and add_project_dependency/meson.build create mode 100644 test cases/failing/122 override and add_project_dependency/subprojects/a/meson.build create mode 100644 test cases/failing/122 override and add_project_dependency/subprojects/a/prog.c create mode 100644 test cases/failing/122 override and add_project_dependency/test.json delete mode 100644 test cases/failing/122 subproject sandbox violation/meson.build delete mode 100644 test cases/failing/122 subproject sandbox violation/meson_options.txt delete mode 100644 test cases/failing/122 subproject sandbox violation/subprojects/subproj1/file.txt delete mode 100644 test cases/failing/122 subproject sandbox violation/subprojects/subproj1/meson.build delete mode 100644 test cases/failing/122 subproject sandbox violation/subprojects/subproj1/nested/meson.build delete mode 100644 test cases/failing/122 subproject sandbox violation/subprojects/subproj2/file.txt delete mode 100644 test cases/failing/122 subproject sandbox violation/subprojects/subproj2/meson.build delete mode 100644 test cases/failing/122 subproject sandbox violation/subprojects/subproj2/nested/meson.build delete mode 100644 test cases/failing/122 subproject sandbox violation/subprojects/subproj3/file.txt delete mode 100644 test cases/failing/122 subproject sandbox violation/subprojects/subproj3/meson.build delete mode 100644 test cases/failing/122 subproject sandbox violation/test.json delete mode 100644 test cases/failing/123 override and add_project_dependency/inc/lib.h delete mode 100644 test cases/failing/123 override and add_project_dependency/lib.c delete mode 100644 test cases/failing/123 override and add_project_dependency/meson.build delete mode 100644 test cases/failing/123 override and add_project_dependency/subprojects/a/meson.build delete mode 100644 test cases/failing/123 override and add_project_dependency/subprojects/a/prog.c delete mode 100644 test cases/failing/123 override and add_project_dependency/test.json create mode 100644 test cases/failing/123 targets before add_project_dependency/inc/lib.h create mode 100644 test cases/failing/123 targets before add_project_dependency/lib.c create mode 100644 test cases/failing/123 targets before add_project_dependency/meson.build create mode 100644 test cases/failing/123 targets before add_project_dependency/test.json create mode 100644 test cases/failing/124 extract from unity/meson.build create mode 100644 test cases/failing/124 extract from unity/src1.c create mode 100644 test cases/failing/124 extract from unity/src2.c create mode 100644 test cases/failing/124 extract from unity/test.json delete mode 100644 test cases/failing/124 targets before add_project_dependency/inc/lib.h delete mode 100644 test cases/failing/124 targets before add_project_dependency/lib.c delete mode 100644 test cases/failing/124 targets before add_project_dependency/meson.build delete mode 100644 test cases/failing/124 targets before add_project_dependency/test.json delete mode 100644 test cases/failing/125 extract from unity/meson.build delete mode 100644 test cases/failing/125 extract from unity/src1.c delete mode 100644 test cases/failing/125 extract from unity/src2.c delete mode 100644 test cases/failing/125 extract from unity/test.json create mode 100644 test cases/failing/125 subproject object as a dependency/main.c create mode 100644 test cases/failing/125 subproject object as a dependency/meson.build create mode 100644 test cases/failing/125 subproject object as a dependency/subprojects/sub/meson.build create mode 100644 test cases/failing/125 subproject object as a dependency/test.json create mode 100644 test cases/failing/126 generator host binary/exe.c create mode 100644 test cases/failing/126 generator host binary/lib.in create mode 100644 test cases/failing/126 generator host binary/meson.build create mode 100644 test cases/failing/126 generator host binary/test.json delete mode 100644 test cases/failing/126 subproject object as a dependency/main.c delete mode 100644 test cases/failing/126 subproject object as a dependency/meson.build delete mode 100644 test cases/failing/126 subproject object as a dependency/subprojects/sub/meson.build delete mode 100644 test cases/failing/126 subproject object as a dependency/test.json delete mode 100644 test cases/failing/127 generator host binary/exe.c delete mode 100644 test cases/failing/127 generator host binary/lib.in delete mode 100644 test cases/failing/127 generator host binary/meson.build delete mode 100644 test cases/failing/127 generator host binary/test.json create mode 100644 test cases/failing/127 invalid ast/meson.build create mode 100644 test cases/failing/127 invalid ast/test.json delete mode 100644 test cases/failing/128 invalid ast/meson.build delete mode 100644 test cases/failing/128 invalid ast/test.json create mode 100644 test cases/failing/128 invalid project function/meson.build create mode 100644 test cases/failing/128 invalid project function/test.json delete mode 100644 test cases/failing/129 invalid project function/meson.build delete mode 100644 test cases/failing/129 invalid project function/test.json create mode 100644 test cases/failing/129 utf8 with bom/meson.build create mode 100644 test cases/failing/129 utf8 with bom/test.json create mode 100644 test cases/failing/130 utf8 with bom subdir/meson.build create mode 100644 test cases/failing/130 utf8 with bom subdir/subdir/meson.build create mode 100644 test cases/failing/130 utf8 with bom subdir/test.json delete mode 100644 test cases/failing/130 utf8 with bom/meson.build delete mode 100644 test cases/failing/130 utf8 with bom/test.json create mode 100644 test cases/failing/131 utf8 with bom options/meson.build create mode 100644 test cases/failing/131 utf8 with bom options/meson.options create mode 100644 test cases/failing/131 utf8 with bom options/test.json delete mode 100644 test cases/failing/131 utf8 with bom subdir/meson.build delete mode 100644 test cases/failing/131 utf8 with bom subdir/subdir/meson.build delete mode 100644 test cases/failing/131 utf8 with bom subdir/test.json delete mode 100644 test cases/failing/132 utf8 with bom options/meson.build delete mode 100644 test cases/failing/132 utf8 with bom options/meson.options delete mode 100644 test cases/failing/132 utf8 with bom options/test.json create mode 100644 test cases/failing/47 pkgconfig variables not key value/meson.build create mode 100644 test cases/failing/47 pkgconfig variables not key value/simple.c create mode 100644 test cases/failing/47 pkgconfig variables not key value/simple.h create mode 100644 test cases/failing/47 pkgconfig variables not key value/test.json create mode 100644 test cases/failing/48 executable comparison/meson.build create mode 100644 test cases/failing/48 executable comparison/prog.c create mode 100644 test cases/failing/48 executable comparison/test.json delete mode 100644 test cases/failing/48 pkgconfig variables not key value/meson.build delete mode 100644 test cases/failing/48 pkgconfig variables not key value/simple.c delete mode 100644 test cases/failing/48 pkgconfig variables not key value/simple.h delete mode 100644 test cases/failing/48 pkgconfig variables not key value/test.json delete mode 100644 test cases/failing/49 executable comparison/meson.build delete mode 100644 test cases/failing/49 executable comparison/prog.c delete mode 100644 test cases/failing/49 executable comparison/test.json create mode 100644 test cases/failing/49 inconsistent comparison/meson.build create mode 100644 test cases/failing/49 inconsistent comparison/test.json delete mode 100644 test cases/failing/50 inconsistent comparison/meson.build delete mode 100644 test cases/failing/50 inconsistent comparison/test.json create mode 100644 test cases/failing/50 slashname/meson.build create mode 100644 test cases/failing/50 slashname/sub/meson.build create mode 100644 test cases/failing/50 slashname/sub/prog.c create mode 100644 test cases/failing/50 slashname/test.json create mode 100644 test cases/failing/51 reserved meson prefix/meson-foo/meson.build create mode 100644 test cases/failing/51 reserved meson prefix/meson.build create mode 100644 test cases/failing/51 reserved meson prefix/test.json delete mode 100644 test cases/failing/51 slashname/meson.build delete mode 100644 test cases/failing/51 slashname/sub/meson.build delete mode 100644 test cases/failing/51 slashname/sub/prog.c delete mode 100644 test cases/failing/51 slashname/test.json create mode 100644 test cases/failing/52 or on new line/meson.build create mode 100644 test cases/failing/52 or on new line/meson_options.txt create mode 100644 test cases/failing/52 or on new line/test.json delete mode 100644 test cases/failing/52 reserved meson prefix/meson-foo/meson.build delete mode 100644 test cases/failing/52 reserved meson prefix/meson.build delete mode 100644 test cases/failing/52 reserved meson prefix/test.json create mode 100644 test cases/failing/53 link with executable/meson.build create mode 100644 test cases/failing/53 link with executable/module.c create mode 100644 test cases/failing/53 link with executable/prog.c create mode 100644 test cases/failing/53 link with executable/test.json delete mode 100644 test cases/failing/53 or on new line/meson.build delete mode 100644 test cases/failing/53 or on new line/meson_options.txt delete mode 100644 test cases/failing/53 or on new line/test.json create mode 100644 test cases/failing/54 assign custom target index/meson.build create mode 100644 test cases/failing/54 assign custom target index/test.json delete mode 100644 test cases/failing/54 link with executable/meson.build delete mode 100644 test cases/failing/54 link with executable/module.c delete mode 100644 test cases/failing/54 link with executable/prog.c delete mode 100644 test cases/failing/54 link with executable/test.json delete mode 100644 test cases/failing/55 assign custom target index/meson.build delete mode 100644 test cases/failing/55 assign custom target index/test.json create mode 100644 test cases/failing/55 getoption prefix/meson.build create mode 100644 test cases/failing/55 getoption prefix/subprojects/abc/meson.build create mode 100644 test cases/failing/55 getoption prefix/subprojects/abc/meson_options.txt create mode 100644 test cases/failing/55 getoption prefix/test.json create mode 100644 test cases/failing/56 bad option argument/meson.build create mode 100644 test cases/failing/56 bad option argument/meson_options.txt create mode 100644 test cases/failing/56 bad option argument/test.json delete mode 100644 test cases/failing/56 getoption prefix/meson.build delete mode 100644 test cases/failing/56 getoption prefix/subprojects/abc/meson.build delete mode 100644 test cases/failing/56 getoption prefix/subprojects/abc/meson_options.txt delete mode 100644 test cases/failing/56 getoption prefix/test.json delete mode 100644 test cases/failing/57 bad option argument/meson.build delete mode 100644 test cases/failing/57 bad option argument/meson_options.txt delete mode 100644 test cases/failing/57 bad option argument/test.json create mode 100644 test cases/failing/57 subproj filegrab/meson.build create mode 100644 test cases/failing/57 subproj filegrab/prog.c create mode 100644 test cases/failing/57 subproj filegrab/subprojects/a/meson.build create mode 100644 test cases/failing/57 subproj filegrab/test.json create mode 100644 test cases/failing/58 grab subproj/meson.build create mode 100644 test cases/failing/58 grab subproj/subprojects/foo/meson.build create mode 100644 test cases/failing/58 grab subproj/subprojects/foo/sub.c create mode 100644 test cases/failing/58 grab subproj/test.json delete mode 100644 test cases/failing/58 subproj filegrab/meson.build delete mode 100644 test cases/failing/58 subproj filegrab/prog.c delete mode 100644 test cases/failing/58 subproj filegrab/subprojects/a/meson.build delete mode 100644 test cases/failing/58 subproj filegrab/test.json create mode 100644 test cases/failing/59 grab sibling/meson.build create mode 100644 test cases/failing/59 grab sibling/subprojects/a/meson.build create mode 100644 test cases/failing/59 grab sibling/subprojects/b/meson.build create mode 100644 test cases/failing/59 grab sibling/subprojects/b/sneaky.c create mode 100644 test cases/failing/59 grab sibling/test.json delete mode 100644 test cases/failing/59 grab subproj/meson.build delete mode 100644 test cases/failing/59 grab subproj/subprojects/foo/meson.build delete mode 100644 test cases/failing/59 grab subproj/subprojects/foo/sub.c delete mode 100644 test cases/failing/59 grab subproj/test.json delete mode 100644 test cases/failing/60 grab sibling/meson.build delete mode 100644 test cases/failing/60 grab sibling/subprojects/a/meson.build delete mode 100644 test cases/failing/60 grab sibling/subprojects/b/meson.build delete mode 100644 test cases/failing/60 grab sibling/subprojects/b/sneaky.c delete mode 100644 test cases/failing/60 grab sibling/test.json create mode 100644 test cases/failing/60 string as link target/meson.build create mode 100644 test cases/failing/60 string as link target/prog.c create mode 100644 test cases/failing/60 string as link target/test.json create mode 100644 test cases/failing/61 dependency not-found and required/meson.build create mode 100644 test cases/failing/61 dependency not-found and required/test.json delete mode 100644 test cases/failing/61 string as link target/meson.build delete mode 100644 test cases/failing/61 string as link target/prog.c delete mode 100644 test cases/failing/61 string as link target/test.json delete mode 100644 test cases/failing/62 dependency not-found and required/meson.build delete mode 100644 test cases/failing/62 dependency not-found and required/test.json create mode 100644 test cases/failing/62 subproj different versions/main.c create mode 100644 test cases/failing/62 subproj different versions/meson.build create mode 100644 test cases/failing/62 subproj different versions/subprojects/a/a.c create mode 100644 test cases/failing/62 subproj different versions/subprojects/a/a.h create mode 100644 test cases/failing/62 subproj different versions/subprojects/a/meson.build create mode 100644 test cases/failing/62 subproj different versions/subprojects/b/b.c create mode 100644 test cases/failing/62 subproj different versions/subprojects/b/b.h create mode 100644 test cases/failing/62 subproj different versions/subprojects/b/meson.build create mode 100644 test cases/failing/62 subproj different versions/subprojects/c/c.h create mode 100644 test cases/failing/62 subproj different versions/subprojects/c/meson.build create mode 100644 test cases/failing/62 subproj different versions/test.json delete mode 100644 test cases/failing/63 subproj different versions/main.c delete mode 100644 test cases/failing/63 subproj different versions/meson.build delete mode 100644 test cases/failing/63 subproj different versions/subprojects/a/a.c delete mode 100644 test cases/failing/63 subproj different versions/subprojects/a/a.h delete mode 100644 test cases/failing/63 subproj different versions/subprojects/a/meson.build delete mode 100644 test cases/failing/63 subproj different versions/subprojects/b/b.c delete mode 100644 test cases/failing/63 subproj different versions/subprojects/b/b.h delete mode 100644 test cases/failing/63 subproj different versions/subprojects/b/meson.build delete mode 100644 test cases/failing/63 subproj different versions/subprojects/c/c.h delete mode 100644 test cases/failing/63 subproj different versions/subprojects/c/meson.build delete mode 100644 test cases/failing/63 subproj different versions/test.json create mode 100644 test cases/failing/63 wrong boost module/meson.build create mode 100644 test cases/failing/63 wrong boost module/test.json create mode 100644 test cases/failing/64 install_data rename bad size/file1.txt create mode 100644 test cases/failing/64 install_data rename bad size/file2.txt create mode 100644 test cases/failing/64 install_data rename bad size/meson.build create mode 100644 test cases/failing/64 install_data rename bad size/test.json delete mode 100644 test cases/failing/64 wrong boost module/meson.build delete mode 100644 test cases/failing/64 wrong boost module/test.json delete mode 100644 test cases/failing/65 install_data rename bad size/file1.txt delete mode 100644 test cases/failing/65 install_data rename bad size/file2.txt delete mode 100644 test cases/failing/65 install_data rename bad size/meson.build delete mode 100644 test cases/failing/65 install_data rename bad size/test.json create mode 100644 test cases/failing/65 skip only subdir/meson.build create mode 100644 test cases/failing/65 skip only subdir/subdir/meson.build create mode 100644 test cases/failing/65 skip only subdir/test.json create mode 100644 test cases/failing/66 dual override/meson.build create mode 100644 test cases/failing/66 dual override/overrides.py create mode 100644 test cases/failing/66 dual override/test.json delete mode 100644 test cases/failing/66 skip only subdir/meson.build delete mode 100644 test cases/failing/66 skip only subdir/subdir/meson.build delete mode 100644 test cases/failing/66 skip only subdir/test.json delete mode 100644 test cases/failing/67 dual override/meson.build delete mode 100644 test cases/failing/67 dual override/overrides.py delete mode 100644 test cases/failing/67 dual override/test.json create mode 100644 test cases/failing/67 override used/meson.build create mode 100755 test cases/failing/67 override used/other.py create mode 100755 test cases/failing/67 override used/something.py create mode 100644 test cases/failing/67 override used/test.json delete mode 100644 test cases/failing/68 override used/meson.build delete mode 100755 test cases/failing/68 override used/other.py delete mode 100755 test cases/failing/68 override used/something.py delete mode 100644 test cases/failing/68 override used/test.json create mode 100644 test cases/failing/68 run_command unclean exit/meson.build create mode 100755 test cases/failing/68 run_command unclean exit/returncode.py create mode 100644 test cases/failing/68 run_command unclean exit/test.json create mode 100644 test cases/failing/69 int literal leading zero/meson.build create mode 100644 test cases/failing/69 int literal leading zero/test.json delete mode 100644 test cases/failing/69 run_command unclean exit/meson.build delete mode 100755 test cases/failing/69 run_command unclean exit/returncode.py delete mode 100644 test cases/failing/69 run_command unclean exit/test.json create mode 100644 test cases/failing/70 configuration immutable/input create mode 100644 test cases/failing/70 configuration immutable/meson.build create mode 100644 test cases/failing/70 configuration immutable/test.json delete mode 100644 test cases/failing/70 int literal leading zero/meson.build delete mode 100644 test cases/failing/70 int literal leading zero/test.json delete mode 100644 test cases/failing/71 configuration immutable/input delete mode 100644 test cases/failing/71 configuration immutable/meson.build delete mode 100644 test cases/failing/71 configuration immutable/test.json create mode 100644 test cases/failing/71 link with shared module on osx/meson.build create mode 100644 test cases/failing/71 link with shared module on osx/module.c create mode 100644 test cases/failing/71 link with shared module on osx/prog.c create mode 100644 test cases/failing/71 link with shared module on osx/test.json delete mode 100644 test cases/failing/72 link with shared module on osx/meson.build delete mode 100644 test cases/failing/72 link with shared module on osx/module.c delete mode 100644 test cases/failing/72 link with shared module on osx/prog.c delete mode 100644 test cases/failing/72 link with shared module on osx/test.json create mode 100644 test cases/failing/72 non-ascii in ascii encoded configure file/config9.h.in create mode 100644 test cases/failing/72 non-ascii in ascii encoded configure file/meson.build create mode 100644 test cases/failing/72 non-ascii in ascii encoded configure file/test.json delete mode 100644 test cases/failing/73 non-ascii in ascii encoded configure file/config9.h.in delete mode 100644 test cases/failing/73 non-ascii in ascii encoded configure file/meson.build delete mode 100644 test cases/failing/73 non-ascii in ascii encoded configure file/test.json create mode 100644 test cases/failing/73 subproj dependency not-found and required/meson.build create mode 100644 test cases/failing/73 subproj dependency not-found and required/test.json delete mode 100644 test cases/failing/74 subproj dependency not-found and required/meson.build delete mode 100644 test cases/failing/74 subproj dependency not-found and required/test.json create mode 100644 test cases/failing/74 unfound run/meson.build create mode 100644 test cases/failing/74 unfound run/test.json create mode 100644 test cases/failing/75 framework dependency with version/meson.build create mode 100644 test cases/failing/75 framework dependency with version/test.json delete mode 100644 test cases/failing/75 unfound run/meson.build delete mode 100644 test cases/failing/75 unfound run/test.json delete mode 100644 test cases/failing/76 framework dependency with version/meson.build delete mode 100644 test cases/failing/76 framework dependency with version/test.json create mode 100644 test cases/failing/76 override exe config/foo.c create mode 100644 test cases/failing/76 override exe config/meson.build create mode 100644 test cases/failing/76 override exe config/test.json create mode 100644 test cases/failing/77 gl dependency with version/meson.build create mode 100644 test cases/failing/77 gl dependency with version/test.json delete mode 100644 test cases/failing/77 override exe config/foo.c delete mode 100644 test cases/failing/77 override exe config/meson.build delete mode 100644 test cases/failing/77 override exe config/test.json delete mode 100644 test cases/failing/78 gl dependency with version/meson.build delete mode 100644 test cases/failing/78 gl dependency with version/test.json create mode 100644 test cases/failing/78 threads dependency with version/meson.build create mode 100644 test cases/failing/78 threads dependency with version/test.json create mode 100644 test cases/failing/79 gtest dependency with version/meson.build create mode 100644 test cases/failing/79 gtest dependency with version/test.json delete mode 100644 test cases/failing/79 threads dependency with version/meson.build delete mode 100644 test cases/failing/79 threads dependency with version/test.json create mode 100644 test cases/failing/80 dub library/meson.build create mode 100644 test cases/failing/80 dub library/test.json delete mode 100644 test cases/failing/80 gtest dependency with version/meson.build delete mode 100644 test cases/failing/80 gtest dependency with version/test.json create mode 100644 test cases/failing/81 dub executable/meson.build create mode 100644 test cases/failing/81 dub executable/test.json delete mode 100644 test cases/failing/81 dub library/meson.build delete mode 100644 test cases/failing/81 dub library/test.json create mode 100644 test cases/failing/82 dub compiler/meson.build create mode 100644 test cases/failing/82 dub compiler/test.json delete mode 100644 test cases/failing/82 dub executable/meson.build delete mode 100644 test cases/failing/82 dub executable/test.json delete mode 100644 test cases/failing/83 dub compiler/meson.build delete mode 100644 test cases/failing/83 dub compiler/test.json create mode 100644 test cases/failing/83 subproj not-found dep/meson.build create mode 100644 test cases/failing/83 subproj not-found dep/subprojects/somesubproj/meson.build create mode 100644 test cases/failing/83 subproj not-found dep/test.json create mode 100644 test cases/failing/84 invalid configure file/input create mode 100644 test cases/failing/84 invalid configure file/meson.build create mode 100644 test cases/failing/84 invalid configure file/test.json delete mode 100644 test cases/failing/84 subproj not-found dep/meson.build delete mode 100644 test cases/failing/84 subproj not-found dep/subprojects/somesubproj/meson.build delete mode 100644 test cases/failing/84 subproj not-found dep/test.json delete mode 100644 test cases/failing/85 invalid configure file/input delete mode 100644 test cases/failing/85 invalid configure file/meson.build delete mode 100644 test cases/failing/85 invalid configure file/test.json create mode 100644 test cases/failing/85 kwarg dupe/meson.build create mode 100644 test cases/failing/85 kwarg dupe/prog.c create mode 100644 test cases/failing/85 kwarg dupe/test.json delete mode 100644 test cases/failing/86 kwarg dupe/meson.build delete mode 100644 test cases/failing/86 kwarg dupe/prog.c delete mode 100644 test cases/failing/86 kwarg dupe/test.json create mode 100644 test cases/failing/86 missing pch file/meson.build create mode 100644 test cases/failing/86 missing pch file/prog.c create mode 100644 test cases/failing/86 missing pch file/test.json delete mode 100644 test cases/failing/87 missing pch file/meson.build delete mode 100644 test cases/failing/87 missing pch file/prog.c delete mode 100644 test cases/failing/87 missing pch file/test.json create mode 100644 test cases/failing/87 pch source different folder/include/pch.h create mode 100644 test cases/failing/87 pch source different folder/meson.build create mode 100644 test cases/failing/87 pch source different folder/prog.c create mode 100644 test cases/failing/87 pch source different folder/src/pch.c create mode 100644 test cases/failing/87 pch source different folder/test.json delete mode 100644 test cases/failing/88 pch source different folder/include/pch.h delete mode 100644 test cases/failing/88 pch source different folder/meson.build delete mode 100644 test cases/failing/88 pch source different folder/prog.c delete mode 100644 test cases/failing/88 pch source different folder/src/pch.c delete mode 100644 test cases/failing/88 pch source different folder/test.json create mode 100644 test cases/failing/88 unknown config tool/meson.build create mode 100644 test cases/failing/88 unknown config tool/test.json create mode 100644 test cases/failing/89 custom target install data/Info.plist.cpp create mode 100644 test cases/failing/89 custom target install data/meson.build create mode 100644 test cases/failing/89 custom target install data/preproc.py create mode 100644 test cases/failing/89 custom target install data/test.json delete mode 100644 test cases/failing/89 unknown config tool/meson.build delete mode 100644 test cases/failing/89 unknown config tool/test.json create mode 100644 test cases/failing/90 add dict non string key/meson.build create mode 100644 test cases/failing/90 add dict non string key/test.json delete mode 100644 test cases/failing/90 custom target install data/Info.plist.cpp delete mode 100644 test cases/failing/90 custom target install data/meson.build delete mode 100644 test cases/failing/90 custom target install data/preproc.py delete mode 100644 test cases/failing/90 custom target install data/test.json create mode 100644 test cases/failing/91 add dict duplicate keys/meson.build create mode 100644 test cases/failing/91 add dict duplicate keys/test.json delete mode 100644 test cases/failing/91 add dict non string key/meson.build delete mode 100644 test cases/failing/91 add dict non string key/test.json delete mode 100644 test cases/failing/92 add dict duplicate keys/meson.build delete mode 100644 test cases/failing/92 add dict duplicate keys/test.json create mode 100644 test cases/failing/92 no host get_external_property/meson.build create mode 100644 test cases/failing/92 no host get_external_property/test.json delete mode 100644 test cases/failing/93 no host get_external_property/meson.build delete mode 100644 test cases/failing/93 no host get_external_property/test.json create mode 100644 test cases/failing/93 no native compiler/main.c create mode 100644 test cases/failing/93 no native compiler/meson.build create mode 100644 test cases/failing/93 no native compiler/test.json delete mode 100644 test cases/failing/94 no native compiler/main.c delete mode 100644 test cases/failing/94 no native compiler/meson.build delete mode 100644 test cases/failing/94 no native compiler/test.json create mode 100644 test cases/failing/94 subdir parse error/meson.build create mode 100644 test cases/failing/94 subdir parse error/subdir/meson.build create mode 100644 test cases/failing/94 subdir parse error/test.json create mode 100644 test cases/failing/95 invalid option file/meson.build create mode 100644 test cases/failing/95 invalid option file/meson_options.txt create mode 100644 test cases/failing/95 invalid option file/test.json delete mode 100644 test cases/failing/95 subdir parse error/meson.build delete mode 100644 test cases/failing/95 subdir parse error/subdir/meson.build delete mode 100644 test cases/failing/95 subdir parse error/test.json delete mode 100644 test cases/failing/96 invalid option file/meson.build delete mode 100644 test cases/failing/96 invalid option file/meson_options.txt delete mode 100644 test cases/failing/96 invalid option file/test.json create mode 100644 test cases/failing/96 no lang/main.c create mode 100644 test cases/failing/96 no lang/meson.build create mode 100644 test cases/failing/96 no lang/test.json create mode 100644 test cases/failing/97 no glib-compile-resources/meson.build create mode 100644 test cases/failing/97 no glib-compile-resources/test.json create mode 100644 test cases/failing/97 no glib-compile-resources/trivial.gresource.xml delete mode 100644 test cases/failing/97 no lang/main.c delete mode 100644 test cases/failing/97 no lang/meson.build delete mode 100644 test cases/failing/97 no lang/test.json delete mode 100644 test cases/failing/98 no glib-compile-resources/meson.build delete mode 100644 test cases/failing/98 no glib-compile-resources/test.json delete mode 100644 test cases/failing/98 no glib-compile-resources/trivial.gresource.xml create mode 100644 test cases/failing/98 number in combo/meson.build create mode 100644 test cases/failing/98 number in combo/nativefile.ini create mode 100644 test cases/failing/98 number in combo/test.json create mode 100644 test cases/failing/99 bool in combo/meson.build create mode 100644 test cases/failing/99 bool in combo/meson_options.txt create mode 100644 test cases/failing/99 bool in combo/nativefile.ini create mode 100644 test cases/failing/99 bool in combo/test.json delete mode 100644 test cases/failing/99 number in combo/meson.build delete mode 100644 test cases/failing/99 number in combo/nativefile.ini delete mode 100644 test cases/failing/99 number in combo/test.json (limited to 'test cases') diff --git a/test cases/failing/100 bool in combo/meson.build b/test cases/failing/100 bool in combo/meson.build deleted file mode 100644 index c5efd67..0000000 --- a/test cases/failing/100 bool in combo/meson.build +++ /dev/null @@ -1 +0,0 @@ -project('bool in combo') diff --git a/test cases/failing/100 bool in combo/meson_options.txt b/test cases/failing/100 bool in combo/meson_options.txt deleted file mode 100644 index 0c8f5de..0000000 --- a/test cases/failing/100 bool in combo/meson_options.txt +++ /dev/null @@ -1,5 +0,0 @@ -option( - 'opt', - type : 'combo', - choices : ['true', 'false'] -) diff --git a/test cases/failing/100 bool in combo/nativefile.ini b/test cases/failing/100 bool in combo/nativefile.ini deleted file mode 100644 index b423957..0000000 --- a/test cases/failing/100 bool in combo/nativefile.ini +++ /dev/null @@ -1,2 +0,0 @@ -[project options] -opt = true diff --git a/test cases/failing/100 bool in combo/test.json b/test cases/failing/100 bool in combo/test.json deleted file mode 100644 index 357d7a8..0000000 --- a/test cases/failing/100 bool in combo/test.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "stdout": [ - { "line": "test cases/failing/100 bool in combo/meson.build:1:0: ERROR: Value \"True\" (of type \"boolean\") for combo option \"opt\" is not one of the choices. Possible choices are (as string): \"true\", \"false\"." } - ] -} diff --git a/test cases/failing/100 compiler no lang/meson.build b/test cases/failing/100 compiler no lang/meson.build new file mode 100644 index 0000000..366bbdd --- /dev/null +++ b/test cases/failing/100 compiler no lang/meson.build @@ -0,0 +1,2 @@ +project('compiler without lang') +meson.get_compiler('c') diff --git a/test cases/failing/100 compiler no lang/test.json b/test cases/failing/100 compiler no lang/test.json new file mode 100644 index 0000000..935d79d --- /dev/null +++ b/test cases/failing/100 compiler no lang/test.json @@ -0,0 +1,7 @@ +{ + "stdout": [ + { + "line": "test cases/failing/100 compiler no lang/meson.build:2:6: ERROR: Tried to access compiler for language \"c\", not specified for host machine." + } + ] +} diff --git a/test cases/failing/101 compiler no lang/meson.build b/test cases/failing/101 compiler no lang/meson.build deleted file mode 100644 index 366bbdd..0000000 --- a/test cases/failing/101 compiler no lang/meson.build +++ /dev/null @@ -1,2 +0,0 @@ -project('compiler without lang') -meson.get_compiler('c') diff --git a/test cases/failing/101 compiler no lang/test.json b/test cases/failing/101 compiler no lang/test.json deleted file mode 100644 index 364efa9..0000000 --- a/test cases/failing/101 compiler no lang/test.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "stdout": [ - { - "line": "test cases/failing/101 compiler no lang/meson.build:2:6: ERROR: Tried to access compiler for language \"c\", not specified for host machine." - } - ] -} diff --git a/test cases/failing/101 no fallback/meson.build b/test cases/failing/101 no fallback/meson.build new file mode 100644 index 0000000..91d6b93 --- /dev/null +++ b/test cases/failing/101 no fallback/meson.build @@ -0,0 +1,2 @@ +project('no fallback') +foob_dep = dependency('foob', allow_fallback: false, required: true) diff --git a/test cases/failing/101 no fallback/subprojects/foob/meson.build b/test cases/failing/101 no fallback/subprojects/foob/meson.build new file mode 100644 index 0000000..b2c4814 --- /dev/null +++ b/test cases/failing/101 no fallback/subprojects/foob/meson.build @@ -0,0 +1,2 @@ +project('foob', 'c') +meson.override_dependency('foob', declare_dependency()) diff --git a/test cases/failing/101 no fallback/test.json b/test cases/failing/101 no fallback/test.json new file mode 100644 index 0000000..5fbffe3 --- /dev/null +++ b/test cases/failing/101 no fallback/test.json @@ -0,0 +1,8 @@ +{ + "stdout": [ + { + "match": "re", + "line": ".*/meson\\.build:2:11: ERROR: (Pkg-config binary for machine MachineChoice\\.HOST not found\\. Giving up\\.|Dependency \"foob\" not found, tried .*)" + } + ] +} diff --git a/test cases/failing/102 feature require/meson.build b/test cases/failing/102 feature require/meson.build new file mode 100644 index 0000000..8c47e37 --- /dev/null +++ b/test cases/failing/102 feature require/meson.build @@ -0,0 +1,2 @@ +project('no fallback') +foo = get_option('reqfeature').require(false, error_message: 'frobnicator not available') diff --git a/test cases/failing/102 feature require/meson_options.txt b/test cases/failing/102 feature require/meson_options.txt new file mode 100644 index 0000000..5910a87 --- /dev/null +++ b/test cases/failing/102 feature require/meson_options.txt @@ -0,0 +1 @@ +option('reqfeature', type : 'feature', value : 'enabled', description : 'A required feature') diff --git a/test cases/failing/102 feature require/test.json b/test cases/failing/102 feature require/test.json new file mode 100644 index 0000000..2da5494 --- /dev/null +++ b/test cases/failing/102 feature require/test.json @@ -0,0 +1,8 @@ +{ + "stdout": [ + { + "match": "re", + "line": ".*/meson\\.build:2:31: ERROR: Feature reqfeature cannot be enabled: frobnicator not available" + } + ] +} diff --git a/test cases/failing/102 no fallback/meson.build b/test cases/failing/102 no fallback/meson.build deleted file mode 100644 index 91d6b93..0000000 --- a/test cases/failing/102 no fallback/meson.build +++ /dev/null @@ -1,2 +0,0 @@ -project('no fallback') -foob_dep = dependency('foob', allow_fallback: false, required: true) diff --git a/test cases/failing/102 no fallback/subprojects/foob/meson.build b/test cases/failing/102 no fallback/subprojects/foob/meson.build deleted file mode 100644 index b2c4814..0000000 --- a/test cases/failing/102 no fallback/subprojects/foob/meson.build +++ /dev/null @@ -1,2 +0,0 @@ -project('foob', 'c') -meson.override_dependency('foob', declare_dependency()) diff --git a/test cases/failing/102 no fallback/test.json b/test cases/failing/102 no fallback/test.json deleted file mode 100644 index 5fbffe3..0000000 --- a/test cases/failing/102 no fallback/test.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "stdout": [ - { - "match": "re", - "line": ".*/meson\\.build:2:11: ERROR: (Pkg-config binary for machine MachineChoice\\.HOST not found\\. Giving up\\.|Dependency \"foob\" not found, tried .*)" - } - ] -} diff --git a/test cases/failing/103 feature require.bis/meson.build b/test cases/failing/103 feature require.bis/meson.build new file mode 100644 index 0000000..4ea65e5 --- /dev/null +++ b/test cases/failing/103 feature require.bis/meson.build @@ -0,0 +1,2 @@ +project('no fallback') +foo = get_option('reqfeature').require(false) diff --git a/test cases/failing/103 feature require.bis/meson_options.txt b/test cases/failing/103 feature require.bis/meson_options.txt new file mode 100644 index 0000000..5910a87 --- /dev/null +++ b/test cases/failing/103 feature require.bis/meson_options.txt @@ -0,0 +1 @@ +option('reqfeature', type : 'feature', value : 'enabled', description : 'A required feature') diff --git a/test cases/failing/103 feature require.bis/test.json b/test cases/failing/103 feature require.bis/test.json new file mode 100644 index 0000000..ed488af --- /dev/null +++ b/test cases/failing/103 feature require.bis/test.json @@ -0,0 +1,8 @@ +{ + "stdout": [ + { + "match": "re", + "line": ".*/meson\\.build:2:31: ERROR: Feature reqfeature cannot be enabled" + } + ] +} diff --git a/test cases/failing/103 feature require/meson.build b/test cases/failing/103 feature require/meson.build deleted file mode 100644 index 8c47e37..0000000 --- a/test cases/failing/103 feature require/meson.build +++ /dev/null @@ -1,2 +0,0 @@ -project('no fallback') -foo = get_option('reqfeature').require(false, error_message: 'frobnicator not available') diff --git a/test cases/failing/103 feature require/meson_options.txt b/test cases/failing/103 feature require/meson_options.txt deleted file mode 100644 index 5910a87..0000000 --- a/test cases/failing/103 feature require/meson_options.txt +++ /dev/null @@ -1 +0,0 @@ -option('reqfeature', type : 'feature', value : 'enabled', description : 'A required feature') diff --git a/test cases/failing/103 feature require/test.json b/test cases/failing/103 feature require/test.json deleted file mode 100644 index 2da5494..0000000 --- a/test cases/failing/103 feature require/test.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "stdout": [ - { - "match": "re", - "line": ".*/meson\\.build:2:31: ERROR: Feature reqfeature cannot be enabled: frobnicator not available" - } - ] -} diff --git a/test cases/failing/104 feature require.bis/meson.build b/test cases/failing/104 feature require.bis/meson.build deleted file mode 100644 index 4ea65e5..0000000 --- a/test cases/failing/104 feature require.bis/meson.build +++ /dev/null @@ -1,2 +0,0 @@ -project('no fallback') -foo = get_option('reqfeature').require(false) diff --git a/test cases/failing/104 feature require.bis/meson_options.txt b/test cases/failing/104 feature require.bis/meson_options.txt deleted file mode 100644 index 5910a87..0000000 --- a/test cases/failing/104 feature require.bis/meson_options.txt +++ /dev/null @@ -1 +0,0 @@ -option('reqfeature', type : 'feature', value : 'enabled', description : 'A required feature') diff --git a/test cases/failing/104 feature require.bis/test.json b/test cases/failing/104 feature require.bis/test.json deleted file mode 100644 index ed488af..0000000 --- a/test cases/failing/104 feature require.bis/test.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "stdout": [ - { - "match": "re", - "line": ".*/meson\\.build:2:31: ERROR: Feature reqfeature cannot be enabled" - } - ] -} diff --git a/test cases/failing/104 no build get_external_property/meson.build b/test cases/failing/104 no build get_external_property/meson.build new file mode 100644 index 0000000..8a4215c --- /dev/null +++ b/test cases/failing/104 no build get_external_property/meson.build @@ -0,0 +1,3 @@ +project('missing property') + +message(meson.get_external_property('nonexisting', native : true)) diff --git a/test cases/failing/104 no build get_external_property/test.json b/test cases/failing/104 no build get_external_property/test.json new file mode 100644 index 0000000..5792213 --- /dev/null +++ b/test cases/failing/104 no build get_external_property/test.json @@ -0,0 +1,7 @@ +{ + "stdout": [ + { + "line": "test cases/failing/104 no build get_external_property/meson.build:3:14: ERROR: Unknown property for build machine: nonexisting" + } + ] +} diff --git a/test cases/failing/105 enter subdir twice/meson.build b/test cases/failing/105 enter subdir twice/meson.build new file mode 100644 index 0000000..d9bf9f5 --- /dev/null +++ b/test cases/failing/105 enter subdir twice/meson.build @@ -0,0 +1,3 @@ +project('subdir2') +subdir('sub') +subdir('sub') diff --git a/test cases/failing/105 enter subdir twice/sub/meson.build b/test cases/failing/105 enter subdir twice/sub/meson.build new file mode 100644 index 0000000..d036a3f --- /dev/null +++ b/test cases/failing/105 enter subdir twice/sub/meson.build @@ -0,0 +1 @@ +message('Now in subdir') diff --git a/test cases/failing/105 enter subdir twice/test.json b/test cases/failing/105 enter subdir twice/test.json new file mode 100644 index 0000000..80e8c10 --- /dev/null +++ b/test cases/failing/105 enter subdir twice/test.json @@ -0,0 +1,7 @@ +{ + "stdout": [ + { + "line": "test cases/failing/105 enter subdir twice/meson.build:3:0: ERROR: Tried to enter directory \"sub\", which has already been visited." + } + ] +} diff --git a/test cases/failing/105 no build get_external_property/meson.build b/test cases/failing/105 no build get_external_property/meson.build deleted file mode 100644 index 8a4215c..0000000 --- a/test cases/failing/105 no build get_external_property/meson.build +++ /dev/null @@ -1,3 +0,0 @@ -project('missing property') - -message(meson.get_external_property('nonexisting', native : true)) diff --git a/test cases/failing/105 no build get_external_property/test.json b/test cases/failing/105 no build get_external_property/test.json deleted file mode 100644 index e8b282c..0000000 --- a/test cases/failing/105 no build get_external_property/test.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "stdout": [ - { - "line": "test cases/failing/105 no build get_external_property/meson.build:3:14: ERROR: Unknown property for build machine: nonexisting" - } - ] -} diff --git a/test cases/failing/106 enter subdir twice/meson.build b/test cases/failing/106 enter subdir twice/meson.build deleted file mode 100644 index d9bf9f5..0000000 --- a/test cases/failing/106 enter subdir twice/meson.build +++ /dev/null @@ -1,3 +0,0 @@ -project('subdir2') -subdir('sub') -subdir('sub') diff --git a/test cases/failing/106 enter subdir twice/sub/meson.build b/test cases/failing/106 enter subdir twice/sub/meson.build deleted file mode 100644 index d036a3f..0000000 --- a/test cases/failing/106 enter subdir twice/sub/meson.build +++ /dev/null @@ -1 +0,0 @@ -message('Now in subdir') diff --git a/test cases/failing/106 enter subdir twice/test.json b/test cases/failing/106 enter subdir twice/test.json deleted file mode 100644 index 9a8b11d..0000000 --- a/test cases/failing/106 enter subdir twice/test.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "stdout": [ - { - "line": "test cases/failing/106 enter subdir twice/meson.build:3:0: ERROR: Tried to enter directory \"sub\", which has already been visited." - } - ] -} diff --git a/test cases/failing/106 invalid fstring/109 invalid fstring/meson.build b/test cases/failing/106 invalid fstring/109 invalid fstring/meson.build new file mode 100644 index 0000000..dd22f56 --- /dev/null +++ b/test cases/failing/106 invalid fstring/109 invalid fstring/meson.build @@ -0,0 +1,4 @@ +project('invalid-fstring', 'c') + +dict = {'key': true} +s = f'invalid fstring: @dict@' diff --git a/test cases/failing/106 invalid fstring/109 invalid fstring/test.json b/test cases/failing/106 invalid fstring/109 invalid fstring/test.json new file mode 100644 index 0000000..71d8f59 --- /dev/null +++ b/test cases/failing/106 invalid fstring/109 invalid fstring/test.json @@ -0,0 +1,7 @@ +{ + "stdout": [ + { + "line": "test cases/failing/109 invalid fstring/meson.build:4:0: ERROR: Identifier \"dict\" does not name a formattable variable (has to be an integer, a string, a floating point number or a boolean)." + } + ] +} diff --git a/test cases/failing/106 invalid fstring/meson.build b/test cases/failing/106 invalid fstring/meson.build new file mode 100644 index 0000000..7eb3ccf --- /dev/null +++ b/test cases/failing/106 invalid fstring/meson.build @@ -0,0 +1,3 @@ +project('invalid-fstring') + +z = f'invalid fstring: @foo@' diff --git a/test cases/failing/106 invalid fstring/test.json b/test cases/failing/106 invalid fstring/test.json new file mode 100644 index 0000000..8d53428 --- /dev/null +++ b/test cases/failing/106 invalid fstring/test.json @@ -0,0 +1,7 @@ +{ + "stdout": [ + { + "line": "test cases/failing/106 invalid fstring/meson.build:3:4: ERROR: Identifier \"foo\" does not name a variable." + } + ] +} diff --git a/test cases/failing/107 compiler argument checking/meson.build b/test cases/failing/107 compiler argument checking/meson.build new file mode 100644 index 0000000..bb1f447 --- /dev/null +++ b/test cases/failing/107 compiler argument checking/meson.build @@ -0,0 +1,4 @@ +project('compiler argument checking test', 'c') + +cc = meson.get_compiler('c') +add_project_arguments(cc.get_supported_arguments('-meson-goober-arg-for-testing', checked : 'require'), language : 'c') diff --git a/test cases/failing/107 compiler argument checking/test.json b/test cases/failing/107 compiler argument checking/test.json new file mode 100644 index 0000000..a1576aa --- /dev/null +++ b/test cases/failing/107 compiler argument checking/test.json @@ -0,0 +1,7 @@ +{ + "stdout": [ + { + "line": "test cases/failing/107 compiler argument checking/meson.build:4:25: ERROR: Compiler for C does not support \"-meson-goober-arg-for-testing\"" + } + ] +} diff --git a/test cases/failing/107 invalid fstring/109 invalid fstring/meson.build b/test cases/failing/107 invalid fstring/109 invalid fstring/meson.build deleted file mode 100644 index dd22f56..0000000 --- a/test cases/failing/107 invalid fstring/109 invalid fstring/meson.build +++ /dev/null @@ -1,4 +0,0 @@ -project('invalid-fstring', 'c') - -dict = {'key': true} -s = f'invalid fstring: @dict@' diff --git a/test cases/failing/107 invalid fstring/109 invalid fstring/test.json b/test cases/failing/107 invalid fstring/109 invalid fstring/test.json deleted file mode 100644 index 71d8f59..0000000 --- a/test cases/failing/107 invalid fstring/109 invalid fstring/test.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "stdout": [ - { - "line": "test cases/failing/109 invalid fstring/meson.build:4:0: ERROR: Identifier \"dict\" does not name a formattable variable (has to be an integer, a string, a floating point number or a boolean)." - } - ] -} diff --git a/test cases/failing/107 invalid fstring/meson.build b/test cases/failing/107 invalid fstring/meson.build deleted file mode 100644 index 7eb3ccf..0000000 --- a/test cases/failing/107 invalid fstring/meson.build +++ /dev/null @@ -1,3 +0,0 @@ -project('invalid-fstring') - -z = f'invalid fstring: @foo@' diff --git a/test cases/failing/107 invalid fstring/test.json b/test cases/failing/107 invalid fstring/test.json deleted file mode 100644 index ccd82b5..0000000 --- a/test cases/failing/107 invalid fstring/test.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "stdout": [ - { - "line": "test cases/failing/107 invalid fstring/meson.build:3:4: ERROR: Identifier \"foo\" does not name a variable." - } - ] -} diff --git a/test cases/failing/108 compiler argument checking/meson.build b/test cases/failing/108 compiler argument checking/meson.build deleted file mode 100644 index bb1f447..0000000 --- a/test cases/failing/108 compiler argument checking/meson.build +++ /dev/null @@ -1,4 +0,0 @@ -project('compiler argument checking test', 'c') - -cc = meson.get_compiler('c') -add_project_arguments(cc.get_supported_arguments('-meson-goober-arg-for-testing', checked : 'require'), language : 'c') diff --git a/test cases/failing/108 compiler argument checking/test.json b/test cases/failing/108 compiler argument checking/test.json deleted file mode 100644 index e9e27af..0000000 --- a/test cases/failing/108 compiler argument checking/test.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "stdout": [ - { - "line": "test cases/failing/108 compiler argument checking/meson.build:4:25: ERROR: Compiler for C does not support \"-meson-goober-arg-for-testing\"" - } - ] -} diff --git a/test cases/failing/108 empty fallback/meson.build b/test cases/failing/108 empty fallback/meson.build new file mode 100644 index 0000000..f4eb5fe --- /dev/null +++ b/test cases/failing/108 empty fallback/meson.build @@ -0,0 +1,6 @@ +project('empty fallback') + +# There is a subproject named 'foo' that overrides that dependency, +# but `fallback: []` should not allow to use it. Same behaviour than with +# `allow_fallback: false` +dependency('foo', fallback: []) diff --git a/test cases/failing/108 empty fallback/subprojects/foo/meson.build b/test cases/failing/108 empty fallback/subprojects/foo/meson.build new file mode 100644 index 0000000..c9e134b --- /dev/null +++ b/test cases/failing/108 empty fallback/subprojects/foo/meson.build @@ -0,0 +1,3 @@ +project('foo') + +meson.override_dependency('foo', declare_dependency()) diff --git a/test cases/failing/108 empty fallback/test.json b/test cases/failing/108 empty fallback/test.json new file mode 100644 index 0000000..c631882 --- /dev/null +++ b/test cases/failing/108 empty fallback/test.json @@ -0,0 +1,8 @@ +{ + "stdout": [ + { + "match": "re", + "line": "test cases/failing/108 empty fallback/meson.build:6:0: ERROR: Dependency \"foo\" not found.*" + } + ] +} diff --git a/test cases/failing/109 cmake executable dependency/meson.build b/test cases/failing/109 cmake executable dependency/meson.build new file mode 100644 index 0000000..48d8fcb --- /dev/null +++ b/test cases/failing/109 cmake executable dependency/meson.build @@ -0,0 +1,9 @@ +project('cmake-executable-dependency', 'c') + +if not find_program('cmake', required: false).found() + error('MESON_SKIP_TEST CMake is not installed') +endif + +cmake = import('cmake') +cmlib = cmake.subproject('cmlib') +maind = cmlib.dependency('main') diff --git a/test cases/failing/109 cmake executable dependency/subprojects/cmlib/CMakeLists.txt b/test cases/failing/109 cmake executable dependency/subprojects/cmlib/CMakeLists.txt new file mode 100644 index 0000000..0067879 --- /dev/null +++ b/test cases/failing/109 cmake executable dependency/subprojects/cmlib/CMakeLists.txt @@ -0,0 +1,5 @@ +cmake_minimum_required(VERSION 3.5) + +project(cmlib) + +add_executable(main main.c) diff --git a/test cases/failing/109 cmake executable dependency/subprojects/cmlib/main.c b/test cases/failing/109 cmake executable dependency/subprojects/cmlib/main.c new file mode 100644 index 0000000..9b6bdc2 --- /dev/null +++ b/test cases/failing/109 cmake executable dependency/subprojects/cmlib/main.c @@ -0,0 +1,3 @@ +int main(void) { + return 0; +} diff --git a/test cases/failing/109 cmake executable dependency/test.json b/test cases/failing/109 cmake executable dependency/test.json new file mode 100644 index 0000000..f7c4775 --- /dev/null +++ b/test cases/failing/109 cmake executable dependency/test.json @@ -0,0 +1,10 @@ +{ + "stdout": [ + { + "line": "test cases/failing/109 cmake executable dependency/meson.build:9:14: ERROR: main is an executable and does not support the dependency() method. Use target() instead." + } + ], + "tools": { + "cmake": ">=3.14" + } +} diff --git a/test cases/failing/109 empty fallback/meson.build b/test cases/failing/109 empty fallback/meson.build deleted file mode 100644 index f4eb5fe..0000000 --- a/test cases/failing/109 empty fallback/meson.build +++ /dev/null @@ -1,6 +0,0 @@ -project('empty fallback') - -# There is a subproject named 'foo' that overrides that dependency, -# but `fallback: []` should not allow to use it. Same behaviour than with -# `allow_fallback: false` -dependency('foo', fallback: []) diff --git a/test cases/failing/109 empty fallback/subprojects/foo/meson.build b/test cases/failing/109 empty fallback/subprojects/foo/meson.build deleted file mode 100644 index c9e134b..0000000 --- a/test cases/failing/109 empty fallback/subprojects/foo/meson.build +++ /dev/null @@ -1,3 +0,0 @@ -project('foo') - -meson.override_dependency('foo', declare_dependency()) diff --git a/test cases/failing/109 empty fallback/test.json b/test cases/failing/109 empty fallback/test.json deleted file mode 100644 index 46a4ec5..0000000 --- a/test cases/failing/109 empty fallback/test.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "stdout": [ - { - "match": "re", - "line": "test cases/failing/109 empty fallback/meson.build:6:0: ERROR: Dependency \"foo\" not found.*" - } - ] -} diff --git a/test cases/failing/110 allow_fallback with fallback/meson.build b/test cases/failing/110 allow_fallback with fallback/meson.build new file mode 100644 index 0000000..2874e42 --- /dev/null +++ b/test cases/failing/110 allow_fallback with fallback/meson.build @@ -0,0 +1,3 @@ +project('fallback and allow_fallback') + +dependency('foo', fallback: 'foo', allow_fallback: false) diff --git a/test cases/failing/110 allow_fallback with fallback/test.json b/test cases/failing/110 allow_fallback with fallback/test.json new file mode 100644 index 0000000..b558ecc --- /dev/null +++ b/test cases/failing/110 allow_fallback with fallback/test.json @@ -0,0 +1,8 @@ +{ + "stdout": [ + { + "line": "test cases/failing/110 allow_fallback with fallback/meson.build:3:0: ERROR: \"fallback\" and \"allow_fallback\" arguments are mutually exclusive" + } + ] +} + diff --git a/test cases/failing/110 cmake executable dependency/meson.build b/test cases/failing/110 cmake executable dependency/meson.build deleted file mode 100644 index 48d8fcb..0000000 --- a/test cases/failing/110 cmake executable dependency/meson.build +++ /dev/null @@ -1,9 +0,0 @@ -project('cmake-executable-dependency', 'c') - -if not find_program('cmake', required: false).found() - error('MESON_SKIP_TEST CMake is not installed') -endif - -cmake = import('cmake') -cmlib = cmake.subproject('cmlib') -maind = cmlib.dependency('main') diff --git a/test cases/failing/110 cmake executable dependency/subprojects/cmlib/CMakeLists.txt b/test cases/failing/110 cmake executable dependency/subprojects/cmlib/CMakeLists.txt deleted file mode 100644 index 0067879..0000000 --- a/test cases/failing/110 cmake executable dependency/subprojects/cmlib/CMakeLists.txt +++ /dev/null @@ -1,5 +0,0 @@ -cmake_minimum_required(VERSION 3.5) - -project(cmlib) - -add_executable(main main.c) diff --git a/test cases/failing/110 cmake executable dependency/subprojects/cmlib/main.c b/test cases/failing/110 cmake executable dependency/subprojects/cmlib/main.c deleted file mode 100644 index 9b6bdc2..0000000 --- a/test cases/failing/110 cmake executable dependency/subprojects/cmlib/main.c +++ /dev/null @@ -1,3 +0,0 @@ -int main(void) { - return 0; -} diff --git a/test cases/failing/110 cmake executable dependency/test.json b/test cases/failing/110 cmake executable dependency/test.json deleted file mode 100644 index 80d01fe..0000000 --- a/test cases/failing/110 cmake executable dependency/test.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "stdout": [ - { - "line": "test cases/failing/110 cmake executable dependency/meson.build:9:14: ERROR: main is an executable and does not support the dependency() method. Use target() instead." - } - ], - "tools": { - "cmake": ">=3.14" - } -} diff --git a/test cases/failing/111 allow_fallback with fallback/meson.build b/test cases/failing/111 allow_fallback with fallback/meson.build deleted file mode 100644 index 2874e42..0000000 --- a/test cases/failing/111 allow_fallback with fallback/meson.build +++ /dev/null @@ -1,3 +0,0 @@ -project('fallback and allow_fallback') - -dependency('foo', fallback: 'foo', allow_fallback: false) diff --git a/test cases/failing/111 allow_fallback with fallback/test.json b/test cases/failing/111 allow_fallback with fallback/test.json deleted file mode 100644 index 92aa19a..0000000 --- a/test cases/failing/111 allow_fallback with fallback/test.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "stdout": [ - { - "line": "test cases/failing/111 allow_fallback with fallback/meson.build:3:0: ERROR: \"fallback\" and \"allow_fallback\" arguments are mutually exclusive" - } - ] -} - diff --git a/test cases/failing/111 nonsensical bindgen/meson.build b/test cases/failing/111 nonsensical bindgen/meson.build new file mode 100644 index 0000000..6995f67 --- /dev/null +++ b/test cases/failing/111 nonsensical bindgen/meson.build @@ -0,0 +1,20 @@ +# SPDX-license-identifer: Apache-2.0 +# Copyright © 2021 Intel Corporation + +project('rustmod bindgen', 'c') + +if not add_languages('rust', required: false) + error('MESON_SKIP_TEST test requires rust compiler') +endif + +prog_bindgen = find_program('bindgen', required : false) +if not prog_bindgen.found() + error('MESON_SKIP_TEST bindgen not found') +endif + +c_lib = static_library('clib', 'src/source.c') + +import('unstable-rust').bindgen( + input : c_lib, + output : 'header.rs', +) diff --git a/test cases/failing/111 nonsensical bindgen/src/header.h b/test cases/failing/111 nonsensical bindgen/src/header.h new file mode 100644 index 0000000..750621f --- /dev/null +++ b/test cases/failing/111 nonsensical bindgen/src/header.h @@ -0,0 +1,8 @@ +// SPDX-license-identifer: Apache-2.0 +// Copyright © 2021 Intel Corporation + +#pragma once + +#include + +int32_t add(const int32_t, const int32_t); diff --git a/test cases/failing/111 nonsensical bindgen/src/source.c b/test cases/failing/111 nonsensical bindgen/src/source.c new file mode 100644 index 0000000..d652d28 --- /dev/null +++ b/test cases/failing/111 nonsensical bindgen/src/source.c @@ -0,0 +1,8 @@ +// SPDX-license-identifer: Apache-2.0 +// Copyright © 2021 Intel Corporation + +#include "header.h" + +int32_t add(const int32_t first, const int32_t second) { + return first + second; +} diff --git a/test cases/failing/111 nonsensical bindgen/test.json b/test cases/failing/111 nonsensical bindgen/test.json new file mode 100644 index 0000000..f2dc92c --- /dev/null +++ b/test cases/failing/111 nonsensical bindgen/test.json @@ -0,0 +1,8 @@ +{ + "stdout": [ + { + "line": "test cases/failing/111 nonsensical bindgen/meson.build:17:24: ERROR: bindgen source file must be a C header, not an object or build target" + } + ] +} + diff --git a/test cases/failing/112 nonsensical bindgen/meson.build b/test cases/failing/112 nonsensical bindgen/meson.build deleted file mode 100644 index 6995f67..0000000 --- a/test cases/failing/112 nonsensical bindgen/meson.build +++ /dev/null @@ -1,20 +0,0 @@ -# SPDX-license-identifer: Apache-2.0 -# Copyright © 2021 Intel Corporation - -project('rustmod bindgen', 'c') - -if not add_languages('rust', required: false) - error('MESON_SKIP_TEST test requires rust compiler') -endif - -prog_bindgen = find_program('bindgen', required : false) -if not prog_bindgen.found() - error('MESON_SKIP_TEST bindgen not found') -endif - -c_lib = static_library('clib', 'src/source.c') - -import('unstable-rust').bindgen( - input : c_lib, - output : 'header.rs', -) diff --git a/test cases/failing/112 nonsensical bindgen/src/header.h b/test cases/failing/112 nonsensical bindgen/src/header.h deleted file mode 100644 index 750621f..0000000 --- a/test cases/failing/112 nonsensical bindgen/src/header.h +++ /dev/null @@ -1,8 +0,0 @@ -// SPDX-license-identifer: Apache-2.0 -// Copyright © 2021 Intel Corporation - -#pragma once - -#include - -int32_t add(const int32_t, const int32_t); diff --git a/test cases/failing/112 nonsensical bindgen/src/source.c b/test cases/failing/112 nonsensical bindgen/src/source.c deleted file mode 100644 index d652d28..0000000 --- a/test cases/failing/112 nonsensical bindgen/src/source.c +++ /dev/null @@ -1,8 +0,0 @@ -// SPDX-license-identifer: Apache-2.0 -// Copyright © 2021 Intel Corporation - -#include "header.h" - -int32_t add(const int32_t first, const int32_t second) { - return first + second; -} diff --git a/test cases/failing/112 nonsensical bindgen/test.json b/test cases/failing/112 nonsensical bindgen/test.json deleted file mode 100644 index a2b4b71..0000000 --- a/test cases/failing/112 nonsensical bindgen/test.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "stdout": [ - { - "line": "test cases/failing/112 nonsensical bindgen/meson.build:17:24: ERROR: bindgen source file must be a C header, not an object or build target" - } - ] -} - diff --git a/test cases/failing/112 run_target in test/meson.build b/test cases/failing/112 run_target in test/meson.build new file mode 100644 index 0000000..117009e --- /dev/null +++ b/test cases/failing/112 run_target in test/meson.build @@ -0,0 +1,7 @@ +project('trivial test', 'c') + +python = find_program('python3') + +exe = executable('trivialprog', 'trivial.c') +runt = run_target('invalid', command: [python, '--version']) +test('runtest', exe, args: runt) diff --git a/test cases/failing/112 run_target in test/test.json b/test cases/failing/112 run_target in test/test.json new file mode 100644 index 0000000..100db94 --- /dev/null +++ b/test cases/failing/112 run_target in test/test.json @@ -0,0 +1,8 @@ +{ + "stdout": [ + { + "line": "test cases/failing/112 run_target in test/meson.build:7:0: ERROR: test keyword argument 'args' was of type array[RunTarget] but should have been array[str | File | BuildTarget | CustomTarget | CustomTargetIndex]" + } + ] +} + diff --git a/test cases/failing/112 run_target in test/trivial.c b/test cases/failing/112 run_target in test/trivial.c new file mode 100644 index 0000000..96612d4 --- /dev/null +++ b/test cases/failing/112 run_target in test/trivial.c @@ -0,0 +1,6 @@ +#include + +int main(void) { + printf("Trivial test is working.\n"); + return 0; +} diff --git a/test cases/failing/113 run_target in add_install_script/meson.build b/test cases/failing/113 run_target in add_install_script/meson.build new file mode 100644 index 0000000..d3634bf --- /dev/null +++ b/test cases/failing/113 run_target in add_install_script/meson.build @@ -0,0 +1,7 @@ +project('trivial test', 'c') + +python = find_program('python3') + +exe = executable('trivialprog', 'trivial.c') +runt = run_target('invalid', command: [python, '--version']) +meson.add_install_script(exe, runt) diff --git a/test cases/failing/113 run_target in add_install_script/test.json b/test cases/failing/113 run_target in add_install_script/test.json new file mode 100644 index 0000000..c9ed33e --- /dev/null +++ b/test cases/failing/113 run_target in add_install_script/test.json @@ -0,0 +1,8 @@ +{ + "stdout": [ + { + "line": "test cases/failing/113 run_target in add_install_script/meson.build:7:6: ERROR: meson.add_install_script argument 2 was of type \"RunTarget\" but should have been one of: \"str\", \"File\", \"BuildTarget\", \"CustomTarget\", \"CustomTargetIndex\", \"ExternalProgram\"" + } + ] +} + diff --git a/test cases/failing/113 run_target in add_install_script/trivial.c b/test cases/failing/113 run_target in add_install_script/trivial.c new file mode 100644 index 0000000..1b14571 --- /dev/null +++ b/test cases/failing/113 run_target in add_install_script/trivial.c @@ -0,0 +1,11 @@ +#include + +int main(int argc, char **argv) { + FILE *fp = fopen(argv[1], "r"); + if (fp == NULL) { + perror("fopen"); + return 1; + } else { + return 0; + } +} diff --git a/test cases/failing/113 run_target in test/meson.build b/test cases/failing/113 run_target in test/meson.build deleted file mode 100644 index 117009e..0000000 --- a/test cases/failing/113 run_target in test/meson.build +++ /dev/null @@ -1,7 +0,0 @@ -project('trivial test', 'c') - -python = find_program('python3') - -exe = executable('trivialprog', 'trivial.c') -runt = run_target('invalid', command: [python, '--version']) -test('runtest', exe, args: runt) diff --git a/test cases/failing/113 run_target in test/test.json b/test cases/failing/113 run_target in test/test.json deleted file mode 100644 index 0e1ded4..0000000 --- a/test cases/failing/113 run_target in test/test.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "stdout": [ - { - "line": "test cases/failing/113 run_target in test/meson.build:7:0: ERROR: test keyword argument 'args' was of type array[RunTarget] but should have been array[str | File | BuildTarget | CustomTarget | CustomTargetIndex]" - } - ] -} - diff --git a/test cases/failing/113 run_target in test/trivial.c b/test cases/failing/113 run_target in test/trivial.c deleted file mode 100644 index 96612d4..0000000 --- a/test cases/failing/113 run_target in test/trivial.c +++ /dev/null @@ -1,6 +0,0 @@ -#include - -int main(void) { - printf("Trivial test is working.\n"); - return 0; -} diff --git a/test cases/failing/114 pathsep in install_symlink/meson.build b/test cases/failing/114 pathsep in install_symlink/meson.build new file mode 100644 index 0000000..cce82c2 --- /dev/null +++ b/test cases/failing/114 pathsep in install_symlink/meson.build @@ -0,0 +1,3 @@ +project('symlink_pathsep') + +install_symlink('foo/bar', pointing_to: '/usr/baz/bar', install_dir: '/usr') diff --git a/test cases/failing/114 pathsep in install_symlink/test.json b/test cases/failing/114 pathsep in install_symlink/test.json new file mode 100644 index 0000000..bca4e0e --- /dev/null +++ b/test cases/failing/114 pathsep in install_symlink/test.json @@ -0,0 +1,7 @@ +{ + "stdout": [ + { + "line": "test cases/failing/114 pathsep in install_symlink/meson.build:3:0: ERROR: Link name is \"foo/bar\", but link names cannot contain path separators. The dir part should be in install_dir." + } + ] +} diff --git a/test cases/failing/114 run_target in add_install_script/meson.build b/test cases/failing/114 run_target in add_install_script/meson.build deleted file mode 100644 index d3634bf..0000000 --- a/test cases/failing/114 run_target in add_install_script/meson.build +++ /dev/null @@ -1,7 +0,0 @@ -project('trivial test', 'c') - -python = find_program('python3') - -exe = executable('trivialprog', 'trivial.c') -runt = run_target('invalid', command: [python, '--version']) -meson.add_install_script(exe, runt) diff --git a/test cases/failing/114 run_target in add_install_script/test.json b/test cases/failing/114 run_target in add_install_script/test.json deleted file mode 100644 index 0b28f9b..0000000 --- a/test cases/failing/114 run_target in add_install_script/test.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "stdout": [ - { - "line": "test cases/failing/114 run_target in add_install_script/meson.build:7:6: ERROR: meson.add_install_script argument 2 was of type \"RunTarget\" but should have been one of: \"str\", \"File\", \"BuildTarget\", \"CustomTarget\", \"CustomTargetIndex\", \"ExternalProgram\"" - } - ] -} - diff --git a/test cases/failing/114 run_target in add_install_script/trivial.c b/test cases/failing/114 run_target in add_install_script/trivial.c deleted file mode 100644 index 1b14571..0000000 --- a/test cases/failing/114 run_target in add_install_script/trivial.c +++ /dev/null @@ -1,11 +0,0 @@ -#include - -int main(int argc, char **argv) { - FILE *fp = fopen(argv[1], "r"); - if (fp == NULL) { - perror("fopen"); - return 1; - } else { - return 0; - } -} diff --git a/test cases/failing/115 pathsep in install_symlink/meson.build b/test cases/failing/115 pathsep in install_symlink/meson.build deleted file mode 100644 index cce82c2..0000000 --- a/test cases/failing/115 pathsep in install_symlink/meson.build +++ /dev/null @@ -1,3 +0,0 @@ -project('symlink_pathsep') - -install_symlink('foo/bar', pointing_to: '/usr/baz/bar', install_dir: '/usr') diff --git a/test cases/failing/115 pathsep in install_symlink/test.json b/test cases/failing/115 pathsep in install_symlink/test.json deleted file mode 100644 index fee661f..0000000 --- a/test cases/failing/115 pathsep in install_symlink/test.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "stdout": [ - { - "line": "test cases/failing/115 pathsep in install_symlink/meson.build:3:0: ERROR: Link name is \"foo/bar\", but link names cannot contain path separators. The dir part should be in install_dir." - } - ] -} diff --git a/test cases/failing/115 subproject version conflict/meson.build b/test cases/failing/115 subproject version conflict/meson.build new file mode 100644 index 0000000..ffbcc13 --- /dev/null +++ b/test cases/failing/115 subproject version conflict/meson.build @@ -0,0 +1,4 @@ +project('120 subproject version conflict') + +A_dep = subproject('A').get_variable('A_dep') +B_dep = subproject('B', version: '1').get_variable('B_dep') diff --git a/test cases/failing/115 subproject version conflict/subprojects/A/meson.build b/test cases/failing/115 subproject version conflict/subprojects/A/meson.build new file mode 100644 index 0000000..7da4df0 --- /dev/null +++ b/test cases/failing/115 subproject version conflict/subprojects/A/meson.build @@ -0,0 +1,4 @@ +project('A') + +B_dep = subproject('B').get_variable('B_dep') +A_dep = declare_dependency(dependencies: B_dep) diff --git a/test cases/failing/115 subproject version conflict/subprojects/B/meson.build b/test cases/failing/115 subproject version conflict/subprojects/B/meson.build new file mode 100644 index 0000000..0ead934 --- /dev/null +++ b/test cases/failing/115 subproject version conflict/subprojects/B/meson.build @@ -0,0 +1,3 @@ +project('B', version: '100') + +B_dep = declare_dependency() diff --git a/test cases/failing/115 subproject version conflict/test.json b/test cases/failing/115 subproject version conflict/test.json new file mode 100644 index 0000000..23c7eb5 --- /dev/null +++ b/test cases/failing/115 subproject version conflict/test.json @@ -0,0 +1,7 @@ +{ + "stdout": [ + { + "line": "test cases/failing/115 subproject version conflict/meson.build:4:8: ERROR: Subproject B version is 100 but ['1'] required." + } + ] +} diff --git a/test cases/failing/116 structured source empty string/main.rs b/test cases/failing/116 structured source empty string/main.rs new file mode 100644 index 0000000..e69de29 diff --git a/test cases/failing/116 structured source empty string/meson.build b/test cases/failing/116 structured source empty string/meson.build new file mode 100644 index 0000000..0715991 --- /dev/null +++ b/test cases/failing/116 structured source empty string/meson.build @@ -0,0 +1,13 @@ +project('structured_source with empty string key') + +if not add_languages(['rust'], required : false, native : false) + error('MESON_SKIP_TEST: Rust is required but not found.') +endif + +executable( + 'main', + structured_sources( + 'main.rs', + {'' : 'main.rs'}, + ) +) diff --git a/test cases/failing/116 structured source empty string/test.json b/test cases/failing/116 structured source empty string/test.json new file mode 100644 index 0000000..00efbe3 --- /dev/null +++ b/test cases/failing/116 structured source empty string/test.json @@ -0,0 +1,7 @@ +{ + "stdout": [ + { + "line": "test cases/failing/116 structured source empty string/meson.build:9:2: ERROR: structured_sources: keys to dictionary argument may not be an empty string." + } + ] +} diff --git a/test cases/failing/116 subproject version conflict/meson.build b/test cases/failing/116 subproject version conflict/meson.build deleted file mode 100644 index ffbcc13..0000000 --- a/test cases/failing/116 subproject version conflict/meson.build +++ /dev/null @@ -1,4 +0,0 @@ -project('120 subproject version conflict') - -A_dep = subproject('A').get_variable('A_dep') -B_dep = subproject('B', version: '1').get_variable('B_dep') diff --git a/test cases/failing/116 subproject version conflict/subprojects/A/meson.build b/test cases/failing/116 subproject version conflict/subprojects/A/meson.build deleted file mode 100644 index 7da4df0..0000000 --- a/test cases/failing/116 subproject version conflict/subprojects/A/meson.build +++ /dev/null @@ -1,4 +0,0 @@ -project('A') - -B_dep = subproject('B').get_variable('B_dep') -A_dep = declare_dependency(dependencies: B_dep) diff --git a/test cases/failing/116 subproject version conflict/subprojects/B/meson.build b/test cases/failing/116 subproject version conflict/subprojects/B/meson.build deleted file mode 100644 index 0ead934..0000000 --- a/test cases/failing/116 subproject version conflict/subprojects/B/meson.build +++ /dev/null @@ -1,3 +0,0 @@ -project('B', version: '100') - -B_dep = declare_dependency() diff --git a/test cases/failing/116 subproject version conflict/test.json b/test cases/failing/116 subproject version conflict/test.json deleted file mode 100644 index c827744..0000000 --- a/test cases/failing/116 subproject version conflict/test.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "stdout": [ - { - "line": "test cases/failing/116 subproject version conflict/meson.build:4:8: ERROR: Subproject B version is 100 but ['1'] required." - } - ] -} diff --git a/test cases/failing/117 structured source empty string/main.rs b/test cases/failing/117 structured source empty string/main.rs deleted file mode 100644 index e69de29..0000000 diff --git a/test cases/failing/117 structured source empty string/meson.build b/test cases/failing/117 structured source empty string/meson.build deleted file mode 100644 index 0715991..0000000 --- a/test cases/failing/117 structured source empty string/meson.build +++ /dev/null @@ -1,13 +0,0 @@ -project('structured_source with empty string key') - -if not add_languages(['rust'], required : false, native : false) - error('MESON_SKIP_TEST: Rust is required but not found.') -endif - -executable( - 'main', - structured_sources( - 'main.rs', - {'' : 'main.rs'}, - ) -) diff --git a/test cases/failing/117 structured source empty string/test.json b/test cases/failing/117 structured source empty string/test.json deleted file mode 100644 index 7c90b03..0000000 --- a/test cases/failing/117 structured source empty string/test.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "stdout": [ - { - "line": "test cases/failing/117 structured source empty string/meson.build:9:2: ERROR: structured_sources: keys to dictionary argument may not be an empty string." - } - ] -} diff --git a/test cases/failing/117 structured_sources conflicts/main.rs b/test cases/failing/117 structured_sources conflicts/main.rs new file mode 100644 index 0000000..e69de29 diff --git a/test cases/failing/117 structured_sources conflicts/meson.build b/test cases/failing/117 structured_sources conflicts/meson.build new file mode 100644 index 0000000..561ad86 --- /dev/null +++ b/test cases/failing/117 structured_sources conflicts/meson.build @@ -0,0 +1,17 @@ +project('structured_source with empty string key') + +if not add_languages(['rust'], required : false, native : false) + error('MESON_SKIP_TEST: Rust is required but not found.') +endif + +executable( + 'main', + [ + structured_sources( + 'main.rs', + ), + structured_sources( + 'main.rs', + ), + ], +) diff --git a/test cases/failing/117 structured_sources conflicts/test.json b/test cases/failing/117 structured_sources conflicts/test.json new file mode 100644 index 0000000..a7201b5 --- /dev/null +++ b/test cases/failing/117 structured_sources conflicts/test.json @@ -0,0 +1,7 @@ +{ + "stdout": [ + { + "line": "test cases/failing/117 structured_sources conflicts/meson.build:7:0: ERROR: Conflicting sources in structured sources: main.rs" + } + ] +} diff --git a/test cases/failing/118 missing compiler/meson.build b/test cases/failing/118 missing compiler/meson.build new file mode 100644 index 0000000..19bdd0c --- /dev/null +++ b/test cases/failing/118 missing compiler/meson.build @@ -0,0 +1,3 @@ +project('main project', 'c') + +subproject('sub') diff --git a/test cases/failing/118 missing compiler/subprojects/sub/main.c b/test cases/failing/118 missing compiler/subprojects/sub/main.c new file mode 100644 index 0000000..44e82e2 --- /dev/null +++ b/test cases/failing/118 missing compiler/subprojects/sub/main.c @@ -0,0 +1 @@ +int main(int argc, char *argv[]) { return 0; } diff --git a/test cases/failing/118 missing compiler/subprojects/sub/meson.build b/test cases/failing/118 missing compiler/subprojects/sub/meson.build new file mode 100644 index 0000000..b60850c --- /dev/null +++ b/test cases/failing/118 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/118 missing compiler/test.json b/test cases/failing/118 missing compiler/test.json new file mode 100644 index 0000000..a2494e4 --- /dev/null +++ b/test cases/failing/118 missing compiler/test.json @@ -0,0 +1,7 @@ +{ + "stdout": [ + { + "line": "test cases/failing/118 missing compiler/subprojects/sub/meson.build:4:0: ERROR: No host machine compiler for 'subprojects/sub/main.c'" + } + ] +} diff --git a/test cases/failing/118 structured_sources conflicts/main.rs b/test cases/failing/118 structured_sources conflicts/main.rs deleted file mode 100644 index e69de29..0000000 diff --git a/test cases/failing/118 structured_sources conflicts/meson.build b/test cases/failing/118 structured_sources conflicts/meson.build deleted file mode 100644 index 561ad86..0000000 --- a/test cases/failing/118 structured_sources conflicts/meson.build +++ /dev/null @@ -1,17 +0,0 @@ -project('structured_source with empty string key') - -if not add_languages(['rust'], required : false, native : false) - error('MESON_SKIP_TEST: Rust is required but not found.') -endif - -executable( - 'main', - [ - structured_sources( - 'main.rs', - ), - structured_sources( - 'main.rs', - ), - ], -) diff --git a/test cases/failing/118 structured_sources conflicts/test.json b/test cases/failing/118 structured_sources conflicts/test.json deleted file mode 100644 index 55b1228..0000000 --- a/test cases/failing/118 structured_sources conflicts/test.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "stdout": [ - { - "line": "test cases/failing/118 structured_sources conflicts/meson.build:7:0: ERROR: Conflicting sources in structured sources: main.rs" - } - ] -} diff --git a/test cases/failing/119 cmake subproject error/meson.build b/test cases/failing/119 cmake subproject error/meson.build new file mode 100644 index 0000000..a308239 --- /dev/null +++ b/test cases/failing/119 cmake subproject error/meson.build @@ -0,0 +1,8 @@ +project('cmake-executable-dependency') + +if not find_program('cmake', required: false).found() + error('MESON_SKIP_TEST CMake is not installed') +endif + +cmake = import('cmake') +cmlib = cmake.subproject('cmlib') diff --git a/test cases/failing/119 cmake subproject error/subprojects/cmlib/CMakeLists.txt b/test cases/failing/119 cmake subproject error/subprojects/cmlib/CMakeLists.txt new file mode 100644 index 0000000..edbe395 --- /dev/null +++ b/test cases/failing/119 cmake subproject error/subprojects/cmlib/CMakeLists.txt @@ -0,0 +1,5 @@ +cmake_minimum_required(VERSION 3.5) + +project(cmlib) + +message(FATAL_ERROR "Fancy error message") diff --git a/test cases/failing/119 cmake subproject error/test.json b/test cases/failing/119 cmake subproject error/test.json new file mode 100644 index 0000000..625e451 --- /dev/null +++ b/test cases/failing/119 cmake subproject error/test.json @@ -0,0 +1,10 @@ +{ + "stdout": [ + { + "line": "test cases/failing/119 cmake subproject error/meson.build:8:14: ERROR: Failed to configure the CMake subproject: Fancy error message" + } + ], + "tools": { + "cmake": ">=3.14" + } +} diff --git a/test cases/failing/119 missing compiler/meson.build b/test cases/failing/119 missing compiler/meson.build deleted file mode 100644 index 19bdd0c..0000000 --- a/test cases/failing/119 missing compiler/meson.build +++ /dev/null @@ -1,3 +0,0 @@ -project('main project', 'c') - -subproject('sub') diff --git a/test cases/failing/119 missing compiler/subprojects/sub/main.c b/test cases/failing/119 missing compiler/subprojects/sub/main.c deleted file mode 100644 index 44e82e2..0000000 --- a/test cases/failing/119 missing compiler/subprojects/sub/main.c +++ /dev/null @@ -1 +0,0 @@ -int main(int argc, char *argv[]) { return 0; } diff --git a/test cases/failing/119 missing compiler/subprojects/sub/meson.build b/test cases/failing/119 missing compiler/subprojects/sub/meson.build deleted file mode 100644 index b60850c..0000000 --- a/test cases/failing/119 missing compiler/subprojects/sub/meson.build +++ /dev/null @@ -1,4 +0,0 @@ -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/119 missing compiler/test.json b/test cases/failing/119 missing compiler/test.json deleted file mode 100644 index c5f3fb1..0000000 --- a/test cases/failing/119 missing compiler/test.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "stdout": [ - { - "line": "test cases/failing/119 missing compiler/subprojects/sub/meson.build:4:0: ERROR: No host machine compiler for 'subprojects/sub/main.c'" - } - ] -} diff --git a/test cases/failing/120 cmake subproject error/meson.build b/test cases/failing/120 cmake subproject error/meson.build deleted file mode 100644 index a308239..0000000 --- a/test cases/failing/120 cmake subproject error/meson.build +++ /dev/null @@ -1,8 +0,0 @@ -project('cmake-executable-dependency') - -if not find_program('cmake', required: false).found() - error('MESON_SKIP_TEST CMake is not installed') -endif - -cmake = import('cmake') -cmlib = cmake.subproject('cmlib') diff --git a/test cases/failing/120 cmake subproject error/subprojects/cmlib/CMakeLists.txt b/test cases/failing/120 cmake subproject error/subprojects/cmlib/CMakeLists.txt deleted file mode 100644 index edbe395..0000000 --- a/test cases/failing/120 cmake subproject error/subprojects/cmlib/CMakeLists.txt +++ /dev/null @@ -1,5 +0,0 @@ -cmake_minimum_required(VERSION 3.5) - -project(cmlib) - -message(FATAL_ERROR "Fancy error message") diff --git a/test cases/failing/120 cmake subproject error/test.json b/test cases/failing/120 cmake subproject error/test.json deleted file mode 100644 index d88e708..0000000 --- a/test cases/failing/120 cmake subproject error/test.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "stdout": [ - { - "line": "test cases/failing/120 cmake subproject error/meson.build:8:14: ERROR: Failed to configure the CMake subproject: Fancy error message" - } - ], - "tools": { - "cmake": ">=3.14" - } -} diff --git a/test cases/failing/120 pkgconfig not relocatable outside prefix/meson.build b/test cases/failing/120 pkgconfig not relocatable outside prefix/meson.build new file mode 100644 index 0000000..7ebdfc3 --- /dev/null +++ b/test cases/failing/120 pkgconfig not relocatable outside prefix/meson.build @@ -0,0 +1,22 @@ +project( + 'pkgconfig-not-relocatable-outside-prefix', + version : '1.0', + default_options: [ + 'pkgconfig.relocatable=true', + ]) + +pkgg = import('pkgconfig') + +# A drive letter is needed on windows for this to be an absolute path. +if host_machine.system() == 'windows' + install_dir = 'C:/opt/lib/pkgconfig' +else + install_dir = '/opt/lib/pkgconfig' +endif + +pkgg.generate( + name : 'libsimple', + version : '1.0', + description : 'A simple pkgconfig file.', + install_dir: install_dir, +) diff --git a/test cases/failing/120 pkgconfig not relocatable outside prefix/test.json b/test cases/failing/120 pkgconfig not relocatable outside prefix/test.json new file mode 100644 index 0000000..32c6e09 --- /dev/null +++ b/test cases/failing/120 pkgconfig not relocatable outside prefix/test.json @@ -0,0 +1,8 @@ +{ + "stdout": [ + { + "line": "test cases/failing/120 pkgconfig not relocatable outside prefix/meson\\.build:17:5: ERROR: Pkgconfig prefix cannot be outside of the prefix when pkgconfig\\.relocatable=true. Pkgconfig prefix is (C:)?/opt/lib/pkgconfig.", + "match": "re" + } + ] +} diff --git a/test cases/failing/121 pkgconfig not relocatable outside prefix/meson.build b/test cases/failing/121 pkgconfig not relocatable outside prefix/meson.build deleted file mode 100644 index 7ebdfc3..0000000 --- a/test cases/failing/121 pkgconfig not relocatable outside prefix/meson.build +++ /dev/null @@ -1,22 +0,0 @@ -project( - 'pkgconfig-not-relocatable-outside-prefix', - version : '1.0', - default_options: [ - 'pkgconfig.relocatable=true', - ]) - -pkgg = import('pkgconfig') - -# A drive letter is needed on windows for this to be an absolute path. -if host_machine.system() == 'windows' - install_dir = 'C:/opt/lib/pkgconfig' -else - install_dir = '/opt/lib/pkgconfig' -endif - -pkgg.generate( - name : 'libsimple', - version : '1.0', - description : 'A simple pkgconfig file.', - install_dir: install_dir, -) diff --git a/test cases/failing/121 pkgconfig not relocatable outside prefix/test.json b/test cases/failing/121 pkgconfig not relocatable outside prefix/test.json deleted file mode 100644 index c0dfb87..0000000 --- a/test cases/failing/121 pkgconfig not relocatable outside prefix/test.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "stdout": [ - { - "line": "test cases/failing/121 pkgconfig not relocatable outside prefix/meson\\.build:17:5: ERROR: Pkgconfig prefix cannot be outside of the prefix when pkgconfig\\.relocatable=true. Pkgconfig prefix is (C:)?/opt/lib/pkgconfig.", - "match": "re" - } - ] -} diff --git a/test cases/failing/121 subproject sandbox violation/meson.build b/test cases/failing/121 subproject sandbox violation/meson.build new file mode 100644 index 0000000..d41994c --- /dev/null +++ b/test cases/failing/121 subproject sandbox violation/meson.build @@ -0,0 +1,34 @@ +project('subproject-sandbox-violation') + +sub1_d = subproject('subproj1').get_variable('d') +sub1_mustfail = sub1_d.get_variable('dir') / '..' / 'file.txt' + +sub2_d = subproject('subproj2').get_variable('d') +sub2_mustfail = sub2_d.get_variable('dir') / 'file.txt' + +main_d = declare_dependency( + variables: [ + 'dir=@0@'.format(meson.current_source_dir()), + ] +) +main_mustfail = main_d.get_variable('dir') / 'subprojects/subproj3/file.txt' + +if get_option('failmode') == 'parent-dir' + mustfail = sub1_mustfail +elif get_option('failmode') == 'not-installed' + mustfail = sub2_mustfail +elif get_option('failmode') == 'root-subdir' + mustfail = main_mustfail +endif + +custom_target( + 'mustfail', + input: mustfail, + output: 'file.txt', + command: [ + 'python3', '-c', + 'import os; shutil.copy(sys.argv[1], sys.argv[2])', + '@INPUT@', + '@OUTPUT@' + ], +) diff --git a/test cases/failing/121 subproject sandbox violation/meson_options.txt b/test cases/failing/121 subproject sandbox violation/meson_options.txt new file mode 100644 index 0000000..e7b782d --- /dev/null +++ b/test cases/failing/121 subproject sandbox violation/meson_options.txt @@ -0,0 +1 @@ +option('failmode', type: 'combo', choices: ['parent-dir', 'not-installed', 'root-subdir']) diff --git a/test cases/failing/121 subproject sandbox violation/subprojects/subproj1/file.txt b/test cases/failing/121 subproject sandbox violation/subprojects/subproj1/file.txt new file mode 100644 index 0000000..e69de29 diff --git a/test cases/failing/121 subproject sandbox violation/subprojects/subproj1/meson.build b/test cases/failing/121 subproject sandbox violation/subprojects/subproj1/meson.build new file mode 100644 index 0000000..bd33bf3 --- /dev/null +++ b/test cases/failing/121 subproject sandbox violation/subprojects/subproj1/meson.build @@ -0,0 +1,4 @@ +project('subproj1') + +install_data('file.txt') +subdir('nested') diff --git a/test cases/failing/121 subproject sandbox violation/subprojects/subproj1/nested/meson.build b/test cases/failing/121 subproject sandbox violation/subprojects/subproj1/nested/meson.build new file mode 100644 index 0000000..038c139 --- /dev/null +++ b/test cases/failing/121 subproject sandbox violation/subprojects/subproj1/nested/meson.build @@ -0,0 +1,5 @@ +d = declare_dependency( + variables: [ + 'dir=@0@'.format(meson.current_source_dir()), + ] +) diff --git a/test cases/failing/121 subproject sandbox violation/subprojects/subproj2/file.txt b/test cases/failing/121 subproject sandbox violation/subprojects/subproj2/file.txt new file mode 100644 index 0000000..e69de29 diff --git a/test cases/failing/121 subproject sandbox violation/subprojects/subproj2/meson.build b/test cases/failing/121 subproject sandbox violation/subprojects/subproj2/meson.build new file mode 100644 index 0000000..a6032aa --- /dev/null +++ b/test cases/failing/121 subproject sandbox violation/subprojects/subproj2/meson.build @@ -0,0 +1,7 @@ +project('subproj1') + +d = declare_dependency( + variables: [ + 'dir=@0@'.format(meson.current_source_dir()), + ] +) diff --git a/test cases/failing/121 subproject sandbox violation/subprojects/subproj2/nested/meson.build b/test cases/failing/121 subproject sandbox violation/subprojects/subproj2/nested/meson.build new file mode 100644 index 0000000..e69de29 diff --git a/test cases/failing/121 subproject sandbox violation/subprojects/subproj3/file.txt b/test cases/failing/121 subproject sandbox violation/subprojects/subproj3/file.txt new file mode 100644 index 0000000..e69de29 diff --git a/test cases/failing/121 subproject sandbox violation/subprojects/subproj3/meson.build b/test cases/failing/121 subproject sandbox violation/subprojects/subproj3/meson.build new file mode 100644 index 0000000..c4fa64c --- /dev/null +++ b/test cases/failing/121 subproject sandbox violation/subprojects/subproj3/meson.build @@ -0,0 +1,3 @@ +project('subproj2') + +install_data('file.txt') diff --git a/test cases/failing/121 subproject sandbox violation/test.json b/test cases/failing/121 subproject sandbox violation/test.json new file mode 100644 index 0000000..d8c28d7 --- /dev/null +++ b/test cases/failing/121 subproject sandbox violation/test.json @@ -0,0 +1,16 @@ +{ + "matrix": { + "options": { + "failmode": [ + { "val": "not-installed" }, + { "val": "parent-dir" }, + { "val": "root-subdir" } + ] + } + }, + "stdout": [ + { + "line": "test cases/failing/121 subproject sandbox violation/meson.build:24:0: ERROR: Sandbox violation: Tried to grab file file.txt from a nested subproject." + } + ] +} diff --git a/test cases/failing/122 override and add_project_dependency/inc/lib.h b/test cases/failing/122 override and add_project_dependency/inc/lib.h new file mode 100644 index 0000000..4cfc47e --- /dev/null +++ b/test cases/failing/122 override and add_project_dependency/inc/lib.h @@ -0,0 +1,2 @@ +#pragma once +void f(void); diff --git a/test cases/failing/122 override and add_project_dependency/lib.c b/test cases/failing/122 override and add_project_dependency/lib.c new file mode 100644 index 0000000..b8b22a3 --- /dev/null +++ b/test cases/failing/122 override and add_project_dependency/lib.c @@ -0,0 +1,3 @@ +#include +#include "lib.h" +void f() {puts("hello");} diff --git a/test cases/failing/122 override and add_project_dependency/meson.build b/test cases/failing/122 override and add_project_dependency/meson.build new file mode 100644 index 0000000..c878b01 --- /dev/null +++ b/test cases/failing/122 override and add_project_dependency/meson.build @@ -0,0 +1,8 @@ +project('super', 'c') + +inc = include_directories('inc') +lib = static_library('sneaky', 'lib.c', include_directories: inc) +meson.override_dependency('sneaky', + declare_dependency(link_with: lib, include_directories: inc)) + +subproject('a') diff --git a/test cases/failing/122 override and add_project_dependency/subprojects/a/meson.build b/test cases/failing/122 override and add_project_dependency/subprojects/a/meson.build new file mode 100644 index 0000000..4f6f070 --- /dev/null +++ b/test cases/failing/122 override and add_project_dependency/subprojects/a/meson.build @@ -0,0 +1,10 @@ +project('a', 'c') + +dep = dependency('sneaky') + +# does not work +add_project_dependencies(dep, language: 'c') +executable('prog', 'prog.c') + +# this would work instead: +# executable('prog', 'prog.c', dependencies: dep) diff --git a/test cases/failing/122 override and add_project_dependency/subprojects/a/prog.c b/test cases/failing/122 override and add_project_dependency/subprojects/a/prog.c new file mode 100644 index 0000000..ce60f81 --- /dev/null +++ b/test cases/failing/122 override and add_project_dependency/subprojects/a/prog.c @@ -0,0 +1,6 @@ +#include "lib.h" + +int main() { + f(); + return 0; +} diff --git a/test cases/failing/122 override and add_project_dependency/test.json b/test cases/failing/122 override and add_project_dependency/test.json new file mode 100644 index 0000000..08eb0c6 --- /dev/null +++ b/test cases/failing/122 override and add_project_dependency/test.json @@ -0,0 +1,7 @@ +{ + "stdout": [ + { + "line": "test cases/failing/122 override and add_project_dependency/subprojects/a/meson.build:6:0: ERROR: Dependencies must be external dependencies" + } + ] +} diff --git a/test cases/failing/122 subproject sandbox violation/meson.build b/test cases/failing/122 subproject sandbox violation/meson.build deleted file mode 100644 index d41994c..0000000 --- a/test cases/failing/122 subproject sandbox violation/meson.build +++ /dev/null @@ -1,34 +0,0 @@ -project('subproject-sandbox-violation') - -sub1_d = subproject('subproj1').get_variable('d') -sub1_mustfail = sub1_d.get_variable('dir') / '..' / 'file.txt' - -sub2_d = subproject('subproj2').get_variable('d') -sub2_mustfail = sub2_d.get_variable('dir') / 'file.txt' - -main_d = declare_dependency( - variables: [ - 'dir=@0@'.format(meson.current_source_dir()), - ] -) -main_mustfail = main_d.get_variable('dir') / 'subprojects/subproj3/file.txt' - -if get_option('failmode') == 'parent-dir' - mustfail = sub1_mustfail -elif get_option('failmode') == 'not-installed' - mustfail = sub2_mustfail -elif get_option('failmode') == 'root-subdir' - mustfail = main_mustfail -endif - -custom_target( - 'mustfail', - input: mustfail, - output: 'file.txt', - command: [ - 'python3', '-c', - 'import os; shutil.copy(sys.argv[1], sys.argv[2])', - '@INPUT@', - '@OUTPUT@' - ], -) diff --git a/test cases/failing/122 subproject sandbox violation/meson_options.txt b/test cases/failing/122 subproject sandbox violation/meson_options.txt deleted file mode 100644 index e7b782d..0000000 --- a/test cases/failing/122 subproject sandbox violation/meson_options.txt +++ /dev/null @@ -1 +0,0 @@ -option('failmode', type: 'combo', choices: ['parent-dir', 'not-installed', 'root-subdir']) diff --git a/test cases/failing/122 subproject sandbox violation/subprojects/subproj1/file.txt b/test cases/failing/122 subproject sandbox violation/subprojects/subproj1/file.txt deleted file mode 100644 index e69de29..0000000 diff --git a/test cases/failing/122 subproject sandbox violation/subprojects/subproj1/meson.build b/test cases/failing/122 subproject sandbox violation/subprojects/subproj1/meson.build deleted file mode 100644 index bd33bf3..0000000 --- a/test cases/failing/122 subproject sandbox violation/subprojects/subproj1/meson.build +++ /dev/null @@ -1,4 +0,0 @@ -project('subproj1') - -install_data('file.txt') -subdir('nested') diff --git a/test cases/failing/122 subproject sandbox violation/subprojects/subproj1/nested/meson.build b/test cases/failing/122 subproject sandbox violation/subprojects/subproj1/nested/meson.build deleted file mode 100644 index 038c139..0000000 --- a/test cases/failing/122 subproject sandbox violation/subprojects/subproj1/nested/meson.build +++ /dev/null @@ -1,5 +0,0 @@ -d = declare_dependency( - variables: [ - 'dir=@0@'.format(meson.current_source_dir()), - ] -) diff --git a/test cases/failing/122 subproject sandbox violation/subprojects/subproj2/file.txt b/test cases/failing/122 subproject sandbox violation/subprojects/subproj2/file.txt deleted file mode 100644 index e69de29..0000000 diff --git a/test cases/failing/122 subproject sandbox violation/subprojects/subproj2/meson.build b/test cases/failing/122 subproject sandbox violation/subprojects/subproj2/meson.build deleted file mode 100644 index a6032aa..0000000 --- a/test cases/failing/122 subproject sandbox violation/subprojects/subproj2/meson.build +++ /dev/null @@ -1,7 +0,0 @@ -project('subproj1') - -d = declare_dependency( - variables: [ - 'dir=@0@'.format(meson.current_source_dir()), - ] -) diff --git a/test cases/failing/122 subproject sandbox violation/subprojects/subproj2/nested/meson.build b/test cases/failing/122 subproject sandbox violation/subprojects/subproj2/nested/meson.build deleted file mode 100644 index e69de29..0000000 diff --git a/test cases/failing/122 subproject sandbox violation/subprojects/subproj3/file.txt b/test cases/failing/122 subproject sandbox violation/subprojects/subproj3/file.txt deleted file mode 100644 index e69de29..0000000 diff --git a/test cases/failing/122 subproject sandbox violation/subprojects/subproj3/meson.build b/test cases/failing/122 subproject sandbox violation/subprojects/subproj3/meson.build deleted file mode 100644 index c4fa64c..0000000 --- a/test cases/failing/122 subproject sandbox violation/subprojects/subproj3/meson.build +++ /dev/null @@ -1,3 +0,0 @@ -project('subproj2') - -install_data('file.txt') diff --git a/test cases/failing/122 subproject sandbox violation/test.json b/test cases/failing/122 subproject sandbox violation/test.json deleted file mode 100644 index 4bd4028..0000000 --- a/test cases/failing/122 subproject sandbox violation/test.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "matrix": { - "options": { - "failmode": [ - { "val": "not-installed" }, - { "val": "parent-dir" }, - { "val": "root-subdir" } - ] - } - }, - "stdout": [ - { - "line": "test cases/failing/122 subproject sandbox violation/meson.build:24:0: ERROR: Sandbox violation: Tried to grab file file.txt from a nested subproject." - } - ] -} diff --git a/test cases/failing/123 override and add_project_dependency/inc/lib.h b/test cases/failing/123 override and add_project_dependency/inc/lib.h deleted file mode 100644 index 4cfc47e..0000000 --- a/test cases/failing/123 override and add_project_dependency/inc/lib.h +++ /dev/null @@ -1,2 +0,0 @@ -#pragma once -void f(void); diff --git a/test cases/failing/123 override and add_project_dependency/lib.c b/test cases/failing/123 override and add_project_dependency/lib.c deleted file mode 100644 index b8b22a3..0000000 --- a/test cases/failing/123 override and add_project_dependency/lib.c +++ /dev/null @@ -1,3 +0,0 @@ -#include -#include "lib.h" -void f() {puts("hello");} diff --git a/test cases/failing/123 override and add_project_dependency/meson.build b/test cases/failing/123 override and add_project_dependency/meson.build deleted file mode 100644 index c878b01..0000000 --- a/test cases/failing/123 override and add_project_dependency/meson.build +++ /dev/null @@ -1,8 +0,0 @@ -project('super', 'c') - -inc = include_directories('inc') -lib = static_library('sneaky', 'lib.c', include_directories: inc) -meson.override_dependency('sneaky', - declare_dependency(link_with: lib, include_directories: inc)) - -subproject('a') diff --git a/test cases/failing/123 override and add_project_dependency/subprojects/a/meson.build b/test cases/failing/123 override and add_project_dependency/subprojects/a/meson.build deleted file mode 100644 index 4f6f070..0000000 --- a/test cases/failing/123 override and add_project_dependency/subprojects/a/meson.build +++ /dev/null @@ -1,10 +0,0 @@ -project('a', 'c') - -dep = dependency('sneaky') - -# does not work -add_project_dependencies(dep, language: 'c') -executable('prog', 'prog.c') - -# this would work instead: -# executable('prog', 'prog.c', dependencies: dep) diff --git a/test cases/failing/123 override and add_project_dependency/subprojects/a/prog.c b/test cases/failing/123 override and add_project_dependency/subprojects/a/prog.c deleted file mode 100644 index ce60f81..0000000 --- a/test cases/failing/123 override and add_project_dependency/subprojects/a/prog.c +++ /dev/null @@ -1,6 +0,0 @@ -#include "lib.h" - -int main() { - f(); - return 0; -} diff --git a/test cases/failing/123 override and add_project_dependency/test.json b/test cases/failing/123 override and add_project_dependency/test.json deleted file mode 100644 index e0a4433..0000000 --- a/test cases/failing/123 override and add_project_dependency/test.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "stdout": [ - { - "line": "test cases/failing/123 override and add_project_dependency/subprojects/a/meson.build:6:0: ERROR: Dependencies must be external dependencies" - } - ] -} diff --git a/test cases/failing/123 targets before add_project_dependency/inc/lib.h b/test cases/failing/123 targets before add_project_dependency/inc/lib.h new file mode 100644 index 0000000..4cfc47e --- /dev/null +++ b/test cases/failing/123 targets before add_project_dependency/inc/lib.h @@ -0,0 +1,2 @@ +#pragma once +void f(void); diff --git a/test cases/failing/123 targets before add_project_dependency/lib.c b/test cases/failing/123 targets before add_project_dependency/lib.c new file mode 100644 index 0000000..b8b22a3 --- /dev/null +++ b/test cases/failing/123 targets before add_project_dependency/lib.c @@ -0,0 +1,3 @@ +#include +#include "lib.h" +void f() {puts("hello");} diff --git a/test cases/failing/123 targets before add_project_dependency/meson.build b/test cases/failing/123 targets before add_project_dependency/meson.build new file mode 100644 index 0000000..38fe102 --- /dev/null +++ b/test cases/failing/123 targets before add_project_dependency/meson.build @@ -0,0 +1,5 @@ +project('test', 'c') + +static_library('lib', 'lib.c') +inc = include_directories('inc') +add_project_dependencies(declare_dependency(include_directories: inc), language: 'c') diff --git a/test cases/failing/123 targets before add_project_dependency/test.json b/test cases/failing/123 targets before add_project_dependency/test.json new file mode 100644 index 0000000..4a21eec --- /dev/null +++ b/test cases/failing/123 targets before add_project_dependency/test.json @@ -0,0 +1,7 @@ +{ + "stdout": [ + { + "line": "test cases/failing/123 targets before add_project_dependency/meson.build:5:0: ERROR: Tried to use 'add_project_dependencies' after a build target has been declared." + } + ] +} diff --git a/test cases/failing/124 extract from unity/meson.build b/test cases/failing/124 extract from unity/meson.build new file mode 100644 index 0000000..9e3e65f --- /dev/null +++ b/test cases/failing/124 extract from unity/meson.build @@ -0,0 +1,4 @@ +project('extract nonexisting gen', 'c') + +lib1 = library('lib1', 'src1.c', 'src2.c', override_options: ['unity=on']) +lib2 = library('lib2', objects: lib1.extract_objects('src1.c')) diff --git a/test cases/failing/124 extract from unity/src1.c b/test cases/failing/124 extract from unity/src1.c new file mode 100644 index 0000000..da971bb --- /dev/null +++ b/test cases/failing/124 extract from unity/src1.c @@ -0,0 +1,3 @@ +int sub_lib_method1() { + return 1337; +} diff --git a/test cases/failing/124 extract from unity/src2.c b/test cases/failing/124 extract from unity/src2.c new file mode 100644 index 0000000..a461669 --- /dev/null +++ b/test cases/failing/124 extract from unity/src2.c @@ -0,0 +1,3 @@ +int sub_lib_method2() { + return 1337; +} diff --git a/test cases/failing/124 extract from unity/test.json b/test cases/failing/124 extract from unity/test.json new file mode 100644 index 0000000..ef76d2f --- /dev/null +++ b/test cases/failing/124 extract from unity/test.json @@ -0,0 +1,7 @@ +{ + "stdout": [ + { + "line": "test cases/failing/124 extract from unity/meson.build:4:37: ERROR: Single object files cannot be extracted in Unity builds. You can only extract all the object files for each compiler at once." + } + ] +} diff --git a/test cases/failing/124 targets before add_project_dependency/inc/lib.h b/test cases/failing/124 targets before add_project_dependency/inc/lib.h deleted file mode 100644 index 4cfc47e..0000000 --- a/test cases/failing/124 targets before add_project_dependency/inc/lib.h +++ /dev/null @@ -1,2 +0,0 @@ -#pragma once -void f(void); diff --git a/test cases/failing/124 targets before add_project_dependency/lib.c b/test cases/failing/124 targets before add_project_dependency/lib.c deleted file mode 100644 index b8b22a3..0000000 --- a/test cases/failing/124 targets before add_project_dependency/lib.c +++ /dev/null @@ -1,3 +0,0 @@ -#include -#include "lib.h" -void f() {puts("hello");} diff --git a/test cases/failing/124 targets before add_project_dependency/meson.build b/test cases/failing/124 targets before add_project_dependency/meson.build deleted file mode 100644 index 38fe102..0000000 --- a/test cases/failing/124 targets before add_project_dependency/meson.build +++ /dev/null @@ -1,5 +0,0 @@ -project('test', 'c') - -static_library('lib', 'lib.c') -inc = include_directories('inc') -add_project_dependencies(declare_dependency(include_directories: inc), language: 'c') diff --git a/test cases/failing/124 targets before add_project_dependency/test.json b/test cases/failing/124 targets before add_project_dependency/test.json deleted file mode 100644 index d856ba4..0000000 --- a/test cases/failing/124 targets before add_project_dependency/test.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "stdout": [ - { - "line": "test cases/failing/124 targets before add_project_dependency/meson.build:5:0: ERROR: Tried to use 'add_project_dependencies' after a build target has been declared." - } - ] -} diff --git a/test cases/failing/125 extract from unity/meson.build b/test cases/failing/125 extract from unity/meson.build deleted file mode 100644 index 9e3e65f..0000000 --- a/test cases/failing/125 extract from unity/meson.build +++ /dev/null @@ -1,4 +0,0 @@ -project('extract nonexisting gen', 'c') - -lib1 = library('lib1', 'src1.c', 'src2.c', override_options: ['unity=on']) -lib2 = library('lib2', objects: lib1.extract_objects('src1.c')) diff --git a/test cases/failing/125 extract from unity/src1.c b/test cases/failing/125 extract from unity/src1.c deleted file mode 100644 index da971bb..0000000 --- a/test cases/failing/125 extract from unity/src1.c +++ /dev/null @@ -1,3 +0,0 @@ -int sub_lib_method1() { - return 1337; -} diff --git a/test cases/failing/125 extract from unity/src2.c b/test cases/failing/125 extract from unity/src2.c deleted file mode 100644 index a461669..0000000 --- a/test cases/failing/125 extract from unity/src2.c +++ /dev/null @@ -1,3 +0,0 @@ -int sub_lib_method2() { - return 1337; -} diff --git a/test cases/failing/125 extract from unity/test.json b/test cases/failing/125 extract from unity/test.json deleted file mode 100644 index 2f6468d..0000000 --- a/test cases/failing/125 extract from unity/test.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "stdout": [ - { - "line": "test cases/failing/125 extract from unity/meson.build:4:37: ERROR: Single object files cannot be extracted in Unity builds. You can only extract all the object files for each compiler at once." - } - ] -} diff --git a/test cases/failing/125 subproject object as a dependency/main.c b/test cases/failing/125 subproject object as a dependency/main.c new file mode 100644 index 0000000..78f2de1 --- /dev/null +++ b/test cases/failing/125 subproject object as a dependency/main.c @@ -0,0 +1 @@ +int main(void) { return 0; } diff --git a/test cases/failing/125 subproject object as a dependency/meson.build b/test cases/failing/125 subproject object as a dependency/meson.build new file mode 100644 index 0000000..0114b9a --- /dev/null +++ b/test cases/failing/125 subproject object as a dependency/meson.build @@ -0,0 +1,4 @@ +project('test', 'c') + +executable( + 'main', 'main.c', dependencies: subproject('sub')) diff --git a/test cases/failing/125 subproject object as a dependency/subprojects/sub/meson.build b/test cases/failing/125 subproject object as a dependency/subprojects/sub/meson.build new file mode 100644 index 0000000..0adfd6a --- /dev/null +++ b/test cases/failing/125 subproject object as a dependency/subprojects/sub/meson.build @@ -0,0 +1 @@ +project('sub') diff --git a/test cases/failing/125 subproject object as a dependency/test.json b/test cases/failing/125 subproject object as a dependency/test.json new file mode 100644 index 0000000..0cb2571 --- /dev/null +++ b/test cases/failing/125 subproject object as a dependency/test.json @@ -0,0 +1,7 @@ +{ + "stdout": [ + { + "line": "test cases/failing/125 subproject object as a dependency/meson.build:3:0: ERROR: Tried to use subproject object as a dependency." + } + ] +} diff --git a/test cases/failing/126 generator host binary/exe.c b/test cases/failing/126 generator host binary/exe.c new file mode 100644 index 0000000..78f2de1 --- /dev/null +++ b/test cases/failing/126 generator host binary/exe.c @@ -0,0 +1 @@ +int main(void) { return 0; } diff --git a/test cases/failing/126 generator host binary/lib.in b/test cases/failing/126 generator host binary/lib.in new file mode 100644 index 0000000..d0b6ab7 --- /dev/null +++ b/test cases/failing/126 generator host binary/lib.in @@ -0,0 +1 @@ +int foo(void) { return 7; } diff --git a/test cases/failing/126 generator host binary/meson.build b/test cases/failing/126 generator host binary/meson.build new file mode 100644 index 0000000..e769338 --- /dev/null +++ b/test cases/failing/126 generator host binary/meson.build @@ -0,0 +1,14 @@ +project('generator host binary no exe_wrapper') + +if meson.can_run_host_binaries() + error('MESON_SKIP_TEST: test requires that build machine cannot run host binaries') +endif + +add_languages('c', native : false) + +exe = executable('exe', 'exe.c', native : false) + +gen = generator(exe, output : '@BASENAME@.c', arguments : ['@INPUT@', '@OUTPUT@']) +foo = gen.process('lib.in') + +library('foo', foo) diff --git a/test cases/failing/126 generator host binary/test.json b/test cases/failing/126 generator host binary/test.json new file mode 100644 index 0000000..7e354d6 --- /dev/null +++ b/test cases/failing/126 generator host binary/test.json @@ -0,0 +1,5 @@ +{ + "stdout": [ + { "line": "ERROR: An exe_wrapper is needed but was not found. Please define one in cross file and check the command and/or add it to PATH." } + ] +} diff --git a/test cases/failing/126 subproject object as a dependency/main.c b/test cases/failing/126 subproject object as a dependency/main.c deleted file mode 100644 index 78f2de1..0000000 --- a/test cases/failing/126 subproject object as a dependency/main.c +++ /dev/null @@ -1 +0,0 @@ -int main(void) { return 0; } diff --git a/test cases/failing/126 subproject object as a dependency/meson.build b/test cases/failing/126 subproject object as a dependency/meson.build deleted file mode 100644 index 0114b9a..0000000 --- a/test cases/failing/126 subproject object as a dependency/meson.build +++ /dev/null @@ -1,4 +0,0 @@ -project('test', 'c') - -executable( - 'main', 'main.c', dependencies: subproject('sub')) diff --git a/test cases/failing/126 subproject object as a dependency/subprojects/sub/meson.build b/test cases/failing/126 subproject object as a dependency/subprojects/sub/meson.build deleted file mode 100644 index 0adfd6a..0000000 --- a/test cases/failing/126 subproject object as a dependency/subprojects/sub/meson.build +++ /dev/null @@ -1 +0,0 @@ -project('sub') diff --git a/test cases/failing/126 subproject object as a dependency/test.json b/test cases/failing/126 subproject object as a dependency/test.json deleted file mode 100644 index 4bf7f5b..0000000 --- a/test cases/failing/126 subproject object as a dependency/test.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "stdout": [ - { - "line": "test cases/failing/126 subproject object as a dependency/meson.build:3:0: ERROR: Tried to use subproject object as a dependency." - } - ] -} diff --git a/test cases/failing/127 generator host binary/exe.c b/test cases/failing/127 generator host binary/exe.c deleted file mode 100644 index 78f2de1..0000000 --- a/test cases/failing/127 generator host binary/exe.c +++ /dev/null @@ -1 +0,0 @@ -int main(void) { return 0; } diff --git a/test cases/failing/127 generator host binary/lib.in b/test cases/failing/127 generator host binary/lib.in deleted file mode 100644 index d0b6ab7..0000000 --- a/test cases/failing/127 generator host binary/lib.in +++ /dev/null @@ -1 +0,0 @@ -int foo(void) { return 7; } diff --git a/test cases/failing/127 generator host binary/meson.build b/test cases/failing/127 generator host binary/meson.build deleted file mode 100644 index e769338..0000000 --- a/test cases/failing/127 generator host binary/meson.build +++ /dev/null @@ -1,14 +0,0 @@ -project('generator host binary no exe_wrapper') - -if meson.can_run_host_binaries() - error('MESON_SKIP_TEST: test requires that build machine cannot run host binaries') -endif - -add_languages('c', native : false) - -exe = executable('exe', 'exe.c', native : false) - -gen = generator(exe, output : '@BASENAME@.c', arguments : ['@INPUT@', '@OUTPUT@']) -foo = gen.process('lib.in') - -library('foo', foo) diff --git a/test cases/failing/127 generator host binary/test.json b/test cases/failing/127 generator host binary/test.json deleted file mode 100644 index 7e354d6..0000000 --- a/test cases/failing/127 generator host binary/test.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "stdout": [ - { "line": "ERROR: An exe_wrapper is needed but was not found. Please define one in cross file and check the command and/or add it to PATH." } - ] -} diff --git a/test cases/failing/127 invalid ast/meson.build b/test cases/failing/127 invalid ast/meson.build new file mode 100644 index 0000000..06011c2 --- /dev/null +++ b/test cases/failing/127 invalid ast/meson.build @@ -0,0 +1,3 @@ +project('invalid ast crash', meson_version: '0.1.0') + += >%@ diff --git a/test cases/failing/127 invalid ast/test.json b/test cases/failing/127 invalid ast/test.json new file mode 100644 index 0000000..db7bfe8 --- /dev/null +++ b/test cases/failing/127 invalid ast/test.json @@ -0,0 +1,9 @@ +{ + "stdout": [ + { + "match": "re", + "line": "test cases/failing/127 invalid ast/meson.build:1:44: ERROR: Meson version is [0-9.]+(\\.rc[0-9]+)? but project requires 0.1.0" + } + ] +} + diff --git a/test cases/failing/128 invalid ast/meson.build b/test cases/failing/128 invalid ast/meson.build deleted file mode 100644 index 06011c2..0000000 --- a/test cases/failing/128 invalid ast/meson.build +++ /dev/null @@ -1,3 +0,0 @@ -project('invalid ast crash', meson_version: '0.1.0') - -= >%@ diff --git a/test cases/failing/128 invalid ast/test.json b/test cases/failing/128 invalid ast/test.json deleted file mode 100644 index e5c3873..0000000 --- a/test cases/failing/128 invalid ast/test.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "stdout": [ - { - "match": "re", - "line": "test cases/failing/128 invalid ast/meson.build:1:44: ERROR: Meson version is [0-9.]+(\\.rc[0-9]+)? but project requires 0.1.0" - } - ] -} - diff --git a/test cases/failing/128 invalid project function/meson.build b/test cases/failing/128 invalid project function/meson.build new file mode 100644 index 0000000..0032c9c --- /dev/null +++ b/test cases/failing/128 invalid project function/meson.build @@ -0,0 +1 @@ +project('invalid project function with bad kwargs', meson_version: '0.1.0', unknown_kwarg: 'val') diff --git a/test cases/failing/128 invalid project function/test.json b/test cases/failing/128 invalid project function/test.json new file mode 100644 index 0000000..17c1ac6 --- /dev/null +++ b/test cases/failing/128 invalid project function/test.json @@ -0,0 +1,9 @@ +{ + "stdout": [ + { + "match": "re", + "line": "test cases/failing/128 invalid project function/meson.build:1:67: ERROR: Meson version is [0-9.]+(\\.rc[0-9]+)? but project requires 0.1.0" + } + ] +} + diff --git a/test cases/failing/129 invalid project function/meson.build b/test cases/failing/129 invalid project function/meson.build deleted file mode 100644 index 0032c9c..0000000 --- a/test cases/failing/129 invalid project function/meson.build +++ /dev/null @@ -1 +0,0 @@ -project('invalid project function with bad kwargs', meson_version: '0.1.0', unknown_kwarg: 'val') diff --git a/test cases/failing/129 invalid project function/test.json b/test cases/failing/129 invalid project function/test.json deleted file mode 100644 index b28266c..0000000 --- a/test cases/failing/129 invalid project function/test.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "stdout": [ - { - "match": "re", - "line": "test cases/failing/129 invalid project function/meson.build:1:67: ERROR: Meson version is [0-9.]+(\\.rc[0-9]+)? but project requires 0.1.0" - } - ] -} - diff --git a/test cases/failing/129 utf8 with bom/meson.build b/test cases/failing/129 utf8 with bom/meson.build new file mode 100644 index 0000000..492a0c6 --- /dev/null +++ b/test cases/failing/129 utf8 with bom/meson.build @@ -0,0 +1,3 @@ +project('utf8 with bom') + +subdir('subdir') diff --git a/test cases/failing/129 utf8 with bom/test.json b/test cases/failing/129 utf8 with bom/test.json new file mode 100644 index 0000000..ec2df13 --- /dev/null +++ b/test cases/failing/129 utf8 with bom/test.json @@ -0,0 +1,8 @@ +{ + "stdout": [ + { + "line": "test cases/failing/129 utf8 with bom/meson.build:0:0: ERROR: Builder file must be encoded in UTF-8 (with no BOM)" + } + ] + } + \ No newline at end of file diff --git a/test cases/failing/130 utf8 with bom subdir/meson.build b/test cases/failing/130 utf8 with bom subdir/meson.build new file mode 100644 index 0000000..8d3bbd7 --- /dev/null +++ b/test cases/failing/130 utf8 with bom subdir/meson.build @@ -0,0 +1,3 @@ +project('utf8 with bom subdir') + +subdir('subdir') diff --git a/test cases/failing/130 utf8 with bom subdir/subdir/meson.build b/test cases/failing/130 utf8 with bom subdir/subdir/meson.build new file mode 100644 index 0000000..dbf2b9c --- /dev/null +++ b/test cases/failing/130 utf8 with bom subdir/subdir/meson.build @@ -0,0 +1 @@ +a = 'Hello, World!' diff --git a/test cases/failing/130 utf8 with bom subdir/test.json b/test cases/failing/130 utf8 with bom subdir/test.json new file mode 100644 index 0000000..bbaea1b --- /dev/null +++ b/test cases/failing/130 utf8 with bom subdir/test.json @@ -0,0 +1,8 @@ +{ + "stdout": [ + { + "line": "test cases/failing/130 utf8 with bom subdir/subdir/meson.build:0:0: ERROR: Builder file must be encoded in UTF-8 (with no BOM)" + } + ] + } + \ No newline at end of file diff --git a/test cases/failing/130 utf8 with bom/meson.build b/test cases/failing/130 utf8 with bom/meson.build deleted file mode 100644 index 492a0c6..0000000 --- a/test cases/failing/130 utf8 with bom/meson.build +++ /dev/null @@ -1,3 +0,0 @@ -project('utf8 with bom') - -subdir('subdir') diff --git a/test cases/failing/130 utf8 with bom/test.json b/test cases/failing/130 utf8 with bom/test.json deleted file mode 100644 index 2292beb..0000000 --- a/test cases/failing/130 utf8 with bom/test.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "stdout": [ - { - "line": "test cases/failing/130 utf8 with bom/meson.build:0:0: ERROR: Builder file must be encoded in UTF-8 (with no BOM)" - } - ] - } - \ No newline at end of file diff --git a/test cases/failing/131 utf8 with bom options/meson.build b/test cases/failing/131 utf8 with bom options/meson.build new file mode 100644 index 0000000..50413e0 --- /dev/null +++ b/test cases/failing/131 utf8 with bom options/meson.build @@ -0,0 +1 @@ +project('utf8 with bom options') diff --git a/test cases/failing/131 utf8 with bom options/meson.options b/test cases/failing/131 utf8 with bom options/meson.options new file mode 100644 index 0000000..250c032 --- /dev/null +++ b/test cases/failing/131 utf8 with bom options/meson.options @@ -0,0 +1 @@ +option('someoption', type : 'string', value : 'optval', description : 'An option') diff --git a/test cases/failing/131 utf8 with bom options/test.json b/test cases/failing/131 utf8 with bom options/test.json new file mode 100644 index 0000000..e6391c5 --- /dev/null +++ b/test cases/failing/131 utf8 with bom options/test.json @@ -0,0 +1,8 @@ +{ + "stdout": [ + { + "line": "test cases/failing/131 utf8 with bom options/meson.options:0:0: ERROR: Builder file must be encoded in UTF-8 (with no BOM)" + } + ] + } + \ No newline at end of file diff --git a/test cases/failing/131 utf8 with bom subdir/meson.build b/test cases/failing/131 utf8 with bom subdir/meson.build deleted file mode 100644 index 8d3bbd7..0000000 --- a/test cases/failing/131 utf8 with bom subdir/meson.build +++ /dev/null @@ -1,3 +0,0 @@ -project('utf8 with bom subdir') - -subdir('subdir') diff --git a/test cases/failing/131 utf8 with bom subdir/subdir/meson.build b/test cases/failing/131 utf8 with bom subdir/subdir/meson.build deleted file mode 100644 index dbf2b9c..0000000 --- a/test cases/failing/131 utf8 with bom subdir/subdir/meson.build +++ /dev/null @@ -1 +0,0 @@ -a = 'Hello, World!' diff --git a/test cases/failing/131 utf8 with bom subdir/test.json b/test cases/failing/131 utf8 with bom subdir/test.json deleted file mode 100644 index 72cc515..0000000 --- a/test cases/failing/131 utf8 with bom subdir/test.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "stdout": [ - { - "line": "test cases/failing/131 utf8 with bom subdir/subdir/meson.build:0:0: ERROR: Builder file must be encoded in UTF-8 (with no BOM)" - } - ] - } - \ No newline at end of file diff --git a/test cases/failing/132 utf8 with bom options/meson.build b/test cases/failing/132 utf8 with bom options/meson.build deleted file mode 100644 index 50413e0..0000000 --- a/test cases/failing/132 utf8 with bom options/meson.build +++ /dev/null @@ -1 +0,0 @@ -project('utf8 with bom options') diff --git a/test cases/failing/132 utf8 with bom options/meson.options b/test cases/failing/132 utf8 with bom options/meson.options deleted file mode 100644 index 250c032..0000000 --- a/test cases/failing/132 utf8 with bom options/meson.options +++ /dev/null @@ -1 +0,0 @@ -option('someoption', type : 'string', value : 'optval', description : 'An option') diff --git a/test cases/failing/132 utf8 with bom options/test.json b/test cases/failing/132 utf8 with bom options/test.json deleted file mode 100644 index c09f48e..0000000 --- a/test cases/failing/132 utf8 with bom options/test.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "stdout": [ - { - "line": "test cases/failing/132 utf8 with bom options/meson.options:0:0: ERROR: Builder file must be encoded in UTF-8 (with no BOM)" - } - ] - } - \ No newline at end of file diff --git a/test cases/failing/47 pkgconfig variables not key value/meson.build b/test cases/failing/47 pkgconfig variables not key value/meson.build new file mode 100644 index 0000000..02fa737 --- /dev/null +++ b/test cases/failing/47 pkgconfig variables not key value/meson.build @@ -0,0 +1,16 @@ +project('variables-not-key-value-test', 'c', version : '1.0') + +pkgg = import('pkgconfig') +lib = shared_library('simple', 'simple.c') +libver = '1.0' +h = install_headers('simple.h') + +pkgg.generate( + libraries : [lib, '-lz'], + subdirs : '.', + version : libver, + name : 'libsimple', + filebase : 'simple', + description : 'A simple demo library.', + variables : [ 'this_should_be_key_value' ] +) diff --git a/test cases/failing/47 pkgconfig variables not key value/simple.c b/test cases/failing/47 pkgconfig variables not key value/simple.c new file mode 100644 index 0000000..e8a6d83 --- /dev/null +++ b/test cases/failing/47 pkgconfig variables not key value/simple.c @@ -0,0 +1,5 @@ +#include"simple.h" + +int simple_function() { + return 42; +} diff --git a/test cases/failing/47 pkgconfig variables not key value/simple.h b/test cases/failing/47 pkgconfig variables not key value/simple.h new file mode 100644 index 0000000..bb52e6d --- /dev/null +++ b/test cases/failing/47 pkgconfig variables not key value/simple.h @@ -0,0 +1,6 @@ +#ifndef SIMPLE_H_ +#define SIMPLE_H_ + +int simple_function(); + +#endif diff --git a/test cases/failing/47 pkgconfig variables not key value/test.json b/test cases/failing/47 pkgconfig variables not key value/test.json new file mode 100644 index 0000000..11cd374 --- /dev/null +++ b/test cases/failing/47 pkgconfig variables not key value/test.json @@ -0,0 +1,7 @@ +{ + "stdout": [ + { + "line": "test cases/failing/47 pkgconfig variables not key value/meson.build:8:5: ERROR: pkgconfig.generate keyword argument \"variables\" variable 'this_should_be_key_value' must have a value separated by equals sign." + } + ] +} diff --git a/test cases/failing/48 executable comparison/meson.build b/test cases/failing/48 executable comparison/meson.build new file mode 100644 index 0000000..041bcf3 --- /dev/null +++ b/test cases/failing/48 executable comparison/meson.build @@ -0,0 +1,6 @@ +project('executable comparison', 'c') + +exe1 = executable('prog1', sources : 'prog.c') +exe2 = executable('prog2', sources : 'prog.c') + +assert(exe1 < exe2, 'should fail') diff --git a/test cases/failing/48 executable comparison/prog.c b/test cases/failing/48 executable comparison/prog.c new file mode 100644 index 0000000..0314ff1 --- /dev/null +++ b/test cases/failing/48 executable comparison/prog.c @@ -0,0 +1 @@ +int main(int argc, char **argv) { return 0; } diff --git a/test cases/failing/48 executable comparison/test.json b/test cases/failing/48 executable comparison/test.json new file mode 100644 index 0000000..db6dac3 --- /dev/null +++ b/test cases/failing/48 executable comparison/test.json @@ -0,0 +1,8 @@ +{ + "stdout": [ + { + "match": "re", + "line": "test cases/failing/48 executable comparison/meson.build:6:14: ERROR: Object of type Executable does not support the `<` operator." + } + ] +} diff --git a/test cases/failing/48 pkgconfig variables not key value/meson.build b/test cases/failing/48 pkgconfig variables not key value/meson.build deleted file mode 100644 index 02fa737..0000000 --- a/test cases/failing/48 pkgconfig variables not key value/meson.build +++ /dev/null @@ -1,16 +0,0 @@ -project('variables-not-key-value-test', 'c', version : '1.0') - -pkgg = import('pkgconfig') -lib = shared_library('simple', 'simple.c') -libver = '1.0' -h = install_headers('simple.h') - -pkgg.generate( - libraries : [lib, '-lz'], - subdirs : '.', - version : libver, - name : 'libsimple', - filebase : 'simple', - description : 'A simple demo library.', - variables : [ 'this_should_be_key_value' ] -) diff --git a/test cases/failing/48 pkgconfig variables not key value/simple.c b/test cases/failing/48 pkgconfig variables not key value/simple.c deleted file mode 100644 index e8a6d83..0000000 --- a/test cases/failing/48 pkgconfig variables not key value/simple.c +++ /dev/null @@ -1,5 +0,0 @@ -#include"simple.h" - -int simple_function() { - return 42; -} diff --git a/test cases/failing/48 pkgconfig variables not key value/simple.h b/test cases/failing/48 pkgconfig variables not key value/simple.h deleted file mode 100644 index bb52e6d..0000000 --- a/test cases/failing/48 pkgconfig variables not key value/simple.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef SIMPLE_H_ -#define SIMPLE_H_ - -int simple_function(); - -#endif diff --git a/test cases/failing/48 pkgconfig variables not key value/test.json b/test cases/failing/48 pkgconfig variables not key value/test.json deleted file mode 100644 index 96422a9..0000000 --- a/test cases/failing/48 pkgconfig variables not key value/test.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "stdout": [ - { - "line": "test cases/failing/48 pkgconfig variables not key value/meson.build:8:5: ERROR: pkgconfig.generate keyword argument \"variables\" variable 'this_should_be_key_value' must have a value separated by equals sign." - } - ] -} diff --git a/test cases/failing/49 executable comparison/meson.build b/test cases/failing/49 executable comparison/meson.build deleted file mode 100644 index 041bcf3..0000000 --- a/test cases/failing/49 executable comparison/meson.build +++ /dev/null @@ -1,6 +0,0 @@ -project('executable comparison', 'c') - -exe1 = executable('prog1', sources : 'prog.c') -exe2 = executable('prog2', sources : 'prog.c') - -assert(exe1 < exe2, 'should fail') diff --git a/test cases/failing/49 executable comparison/prog.c b/test cases/failing/49 executable comparison/prog.c deleted file mode 100644 index 0314ff1..0000000 --- a/test cases/failing/49 executable comparison/prog.c +++ /dev/null @@ -1 +0,0 @@ -int main(int argc, char **argv) { return 0; } diff --git a/test cases/failing/49 executable comparison/test.json b/test cases/failing/49 executable comparison/test.json deleted file mode 100644 index 76c310b..0000000 --- a/test cases/failing/49 executable comparison/test.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "stdout": [ - { - "match": "re", - "line": "test cases/failing/49 executable comparison/meson.build:6:14: ERROR: Object of type Executable does not support the `<` operator." - } - ] -} diff --git a/test cases/failing/49 inconsistent comparison/meson.build b/test cases/failing/49 inconsistent comparison/meson.build new file mode 100644 index 0000000..237a157 --- /dev/null +++ b/test cases/failing/49 inconsistent comparison/meson.build @@ -0,0 +1,7 @@ +project('kwarg before arg') + +# All of these should fail, though only the first one will error out if +# everything's working correctly. +assert([] < 'st', 'should fail') +assert([] < 1, 'should fail') +assert(2 < 'st', 'should fail') diff --git a/test cases/failing/49 inconsistent comparison/test.json b/test cases/failing/49 inconsistent comparison/test.json new file mode 100644 index 0000000..4440a86 --- /dev/null +++ b/test cases/failing/49 inconsistent comparison/test.json @@ -0,0 +1,7 @@ +{ + "stdout": [ + { + "line": "test cases/failing/49 inconsistent comparison/meson.build:5:12: ERROR: Object <[ArrayHolder] holds [list]: []> of type array does not support the `<` operator." + } + ] +} diff --git a/test cases/failing/50 inconsistent comparison/meson.build b/test cases/failing/50 inconsistent comparison/meson.build deleted file mode 100644 index 237a157..0000000 --- a/test cases/failing/50 inconsistent comparison/meson.build +++ /dev/null @@ -1,7 +0,0 @@ -project('kwarg before arg') - -# All of these should fail, though only the first one will error out if -# everything's working correctly. -assert([] < 'st', 'should fail') -assert([] < 1, 'should fail') -assert(2 < 'st', 'should fail') diff --git a/test cases/failing/50 inconsistent comparison/test.json b/test cases/failing/50 inconsistent comparison/test.json deleted file mode 100644 index fa71eef..0000000 --- a/test cases/failing/50 inconsistent comparison/test.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "stdout": [ - { - "line": "test cases/failing/50 inconsistent comparison/meson.build:5:12: ERROR: Object <[ArrayHolder] holds [list]: []> of type array does not support the `<` operator." - } - ] -} diff --git a/test cases/failing/50 slashname/meson.build b/test cases/failing/50 slashname/meson.build new file mode 100644 index 0000000..29fe1fc --- /dev/null +++ b/test cases/failing/50 slashname/meson.build @@ -0,0 +1,11 @@ +project('slashname', 'c') + +# Traverse this subdir so the corresponding dir +# is created inside the build dir. +subdir('sub') + +# Try to create an executable that would go in the "sub" dir +# inside the build dir. This is prohibited. +executable('sub/prog', pf) + +error('Re-enable me once slash in name is finally prohibited.') diff --git a/test cases/failing/50 slashname/sub/meson.build b/test cases/failing/50 slashname/sub/meson.build new file mode 100644 index 0000000..3baacf6 --- /dev/null +++ b/test cases/failing/50 slashname/sub/meson.build @@ -0,0 +1 @@ +pf = files('prog.c') diff --git a/test cases/failing/50 slashname/sub/prog.c b/test cases/failing/50 slashname/sub/prog.c new file mode 100644 index 0000000..722de0a --- /dev/null +++ b/test cases/failing/50 slashname/sub/prog.c @@ -0,0 +1,6 @@ +#include + +int main(int argc, char **argv) { + printf("I should not be run ever.\n"); + return 1; +} diff --git a/test cases/failing/50 slashname/test.json b/test cases/failing/50 slashname/test.json new file mode 100644 index 0000000..44b566c --- /dev/null +++ b/test cases/failing/50 slashname/test.json @@ -0,0 +1,7 @@ +{ + "stdout": [ + { + "line": "test cases/failing/50 slashname/meson.build:9:0: ERROR: Target \"sub/prog\" has a path segment pointing to directory \"sub\". This is an error." + } + ] +} diff --git a/test cases/failing/51 reserved meson prefix/meson-foo/meson.build b/test cases/failing/51 reserved meson prefix/meson-foo/meson.build new file mode 100644 index 0000000..e69de29 diff --git a/test cases/failing/51 reserved meson prefix/meson.build b/test cases/failing/51 reserved meson prefix/meson.build new file mode 100644 index 0000000..1339035 --- /dev/null +++ b/test cases/failing/51 reserved meson prefix/meson.build @@ -0,0 +1,3 @@ +project('test') + +subdir('meson-foo') diff --git a/test cases/failing/51 reserved meson prefix/test.json b/test cases/failing/51 reserved meson prefix/test.json new file mode 100644 index 0000000..9eb1fa4 --- /dev/null +++ b/test cases/failing/51 reserved meson prefix/test.json @@ -0,0 +1,7 @@ +{ + "stdout": [ + { + "line": "test cases/failing/51 reserved meson prefix/meson.build:3:0: ERROR: The \"meson-\" prefix is reserved and cannot be used for top-level subdir()." + } + ] +} diff --git a/test cases/failing/51 slashname/meson.build b/test cases/failing/51 slashname/meson.build deleted file mode 100644 index 29fe1fc..0000000 --- a/test cases/failing/51 slashname/meson.build +++ /dev/null @@ -1,11 +0,0 @@ -project('slashname', 'c') - -# Traverse this subdir so the corresponding dir -# is created inside the build dir. -subdir('sub') - -# Try to create an executable that would go in the "sub" dir -# inside the build dir. This is prohibited. -executable('sub/prog', pf) - -error('Re-enable me once slash in name is finally prohibited.') diff --git a/test cases/failing/51 slashname/sub/meson.build b/test cases/failing/51 slashname/sub/meson.build deleted file mode 100644 index 3baacf6..0000000 --- a/test cases/failing/51 slashname/sub/meson.build +++ /dev/null @@ -1 +0,0 @@ -pf = files('prog.c') diff --git a/test cases/failing/51 slashname/sub/prog.c b/test cases/failing/51 slashname/sub/prog.c deleted file mode 100644 index 722de0a..0000000 --- a/test cases/failing/51 slashname/sub/prog.c +++ /dev/null @@ -1,6 +0,0 @@ -#include - -int main(int argc, char **argv) { - printf("I should not be run ever.\n"); - return 1; -} diff --git a/test cases/failing/51 slashname/test.json b/test cases/failing/51 slashname/test.json deleted file mode 100644 index 39346a9..0000000 --- a/test cases/failing/51 slashname/test.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "stdout": [ - { - "line": "test cases/failing/51 slashname/meson.build:9:0: ERROR: Target \"sub/prog\" has a path segment pointing to directory \"sub\". This is an error." - } - ] -} diff --git a/test cases/failing/52 or on new line/meson.build b/test cases/failing/52 or on new line/meson.build new file mode 100644 index 0000000..b0bd08e --- /dev/null +++ b/test cases/failing/52 or on new line/meson.build @@ -0,0 +1,7 @@ +project('silent_or') + +if get_option('foo') == 'true' + or get_option('foo') == 'auto' +else + message('If this message is printed then something is wrong. The or above should give a syntax error.') +endif diff --git a/test cases/failing/52 or on new line/meson_options.txt b/test cases/failing/52 or on new line/meson_options.txt new file mode 100644 index 0000000..3302cf4 --- /dev/null +++ b/test cases/failing/52 or on new line/meson_options.txt @@ -0,0 +1 @@ +option('foo', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto') diff --git a/test cases/failing/52 or on new line/test.json b/test cases/failing/52 or on new line/test.json new file mode 100644 index 0000000..49a7255 --- /dev/null +++ b/test cases/failing/52 or on new line/test.json @@ -0,0 +1,7 @@ +{ + "stdout": [ + { + "line": "test cases/failing/52 or on new line/meson.build:4:8: ERROR: Invalid or clause." + } + ] +} diff --git a/test cases/failing/52 reserved meson prefix/meson-foo/meson.build b/test cases/failing/52 reserved meson prefix/meson-foo/meson.build deleted file mode 100644 index e69de29..0000000 diff --git a/test cases/failing/52 reserved meson prefix/meson.build b/test cases/failing/52 reserved meson prefix/meson.build deleted file mode 100644 index 1339035..0000000 --- a/test cases/failing/52 reserved meson prefix/meson.build +++ /dev/null @@ -1,3 +0,0 @@ -project('test') - -subdir('meson-foo') diff --git a/test cases/failing/52 reserved meson prefix/test.json b/test cases/failing/52 reserved meson prefix/test.json deleted file mode 100644 index 707cd73..0000000 --- a/test cases/failing/52 reserved meson prefix/test.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "stdout": [ - { - "line": "test cases/failing/52 reserved meson prefix/meson.build:3:0: ERROR: The \"meson-\" prefix is reserved and cannot be used for top-level subdir()." - } - ] -} diff --git a/test cases/failing/53 link with executable/meson.build b/test cases/failing/53 link with executable/meson.build new file mode 100644 index 0000000..186b3e5 --- /dev/null +++ b/test cases/failing/53 link with executable/meson.build @@ -0,0 +1,4 @@ +project('link with exe', 'c') + +e = executable('prog', 'prog.c') +m = shared_module('module', 'module.c', link_with: e) diff --git a/test cases/failing/53 link with executable/module.c b/test cases/failing/53 link with executable/module.c new file mode 100644 index 0000000..dc0124a --- /dev/null +++ b/test cases/failing/53 link with executable/module.c @@ -0,0 +1,4 @@ + +int func(void) { + return 42; +} diff --git a/test cases/failing/53 link with executable/prog.c b/test cases/failing/53 link with executable/prog.c new file mode 100644 index 0000000..f3836d7 --- /dev/null +++ b/test cases/failing/53 link with executable/prog.c @@ -0,0 +1,5 @@ +int +main (int argc, char **argv) +{ + return 0; +} diff --git a/test cases/failing/53 link with executable/test.json b/test cases/failing/53 link with executable/test.json new file mode 100644 index 0000000..8c25e07 --- /dev/null +++ b/test cases/failing/53 link with executable/test.json @@ -0,0 +1,7 @@ +{ + "stdout": [ + { + "line": "test cases/failing/53 link with executable/meson.build:4:4: ERROR: Link target 'prog' is not linkable." + } + ] +} diff --git a/test cases/failing/53 or on new line/meson.build b/test cases/failing/53 or on new line/meson.build deleted file mode 100644 index b0bd08e..0000000 --- a/test cases/failing/53 or on new line/meson.build +++ /dev/null @@ -1,7 +0,0 @@ -project('silent_or') - -if get_option('foo') == 'true' - or get_option('foo') == 'auto' -else - message('If this message is printed then something is wrong. The or above should give a syntax error.') -endif diff --git a/test cases/failing/53 or on new line/meson_options.txt b/test cases/failing/53 or on new line/meson_options.txt deleted file mode 100644 index 3302cf4..0000000 --- a/test cases/failing/53 or on new line/meson_options.txt +++ /dev/null @@ -1 +0,0 @@ -option('foo', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto') diff --git a/test cases/failing/53 or on new line/test.json b/test cases/failing/53 or on new line/test.json deleted file mode 100644 index 3390025..0000000 --- a/test cases/failing/53 or on new line/test.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "stdout": [ - { - "line": "test cases/failing/53 or on new line/meson.build:4:8: ERROR: Invalid or clause." - } - ] -} diff --git a/test cases/failing/54 assign custom target index/meson.build b/test cases/failing/54 assign custom target index/meson.build new file mode 100644 index 0000000..7f2a820 --- /dev/null +++ b/test cases/failing/54 assign custom target index/meson.build @@ -0,0 +1,24 @@ +# Copyright © 2017 Intel Corporation +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +prog_python = import('python3').find_python() + +target = custom_target( + 'target', + output : ['1', '2'], + command : [prog_python, '-c', + 'with open("1", "w") as f: f.write("foo"); with open("2", "w") as f: f.write("foo")'], +) + +target[0] = 'foo' diff --git a/test cases/failing/54 assign custom target index/test.json b/test cases/failing/54 assign custom target index/test.json new file mode 100644 index 0000000..15287d6 --- /dev/null +++ b/test cases/failing/54 assign custom target index/test.json @@ -0,0 +1,7 @@ +{ + "stdout": [ + { + "line": "test cases/failing/54 assign custom target index/meson.build:24:0: ERROR: Assignment target must be an id." + } + ] +} diff --git a/test cases/failing/54 link with executable/meson.build b/test cases/failing/54 link with executable/meson.build deleted file mode 100644 index 186b3e5..0000000 --- a/test cases/failing/54 link with executable/meson.build +++ /dev/null @@ -1,4 +0,0 @@ -project('link with exe', 'c') - -e = executable('prog', 'prog.c') -m = shared_module('module', 'module.c', link_with: e) diff --git a/test cases/failing/54 link with executable/module.c b/test cases/failing/54 link with executable/module.c deleted file mode 100644 index dc0124a..0000000 --- a/test cases/failing/54 link with executable/module.c +++ /dev/null @@ -1,4 +0,0 @@ - -int func(void) { - return 42; -} diff --git a/test cases/failing/54 link with executable/prog.c b/test cases/failing/54 link with executable/prog.c deleted file mode 100644 index f3836d7..0000000 --- a/test cases/failing/54 link with executable/prog.c +++ /dev/null @@ -1,5 +0,0 @@ -int -main (int argc, char **argv) -{ - return 0; -} diff --git a/test cases/failing/54 link with executable/test.json b/test cases/failing/54 link with executable/test.json deleted file mode 100644 index 2b51bdd..0000000 --- a/test cases/failing/54 link with executable/test.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "stdout": [ - { - "line": "test cases/failing/54 link with executable/meson.build:4:4: ERROR: Link target 'prog' is not linkable." - } - ] -} diff --git a/test cases/failing/55 assign custom target index/meson.build b/test cases/failing/55 assign custom target index/meson.build deleted file mode 100644 index 7f2a820..0000000 --- a/test cases/failing/55 assign custom target index/meson.build +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright © 2017 Intel Corporation -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -prog_python = import('python3').find_python() - -target = custom_target( - 'target', - output : ['1', '2'], - command : [prog_python, '-c', - 'with open("1", "w") as f: f.write("foo"); with open("2", "w") as f: f.write("foo")'], -) - -target[0] = 'foo' diff --git a/test cases/failing/55 assign custom target index/test.json b/test cases/failing/55 assign custom target index/test.json deleted file mode 100644 index 39983fb..0000000 --- a/test cases/failing/55 assign custom target index/test.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "stdout": [ - { - "line": "test cases/failing/55 assign custom target index/meson.build:24:0: ERROR: Assignment target must be an id." - } - ] -} diff --git a/test cases/failing/55 getoption prefix/meson.build b/test cases/failing/55 getoption prefix/meson.build new file mode 100644 index 0000000..8f85cff --- /dev/null +++ b/test cases/failing/55 getoption prefix/meson.build @@ -0,0 +1,5 @@ +project('getopt prefix') + +subproject('abc') + +get_option('abc:foo') diff --git a/test cases/failing/55 getoption prefix/subprojects/abc/meson.build b/test cases/failing/55 getoption prefix/subprojects/abc/meson.build new file mode 100644 index 0000000..aa9c3df --- /dev/null +++ b/test cases/failing/55 getoption prefix/subprojects/abc/meson.build @@ -0,0 +1 @@ +project('abc', 'c') diff --git a/test cases/failing/55 getoption prefix/subprojects/abc/meson_options.txt b/test cases/failing/55 getoption prefix/subprojects/abc/meson_options.txt new file mode 100644 index 0000000..89e624e --- /dev/null +++ b/test cases/failing/55 getoption prefix/subprojects/abc/meson_options.txt @@ -0,0 +1 @@ +option('foo', type : 'boolean') diff --git a/test cases/failing/55 getoption prefix/test.json b/test cases/failing/55 getoption prefix/test.json new file mode 100644 index 0000000..9f3a936 --- /dev/null +++ b/test cases/failing/55 getoption prefix/test.json @@ -0,0 +1,7 @@ +{ + "stdout": [ + { + "line": "test cases/failing/55 getoption prefix/meson.build:5:0: ERROR: Having a colon in option name is forbidden, projects are not allowed to directly access options of other subprojects." + } + ] +} diff --git a/test cases/failing/56 bad option argument/meson.build b/test cases/failing/56 bad option argument/meson.build new file mode 100644 index 0000000..5219cfb --- /dev/null +++ b/test cases/failing/56 bad option argument/meson.build @@ -0,0 +1,3 @@ +project('bad option') + +get_option('name') diff --git a/test cases/failing/56 bad option argument/meson_options.txt b/test cases/failing/56 bad option argument/meson_options.txt new file mode 100644 index 0000000..0e0372b --- /dev/null +++ b/test cases/failing/56 bad option argument/meson_options.txt @@ -0,0 +1 @@ +option('name', type : 'string', value_ : 'foo') diff --git a/test cases/failing/56 bad option argument/test.json b/test cases/failing/56 bad option argument/test.json new file mode 100644 index 0000000..c7957cd --- /dev/null +++ b/test cases/failing/56 bad option argument/test.json @@ -0,0 +1,7 @@ +{ + "stdout": [ + { + "line": "test cases/failing/56 bad option argument/meson_options.txt:1:0: ERROR: string option got unknown keyword arguments \"value_\"" + } + ] +} diff --git a/test cases/failing/56 getoption prefix/meson.build b/test cases/failing/56 getoption prefix/meson.build deleted file mode 100644 index 8f85cff..0000000 --- a/test cases/failing/56 getoption prefix/meson.build +++ /dev/null @@ -1,5 +0,0 @@ -project('getopt prefix') - -subproject('abc') - -get_option('abc:foo') diff --git a/test cases/failing/56 getoption prefix/subprojects/abc/meson.build b/test cases/failing/56 getoption prefix/subprojects/abc/meson.build deleted file mode 100644 index aa9c3df..0000000 --- a/test cases/failing/56 getoption prefix/subprojects/abc/meson.build +++ /dev/null @@ -1 +0,0 @@ -project('abc', 'c') diff --git a/test cases/failing/56 getoption prefix/subprojects/abc/meson_options.txt b/test cases/failing/56 getoption prefix/subprojects/abc/meson_options.txt deleted file mode 100644 index 89e624e..0000000 --- a/test cases/failing/56 getoption prefix/subprojects/abc/meson_options.txt +++ /dev/null @@ -1 +0,0 @@ -option('foo', type : 'boolean') diff --git a/test cases/failing/56 getoption prefix/test.json b/test cases/failing/56 getoption prefix/test.json deleted file mode 100644 index c52dffc..0000000 --- a/test cases/failing/56 getoption prefix/test.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "stdout": [ - { - "line": "test cases/failing/56 getoption prefix/meson.build:5:0: ERROR: Having a colon in option name is forbidden, projects are not allowed to directly access options of other subprojects." - } - ] -} diff --git a/test cases/failing/57 bad option argument/meson.build b/test cases/failing/57 bad option argument/meson.build deleted file mode 100644 index 5219cfb..0000000 --- a/test cases/failing/57 bad option argument/meson.build +++ /dev/null @@ -1,3 +0,0 @@ -project('bad option') - -get_option('name') diff --git a/test cases/failing/57 bad option argument/meson_options.txt b/test cases/failing/57 bad option argument/meson_options.txt deleted file mode 100644 index 0e0372b..0000000 --- a/test cases/failing/57 bad option argument/meson_options.txt +++ /dev/null @@ -1 +0,0 @@ -option('name', type : 'string', value_ : 'foo') diff --git a/test cases/failing/57 bad option argument/test.json b/test cases/failing/57 bad option argument/test.json deleted file mode 100644 index 622acdf..0000000 --- a/test cases/failing/57 bad option argument/test.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "stdout": [ - { - "line": "test cases/failing/57 bad option argument/meson_options.txt:1:0: ERROR: string option got unknown keyword arguments \"value_\"" - } - ] -} diff --git a/test cases/failing/57 subproj filegrab/meson.build b/test cases/failing/57 subproj filegrab/meson.build new file mode 100644 index 0000000..b5c484c --- /dev/null +++ b/test cases/failing/57 subproj filegrab/meson.build @@ -0,0 +1,5 @@ +project('mainproj') + +# Try to grab a file from a parent project. + +subproject('a') diff --git a/test cases/failing/57 subproj filegrab/prog.c b/test cases/failing/57 subproj filegrab/prog.c new file mode 100644 index 0000000..0314ff1 --- /dev/null +++ b/test cases/failing/57 subproj filegrab/prog.c @@ -0,0 +1 @@ +int main(int argc, char **argv) { return 0; } diff --git a/test cases/failing/57 subproj filegrab/subprojects/a/meson.build b/test cases/failing/57 subproj filegrab/subprojects/a/meson.build new file mode 100644 index 0000000..80b9888 --- /dev/null +++ b/test cases/failing/57 subproj filegrab/subprojects/a/meson.build @@ -0,0 +1,3 @@ +project('a', 'c') + +executable('prog', '../../prog.c') diff --git a/test cases/failing/57 subproj filegrab/test.json b/test cases/failing/57 subproj filegrab/test.json new file mode 100644 index 0000000..8b0b27f --- /dev/null +++ b/test cases/failing/57 subproj filegrab/test.json @@ -0,0 +1,7 @@ +{ + "stdout": [ + { + "line": "test cases/failing/57 subproj filegrab/subprojects/a/meson.build:3:0: ERROR: Sandbox violation: Tried to grab file prog.c outside current (sub)project." + } + ] +} diff --git a/test cases/failing/58 grab subproj/meson.build b/test cases/failing/58 grab subproj/meson.build new file mode 100644 index 0000000..30fc690 --- /dev/null +++ b/test cases/failing/58 grab subproj/meson.build @@ -0,0 +1,7 @@ +project('grabber', 'c') + +# Try to grab a file from a child subproject. + +subproject('foo') + +executable('foo', 'subprojects/foo/sub.c') diff --git a/test cases/failing/58 grab subproj/subprojects/foo/meson.build b/test cases/failing/58 grab subproj/subprojects/foo/meson.build new file mode 100644 index 0000000..b346f6d --- /dev/null +++ b/test cases/failing/58 grab subproj/subprojects/foo/meson.build @@ -0,0 +1,3 @@ +project('foo', 'c') + +message('I do nothing.') diff --git a/test cases/failing/58 grab subproj/subprojects/foo/sub.c b/test cases/failing/58 grab subproj/subprojects/foo/sub.c new file mode 100644 index 0000000..a94b1f5 --- /dev/null +++ b/test cases/failing/58 grab subproj/subprojects/foo/sub.c @@ -0,0 +1,6 @@ +#include + +int main(int argc, char **argv) { + printf("I am a subproject executable file.\n"); + return 0; +} diff --git a/test cases/failing/58 grab subproj/test.json b/test cases/failing/58 grab subproj/test.json new file mode 100644 index 0000000..bdb0fdf --- /dev/null +++ b/test cases/failing/58 grab subproj/test.json @@ -0,0 +1,7 @@ +{ + "stdout": [ + { + "line": "test cases/failing/58 grab subproj/meson.build:7:0: ERROR: Sandbox violation: Tried to grab file sub.c from a nested subproject." + } + ] +} diff --git a/test cases/failing/58 subproj filegrab/meson.build b/test cases/failing/58 subproj filegrab/meson.build deleted file mode 100644 index b5c484c..0000000 --- a/test cases/failing/58 subproj filegrab/meson.build +++ /dev/null @@ -1,5 +0,0 @@ -project('mainproj') - -# Try to grab a file from a parent project. - -subproject('a') diff --git a/test cases/failing/58 subproj filegrab/prog.c b/test cases/failing/58 subproj filegrab/prog.c deleted file mode 100644 index 0314ff1..0000000 --- a/test cases/failing/58 subproj filegrab/prog.c +++ /dev/null @@ -1 +0,0 @@ -int main(int argc, char **argv) { return 0; } diff --git a/test cases/failing/58 subproj filegrab/subprojects/a/meson.build b/test cases/failing/58 subproj filegrab/subprojects/a/meson.build deleted file mode 100644 index 80b9888..0000000 --- a/test cases/failing/58 subproj filegrab/subprojects/a/meson.build +++ /dev/null @@ -1,3 +0,0 @@ -project('a', 'c') - -executable('prog', '../../prog.c') diff --git a/test cases/failing/58 subproj filegrab/test.json b/test cases/failing/58 subproj filegrab/test.json deleted file mode 100644 index 950e109..0000000 --- a/test cases/failing/58 subproj filegrab/test.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "stdout": [ - { - "line": "test cases/failing/58 subproj filegrab/subprojects/a/meson.build:3:0: ERROR: Sandbox violation: Tried to grab file prog.c outside current (sub)project." - } - ] -} diff --git a/test cases/failing/59 grab sibling/meson.build b/test cases/failing/59 grab sibling/meson.build new file mode 100644 index 0000000..5ddc295 --- /dev/null +++ b/test cases/failing/59 grab sibling/meson.build @@ -0,0 +1,3 @@ +project('master') + +subproject('a') diff --git a/test cases/failing/59 grab sibling/subprojects/a/meson.build b/test cases/failing/59 grab sibling/subprojects/a/meson.build new file mode 100644 index 0000000..6dd9f61 --- /dev/null +++ b/test cases/failing/59 grab sibling/subprojects/a/meson.build @@ -0,0 +1,3 @@ +project('a', 'c') + +executable('sneaky', '../b/sneaky.c') diff --git a/test cases/failing/59 grab sibling/subprojects/b/meson.build b/test cases/failing/59 grab sibling/subprojects/b/meson.build new file mode 100644 index 0000000..57f261a --- /dev/null +++ b/test cases/failing/59 grab sibling/subprojects/b/meson.build @@ -0,0 +1,3 @@ +projecT('b') + +message('I do nothing.') diff --git a/test cases/failing/59 grab sibling/subprojects/b/sneaky.c b/test cases/failing/59 grab sibling/subprojects/b/sneaky.c new file mode 100644 index 0000000..46718c6 --- /dev/null +++ b/test cases/failing/59 grab sibling/subprojects/b/sneaky.c @@ -0,0 +1,6 @@ +#include + +int main(int argc, char **argv) { + printf("I can only come into existence via trickery.\n"); + return 0; +} diff --git a/test cases/failing/59 grab sibling/test.json b/test cases/failing/59 grab sibling/test.json new file mode 100644 index 0000000..ec17e7e --- /dev/null +++ b/test cases/failing/59 grab sibling/test.json @@ -0,0 +1,7 @@ +{ + "stdout": [ + { + "line": "test cases/failing/59 grab sibling/subprojects/a/meson.build:3:0: ERROR: Sandbox violation: Tried to grab file sneaky.c outside current (sub)project." + } + ] +} diff --git a/test cases/failing/59 grab subproj/meson.build b/test cases/failing/59 grab subproj/meson.build deleted file mode 100644 index 30fc690..0000000 --- a/test cases/failing/59 grab subproj/meson.build +++ /dev/null @@ -1,7 +0,0 @@ -project('grabber', 'c') - -# Try to grab a file from a child subproject. - -subproject('foo') - -executable('foo', 'subprojects/foo/sub.c') diff --git a/test cases/failing/59 grab subproj/subprojects/foo/meson.build b/test cases/failing/59 grab subproj/subprojects/foo/meson.build deleted file mode 100644 index b346f6d..0000000 --- a/test cases/failing/59 grab subproj/subprojects/foo/meson.build +++ /dev/null @@ -1,3 +0,0 @@ -project('foo', 'c') - -message('I do nothing.') diff --git a/test cases/failing/59 grab subproj/subprojects/foo/sub.c b/test cases/failing/59 grab subproj/subprojects/foo/sub.c deleted file mode 100644 index a94b1f5..0000000 --- a/test cases/failing/59 grab subproj/subprojects/foo/sub.c +++ /dev/null @@ -1,6 +0,0 @@ -#include - -int main(int argc, char **argv) { - printf("I am a subproject executable file.\n"); - return 0; -} diff --git a/test cases/failing/59 grab subproj/test.json b/test cases/failing/59 grab subproj/test.json deleted file mode 100644 index 7c90202..0000000 --- a/test cases/failing/59 grab subproj/test.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "stdout": [ - { - "line": "test cases/failing/59 grab subproj/meson.build:7:0: ERROR: Sandbox violation: Tried to grab file sub.c from a nested subproject." - } - ] -} diff --git a/test cases/failing/60 grab sibling/meson.build b/test cases/failing/60 grab sibling/meson.build deleted file mode 100644 index 5ddc295..0000000 --- a/test cases/failing/60 grab sibling/meson.build +++ /dev/null @@ -1,3 +0,0 @@ -project('master') - -subproject('a') diff --git a/test cases/failing/60 grab sibling/subprojects/a/meson.build b/test cases/failing/60 grab sibling/subprojects/a/meson.build deleted file mode 100644 index 6dd9f61..0000000 --- a/test cases/failing/60 grab sibling/subprojects/a/meson.build +++ /dev/null @@ -1,3 +0,0 @@ -project('a', 'c') - -executable('sneaky', '../b/sneaky.c') diff --git a/test cases/failing/60 grab sibling/subprojects/b/meson.build b/test cases/failing/60 grab sibling/subprojects/b/meson.build deleted file mode 100644 index 57f261a..0000000 --- a/test cases/failing/60 grab sibling/subprojects/b/meson.build +++ /dev/null @@ -1,3 +0,0 @@ -projecT('b') - -message('I do nothing.') diff --git a/test cases/failing/60 grab sibling/subprojects/b/sneaky.c b/test cases/failing/60 grab sibling/subprojects/b/sneaky.c deleted file mode 100644 index 46718c6..0000000 --- a/test cases/failing/60 grab sibling/subprojects/b/sneaky.c +++ /dev/null @@ -1,6 +0,0 @@ -#include - -int main(int argc, char **argv) { - printf("I can only come into existence via trickery.\n"); - return 0; -} diff --git a/test cases/failing/60 grab sibling/test.json b/test cases/failing/60 grab sibling/test.json deleted file mode 100644 index 8f42bad..0000000 --- a/test cases/failing/60 grab sibling/test.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "stdout": [ - { - "line": "test cases/failing/60 grab sibling/subprojects/a/meson.build:3:0: ERROR: Sandbox violation: Tried to grab file sneaky.c outside current (sub)project." - } - ] -} diff --git a/test cases/failing/60 string as link target/meson.build b/test cases/failing/60 string as link target/meson.build new file mode 100644 index 0000000..cb83fff --- /dev/null +++ b/test cases/failing/60 string as link target/meson.build @@ -0,0 +1,2 @@ +project('string as link argument', 'c') +executable('myprog', 'prog.c', link_with: [ '' ]) diff --git a/test cases/failing/60 string as link target/prog.c b/test cases/failing/60 string as link target/prog.c new file mode 100644 index 0000000..0314ff1 --- /dev/null +++ b/test cases/failing/60 string as link target/prog.c @@ -0,0 +1 @@ +int main(int argc, char **argv) { return 0; } diff --git a/test cases/failing/60 string as link target/test.json b/test cases/failing/60 string as link target/test.json new file mode 100644 index 0000000..a97b124 --- /dev/null +++ b/test cases/failing/60 string as link target/test.json @@ -0,0 +1,7 @@ +{ + "stdout": [ + { + "line": "test cases/failing/60 string as link target/meson.build:2:0: ERROR: '' is not a target." + } + ] +} diff --git a/test cases/failing/61 dependency not-found and required/meson.build b/test cases/failing/61 dependency not-found and required/meson.build new file mode 100644 index 0000000..1ce5747 --- /dev/null +++ b/test cases/failing/61 dependency not-found and required/meson.build @@ -0,0 +1,2 @@ +project('dep-test') +dep = dependency('', required:true) diff --git a/test cases/failing/61 dependency not-found and required/test.json b/test cases/failing/61 dependency not-found and required/test.json new file mode 100644 index 0000000..f7a6c9f --- /dev/null +++ b/test cases/failing/61 dependency not-found and required/test.json @@ -0,0 +1,7 @@ +{ + "stdout": [ + { + "line": "test cases/failing/61 dependency not-found and required/meson.build:2:6: ERROR: Dependency is required but has no candidates." + } + ] +} diff --git a/test cases/failing/61 string as link target/meson.build b/test cases/failing/61 string as link target/meson.build deleted file mode 100644 index cb83fff..0000000 --- a/test cases/failing/61 string as link target/meson.build +++ /dev/null @@ -1,2 +0,0 @@ -project('string as link argument', 'c') -executable('myprog', 'prog.c', link_with: [ '' ]) diff --git a/test cases/failing/61 string as link target/prog.c b/test cases/failing/61 string as link target/prog.c deleted file mode 100644 index 0314ff1..0000000 --- a/test cases/failing/61 string as link target/prog.c +++ /dev/null @@ -1 +0,0 @@ -int main(int argc, char **argv) { return 0; } diff --git a/test cases/failing/61 string as link target/test.json b/test cases/failing/61 string as link target/test.json deleted file mode 100644 index b7f6bd7..0000000 --- a/test cases/failing/61 string as link target/test.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "stdout": [ - { - "line": "test cases/failing/61 string as link target/meson.build:2:0: ERROR: '' is not a target." - } - ] -} diff --git a/test cases/failing/62 dependency not-found and required/meson.build b/test cases/failing/62 dependency not-found and required/meson.build deleted file mode 100644 index 1ce5747..0000000 --- a/test cases/failing/62 dependency not-found and required/meson.build +++ /dev/null @@ -1,2 +0,0 @@ -project('dep-test') -dep = dependency('', required:true) diff --git a/test cases/failing/62 dependency not-found and required/test.json b/test cases/failing/62 dependency not-found and required/test.json deleted file mode 100644 index 69a67ff..0000000 --- a/test cases/failing/62 dependency not-found and required/test.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "stdout": [ - { - "line": "test cases/failing/62 dependency not-found and required/meson.build:2:6: ERROR: Dependency is required but has no candidates." - } - ] -} diff --git a/test cases/failing/62 subproj different versions/main.c b/test cases/failing/62 subproj different versions/main.c new file mode 100644 index 0000000..8793c62 --- /dev/null +++ b/test cases/failing/62 subproj different versions/main.c @@ -0,0 +1,9 @@ +#include +#include "a.h" +#include "b.h" + +int main(int argc, char **argv) { + int life = a_fun() + b_fun(); + printf("%d\n", life); + return 0; +} diff --git a/test cases/failing/62 subproj different versions/meson.build b/test cases/failing/62 subproj different versions/meson.build new file mode 100644 index 0000000..e964e42 --- /dev/null +++ b/test cases/failing/62 subproj different versions/meson.build @@ -0,0 +1,9 @@ +project('super', 'c') + +# A will use version 1 of C +a_dep = dependency('a', fallback: ['a', 'a_dep']) + +# B will fail because it requests version 2 of C +b_dep = dependency('b', fallback: ['b', 'b_dep']) + +main = executable('main', files('main.c'), dependencies: [a_dep, b_dep]) diff --git a/test cases/failing/62 subproj different versions/subprojects/a/a.c b/test cases/failing/62 subproj different versions/subprojects/a/a.c new file mode 100644 index 0000000..cd41a65 --- /dev/null +++ b/test cases/failing/62 subproj different versions/subprojects/a/a.c @@ -0,0 +1,5 @@ +#include "c.h" + +int a_fun() { + return c_fun(); +} diff --git a/test cases/failing/62 subproj different versions/subprojects/a/a.h b/test cases/failing/62 subproj different versions/subprojects/a/a.h new file mode 100644 index 0000000..8f1d49e --- /dev/null +++ b/test cases/failing/62 subproj different versions/subprojects/a/a.h @@ -0,0 +1 @@ +int a_fun(); diff --git a/test cases/failing/62 subproj different versions/subprojects/a/meson.build b/test cases/failing/62 subproj different versions/subprojects/a/meson.build new file mode 100644 index 0000000..e84182a --- /dev/null +++ b/test cases/failing/62 subproj different versions/subprojects/a/meson.build @@ -0,0 +1,11 @@ +project('a', 'c') + +c_dep = dependency('c', version:'1', fallback: ['c', 'c_dep']) + +alib = library('a', 'a.c', + dependencies: c_dep) + +a_dep = declare_dependency( + link_with: alib, + include_directories: include_directories('.'), +) diff --git a/test cases/failing/62 subproj different versions/subprojects/b/b.c b/test cases/failing/62 subproj different versions/subprojects/b/b.c new file mode 100644 index 0000000..f85f8c3 --- /dev/null +++ b/test cases/failing/62 subproj different versions/subprojects/b/b.c @@ -0,0 +1,5 @@ +#include "c.h" + +int b_fun(){ +return c_fun(); +} diff --git a/test cases/failing/62 subproj different versions/subprojects/b/b.h b/test cases/failing/62 subproj different versions/subprojects/b/b.h new file mode 100644 index 0000000..eced786 --- /dev/null +++ b/test cases/failing/62 subproj different versions/subprojects/b/b.h @@ -0,0 +1 @@ +int b_fun(); diff --git a/test cases/failing/62 subproj different versions/subprojects/b/meson.build b/test cases/failing/62 subproj different versions/subprojects/b/meson.build new file mode 100644 index 0000000..0398340 --- /dev/null +++ b/test cases/failing/62 subproj different versions/subprojects/b/meson.build @@ -0,0 +1,11 @@ +project('b', 'c') + +c_dep = dependency('c', version:'2', fallback: ['c', 'c_dep']) + +blib = library('b', 'b.c', + dependencies: c_dep) + +b_dep = declare_dependency( + link_with: blib, + include_directories: include_directories('.'), +) diff --git a/test cases/failing/62 subproj different versions/subprojects/c/c.h b/test cases/failing/62 subproj different versions/subprojects/c/c.h new file mode 100644 index 0000000..2b15f60 --- /dev/null +++ b/test cases/failing/62 subproj different versions/subprojects/c/c.h @@ -0,0 +1,3 @@ +static int c_fun(){ + return 3; +} diff --git a/test cases/failing/62 subproj different versions/subprojects/c/meson.build b/test cases/failing/62 subproj different versions/subprojects/c/meson.build new file mode 100644 index 0000000..7184933 --- /dev/null +++ b/test cases/failing/62 subproj different versions/subprojects/c/meson.build @@ -0,0 +1,5 @@ +project('c', 'c', version:'1') + +c_dep = declare_dependency( + include_directories: include_directories('.') +) diff --git a/test cases/failing/62 subproj different versions/test.json b/test cases/failing/62 subproj different versions/test.json new file mode 100644 index 0000000..705ff51 --- /dev/null +++ b/test cases/failing/62 subproj different versions/test.json @@ -0,0 +1,7 @@ +{ + "stdout": [ + { + "line": "test cases/failing/62 subproj different versions/subprojects/b/meson.build:3:8: ERROR: Dependency 'c' is required but not found." + } + ] +} diff --git a/test cases/failing/63 subproj different versions/main.c b/test cases/failing/63 subproj different versions/main.c deleted file mode 100644 index 8793c62..0000000 --- a/test cases/failing/63 subproj different versions/main.c +++ /dev/null @@ -1,9 +0,0 @@ -#include -#include "a.h" -#include "b.h" - -int main(int argc, char **argv) { - int life = a_fun() + b_fun(); - printf("%d\n", life); - return 0; -} diff --git a/test cases/failing/63 subproj different versions/meson.build b/test cases/failing/63 subproj different versions/meson.build deleted file mode 100644 index e964e42..0000000 --- a/test cases/failing/63 subproj different versions/meson.build +++ /dev/null @@ -1,9 +0,0 @@ -project('super', 'c') - -# A will use version 1 of C -a_dep = dependency('a', fallback: ['a', 'a_dep']) - -# B will fail because it requests version 2 of C -b_dep = dependency('b', fallback: ['b', 'b_dep']) - -main = executable('main', files('main.c'), dependencies: [a_dep, b_dep]) diff --git a/test cases/failing/63 subproj different versions/subprojects/a/a.c b/test cases/failing/63 subproj different versions/subprojects/a/a.c deleted file mode 100644 index cd41a65..0000000 --- a/test cases/failing/63 subproj different versions/subprojects/a/a.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "c.h" - -int a_fun() { - return c_fun(); -} diff --git a/test cases/failing/63 subproj different versions/subprojects/a/a.h b/test cases/failing/63 subproj different versions/subprojects/a/a.h deleted file mode 100644 index 8f1d49e..0000000 --- a/test cases/failing/63 subproj different versions/subprojects/a/a.h +++ /dev/null @@ -1 +0,0 @@ -int a_fun(); diff --git a/test cases/failing/63 subproj different versions/subprojects/a/meson.build b/test cases/failing/63 subproj different versions/subprojects/a/meson.build deleted file mode 100644 index e84182a..0000000 --- a/test cases/failing/63 subproj different versions/subprojects/a/meson.build +++ /dev/null @@ -1,11 +0,0 @@ -project('a', 'c') - -c_dep = dependency('c', version:'1', fallback: ['c', 'c_dep']) - -alib = library('a', 'a.c', - dependencies: c_dep) - -a_dep = declare_dependency( - link_with: alib, - include_directories: include_directories('.'), -) diff --git a/test cases/failing/63 subproj different versions/subprojects/b/b.c b/test cases/failing/63 subproj different versions/subprojects/b/b.c deleted file mode 100644 index f85f8c3..0000000 --- a/test cases/failing/63 subproj different versions/subprojects/b/b.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "c.h" - -int b_fun(){ -return c_fun(); -} diff --git a/test cases/failing/63 subproj different versions/subprojects/b/b.h b/test cases/failing/63 subproj different versions/subprojects/b/b.h deleted file mode 100644 index eced786..0000000 --- a/test cases/failing/63 subproj different versions/subprojects/b/b.h +++ /dev/null @@ -1 +0,0 @@ -int b_fun(); diff --git a/test cases/failing/63 subproj different versions/subprojects/b/meson.build b/test cases/failing/63 subproj different versions/subprojects/b/meson.build deleted file mode 100644 index 0398340..0000000 --- a/test cases/failing/63 subproj different versions/subprojects/b/meson.build +++ /dev/null @@ -1,11 +0,0 @@ -project('b', 'c') - -c_dep = dependency('c', version:'2', fallback: ['c', 'c_dep']) - -blib = library('b', 'b.c', - dependencies: c_dep) - -b_dep = declare_dependency( - link_with: blib, - include_directories: include_directories('.'), -) diff --git a/test cases/failing/63 subproj different versions/subprojects/c/c.h b/test cases/failing/63 subproj different versions/subprojects/c/c.h deleted file mode 100644 index 2b15f60..0000000 --- a/test cases/failing/63 subproj different versions/subprojects/c/c.h +++ /dev/null @@ -1,3 +0,0 @@ -static int c_fun(){ - return 3; -} diff --git a/test cases/failing/63 subproj different versions/subprojects/c/meson.build b/test cases/failing/63 subproj different versions/subprojects/c/meson.build deleted file mode 100644 index 7184933..0000000 --- a/test cases/failing/63 subproj different versions/subprojects/c/meson.build +++ /dev/null @@ -1,5 +0,0 @@ -project('c', 'c', version:'1') - -c_dep = declare_dependency( - include_directories: include_directories('.') -) diff --git a/test cases/failing/63 subproj different versions/test.json b/test cases/failing/63 subproj different versions/test.json deleted file mode 100644 index f2535fa..0000000 --- a/test cases/failing/63 subproj different versions/test.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "stdout": [ - { - "line": "test cases/failing/63 subproj different versions/subprojects/b/meson.build:3:8: ERROR: Dependency 'c' is required but not found." - } - ] -} diff --git a/test cases/failing/63 wrong boost module/meson.build b/test cases/failing/63 wrong boost module/meson.build new file mode 100644 index 0000000..937e587 --- /dev/null +++ b/test cases/failing/63 wrong boost module/meson.build @@ -0,0 +1,9 @@ +project('boosttest', 'cpp', + default_options : ['cpp_std=c++11']) + +if not dependency('boost', required: false).found() + error('MESON_SKIP_TEST test requires boost') +endif + +# abc doesn't exist +linkdep = dependency('boost', modules : ['thread', 'system', 'test', 'abc']) diff --git a/test cases/failing/63 wrong boost module/test.json b/test cases/failing/63 wrong boost module/test.json new file mode 100644 index 0000000..ec3c1b0 --- /dev/null +++ b/test cases/failing/63 wrong boost module/test.json @@ -0,0 +1,7 @@ +{ + "stdout": [ + { + "line": "test cases/failing/63 wrong boost module/meson.build:9:10: ERROR: Dependency \"boost\" not found, tried system" + } + ] +} diff --git a/test cases/failing/64 install_data rename bad size/file1.txt b/test cases/failing/64 install_data rename bad size/file1.txt new file mode 100644 index 0000000..e69de29 diff --git a/test cases/failing/64 install_data rename bad size/file2.txt b/test cases/failing/64 install_data rename bad size/file2.txt new file mode 100644 index 0000000..e69de29 diff --git a/test cases/failing/64 install_data rename bad size/meson.build b/test cases/failing/64 install_data rename bad size/meson.build new file mode 100644 index 0000000..849bb9a --- /dev/null +++ b/test cases/failing/64 install_data rename bad size/meson.build @@ -0,0 +1,3 @@ +project('data install test') + +install_data(['file1.txt', 'file2.txt'], rename : 'just one name') diff --git a/test cases/failing/64 install_data rename bad size/test.json b/test cases/failing/64 install_data rename bad size/test.json new file mode 100644 index 0000000..5ed4748 --- /dev/null +++ b/test cases/failing/64 install_data rename bad size/test.json @@ -0,0 +1,7 @@ +{ + "stdout": [ + { + "line": "test cases/failing/64 install_data rename bad size/meson.build:3:0: ERROR: \"rename\" and \"sources\" argument lists must be the same length if \"rename\" is given. Rename has 1 elements and sources has 2." + } + ] +} diff --git a/test cases/failing/64 wrong boost module/meson.build b/test cases/failing/64 wrong boost module/meson.build deleted file mode 100644 index 937e587..0000000 --- a/test cases/failing/64 wrong boost module/meson.build +++ /dev/null @@ -1,9 +0,0 @@ -project('boosttest', 'cpp', - default_options : ['cpp_std=c++11']) - -if not dependency('boost', required: false).found() - error('MESON_SKIP_TEST test requires boost') -endif - -# abc doesn't exist -linkdep = dependency('boost', modules : ['thread', 'system', 'test', 'abc']) diff --git a/test cases/failing/64 wrong boost module/test.json b/test cases/failing/64 wrong boost module/test.json deleted file mode 100644 index 78e2069..0000000 --- a/test cases/failing/64 wrong boost module/test.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "stdout": [ - { - "line": "test cases/failing/64 wrong boost module/meson.build:9:10: ERROR: Dependency \"boost\" not found, tried system" - } - ] -} diff --git a/test cases/failing/65 install_data rename bad size/file1.txt b/test cases/failing/65 install_data rename bad size/file1.txt deleted file mode 100644 index e69de29..0000000 diff --git a/test cases/failing/65 install_data rename bad size/file2.txt b/test cases/failing/65 install_data rename bad size/file2.txt deleted file mode 100644 index e69de29..0000000 diff --git a/test cases/failing/65 install_data rename bad size/meson.build b/test cases/failing/65 install_data rename bad size/meson.build deleted file mode 100644 index 849bb9a..0000000 --- a/test cases/failing/65 install_data rename bad size/meson.build +++ /dev/null @@ -1,3 +0,0 @@ -project('data install test') - -install_data(['file1.txt', 'file2.txt'], rename : 'just one name') diff --git a/test cases/failing/65 install_data rename bad size/test.json b/test cases/failing/65 install_data rename bad size/test.json deleted file mode 100644 index efc6290..0000000 --- a/test cases/failing/65 install_data rename bad size/test.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "stdout": [ - { - "line": "test cases/failing/65 install_data rename bad size/meson.build:3:0: ERROR: \"rename\" and \"sources\" argument lists must be the same length if \"rename\" is given. Rename has 1 elements and sources has 2." - } - ] -} diff --git a/test cases/failing/65 skip only subdir/meson.build b/test cases/failing/65 skip only subdir/meson.build new file mode 100644 index 0000000..4832bd4 --- /dev/null +++ b/test cases/failing/65 skip only subdir/meson.build @@ -0,0 +1,8 @@ +# Check that skip_rest only exits subdir, not the whole script. +# Should create an error because main.cpp does not exists. +project('example exit', 'cpp') + +subdir('subdir') + +message('Good') +executable('main', 'main.cpp') diff --git a/test cases/failing/65 skip only subdir/subdir/meson.build b/test cases/failing/65 skip only subdir/subdir/meson.build new file mode 100644 index 0000000..1ba447b --- /dev/null +++ b/test cases/failing/65 skip only subdir/subdir/meson.build @@ -0,0 +1,3 @@ +subdir_done() + +error('Unreachable') diff --git a/test cases/failing/65 skip only subdir/test.json b/test cases/failing/65 skip only subdir/test.json new file mode 100644 index 0000000..2747566 --- /dev/null +++ b/test cases/failing/65 skip only subdir/test.json @@ -0,0 +1,7 @@ +{ + "stdout": [ + { + "line": "test cases/failing/65 skip only subdir/meson.build:8:0: ERROR: File main.cpp does not exist." + } + ] +} diff --git a/test cases/failing/66 dual override/meson.build b/test cases/failing/66 dual override/meson.build new file mode 100644 index 0000000..999b8bc --- /dev/null +++ b/test cases/failing/66 dual override/meson.build @@ -0,0 +1,5 @@ +project('yo dawg') + +p = find_program('overrides.py') +meson.override_find_program('override', p) +meson.override_find_program('override', p) diff --git a/test cases/failing/66 dual override/overrides.py b/test cases/failing/66 dual override/overrides.py new file mode 100644 index 0000000..49e9b7a --- /dev/null +++ b/test cases/failing/66 dual override/overrides.py @@ -0,0 +1,4 @@ +#!/usr/bin/env python3 + +print('Yo dawg, we put overrides in your overrides,') +print('so now you can override when you override.') diff --git a/test cases/failing/66 dual override/test.json b/test cases/failing/66 dual override/test.json new file mode 100644 index 0000000..b8c2651 --- /dev/null +++ b/test cases/failing/66 dual override/test.json @@ -0,0 +1,7 @@ +{ + "stdout": [ + { + "line": "test cases/failing/66 dual override/meson.build:5:6: ERROR: Tried to override executable \"override\" which has already been overridden." + } + ] +} diff --git a/test cases/failing/66 skip only subdir/meson.build b/test cases/failing/66 skip only subdir/meson.build deleted file mode 100644 index 4832bd4..0000000 --- a/test cases/failing/66 skip only subdir/meson.build +++ /dev/null @@ -1,8 +0,0 @@ -# Check that skip_rest only exits subdir, not the whole script. -# Should create an error because main.cpp does not exists. -project('example exit', 'cpp') - -subdir('subdir') - -message('Good') -executable('main', 'main.cpp') diff --git a/test cases/failing/66 skip only subdir/subdir/meson.build b/test cases/failing/66 skip only subdir/subdir/meson.build deleted file mode 100644 index 1ba447b..0000000 --- a/test cases/failing/66 skip only subdir/subdir/meson.build +++ /dev/null @@ -1,3 +0,0 @@ -subdir_done() - -error('Unreachable') diff --git a/test cases/failing/66 skip only subdir/test.json b/test cases/failing/66 skip only subdir/test.json deleted file mode 100644 index de21e00..0000000 --- a/test cases/failing/66 skip only subdir/test.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "stdout": [ - { - "line": "test cases/failing/66 skip only subdir/meson.build:8:0: ERROR: File main.cpp does not exist." - } - ] -} diff --git a/test cases/failing/67 dual override/meson.build b/test cases/failing/67 dual override/meson.build deleted file mode 100644 index 999b8bc..0000000 --- a/test cases/failing/67 dual override/meson.build +++ /dev/null @@ -1,5 +0,0 @@ -project('yo dawg') - -p = find_program('overrides.py') -meson.override_find_program('override', p) -meson.override_find_program('override', p) diff --git a/test cases/failing/67 dual override/overrides.py b/test cases/failing/67 dual override/overrides.py deleted file mode 100644 index 49e9b7a..0000000 --- a/test cases/failing/67 dual override/overrides.py +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env python3 - -print('Yo dawg, we put overrides in your overrides,') -print('so now you can override when you override.') diff --git a/test cases/failing/67 dual override/test.json b/test cases/failing/67 dual override/test.json deleted file mode 100644 index b50f3ac..0000000 --- a/test cases/failing/67 dual override/test.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "stdout": [ - { - "line": "test cases/failing/67 dual override/meson.build:5:6: ERROR: Tried to override executable \"override\" which has already been overridden." - } - ] -} diff --git a/test cases/failing/67 override used/meson.build b/test cases/failing/67 override used/meson.build new file mode 100644 index 0000000..582fc1b --- /dev/null +++ b/test cases/failing/67 override used/meson.build @@ -0,0 +1,5 @@ +project('override an already found exe') + +old = find_program('something.py') +replacement = find_program('other.py') +meson.override_find_program('something.py', replacement) diff --git a/test cases/failing/67 override used/other.py b/test cases/failing/67 override used/other.py new file mode 100755 index 0000000..f62ba96 --- /dev/null +++ b/test cases/failing/67 override used/other.py @@ -0,0 +1,3 @@ +#!/usr/bin/env python3 + +print('Doing something else.') diff --git a/test cases/failing/67 override used/something.py b/test cases/failing/67 override used/something.py new file mode 100755 index 0000000..64c9454 --- /dev/null +++ b/test cases/failing/67 override used/something.py @@ -0,0 +1,3 @@ +#!/usr/bin/env python3 + +print('Doing something.') diff --git a/test cases/failing/67 override used/test.json b/test cases/failing/67 override used/test.json new file mode 100644 index 0000000..90d8b4b --- /dev/null +++ b/test cases/failing/67 override used/test.json @@ -0,0 +1,7 @@ +{ + "stdout": [ + { + "line": "test cases/failing/67 override used/meson.build:5:6: ERROR: Tried to override finding of executable \"something.py\" which has already been found." + } + ] +} diff --git a/test cases/failing/68 override used/meson.build b/test cases/failing/68 override used/meson.build deleted file mode 100644 index 582fc1b..0000000 --- a/test cases/failing/68 override used/meson.build +++ /dev/null @@ -1,5 +0,0 @@ -project('override an already found exe') - -old = find_program('something.py') -replacement = find_program('other.py') -meson.override_find_program('something.py', replacement) diff --git a/test cases/failing/68 override used/other.py b/test cases/failing/68 override used/other.py deleted file mode 100755 index f62ba96..0000000 --- a/test cases/failing/68 override used/other.py +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env python3 - -print('Doing something else.') diff --git a/test cases/failing/68 override used/something.py b/test cases/failing/68 override used/something.py deleted file mode 100755 index 64c9454..0000000 --- a/test cases/failing/68 override used/something.py +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env python3 - -print('Doing something.') diff --git a/test cases/failing/68 override used/test.json b/test cases/failing/68 override used/test.json deleted file mode 100644 index f11aac6..0000000 --- a/test cases/failing/68 override used/test.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "stdout": [ - { - "line": "test cases/failing/68 override used/meson.build:5:6: ERROR: Tried to override finding of executable \"something.py\" which has already been found." - } - ] -} diff --git a/test cases/failing/68 run_command unclean exit/meson.build b/test cases/failing/68 run_command unclean exit/meson.build new file mode 100644 index 0000000..f6bf895 --- /dev/null +++ b/test cases/failing/68 run_command unclean exit/meson.build @@ -0,0 +1,4 @@ +project('run_command unclean exit') + +rcprog = find_program('./returncode.py') +run_command(rcprog, '1', check : true) diff --git a/test cases/failing/68 run_command unclean exit/returncode.py b/test cases/failing/68 run_command unclean exit/returncode.py new file mode 100755 index 0000000..84dbc5d --- /dev/null +++ b/test cases/failing/68 run_command unclean exit/returncode.py @@ -0,0 +1,4 @@ +#!/usr/bin/env python3 + +import sys +exit(int(sys.argv[1])) diff --git a/test cases/failing/68 run_command unclean exit/test.json b/test cases/failing/68 run_command unclean exit/test.json new file mode 100644 index 0000000..cef67e5 --- /dev/null +++ b/test cases/failing/68 run_command unclean exit/test.json @@ -0,0 +1,8 @@ +{ + "stdout": [ + { + "match": "re", + "line": "test cases/failing/68 run_command unclean exit/meson\\.build:4:0: ERROR: Command `.*['\"].*[\\\\/]test cases[\\\\/]failing[\\\\/]68 run_command unclean exit[\\\\/]\\.[\\\\/]returncode\\.py['\"] 1` failed with status 1\\." + } + ] +} diff --git a/test cases/failing/69 int literal leading zero/meson.build b/test cases/failing/69 int literal leading zero/meson.build new file mode 100644 index 0000000..87c776f --- /dev/null +++ b/test cases/failing/69 int literal leading zero/meson.build @@ -0,0 +1,5 @@ + +# This should fail. +# Decimal syntax is 123. +# Octal syntax is 0o123. +fail_0123 = 0123 diff --git a/test cases/failing/69 int literal leading zero/test.json b/test cases/failing/69 int literal leading zero/test.json new file mode 100644 index 0000000..200b569 --- /dev/null +++ b/test cases/failing/69 int literal leading zero/test.json @@ -0,0 +1,8 @@ +{ + "stdout": [ + { + "comment": "this error message is not very informative", + "line": "test cases/failing/69 int literal leading zero/meson.build:5:13: ERROR: Expecting eof got number." + } + ] +} diff --git a/test cases/failing/69 run_command unclean exit/meson.build b/test cases/failing/69 run_command unclean exit/meson.build deleted file mode 100644 index f6bf895..0000000 --- a/test cases/failing/69 run_command unclean exit/meson.build +++ /dev/null @@ -1,4 +0,0 @@ -project('run_command unclean exit') - -rcprog = find_program('./returncode.py') -run_command(rcprog, '1', check : true) diff --git a/test cases/failing/69 run_command unclean exit/returncode.py b/test cases/failing/69 run_command unclean exit/returncode.py deleted file mode 100755 index 84dbc5d..0000000 --- a/test cases/failing/69 run_command unclean exit/returncode.py +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env python3 - -import sys -exit(int(sys.argv[1])) diff --git a/test cases/failing/69 run_command unclean exit/test.json b/test cases/failing/69 run_command unclean exit/test.json deleted file mode 100644 index 96c2141..0000000 --- a/test cases/failing/69 run_command unclean exit/test.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "stdout": [ - { - "match": "re", - "line": "test cases/failing/69 run_command unclean exit/meson\\.build:4:0: ERROR: Command `.*['\"].*[\\\\/]test cases[\\\\/]failing[\\\\/]69 run_command unclean exit[\\\\/]\\.[\\\\/]returncode\\.py['\"] 1` failed with status 1\\." - } - ] -} diff --git a/test cases/failing/70 configuration immutable/input b/test cases/failing/70 configuration immutable/input new file mode 100644 index 0000000..e69de29 diff --git a/test cases/failing/70 configuration immutable/meson.build b/test cases/failing/70 configuration immutable/meson.build new file mode 100644 index 0000000..b6cac41 --- /dev/null +++ b/test cases/failing/70 configuration immutable/meson.build @@ -0,0 +1,12 @@ +project('configuration_data is immutable') + +a = configuration_data() + +configure_file( + configuration : a, + input : 'input', + output : 'output', +) + +still_immutable = a +still_immutable.set('hello', 'world') diff --git a/test cases/failing/70 configuration immutable/test.json b/test cases/failing/70 configuration immutable/test.json new file mode 100644 index 0000000..fc735fa --- /dev/null +++ b/test cases/failing/70 configuration immutable/test.json @@ -0,0 +1,7 @@ +{ + "stdout": [ + { + "line": "test cases/failing/70 configuration immutable/meson.build:12:16: ERROR: Can not set values on configuration object that has been used." + } + ] +} diff --git a/test cases/failing/70 int literal leading zero/meson.build b/test cases/failing/70 int literal leading zero/meson.build deleted file mode 100644 index 87c776f..0000000 --- a/test cases/failing/70 int literal leading zero/meson.build +++ /dev/null @@ -1,5 +0,0 @@ - -# This should fail. -# Decimal syntax is 123. -# Octal syntax is 0o123. -fail_0123 = 0123 diff --git a/test cases/failing/70 int literal leading zero/test.json b/test cases/failing/70 int literal leading zero/test.json deleted file mode 100644 index fafbf0d..0000000 --- a/test cases/failing/70 int literal leading zero/test.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "stdout": [ - { - "comment": "this error message is not very informative", - "line": "test cases/failing/70 int literal leading zero/meson.build:5:13: ERROR: Expecting eof got number." - } - ] -} diff --git a/test cases/failing/71 configuration immutable/input b/test cases/failing/71 configuration immutable/input deleted file mode 100644 index e69de29..0000000 diff --git a/test cases/failing/71 configuration immutable/meson.build b/test cases/failing/71 configuration immutable/meson.build deleted file mode 100644 index b6cac41..0000000 --- a/test cases/failing/71 configuration immutable/meson.build +++ /dev/null @@ -1,12 +0,0 @@ -project('configuration_data is immutable') - -a = configuration_data() - -configure_file( - configuration : a, - input : 'input', - output : 'output', -) - -still_immutable = a -still_immutable.set('hello', 'world') diff --git a/test cases/failing/71 configuration immutable/test.json b/test cases/failing/71 configuration immutable/test.json deleted file mode 100644 index af1a65d..0000000 --- a/test cases/failing/71 configuration immutable/test.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "stdout": [ - { - "line": "test cases/failing/71 configuration immutable/meson.build:12:16: ERROR: Can not set values on configuration object that has been used." - } - ] -} diff --git a/test cases/failing/71 link with shared module on osx/meson.build b/test cases/failing/71 link with shared module on osx/meson.build new file mode 100644 index 0000000..bf18b36 --- /dev/null +++ b/test cases/failing/71 link with shared module on osx/meson.build @@ -0,0 +1,8 @@ +project('link with shared module', 'c') + +if host_machine.system() != 'darwin' + error('MESON_SKIP_TEST test only fails on OSX') +endif + +m = shared_module('mymodule', 'module.c') +e = executable('prog', 'prog.c', link_with : m) diff --git a/test cases/failing/71 link with shared module on osx/module.c b/test cases/failing/71 link with shared module on osx/module.c new file mode 100644 index 0000000..81b0d5a --- /dev/null +++ b/test cases/failing/71 link with shared module on osx/module.c @@ -0,0 +1,3 @@ +int func(void) { + return 1496; +} diff --git a/test cases/failing/71 link with shared module on osx/prog.c b/test cases/failing/71 link with shared module on osx/prog.c new file mode 100644 index 0000000..8164d8d --- /dev/null +++ b/test cases/failing/71 link with shared module on osx/prog.c @@ -0,0 +1,4 @@ + +int main(int argc, char **argv) { + return func(); +} diff --git a/test cases/failing/71 link with shared module on osx/test.json b/test cases/failing/71 link with shared module on osx/test.json new file mode 100644 index 0000000..206d429 --- /dev/null +++ b/test cases/failing/71 link with shared module on osx/test.json @@ -0,0 +1,7 @@ +{ + "stdout": [ + { + "line": "test cases/failing/71 link with shared module on osx/meson.build:8:4: ERROR: target prog links against shared module mymodule. This is not permitted on OSX" + } + ] +} diff --git a/test cases/failing/72 link with shared module on osx/meson.build b/test cases/failing/72 link with shared module on osx/meson.build deleted file mode 100644 index bf18b36..0000000 --- a/test cases/failing/72 link with shared module on osx/meson.build +++ /dev/null @@ -1,8 +0,0 @@ -project('link with shared module', 'c') - -if host_machine.system() != 'darwin' - error('MESON_SKIP_TEST test only fails on OSX') -endif - -m = shared_module('mymodule', 'module.c') -e = executable('prog', 'prog.c', link_with : m) diff --git a/test cases/failing/72 link with shared module on osx/module.c b/test cases/failing/72 link with shared module on osx/module.c deleted file mode 100644 index 81b0d5a..0000000 --- a/test cases/failing/72 link with shared module on osx/module.c +++ /dev/null @@ -1,3 +0,0 @@ -int func(void) { - return 1496; -} diff --git a/test cases/failing/72 link with shared module on osx/prog.c b/test cases/failing/72 link with shared module on osx/prog.c deleted file mode 100644 index 8164d8d..0000000 --- a/test cases/failing/72 link with shared module on osx/prog.c +++ /dev/null @@ -1,4 +0,0 @@ - -int main(int argc, char **argv) { - return func(); -} diff --git a/test cases/failing/72 link with shared module on osx/test.json b/test cases/failing/72 link with shared module on osx/test.json deleted file mode 100644 index 1a2d78c..0000000 --- a/test cases/failing/72 link with shared module on osx/test.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "stdout": [ - { - "line": "test cases/failing/72 link with shared module on osx/meson.build:8:4: ERROR: target prog links against shared module mymodule. This is not permitted on OSX" - } - ] -} diff --git a/test cases/failing/72 non-ascii in ascii encoded configure file/config9.h.in b/test cases/failing/72 non-ascii in ascii encoded configure file/config9.h.in new file mode 100644 index 0000000..323bec6 --- /dev/null +++ b/test cases/failing/72 non-ascii in ascii encoded configure file/config9.h.in @@ -0,0 +1 @@ +#define MESSAGE "@var@" diff --git a/test cases/failing/72 non-ascii in ascii encoded configure file/meson.build b/test cases/failing/72 non-ascii in ascii encoded configure file/meson.build new file mode 100644 index 0000000..eadb627 --- /dev/null +++ b/test cases/failing/72 non-ascii in ascii encoded configure file/meson.build @@ -0,0 +1,10 @@ +project('non-ascii to ascii encoding') +# Writing a non-ASCII character with a ASCII encoding should fail +conf9 = configuration_data() +conf9.set('var', 'д') +configure_file( + input : 'config9.h.in', + output : '@BASENAME@', + encoding : 'ascii', + configuration : conf9 +) diff --git a/test cases/failing/72 non-ascii in ascii encoded configure file/test.json b/test cases/failing/72 non-ascii in ascii encoded configure file/test.json new file mode 100644 index 0000000..1dc0b91 --- /dev/null +++ b/test cases/failing/72 non-ascii in ascii encoded configure file/test.json @@ -0,0 +1,8 @@ +{ + "stdout": [ + { + "match": "re", + "line": "test cases/failing/72 non-ascii in ascii encoded configure file/meson\\.build:5:0: ERROR: Could not write output file .*[\\\\/]config9\\.h: 'ascii' codec can't encode character '\\\\u0434' in position 17: ordinal not in range\\(128\\)" + } + ] +} diff --git a/test cases/failing/73 non-ascii in ascii encoded configure file/config9.h.in b/test cases/failing/73 non-ascii in ascii encoded configure file/config9.h.in deleted file mode 100644 index 323bec6..0000000 --- a/test cases/failing/73 non-ascii in ascii encoded configure file/config9.h.in +++ /dev/null @@ -1 +0,0 @@ -#define MESSAGE "@var@" diff --git a/test cases/failing/73 non-ascii in ascii encoded configure file/meson.build b/test cases/failing/73 non-ascii in ascii encoded configure file/meson.build deleted file mode 100644 index eadb627..0000000 --- a/test cases/failing/73 non-ascii in ascii encoded configure file/meson.build +++ /dev/null @@ -1,10 +0,0 @@ -project('non-ascii to ascii encoding') -# Writing a non-ASCII character with a ASCII encoding should fail -conf9 = configuration_data() -conf9.set('var', 'д') -configure_file( - input : 'config9.h.in', - output : '@BASENAME@', - encoding : 'ascii', - configuration : conf9 -) diff --git a/test cases/failing/73 non-ascii in ascii encoded configure file/test.json b/test cases/failing/73 non-ascii in ascii encoded configure file/test.json deleted file mode 100644 index 63f5bef..0000000 --- a/test cases/failing/73 non-ascii in ascii encoded configure file/test.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "stdout": [ - { - "match": "re", - "line": "test cases/failing/73 non-ascii in ascii encoded configure file/meson\\.build:5:0: ERROR: Could not write output file .*[\\\\/]config9\\.h: 'ascii' codec can't encode character '\\\\u0434' in position 17: ordinal not in range\\(128\\)" - } - ] -} diff --git a/test cases/failing/73 subproj dependency not-found and required/meson.build b/test cases/failing/73 subproj dependency not-found and required/meson.build new file mode 100644 index 0000000..c5a2961 --- /dev/null +++ b/test cases/failing/73 subproj dependency not-found and required/meson.build @@ -0,0 +1,2 @@ +project('dep-test') +missing = dependency('', fallback: ['missing', 'missing_dep'], required: true) diff --git a/test cases/failing/73 subproj dependency not-found and required/test.json b/test cases/failing/73 subproj dependency not-found and required/test.json new file mode 100644 index 0000000..11ab031 --- /dev/null +++ b/test cases/failing/73 subproj dependency not-found and required/test.json @@ -0,0 +1,7 @@ +{ + "stdout": [ + { + "line": "test cases/failing/73 subproj dependency not-found and required/meson.build:2:10: ERROR: Neither a subproject directory nor a missing.wrap file was found." + } + ] +} diff --git a/test cases/failing/74 subproj dependency not-found and required/meson.build b/test cases/failing/74 subproj dependency not-found and required/meson.build deleted file mode 100644 index c5a2961..0000000 --- a/test cases/failing/74 subproj dependency not-found and required/meson.build +++ /dev/null @@ -1,2 +0,0 @@ -project('dep-test') -missing = dependency('', fallback: ['missing', 'missing_dep'], required: true) diff --git a/test cases/failing/74 subproj dependency not-found and required/test.json b/test cases/failing/74 subproj dependency not-found and required/test.json deleted file mode 100644 index 997bc56..0000000 --- a/test cases/failing/74 subproj dependency not-found and required/test.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "stdout": [ - { - "line": "test cases/failing/74 subproj dependency not-found and required/meson.build:2:10: ERROR: Neither a subproject directory nor a missing.wrap file was found." - } - ] -} diff --git a/test cases/failing/74 unfound run/meson.build b/test cases/failing/74 unfound run/meson.build new file mode 100644 index 0000000..3f37e9a --- /dev/null +++ b/test cases/failing/74 unfound run/meson.build @@ -0,0 +1,4 @@ +project('unfound runtarget') + +exe = find_program('nonexisting_prog', required : false) +run_target('invoke_fail', command : [exe]) diff --git a/test cases/failing/74 unfound run/test.json b/test cases/failing/74 unfound run/test.json new file mode 100644 index 0000000..8d31785 --- /dev/null +++ b/test cases/failing/74 unfound run/test.json @@ -0,0 +1,7 @@ +{ + "stdout": [ + { + "line": "test cases/failing/74 unfound run/meson.build:4:0: ERROR: Tried to use non-existing executable 'nonexisting_prog'" + } + ] +} diff --git a/test cases/failing/75 framework dependency with version/meson.build b/test cases/failing/75 framework dependency with version/meson.build new file mode 100644 index 0000000..ee315eb --- /dev/null +++ b/test cases/failing/75 framework dependency with version/meson.build @@ -0,0 +1,8 @@ +project('framework dependency with version', 'c') + +if host_machine.system() != 'darwin' + error('MESON_SKIP_TEST test only applicable on darwin') +endif + +# do individual frameworks have a meaningful version to test? And multiple frameworks might be listed... +dep = dependency('appleframeworks', modules: 'Foundation', version: '>0') diff --git a/test cases/failing/75 framework dependency with version/test.json b/test cases/failing/75 framework dependency with version/test.json new file mode 100644 index 0000000..8a01356 --- /dev/null +++ b/test cases/failing/75 framework dependency with version/test.json @@ -0,0 +1,7 @@ +{ + "stdout": [ + { + "line": "test cases/failing/75 framework dependency with version/meson.build:8:6: ERROR: Dependency lookup for appleframeworks with method 'framework' failed: Unknown version, but need ['>0']." + } + ] +} diff --git a/test cases/failing/75 unfound run/meson.build b/test cases/failing/75 unfound run/meson.build deleted file mode 100644 index 3f37e9a..0000000 --- a/test cases/failing/75 unfound run/meson.build +++ /dev/null @@ -1,4 +0,0 @@ -project('unfound runtarget') - -exe = find_program('nonexisting_prog', required : false) -run_target('invoke_fail', command : [exe]) diff --git a/test cases/failing/75 unfound run/test.json b/test cases/failing/75 unfound run/test.json deleted file mode 100644 index 855c2a4..0000000 --- a/test cases/failing/75 unfound run/test.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "stdout": [ - { - "line": "test cases/failing/75 unfound run/meson.build:4:0: ERROR: Tried to use non-existing executable 'nonexisting_prog'" - } - ] -} diff --git a/test cases/failing/76 framework dependency with version/meson.build b/test cases/failing/76 framework dependency with version/meson.build deleted file mode 100644 index ee315eb..0000000 --- a/test cases/failing/76 framework dependency with version/meson.build +++ /dev/null @@ -1,8 +0,0 @@ -project('framework dependency with version', 'c') - -if host_machine.system() != 'darwin' - error('MESON_SKIP_TEST test only applicable on darwin') -endif - -# do individual frameworks have a meaningful version to test? And multiple frameworks might be listed... -dep = dependency('appleframeworks', modules: 'Foundation', version: '>0') diff --git a/test cases/failing/76 framework dependency with version/test.json b/test cases/failing/76 framework dependency with version/test.json deleted file mode 100644 index 07b4a6e..0000000 --- a/test cases/failing/76 framework dependency with version/test.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "stdout": [ - { - "line": "test cases/failing/76 framework dependency with version/meson.build:8:6: ERROR: Dependency lookup for appleframeworks with method 'framework' failed: Unknown version, but need ['>0']." - } - ] -} diff --git a/test cases/failing/76 override exe config/foo.c b/test cases/failing/76 override exe config/foo.c new file mode 100644 index 0000000..03b2213 --- /dev/null +++ b/test cases/failing/76 override exe config/foo.c @@ -0,0 +1,3 @@ +int main(void) { + return 0; +} diff --git a/test cases/failing/76 override exe config/meson.build b/test cases/failing/76 override exe config/meson.build new file mode 100644 index 0000000..a5d0924 --- /dev/null +++ b/test cases/failing/76 override exe config/meson.build @@ -0,0 +1,6 @@ +project('myexe', 'c') + +foo = executable('foo', 'foo.c') +meson.override_find_program('bar', foo) +bar = find_program('bar') +run_command(bar, check: true) diff --git a/test cases/failing/76 override exe config/test.json b/test cases/failing/76 override exe config/test.json new file mode 100644 index 0000000..23b9055 --- /dev/null +++ b/test cases/failing/76 override exe config/test.json @@ -0,0 +1,7 @@ +{ + "stdout": [ + { + "line": "test cases/failing/76 override exe config/meson.build:6:0: ERROR: Program 'bar' was overridden with the compiled executable 'foo' and therefore cannot be used during configuration" + } + ] +} diff --git a/test cases/failing/77 gl dependency with version/meson.build b/test cases/failing/77 gl dependency with version/meson.build new file mode 100644 index 0000000..0127093 --- /dev/null +++ b/test cases/failing/77 gl dependency with version/meson.build @@ -0,0 +1,9 @@ +project('gl dependency with version', 'c') + +host_system = host_machine.system() +if host_system != 'windows' and host_system != 'darwin' + error('MESON_SKIP_TEST: test only fails on Windows and OSX') +endif + +# gl dependency found via system method doesn't have a meaningful version to check +dep = dependency('gl', method: 'system', version: '>0') diff --git a/test cases/failing/77 gl dependency with version/test.json b/test cases/failing/77 gl dependency with version/test.json new file mode 100644 index 0000000..83665cb --- /dev/null +++ b/test cases/failing/77 gl dependency with version/test.json @@ -0,0 +1,7 @@ +{ + "stdout": [ + { + "line": "test cases/failing/77 gl dependency with version/meson.build:9:6: ERROR: Dependency lookup for gl with method 'system' failed: Unknown version, but need ['>0']." + } + ] +} diff --git a/test cases/failing/77 override exe config/foo.c b/test cases/failing/77 override exe config/foo.c deleted file mode 100644 index 03b2213..0000000 --- a/test cases/failing/77 override exe config/foo.c +++ /dev/null @@ -1,3 +0,0 @@ -int main(void) { - return 0; -} diff --git a/test cases/failing/77 override exe config/meson.build b/test cases/failing/77 override exe config/meson.build deleted file mode 100644 index a5d0924..0000000 --- a/test cases/failing/77 override exe config/meson.build +++ /dev/null @@ -1,6 +0,0 @@ -project('myexe', 'c') - -foo = executable('foo', 'foo.c') -meson.override_find_program('bar', foo) -bar = find_program('bar') -run_command(bar, check: true) diff --git a/test cases/failing/77 override exe config/test.json b/test cases/failing/77 override exe config/test.json deleted file mode 100644 index a0dd7ae..0000000 --- a/test cases/failing/77 override exe config/test.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "stdout": [ - { - "line": "test cases/failing/77 override exe config/meson.build:6:0: ERROR: Program 'bar' was overridden with the compiled executable 'foo' and therefore cannot be used during configuration" - } - ] -} diff --git a/test cases/failing/78 gl dependency with version/meson.build b/test cases/failing/78 gl dependency with version/meson.build deleted file mode 100644 index 0127093..0000000 --- a/test cases/failing/78 gl dependency with version/meson.build +++ /dev/null @@ -1,9 +0,0 @@ -project('gl dependency with version', 'c') - -host_system = host_machine.system() -if host_system != 'windows' and host_system != 'darwin' - error('MESON_SKIP_TEST: test only fails on Windows and OSX') -endif - -# gl dependency found via system method doesn't have a meaningful version to check -dep = dependency('gl', method: 'system', version: '>0') diff --git a/test cases/failing/78 gl dependency with version/test.json b/test cases/failing/78 gl dependency with version/test.json deleted file mode 100644 index fbd9ff9..0000000 --- a/test cases/failing/78 gl dependency with version/test.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "stdout": [ - { - "line": "test cases/failing/78 gl dependency with version/meson.build:9:6: ERROR: Dependency lookup for gl with method 'system' failed: Unknown version, but need ['>0']." - } - ] -} diff --git a/test cases/failing/78 threads dependency with version/meson.build b/test cases/failing/78 threads dependency with version/meson.build new file mode 100644 index 0000000..6023fae --- /dev/null +++ b/test cases/failing/78 threads dependency with version/meson.build @@ -0,0 +1,3 @@ +project('threads dependency with version', 'c') +# threads dependency doesn't have a meaningful version to check +dep = dependency('threads', version: '>0') diff --git a/test cases/failing/78 threads dependency with version/test.json b/test cases/failing/78 threads dependency with version/test.json new file mode 100644 index 0000000..ec02c2b --- /dev/null +++ b/test cases/failing/78 threads dependency with version/test.json @@ -0,0 +1,7 @@ +{ + "stdout": [ + { + "line": "test cases/failing/78 threads dependency with version/meson.build:3:6: ERROR: Dependency lookup for threads with method 'system' failed: Unknown version, but need ['>0']." + } + ] +} diff --git a/test cases/failing/79 gtest dependency with version/meson.build b/test cases/failing/79 gtest dependency with version/meson.build new file mode 100644 index 0000000..efbffe1 --- /dev/null +++ b/test cases/failing/79 gtest dependency with version/meson.build @@ -0,0 +1,8 @@ +project('gtest dependency with version', 'cpp') + +if not dependency('gtest', method: 'system', required: false).found() + error('MESON_SKIP_TEST test requires gtest') +endif + +# discovering gtest version is not yet implemented +dep = dependency('gtest', method: 'system', version: '>0') diff --git a/test cases/failing/79 gtest dependency with version/test.json b/test cases/failing/79 gtest dependency with version/test.json new file mode 100644 index 0000000..a32a3c2 --- /dev/null +++ b/test cases/failing/79 gtest dependency with version/test.json @@ -0,0 +1,7 @@ +{ + "stdout": [ + { + "line": "test cases/failing/79 gtest dependency with version/meson.build:8:6: ERROR: Dependency 'gtest' is required but not found." + } + ] +} diff --git a/test cases/failing/79 threads dependency with version/meson.build b/test cases/failing/79 threads dependency with version/meson.build deleted file mode 100644 index 6023fae..0000000 --- a/test cases/failing/79 threads dependency with version/meson.build +++ /dev/null @@ -1,3 +0,0 @@ -project('threads dependency with version', 'c') -# threads dependency doesn't have a meaningful version to check -dep = dependency('threads', version: '>0') diff --git a/test cases/failing/79 threads dependency with version/test.json b/test cases/failing/79 threads dependency with version/test.json deleted file mode 100644 index 890695b..0000000 --- a/test cases/failing/79 threads dependency with version/test.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "stdout": [ - { - "line": "test cases/failing/79 threads dependency with version/meson.build:3:6: ERROR: Dependency lookup for threads with method 'system' failed: Unknown version, but need ['>0']." - } - ] -} diff --git a/test cases/failing/80 dub library/meson.build b/test cases/failing/80 dub library/meson.build new file mode 100644 index 0000000..306d5b3 --- /dev/null +++ b/test cases/failing/80 dub library/meson.build @@ -0,0 +1,11 @@ +project('dub') + +if not add_languages('d', required: false) + error('MESON_SKIP_TEST test requires D compiler') +endif + +if not find_program('dub', required: false).found() + error('MESON_SKIP_TEST test requires dub') +endif + +dependency('dubtestproject', method: 'dub') # Not library (none) diff --git a/test cases/failing/80 dub library/test.json b/test cases/failing/80 dub library/test.json new file mode 100644 index 0000000..d3c7d42 --- /dev/null +++ b/test cases/failing/80 dub library/test.json @@ -0,0 +1,7 @@ +{ + "stdout": [ + { + "line": "test cases/failing/80 dub library/meson.build:11:0: ERROR: Dependency \"dubtestproject\" not found" + } + ] +} diff --git a/test cases/failing/80 gtest dependency with version/meson.build b/test cases/failing/80 gtest dependency with version/meson.build deleted file mode 100644 index efbffe1..0000000 --- a/test cases/failing/80 gtest dependency with version/meson.build +++ /dev/null @@ -1,8 +0,0 @@ -project('gtest dependency with version', 'cpp') - -if not dependency('gtest', method: 'system', required: false).found() - error('MESON_SKIP_TEST test requires gtest') -endif - -# discovering gtest version is not yet implemented -dep = dependency('gtest', method: 'system', version: '>0') diff --git a/test cases/failing/80 gtest dependency with version/test.json b/test cases/failing/80 gtest dependency with version/test.json deleted file mode 100644 index 3f9934d..0000000 --- a/test cases/failing/80 gtest dependency with version/test.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "stdout": [ - { - "line": "test cases/failing/80 gtest dependency with version/meson.build:8:6: ERROR: Dependency 'gtest' is required but not found." - } - ] -} diff --git a/test cases/failing/81 dub executable/meson.build b/test cases/failing/81 dub executable/meson.build new file mode 100644 index 0000000..9a134ea --- /dev/null +++ b/test cases/failing/81 dub executable/meson.build @@ -0,0 +1,11 @@ +project('dub') + +if not add_languages('d', required: false) + error('MESON_SKIP_TEST test requires D compiler') +endif + +if not find_program('dub', required: false).found() + error('MESON_SKIP_TEST test requires dub') +endif + +dependency('dubtestproject:test1', method: 'dub') # Not library (executable) diff --git a/test cases/failing/81 dub executable/test.json b/test cases/failing/81 dub executable/test.json new file mode 100644 index 0000000..8aefa17 --- /dev/null +++ b/test cases/failing/81 dub executable/test.json @@ -0,0 +1,7 @@ +{ + "stdout": [ + { + "line": "test cases/failing/81 dub executable/meson.build:11:0: ERROR: Dependency \"dubtestproject:test1\" not found" + } + ] +} diff --git a/test cases/failing/81 dub library/meson.build b/test cases/failing/81 dub library/meson.build deleted file mode 100644 index 306d5b3..0000000 --- a/test cases/failing/81 dub library/meson.build +++ /dev/null @@ -1,11 +0,0 @@ -project('dub') - -if not add_languages('d', required: false) - error('MESON_SKIP_TEST test requires D compiler') -endif - -if not find_program('dub', required: false).found() - error('MESON_SKIP_TEST test requires dub') -endif - -dependency('dubtestproject', method: 'dub') # Not library (none) diff --git a/test cases/failing/81 dub library/test.json b/test cases/failing/81 dub library/test.json deleted file mode 100644 index 2db91ee..0000000 --- a/test cases/failing/81 dub library/test.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "stdout": [ - { - "line": "test cases/failing/81 dub library/meson.build:11:0: ERROR: Dependency \"dubtestproject\" not found" - } - ] -} diff --git a/test cases/failing/82 dub compiler/meson.build b/test cases/failing/82 dub compiler/meson.build new file mode 100644 index 0000000..36f1849 --- /dev/null +++ b/test cases/failing/82 dub compiler/meson.build @@ -0,0 +1,17 @@ +project('dub') + +if not add_languages('d', required: false) + error('MESON_SKIP_TEST test requires D compiler') +endif + +if meson.get_compiler('d').get_id() == 'dmd' + if host_machine.system() == 'windows' or host_machine.system() == 'cygwin' + error('MESON_SKIP_TEST Windows test environment lacks multiple D compilers.') + endif +endif + +if not find_program('dub', required: false).found() + error('MESON_SKIP_TEST test requires dub') +endif + +dependency('dubtestproject:test2', method: 'dub') # Compiler mismatch diff --git a/test cases/failing/82 dub compiler/test.json b/test cases/failing/82 dub compiler/test.json new file mode 100644 index 0000000..89d1882 --- /dev/null +++ b/test cases/failing/82 dub compiler/test.json @@ -0,0 +1,19 @@ +{ + "matrix": { + "options": { + "warning_level": [ + { + "val": "1", + "skip_on_env": [ + "SINGLE_DUB_COMPILER" + ] + } + ] + } + }, + "stdout": [ + { + "line": "test cases/failing/82 dub compiler/meson.build:17:0: ERROR: Dependency \"dubtestproject:test2\" not found" + } + ] +} diff --git a/test cases/failing/82 dub executable/meson.build b/test cases/failing/82 dub executable/meson.build deleted file mode 100644 index 9a134ea..0000000 --- a/test cases/failing/82 dub executable/meson.build +++ /dev/null @@ -1,11 +0,0 @@ -project('dub') - -if not add_languages('d', required: false) - error('MESON_SKIP_TEST test requires D compiler') -endif - -if not find_program('dub', required: false).found() - error('MESON_SKIP_TEST test requires dub') -endif - -dependency('dubtestproject:test1', method: 'dub') # Not library (executable) diff --git a/test cases/failing/82 dub executable/test.json b/test cases/failing/82 dub executable/test.json deleted file mode 100644 index 8ae46b8..0000000 --- a/test cases/failing/82 dub executable/test.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "stdout": [ - { - "line": "test cases/failing/82 dub executable/meson.build:11:0: ERROR: Dependency \"dubtestproject:test1\" not found" - } - ] -} diff --git a/test cases/failing/83 dub compiler/meson.build b/test cases/failing/83 dub compiler/meson.build deleted file mode 100644 index 36f1849..0000000 --- a/test cases/failing/83 dub compiler/meson.build +++ /dev/null @@ -1,17 +0,0 @@ -project('dub') - -if not add_languages('d', required: false) - error('MESON_SKIP_TEST test requires D compiler') -endif - -if meson.get_compiler('d').get_id() == 'dmd' - if host_machine.system() == 'windows' or host_machine.system() == 'cygwin' - error('MESON_SKIP_TEST Windows test environment lacks multiple D compilers.') - endif -endif - -if not find_program('dub', required: false).found() - error('MESON_SKIP_TEST test requires dub') -endif - -dependency('dubtestproject:test2', method: 'dub') # Compiler mismatch diff --git a/test cases/failing/83 dub compiler/test.json b/test cases/failing/83 dub compiler/test.json deleted file mode 100644 index 07241d2..0000000 --- a/test cases/failing/83 dub compiler/test.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "matrix": { - "options": { - "warning_level": [ - { - "val": "1", - "skip_on_env": [ - "SINGLE_DUB_COMPILER" - ] - } - ] - } - }, - "stdout": [ - { - "line": "test cases/failing/83 dub compiler/meson.build:17:0: ERROR: Dependency \"dubtestproject:test2\" not found" - } - ] -} diff --git a/test cases/failing/83 subproj not-found dep/meson.build b/test cases/failing/83 subproj not-found dep/meson.build new file mode 100644 index 0000000..2b17df1 --- /dev/null +++ b/test cases/failing/83 subproj not-found dep/meson.build @@ -0,0 +1,2 @@ +project('dep-test') +missing = dependency('', fallback: ['somesubproj', 'notfound_dep'], required: true) diff --git a/test cases/failing/83 subproj not-found dep/subprojects/somesubproj/meson.build b/test cases/failing/83 subproj not-found dep/subprojects/somesubproj/meson.build new file mode 100644 index 0000000..5f451f4 --- /dev/null +++ b/test cases/failing/83 subproj not-found dep/subprojects/somesubproj/meson.build @@ -0,0 +1,3 @@ +project('dep', 'c') + +notfound_dep = dependency('', required : false) diff --git a/test cases/failing/83 subproj not-found dep/test.json b/test cases/failing/83 subproj not-found dep/test.json new file mode 100644 index 0000000..5da4fb9 --- /dev/null +++ b/test cases/failing/83 subproj not-found dep/test.json @@ -0,0 +1,7 @@ +{ + "stdout": [ + { + "line": "test cases/failing/83 subproj not-found dep/meson.build:2:10: ERROR: Dependency '(anonymous)' is required but not found." + } + ] +} diff --git a/test cases/failing/84 invalid configure file/input b/test cases/failing/84 invalid configure file/input new file mode 100644 index 0000000..e69de29 diff --git a/test cases/failing/84 invalid configure file/meson.build b/test cases/failing/84 invalid configure file/meson.build new file mode 100644 index 0000000..08eca2b --- /dev/null +++ b/test cases/failing/84 invalid configure file/meson.build @@ -0,0 +1,9 @@ +project('invalid configura file') + +configure_file( + configuration : configuration_data(), + input : 'input', + output : 'output', + install_dir : '', + install : true, +) diff --git a/test cases/failing/84 invalid configure file/test.json b/test cases/failing/84 invalid configure file/test.json new file mode 100644 index 0000000..2b7a745 --- /dev/null +++ b/test cases/failing/84 invalid configure file/test.json @@ -0,0 +1,7 @@ +{ + "stdout": [ + { + "line": "test cases/failing/84 invalid configure file/meson.build:3:0: ERROR: \"install_dir\" must be specified when \"install\" in a configure_file is true" + } + ] +} diff --git a/test cases/failing/84 subproj not-found dep/meson.build b/test cases/failing/84 subproj not-found dep/meson.build deleted file mode 100644 index 2b17df1..0000000 --- a/test cases/failing/84 subproj not-found dep/meson.build +++ /dev/null @@ -1,2 +0,0 @@ -project('dep-test') -missing = dependency('', fallback: ['somesubproj', 'notfound_dep'], required: true) diff --git a/test cases/failing/84 subproj not-found dep/subprojects/somesubproj/meson.build b/test cases/failing/84 subproj not-found dep/subprojects/somesubproj/meson.build deleted file mode 100644 index 5f451f4..0000000 --- a/test cases/failing/84 subproj not-found dep/subprojects/somesubproj/meson.build +++ /dev/null @@ -1,3 +0,0 @@ -project('dep', 'c') - -notfound_dep = dependency('', required : false) diff --git a/test cases/failing/84 subproj not-found dep/test.json b/test cases/failing/84 subproj not-found dep/test.json deleted file mode 100644 index bea1ed0..0000000 --- a/test cases/failing/84 subproj not-found dep/test.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "stdout": [ - { - "line": "test cases/failing/84 subproj not-found dep/meson.build:2:10: ERROR: Dependency '(anonymous)' is required but not found." - } - ] -} diff --git a/test cases/failing/85 invalid configure file/input b/test cases/failing/85 invalid configure file/input deleted file mode 100644 index e69de29..0000000 diff --git a/test cases/failing/85 invalid configure file/meson.build b/test cases/failing/85 invalid configure file/meson.build deleted file mode 100644 index 08eca2b..0000000 --- a/test cases/failing/85 invalid configure file/meson.build +++ /dev/null @@ -1,9 +0,0 @@ -project('invalid configura file') - -configure_file( - configuration : configuration_data(), - input : 'input', - output : 'output', - install_dir : '', - install : true, -) diff --git a/test cases/failing/85 invalid configure file/test.json b/test cases/failing/85 invalid configure file/test.json deleted file mode 100644 index 1cee208..0000000 --- a/test cases/failing/85 invalid configure file/test.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "stdout": [ - { - "line": "test cases/failing/85 invalid configure file/meson.build:3:0: ERROR: \"install_dir\" must be specified when \"install\" in a configure_file is true" - } - ] -} diff --git a/test cases/failing/85 kwarg dupe/meson.build b/test cases/failing/85 kwarg dupe/meson.build new file mode 100644 index 0000000..06821a2 --- /dev/null +++ b/test cases/failing/85 kwarg dupe/meson.build @@ -0,0 +1,6 @@ +project('dupe kwarg', 'c') + +dupedict = {'install': true} + +executable('prog', 'prog.c', install: true, + kwargs: dupedict) diff --git a/test cases/failing/85 kwarg dupe/prog.c b/test cases/failing/85 kwarg dupe/prog.c new file mode 100644 index 0000000..5f3fbe6 --- /dev/null +++ b/test cases/failing/85 kwarg dupe/prog.c @@ -0,0 +1,6 @@ +#include + +int main(int argc, char **argv) { + printf("I don't get built. It makes me saaaaaad. :(\n"); + return 0; +} diff --git a/test cases/failing/85 kwarg dupe/test.json b/test cases/failing/85 kwarg dupe/test.json new file mode 100644 index 0000000..99719ad --- /dev/null +++ b/test cases/failing/85 kwarg dupe/test.json @@ -0,0 +1,7 @@ +{ + "stdout": [ + { + "line": "test cases/failing/85 kwarg dupe/meson.build:6:2: ERROR: Entry \"install\" defined both as a keyword argument and in a \"kwarg\" entry." + } + ] +} diff --git a/test cases/failing/86 kwarg dupe/meson.build b/test cases/failing/86 kwarg dupe/meson.build deleted file mode 100644 index 06821a2..0000000 --- a/test cases/failing/86 kwarg dupe/meson.build +++ /dev/null @@ -1,6 +0,0 @@ -project('dupe kwarg', 'c') - -dupedict = {'install': true} - -executable('prog', 'prog.c', install: true, - kwargs: dupedict) diff --git a/test cases/failing/86 kwarg dupe/prog.c b/test cases/failing/86 kwarg dupe/prog.c deleted file mode 100644 index 5f3fbe6..0000000 --- a/test cases/failing/86 kwarg dupe/prog.c +++ /dev/null @@ -1,6 +0,0 @@ -#include - -int main(int argc, char **argv) { - printf("I don't get built. It makes me saaaaaad. :(\n"); - return 0; -} diff --git a/test cases/failing/86 kwarg dupe/test.json b/test cases/failing/86 kwarg dupe/test.json deleted file mode 100644 index 229debb..0000000 --- a/test cases/failing/86 kwarg dupe/test.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "stdout": [ - { - "line": "test cases/failing/86 kwarg dupe/meson.build:6:2: ERROR: Entry \"install\" defined both as a keyword argument and in a \"kwarg\" entry." - } - ] -} diff --git a/test cases/failing/86 missing pch file/meson.build b/test cases/failing/86 missing pch file/meson.build new file mode 100644 index 0000000..a67b798 --- /dev/null +++ b/test cases/failing/86 missing pch file/meson.build @@ -0,0 +1,3 @@ +project('pch test', 'c') +exe = executable('prog', 'prog.c', +c_pch : ['pch/prog_pch.c', 'pch/prog.h']) diff --git a/test cases/failing/86 missing pch file/prog.c b/test cases/failing/86 missing pch file/prog.c new file mode 100644 index 0000000..11b7fad --- /dev/null +++ b/test cases/failing/86 missing pch file/prog.c @@ -0,0 +1,3 @@ +int main(int argc, char **argv) { + return 0; +} diff --git a/test cases/failing/86 missing pch file/test.json b/test cases/failing/86 missing pch file/test.json new file mode 100644 index 0000000..d6a50c2 --- /dev/null +++ b/test cases/failing/86 missing pch file/test.json @@ -0,0 +1,8 @@ +{ + "stdout": [ + { + "comment": "literal 'pch/prog.h' from meson.build appears in output, irrespective of os.path.sep", + "line": "test cases/failing/86 missing pch file/meson.build:2:6: ERROR: File pch/prog.h does not exist." + } + ] +} diff --git a/test cases/failing/87 missing pch file/meson.build b/test cases/failing/87 missing pch file/meson.build deleted file mode 100644 index a67b798..0000000 --- a/test cases/failing/87 missing pch file/meson.build +++ /dev/null @@ -1,3 +0,0 @@ -project('pch test', 'c') -exe = executable('prog', 'prog.c', -c_pch : ['pch/prog_pch.c', 'pch/prog.h']) diff --git a/test cases/failing/87 missing pch file/prog.c b/test cases/failing/87 missing pch file/prog.c deleted file mode 100644 index 11b7fad..0000000 --- a/test cases/failing/87 missing pch file/prog.c +++ /dev/null @@ -1,3 +0,0 @@ -int main(int argc, char **argv) { - return 0; -} diff --git a/test cases/failing/87 missing pch file/test.json b/test cases/failing/87 missing pch file/test.json deleted file mode 100644 index a54acb7..0000000 --- a/test cases/failing/87 missing pch file/test.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "stdout": [ - { - "comment": "literal 'pch/prog.h' from meson.build appears in output, irrespective of os.path.sep", - "line": "test cases/failing/87 missing pch file/meson.build:2:6: ERROR: File pch/prog.h does not exist." - } - ] -} diff --git a/test cases/failing/87 pch source different folder/include/pch.h b/test cases/failing/87 pch source different folder/include/pch.h new file mode 100644 index 0000000..e69de29 diff --git a/test cases/failing/87 pch source different folder/meson.build b/test cases/failing/87 pch source different folder/meson.build new file mode 100644 index 0000000..d320717 --- /dev/null +++ b/test cases/failing/87 pch source different folder/meson.build @@ -0,0 +1,5 @@ +project('pch', 'c') +# It is not allowed to have the PCH implementation in a different +# folder than the header. +exe = executable('prog', 'prog.c', + c_pch : ['include/pch.h', 'src/pch.c']) diff --git a/test cases/failing/87 pch source different folder/prog.c b/test cases/failing/87 pch source different folder/prog.c new file mode 100644 index 0000000..3fb1295 --- /dev/null +++ b/test cases/failing/87 pch source different folder/prog.c @@ -0,0 +1 @@ +int main(void) {} \ No newline at end of file diff --git a/test cases/failing/87 pch source different folder/src/pch.c b/test cases/failing/87 pch source different folder/src/pch.c new file mode 100644 index 0000000..e69de29 diff --git a/test cases/failing/87 pch source different folder/test.json b/test cases/failing/87 pch source different folder/test.json new file mode 100644 index 0000000..0a9d39d --- /dev/null +++ b/test cases/failing/87 pch source different folder/test.json @@ -0,0 +1,7 @@ +{ + "stdout": [ + { + "line": "test cases/failing/87 pch source different folder/meson.build:4:6: ERROR: PCH files must be stored in the same folder." + } + ] +} diff --git a/test cases/failing/88 pch source different folder/include/pch.h b/test cases/failing/88 pch source different folder/include/pch.h deleted file mode 100644 index e69de29..0000000 diff --git a/test cases/failing/88 pch source different folder/meson.build b/test cases/failing/88 pch source different folder/meson.build deleted file mode 100644 index d320717..0000000 --- a/test cases/failing/88 pch source different folder/meson.build +++ /dev/null @@ -1,5 +0,0 @@ -project('pch', 'c') -# It is not allowed to have the PCH implementation in a different -# folder than the header. -exe = executable('prog', 'prog.c', - c_pch : ['include/pch.h', 'src/pch.c']) diff --git a/test cases/failing/88 pch source different folder/prog.c b/test cases/failing/88 pch source different folder/prog.c deleted file mode 100644 index 3fb1295..0000000 --- a/test cases/failing/88 pch source different folder/prog.c +++ /dev/null @@ -1 +0,0 @@ -int main(void) {} \ No newline at end of file diff --git a/test cases/failing/88 pch source different folder/src/pch.c b/test cases/failing/88 pch source different folder/src/pch.c deleted file mode 100644 index e69de29..0000000 diff --git a/test cases/failing/88 pch source different folder/test.json b/test cases/failing/88 pch source different folder/test.json deleted file mode 100644 index 60fa4e0..0000000 --- a/test cases/failing/88 pch source different folder/test.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "stdout": [ - { - "line": "test cases/failing/88 pch source different folder/meson.build:4:6: ERROR: PCH files must be stored in the same folder." - } - ] -} diff --git a/test cases/failing/88 unknown config tool/meson.build b/test cases/failing/88 unknown config tool/meson.build new file mode 100644 index 0000000..536976e --- /dev/null +++ b/test cases/failing/88 unknown config tool/meson.build @@ -0,0 +1,2 @@ +project('no-such-config-tool') +dependency('no-such-config-tool', method:'config-tool') diff --git a/test cases/failing/88 unknown config tool/test.json b/test cases/failing/88 unknown config tool/test.json new file mode 100644 index 0000000..5a53b26 --- /dev/null +++ b/test cases/failing/88 unknown config tool/test.json @@ -0,0 +1,7 @@ +{ + "stdout": [ + { + "line": "test cases/failing/88 unknown config tool/meson.build:2:0: ERROR: Dependency \"no-such-config-tool\" not found" + } + ] +} diff --git a/test cases/failing/89 custom target install data/Info.plist.cpp b/test cases/failing/89 custom target install data/Info.plist.cpp new file mode 100644 index 0000000..9ca2fcb --- /dev/null +++ b/test cases/failing/89 custom target install data/Info.plist.cpp @@ -0,0 +1 @@ +Some data which gets processed before installation diff --git a/test cases/failing/89 custom target install data/meson.build b/test cases/failing/89 custom target install data/meson.build new file mode 100644 index 0000000..00d348c --- /dev/null +++ b/test cases/failing/89 custom target install data/meson.build @@ -0,0 +1,11 @@ +project('custom target install data') + +preproc = find_program('preproc.py') + +t = custom_target('Info.plist', + command: [preproc, '@INPUT@', '@OUTPUT@'], + input: 'Info.plist.cpp', + output: 'Info.plist', +) + +install_data(t) diff --git a/test cases/failing/89 custom target install data/preproc.py b/test cases/failing/89 custom target install data/preproc.py new file mode 100644 index 0000000..e6eba4c --- /dev/null +++ b/test cases/failing/89 custom target install data/preproc.py @@ -0,0 +1,13 @@ +#!/usr/bin/env python3 + +import sys + +if len(sys.argv) != 3: + print(sys.argv[0], '', '') + +inf = sys.argv[1] +outf = sys.argv[2] + +with open(outf, 'wb') as o: + with open(inf, 'rb') as i: + o.write(i.read()) diff --git a/test cases/failing/89 custom target install data/test.json b/test cases/failing/89 custom target install data/test.json new file mode 100644 index 0000000..3364a6a --- /dev/null +++ b/test cases/failing/89 custom target install data/test.json @@ -0,0 +1,7 @@ +{ + "stdout": [ + { + "line": "test cases/failing/89 custom target install data/meson.build:11:0: ERROR: install_data argument 1 was of type \"CustomTarget\" but should have been one of: \"str\", \"File\"" + } + ] +} diff --git a/test cases/failing/89 unknown config tool/meson.build b/test cases/failing/89 unknown config tool/meson.build deleted file mode 100644 index 536976e..0000000 --- a/test cases/failing/89 unknown config tool/meson.build +++ /dev/null @@ -1,2 +0,0 @@ -project('no-such-config-tool') -dependency('no-such-config-tool', method:'config-tool') diff --git a/test cases/failing/89 unknown config tool/test.json b/test cases/failing/89 unknown config tool/test.json deleted file mode 100644 index f5c0d96..0000000 --- a/test cases/failing/89 unknown config tool/test.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "stdout": [ - { - "line": "test cases/failing/89 unknown config tool/meson.build:2:0: ERROR: Dependency \"no-such-config-tool\" not found" - } - ] -} diff --git a/test cases/failing/90 add dict non string key/meson.build b/test cases/failing/90 add dict non string key/meson.build new file mode 100644 index 0000000..c81a3f7 --- /dev/null +++ b/test cases/failing/90 add dict non string key/meson.build @@ -0,0 +1,9 @@ +project('add dictionary entry using non-string key') + +dict = {} + +# An integer variable to be used as a key +key = 1 + +# Add new entry using integer variable as key should fail +dict += {key : 'myValue'} \ No newline at end of file diff --git a/test cases/failing/90 add dict non string key/test.json b/test cases/failing/90 add dict non string key/test.json new file mode 100644 index 0000000..822e09f --- /dev/null +++ b/test cases/failing/90 add dict non string key/test.json @@ -0,0 +1,7 @@ +{ + "stdout": [ + { + "line": "test cases/failing/90 add dict non string key/meson.build:9:9: ERROR: Key must be a string" + } + ] +} diff --git a/test cases/failing/90 custom target install data/Info.plist.cpp b/test cases/failing/90 custom target install data/Info.plist.cpp deleted file mode 100644 index 9ca2fcb..0000000 --- a/test cases/failing/90 custom target install data/Info.plist.cpp +++ /dev/null @@ -1 +0,0 @@ -Some data which gets processed before installation diff --git a/test cases/failing/90 custom target install data/meson.build b/test cases/failing/90 custom target install data/meson.build deleted file mode 100644 index 00d348c..0000000 --- a/test cases/failing/90 custom target install data/meson.build +++ /dev/null @@ -1,11 +0,0 @@ -project('custom target install data') - -preproc = find_program('preproc.py') - -t = custom_target('Info.plist', - command: [preproc, '@INPUT@', '@OUTPUT@'], - input: 'Info.plist.cpp', - output: 'Info.plist', -) - -install_data(t) diff --git a/test cases/failing/90 custom target install data/preproc.py b/test cases/failing/90 custom target install data/preproc.py deleted file mode 100644 index e6eba4c..0000000 --- a/test cases/failing/90 custom target install data/preproc.py +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env python3 - -import sys - -if len(sys.argv) != 3: - print(sys.argv[0], '', '') - -inf = sys.argv[1] -outf = sys.argv[2] - -with open(outf, 'wb') as o: - with open(inf, 'rb') as i: - o.write(i.read()) diff --git a/test cases/failing/90 custom target install data/test.json b/test cases/failing/90 custom target install data/test.json deleted file mode 100644 index d495163..0000000 --- a/test cases/failing/90 custom target install data/test.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "stdout": [ - { - "line": "test cases/failing/90 custom target install data/meson.build:11:0: ERROR: install_data argument 1 was of type \"CustomTarget\" but should have been one of: \"str\", \"File\"" - } - ] -} diff --git a/test cases/failing/91 add dict duplicate keys/meson.build b/test cases/failing/91 add dict duplicate keys/meson.build new file mode 100644 index 0000000..7a9b523 --- /dev/null +++ b/test cases/failing/91 add dict duplicate keys/meson.build @@ -0,0 +1,9 @@ +project('add dictionary entries with duplicate keys') + +dict = {} + +# A variable to be used as a key +key = 'myKey' + +# Add two entries with duplicate keys should fail +dict += {key : 'myValue1', key : 'myValue2'} \ No newline at end of file diff --git a/test cases/failing/91 add dict duplicate keys/test.json b/test cases/failing/91 add dict duplicate keys/test.json new file mode 100644 index 0000000..b6941e7 --- /dev/null +++ b/test cases/failing/91 add dict duplicate keys/test.json @@ -0,0 +1,7 @@ +{ + "stdout": [ + { + "line": "test cases/failing/91 add dict duplicate keys/meson.build:9:27: ERROR: Duplicate dictionary key: myKey" + } + ] +} diff --git a/test cases/failing/91 add dict non string key/meson.build b/test cases/failing/91 add dict non string key/meson.build deleted file mode 100644 index c81a3f7..0000000 --- a/test cases/failing/91 add dict non string key/meson.build +++ /dev/null @@ -1,9 +0,0 @@ -project('add dictionary entry using non-string key') - -dict = {} - -# An integer variable to be used as a key -key = 1 - -# Add new entry using integer variable as key should fail -dict += {key : 'myValue'} \ No newline at end of file diff --git a/test cases/failing/91 add dict non string key/test.json b/test cases/failing/91 add dict non string key/test.json deleted file mode 100644 index db506b2..0000000 --- a/test cases/failing/91 add dict non string key/test.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "stdout": [ - { - "line": "test cases/failing/91 add dict non string key/meson.build:9:9: ERROR: Key must be a string" - } - ] -} diff --git a/test cases/failing/92 add dict duplicate keys/meson.build b/test cases/failing/92 add dict duplicate keys/meson.build deleted file mode 100644 index 7a9b523..0000000 --- a/test cases/failing/92 add dict duplicate keys/meson.build +++ /dev/null @@ -1,9 +0,0 @@ -project('add dictionary entries with duplicate keys') - -dict = {} - -# A variable to be used as a key -key = 'myKey' - -# Add two entries with duplicate keys should fail -dict += {key : 'myValue1', key : 'myValue2'} \ No newline at end of file diff --git a/test cases/failing/92 add dict duplicate keys/test.json b/test cases/failing/92 add dict duplicate keys/test.json deleted file mode 100644 index b428a53..0000000 --- a/test cases/failing/92 add dict duplicate keys/test.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "stdout": [ - { - "line": "test cases/failing/92 add dict duplicate keys/meson.build:9:27: ERROR: Duplicate dictionary key: myKey" - } - ] -} diff --git a/test cases/failing/92 no host get_external_property/meson.build b/test cases/failing/92 no host get_external_property/meson.build new file mode 100644 index 0000000..c956754 --- /dev/null +++ b/test cases/failing/92 no host get_external_property/meson.build @@ -0,0 +1,3 @@ +project('missing property') + +message(meson.get_external_property('nonexisting')) diff --git a/test cases/failing/92 no host get_external_property/test.json b/test cases/failing/92 no host get_external_property/test.json new file mode 100644 index 0000000..0f7a803 --- /dev/null +++ b/test cases/failing/92 no host get_external_property/test.json @@ -0,0 +1,7 @@ +{ + "stdout": [ + { + "line": "test cases/failing/92 no host get_external_property/meson.build:3:14: ERROR: Unknown property for host machine: nonexisting" + } + ] +} diff --git a/test cases/failing/93 no host get_external_property/meson.build b/test cases/failing/93 no host get_external_property/meson.build deleted file mode 100644 index c956754..0000000 --- a/test cases/failing/93 no host get_external_property/meson.build +++ /dev/null @@ -1,3 +0,0 @@ -project('missing property') - -message(meson.get_external_property('nonexisting')) diff --git a/test cases/failing/93 no host get_external_property/test.json b/test cases/failing/93 no host get_external_property/test.json deleted file mode 100644 index b26f3c9..0000000 --- a/test cases/failing/93 no host get_external_property/test.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "stdout": [ - { - "line": "test cases/failing/93 no host get_external_property/meson.build:3:14: ERROR: Unknown property for host machine: nonexisting" - } - ] -} diff --git a/test cases/failing/93 no native compiler/main.c b/test cases/failing/93 no native compiler/main.c new file mode 100644 index 0000000..9b6bdc2 --- /dev/null +++ b/test cases/failing/93 no native compiler/main.c @@ -0,0 +1,3 @@ +int main(void) { + return 0; +} diff --git a/test cases/failing/93 no native compiler/meson.build b/test cases/failing/93 no native compiler/meson.build new file mode 100644 index 0000000..f0126ac --- /dev/null +++ b/test cases/failing/93 no native compiler/meson.build @@ -0,0 +1,12 @@ +project('no native compiler') + +if not meson.is_cross_build() + error('MESON_SKIP_TEST test only applicable when cross building.') +endif + +if add_languages('c', required: false, native: true) + error('MESON_SKIP_TEST test only applicable when native compiler not available.') +endif + +add_languages('c') +executable('main', 'main.c', native: true) diff --git a/test cases/failing/93 no native compiler/test.json b/test cases/failing/93 no native compiler/test.json new file mode 100644 index 0000000..adf99f1 --- /dev/null +++ b/test cases/failing/93 no native compiler/test.json @@ -0,0 +1,7 @@ +{ + "stdout": [ + { + "line": "test cases/failing/93 no native compiler/meson.build:12:0: ERROR: No host machine compiler for \"main.c\"" + } + ] +} diff --git a/test cases/failing/94 no native compiler/main.c b/test cases/failing/94 no native compiler/main.c deleted file mode 100644 index 9b6bdc2..0000000 --- a/test cases/failing/94 no native compiler/main.c +++ /dev/null @@ -1,3 +0,0 @@ -int main(void) { - return 0; -} diff --git a/test cases/failing/94 no native compiler/meson.build b/test cases/failing/94 no native compiler/meson.build deleted file mode 100644 index f0126ac..0000000 --- a/test cases/failing/94 no native compiler/meson.build +++ /dev/null @@ -1,12 +0,0 @@ -project('no native compiler') - -if not meson.is_cross_build() - error('MESON_SKIP_TEST test only applicable when cross building.') -endif - -if add_languages('c', required: false, native: true) - error('MESON_SKIP_TEST test only applicable when native compiler not available.') -endif - -add_languages('c') -executable('main', 'main.c', native: true) diff --git a/test cases/failing/94 no native compiler/test.json b/test cases/failing/94 no native compiler/test.json deleted file mode 100644 index 7181c6b..0000000 --- a/test cases/failing/94 no native compiler/test.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "stdout": [ - { - "line": "test cases/failing/94 no native compiler/meson.build:12:0: ERROR: No host machine compiler for \"main.c\"" - } - ] -} diff --git a/test cases/failing/94 subdir parse error/meson.build b/test cases/failing/94 subdir parse error/meson.build new file mode 100644 index 0000000..a744396 --- /dev/null +++ b/test cases/failing/94 subdir parse error/meson.build @@ -0,0 +1,2 @@ +project('subdir false plusassign') +subdir('subdir') diff --git a/test cases/failing/94 subdir parse error/subdir/meson.build b/test cases/failing/94 subdir parse error/subdir/meson.build new file mode 100644 index 0000000..3ac5ef9 --- /dev/null +++ b/test cases/failing/94 subdir parse error/subdir/meson.build @@ -0,0 +1 @@ +3 += 4 diff --git a/test cases/failing/94 subdir parse error/test.json b/test cases/failing/94 subdir parse error/test.json new file mode 100644 index 0000000..0bf82c1 --- /dev/null +++ b/test cases/failing/94 subdir parse error/test.json @@ -0,0 +1,7 @@ +{ + "stdout": [ + { + "line": "test cases/failing/94 subdir parse error/subdir/meson.build:1:0: ERROR: Plusassignment target must be an id." + } + ] +} diff --git a/test cases/failing/95 invalid option file/meson.build b/test cases/failing/95 invalid option file/meson.build new file mode 100644 index 0000000..b0347c3 --- /dev/null +++ b/test cases/failing/95 invalid option file/meson.build @@ -0,0 +1 @@ +project('invalid option file') diff --git a/test cases/failing/95 invalid option file/meson_options.txt b/test cases/failing/95 invalid option file/meson_options.txt new file mode 100644 index 0000000..eef843b --- /dev/null +++ b/test cases/failing/95 invalid option file/meson_options.txt @@ -0,0 +1 @@ +' diff --git a/test cases/failing/95 invalid option file/test.json b/test cases/failing/95 invalid option file/test.json new file mode 100644 index 0000000..073ac67 --- /dev/null +++ b/test cases/failing/95 invalid option file/test.json @@ -0,0 +1,7 @@ +{ + "stdout": [ + { + "line": "test cases/failing/95 invalid option file/meson_options.txt:1:0: ERROR: lexer" + } + ] +} diff --git a/test cases/failing/95 subdir parse error/meson.build b/test cases/failing/95 subdir parse error/meson.build deleted file mode 100644 index a744396..0000000 --- a/test cases/failing/95 subdir parse error/meson.build +++ /dev/null @@ -1,2 +0,0 @@ -project('subdir false plusassign') -subdir('subdir') diff --git a/test cases/failing/95 subdir parse error/subdir/meson.build b/test cases/failing/95 subdir parse error/subdir/meson.build deleted file mode 100644 index 3ac5ef9..0000000 --- a/test cases/failing/95 subdir parse error/subdir/meson.build +++ /dev/null @@ -1 +0,0 @@ -3 += 4 diff --git a/test cases/failing/95 subdir parse error/test.json b/test cases/failing/95 subdir parse error/test.json deleted file mode 100644 index c94ed58..0000000 --- a/test cases/failing/95 subdir parse error/test.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "stdout": [ - { - "line": "test cases/failing/95 subdir parse error/subdir/meson.build:1:0: ERROR: Plusassignment target must be an id." - } - ] -} diff --git a/test cases/failing/96 invalid option file/meson.build b/test cases/failing/96 invalid option file/meson.build deleted file mode 100644 index b0347c3..0000000 --- a/test cases/failing/96 invalid option file/meson.build +++ /dev/null @@ -1 +0,0 @@ -project('invalid option file') diff --git a/test cases/failing/96 invalid option file/meson_options.txt b/test cases/failing/96 invalid option file/meson_options.txt deleted file mode 100644 index eef843b..0000000 --- a/test cases/failing/96 invalid option file/meson_options.txt +++ /dev/null @@ -1 +0,0 @@ -' diff --git a/test cases/failing/96 invalid option file/test.json b/test cases/failing/96 invalid option file/test.json deleted file mode 100644 index 5f1a89f..0000000 --- a/test cases/failing/96 invalid option file/test.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "stdout": [ - { - "line": "test cases/failing/96 invalid option file/meson_options.txt:1:0: ERROR: lexer" - } - ] -} diff --git a/test cases/failing/96 no lang/main.c b/test cases/failing/96 no lang/main.c new file mode 100644 index 0000000..9b6bdc2 --- /dev/null +++ b/test cases/failing/96 no lang/main.c @@ -0,0 +1,3 @@ +int main(void) { + return 0; +} diff --git a/test cases/failing/96 no lang/meson.build b/test cases/failing/96 no lang/meson.build new file mode 100644 index 0000000..85c5db8 --- /dev/null +++ b/test cases/failing/96 no lang/meson.build @@ -0,0 +1,2 @@ +project('target without lang') +executable('main', 'main.c') diff --git a/test cases/failing/96 no lang/test.json b/test cases/failing/96 no lang/test.json new file mode 100644 index 0000000..ab4ca5c --- /dev/null +++ b/test cases/failing/96 no lang/test.json @@ -0,0 +1,7 @@ +{ + "stdout": [ + { + "line": "test cases/failing/96 no lang/meson.build:2:0: ERROR: No host machine compiler for 'main.c'" + } + ] +} diff --git a/test cases/failing/97 no glib-compile-resources/meson.build b/test cases/failing/97 no glib-compile-resources/meson.build new file mode 100644 index 0000000..aae0569 --- /dev/null +++ b/test cases/failing/97 no glib-compile-resources/meson.build @@ -0,0 +1,8 @@ +project('no glib-compile-resources') + +if find_program('glib-compile-resources', required: false).found() + error('MESON_SKIP_TEST test only applicable when glib-compile-resources is missing.') +endif + +gnome = import('gnome') +res = gnome.compile_resources('resources', 'trivial.gresource.xml') diff --git a/test cases/failing/97 no glib-compile-resources/test.json b/test cases/failing/97 no glib-compile-resources/test.json new file mode 100644 index 0000000..f3d92dd --- /dev/null +++ b/test cases/failing/97 no glib-compile-resources/test.json @@ -0,0 +1,7 @@ +{ + "stdout": [ + { + "line": "test cases/failing/97 no glib-compile-resources/meson.build:8:12: ERROR: Program 'glib-compile-resources' not found or not executable" + } + ] +} diff --git a/test cases/failing/97 no glib-compile-resources/trivial.gresource.xml b/test cases/failing/97 no glib-compile-resources/trivial.gresource.xml new file mode 100644 index 0000000..1447b98 --- /dev/null +++ b/test cases/failing/97 no glib-compile-resources/trivial.gresource.xml @@ -0,0 +1,3 @@ + + + diff --git a/test cases/failing/97 no lang/main.c b/test cases/failing/97 no lang/main.c deleted file mode 100644 index 9b6bdc2..0000000 --- a/test cases/failing/97 no lang/main.c +++ /dev/null @@ -1,3 +0,0 @@ -int main(void) { - return 0; -} diff --git a/test cases/failing/97 no lang/meson.build b/test cases/failing/97 no lang/meson.build deleted file mode 100644 index 85c5db8..0000000 --- a/test cases/failing/97 no lang/meson.build +++ /dev/null @@ -1,2 +0,0 @@ -project('target without lang') -executable('main', 'main.c') diff --git a/test cases/failing/97 no lang/test.json b/test cases/failing/97 no lang/test.json deleted file mode 100644 index a2af0a1..0000000 --- a/test cases/failing/97 no lang/test.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "stdout": [ - { - "line": "test cases/failing/97 no lang/meson.build:2:0: ERROR: No host machine compiler for 'main.c'" - } - ] -} diff --git a/test cases/failing/98 no glib-compile-resources/meson.build b/test cases/failing/98 no glib-compile-resources/meson.build deleted file mode 100644 index aae0569..0000000 --- a/test cases/failing/98 no glib-compile-resources/meson.build +++ /dev/null @@ -1,8 +0,0 @@ -project('no glib-compile-resources') - -if find_program('glib-compile-resources', required: false).found() - error('MESON_SKIP_TEST test only applicable when glib-compile-resources is missing.') -endif - -gnome = import('gnome') -res = gnome.compile_resources('resources', 'trivial.gresource.xml') diff --git a/test cases/failing/98 no glib-compile-resources/test.json b/test cases/failing/98 no glib-compile-resources/test.json deleted file mode 100644 index d5edd76..0000000 --- a/test cases/failing/98 no glib-compile-resources/test.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "stdout": [ - { - "line": "test cases/failing/98 no glib-compile-resources/meson.build:8:12: ERROR: Program 'glib-compile-resources' not found or not executable" - } - ] -} diff --git a/test cases/failing/98 no glib-compile-resources/trivial.gresource.xml b/test cases/failing/98 no glib-compile-resources/trivial.gresource.xml deleted file mode 100644 index 1447b98..0000000 --- a/test cases/failing/98 no glib-compile-resources/trivial.gresource.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/test cases/failing/98 number in combo/meson.build b/test cases/failing/98 number in combo/meson.build new file mode 100644 index 0000000..1a647df --- /dev/null +++ b/test cases/failing/98 number in combo/meson.build @@ -0,0 +1 @@ +project('number in combo') diff --git a/test cases/failing/98 number in combo/nativefile.ini b/test cases/failing/98 number in combo/nativefile.ini new file mode 100644 index 0000000..55f10fc --- /dev/null +++ b/test cases/failing/98 number in combo/nativefile.ini @@ -0,0 +1,2 @@ +[built-in options] +optimization = 1 diff --git a/test cases/failing/98 number in combo/test.json b/test cases/failing/98 number in combo/test.json new file mode 100644 index 0000000..ecac667 --- /dev/null +++ b/test cases/failing/98 number in combo/test.json @@ -0,0 +1,5 @@ +{ + "stdout": [ + { "line": "test cases/failing/98 number in combo/meson.build:1:0: ERROR: Value \"1\" (of type \"number\") for combo option \"Optimization level\" is not one of the choices. Possible choices are (as string): \"plain\", \"0\", \"g\", \"1\", \"2\", \"3\", \"s\"." } + ] +} diff --git a/test cases/failing/99 bool in combo/meson.build b/test cases/failing/99 bool in combo/meson.build new file mode 100644 index 0000000..c5efd67 --- /dev/null +++ b/test cases/failing/99 bool in combo/meson.build @@ -0,0 +1 @@ +project('bool in combo') diff --git a/test cases/failing/99 bool in combo/meson_options.txt b/test cases/failing/99 bool in combo/meson_options.txt new file mode 100644 index 0000000..0c8f5de --- /dev/null +++ b/test cases/failing/99 bool in combo/meson_options.txt @@ -0,0 +1,5 @@ +option( + 'opt', + type : 'combo', + choices : ['true', 'false'] +) diff --git a/test cases/failing/99 bool in combo/nativefile.ini b/test cases/failing/99 bool in combo/nativefile.ini new file mode 100644 index 0000000..b423957 --- /dev/null +++ b/test cases/failing/99 bool in combo/nativefile.ini @@ -0,0 +1,2 @@ +[project options] +opt = true diff --git a/test cases/failing/99 bool in combo/test.json b/test cases/failing/99 bool in combo/test.json new file mode 100644 index 0000000..364dde8 --- /dev/null +++ b/test cases/failing/99 bool in combo/test.json @@ -0,0 +1,5 @@ +{ + "stdout": [ + { "line": "test cases/failing/99 bool in combo/meson.build:1:0: ERROR: Value \"True\" (of type \"boolean\") for combo option \"opt\" is not one of the choices. Possible choices are (as string): \"true\", \"false\"." } + ] +} diff --git a/test cases/failing/99 number in combo/meson.build b/test cases/failing/99 number in combo/meson.build deleted file mode 100644 index 1a647df..0000000 --- a/test cases/failing/99 number in combo/meson.build +++ /dev/null @@ -1 +0,0 @@ -project('number in combo') diff --git a/test cases/failing/99 number in combo/nativefile.ini b/test cases/failing/99 number in combo/nativefile.ini deleted file mode 100644 index 55f10fc..0000000 --- a/test cases/failing/99 number in combo/nativefile.ini +++ /dev/null @@ -1,2 +0,0 @@ -[built-in options] -optimization = 1 diff --git a/test cases/failing/99 number in combo/test.json b/test cases/failing/99 number in combo/test.json deleted file mode 100644 index f59812e..0000000 --- a/test cases/failing/99 number in combo/test.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "stdout": [ - { "line": "test cases/failing/99 number in combo/meson.build:1:0: ERROR: Value \"1\" (of type \"number\") for combo option \"Optimization level\" is not one of the choices. Possible choices are (as string): \"plain\", \"0\", \"g\", \"1\", \"2\", \"3\", \"s\"." } - ] -} -- cgit v1.1