diff --git a/test cases/common/245 dependency fallbacks/meson.build b/test cases/common/246 dependency fallbacks/meson.build similarity index 100% rename from test cases/common/245 dependency fallbacks/meson.build rename to test cases/common/246 dependency fallbacks/meson.build diff --git a/test cases/common/245 dependency fallbacks/subprojects/png/meson.build b/test cases/common/246 dependency fallbacks/subprojects/png/meson.build similarity index 100% rename from test cases/common/245 dependency fallbacks/subprojects/png/meson.build rename to test cases/common/246 dependency fallbacks/subprojects/png/meson.build diff --git a/test cases/common/245 deprecated option/meson.build b/test cases/common/247 deprecated option/meson.build similarity index 100% rename from test cases/common/245 deprecated option/meson.build rename to test cases/common/247 deprecated option/meson.build diff --git a/test cases/common/245 deprecated option/meson_options.txt b/test cases/common/247 deprecated option/meson_options.txt similarity index 100% rename from test cases/common/245 deprecated option/meson_options.txt rename to test cases/common/247 deprecated option/meson_options.txt diff --git a/test cases/common/245 deprecated option/test.json b/test cases/common/247 deprecated option/test.json similarity index 100% rename from test cases/common/245 deprecated option/test.json rename to test cases/common/247 deprecated option/test.json diff --git a/test cases/common/246 install_emptydir/meson.build b/test cases/common/248 install_emptydir/meson.build similarity index 100% rename from test cases/common/246 install_emptydir/meson.build rename to test cases/common/248 install_emptydir/meson.build diff --git a/test cases/common/246 install_emptydir/test.json b/test cases/common/248 install_emptydir/test.json similarity index 100% rename from test cases/common/246 install_emptydir/test.json rename to test cases/common/248 install_emptydir/test.json diff --git a/test cases/common/247 install_symlink/datafile.dat b/test cases/common/249 install_symlink/datafile.dat similarity index 100% rename from test cases/common/247 install_symlink/datafile.dat rename to test cases/common/249 install_symlink/datafile.dat diff --git a/test cases/common/247 install_symlink/meson.build b/test cases/common/249 install_symlink/meson.build similarity index 100% rename from test cases/common/247 install_symlink/meson.build rename to test cases/common/249 install_symlink/meson.build diff --git a/test cases/common/247 install_symlink/test.json b/test cases/common/249 install_symlink/test.json similarity index 100% rename from test cases/common/247 install_symlink/test.json rename to test cases/common/249 install_symlink/test.json diff --git a/test cases/failing/106 feature require.bis/meson.build b/test cases/failing/107 feature require.bis/meson.build similarity index 100% rename from test cases/failing/106 feature require.bis/meson.build rename to test cases/failing/107 feature require.bis/meson.build diff --git a/test cases/failing/106 feature require.bis/meson_options.txt b/test cases/failing/107 feature require.bis/meson_options.txt similarity index 100% rename from test cases/failing/106 feature require.bis/meson_options.txt rename to test cases/failing/107 feature require.bis/meson_options.txt diff --git a/test cases/failing/106 feature require.bis/test.json b/test cases/failing/107 feature require.bis/test.json similarity index 100% rename from test cases/failing/106 feature require.bis/test.json rename to test cases/failing/107 feature require.bis/test.json diff --git a/test cases/failing/107 no build get_external_property/meson.build b/test cases/failing/108 no build get_external_property/meson.build similarity index 100% rename from test cases/failing/107 no build get_external_property/meson.build rename to test cases/failing/108 no build get_external_property/meson.build diff --git a/test cases/failing/107 no build get_external_property/test.json b/test cases/failing/108 no build get_external_property/test.json similarity index 63% rename from test cases/failing/107 no build get_external_property/test.json rename to test cases/failing/108 no build get_external_property/test.json index b95427efd..d2827f42e 100644 --- a/test cases/failing/107 no build get_external_property/test.json +++ b/test cases/failing/108 no build get_external_property/test.json @@ -1,7 +1,7 @@ { "stdout": [ { - "line": "test cases/failing/107 no build get_external_property/meson.build:3:0: ERROR: Unknown property for build machine: nonexisting" + "line": "test cases/failing/108 no build get_external_property/meson.build:3:0: ERROR: Unknown property for build machine: nonexisting" } ] } diff --git a/test cases/failing/108 enter subdir twice/meson.build b/test cases/failing/109 enter subdir twice/meson.build similarity index 100% rename from test cases/failing/108 enter subdir twice/meson.build rename to test cases/failing/109 enter subdir twice/meson.build diff --git a/test cases/failing/108 enter subdir twice/sub/meson.build b/test cases/failing/109 enter subdir twice/sub/meson.build similarity index 100% rename from test cases/failing/108 enter subdir twice/sub/meson.build rename to test cases/failing/109 enter subdir twice/sub/meson.build diff --git a/test cases/failing/108 enter subdir twice/test.json b/test cases/failing/109 enter subdir twice/test.json similarity index 64% rename from test cases/failing/108 enter subdir twice/test.json rename to test cases/failing/109 enter subdir twice/test.json index 0a8e12769..f7a526c54 100644 --- a/test cases/failing/108 enter subdir twice/test.json +++ b/test cases/failing/109 enter subdir twice/test.json @@ -1,7 +1,7 @@ { "stdout": [ { - "line": "test cases/failing/108 enter subdir twice/meson.build:3:0: ERROR: Tried to enter directory \"sub\", which has already been visited." + "line": "test cases/failing/109 enter subdir twice/meson.build:3:0: ERROR: Tried to enter directory \"sub\", which has already been visited." } ] } diff --git a/test cases/failing/109 invalid fstring/meson.build b/test cases/failing/111 invalid fstring/109 invalid fstring/meson.build similarity index 100% rename from test cases/failing/109 invalid fstring/meson.build rename to test cases/failing/111 invalid fstring/109 invalid fstring/meson.build diff --git a/test cases/failing/109 invalid fstring/test.json b/test cases/failing/111 invalid fstring/109 invalid fstring/test.json similarity index 100% rename from test cases/failing/109 invalid fstring/test.json rename to test cases/failing/111 invalid fstring/109 invalid fstring/test.json diff --git a/test cases/failing/110 invalid fstring/meson.build b/test cases/failing/111 invalid fstring/meson.build similarity index 100% rename from test cases/failing/110 invalid fstring/meson.build rename to test cases/failing/111 invalid fstring/meson.build diff --git a/test cases/failing/110 invalid fstring/test.json b/test cases/failing/111 invalid fstring/test.json similarity index 63% rename from test cases/failing/110 invalid fstring/test.json rename to test cases/failing/111 invalid fstring/test.json index bfd0e2d42..89ec40c4e 100644 --- a/test cases/failing/110 invalid fstring/test.json +++ b/test cases/failing/111 invalid fstring/test.json @@ -1,7 +1,7 @@ { "stdout": [ { - "line": "test cases/failing/110 invalid fstring/meson.build:3:0: ERROR: Identifier \"foo\" does not name a variable." + "line": "test cases/failing/111 invalid fstring/meson.build:3:0: ERROR: Identifier \"foo\" does not name a variable." } ] } diff --git a/test cases/failing/111 compiler argument checking/meson.build b/test cases/failing/112 compiler argument checking/meson.build similarity index 100% rename from test cases/failing/111 compiler argument checking/meson.build rename to test cases/failing/112 compiler argument checking/meson.build diff --git a/test cases/failing/111 compiler argument checking/test.json b/test cases/failing/112 compiler argument checking/test.json similarity index 66% rename from test cases/failing/111 compiler argument checking/test.json rename to test cases/failing/112 compiler argument checking/test.json index f41f2d2cf..f4728db00 100644 --- a/test cases/failing/111 compiler argument checking/test.json +++ b/test cases/failing/112 compiler argument checking/test.json @@ -1,7 +1,7 @@ { "stdout": [ { - "line": "test cases/failing/111 compiler argument checking/meson.build:4:0: ERROR: Compiler for C does not support \"-meson-goober-arg-for-testing\"" + "line": "test cases/failing/112 compiler argument checking/meson.build:4:0: ERROR: Compiler for C does not support \"-meson-goober-arg-for-testing\"" } ] } diff --git a/test cases/failing/112 empty fallback/meson.build b/test cases/failing/113 empty fallback/meson.build similarity index 100% rename from test cases/failing/112 empty fallback/meson.build rename to test cases/failing/113 empty fallback/meson.build diff --git a/test cases/failing/112 empty fallback/subprojects/foo/meson.build b/test cases/failing/113 empty fallback/subprojects/foo/meson.build similarity index 100% rename from test cases/failing/112 empty fallback/subprojects/foo/meson.build rename to test cases/failing/113 empty fallback/subprojects/foo/meson.build diff --git a/test cases/failing/112 empty fallback/test.json b/test cases/failing/113 empty fallback/test.json similarity index 65% rename from test cases/failing/112 empty fallback/test.json rename to test cases/failing/113 empty fallback/test.json index 89520efc3..c8ed212a8 100644 --- a/test cases/failing/112 empty fallback/test.json +++ b/test cases/failing/113 empty fallback/test.json @@ -1,7 +1,7 @@ { "stdout": [ { - "line": "test cases/failing/112 empty fallback/meson.build:6:0: ERROR: Dependency \"foo\" not found, tried pkgconfig and cmake" + "line": "test cases/failing/113 empty fallback/meson.build:6:0: ERROR: Dependency \"foo\" not found, tried pkgconfig and cmake" } ] } diff --git a/test cases/failing/113 cmake executable dependency/meson.build b/test cases/failing/114 cmake executable dependency/meson.build similarity index 100% rename from test cases/failing/113 cmake executable dependency/meson.build rename to test cases/failing/114 cmake executable dependency/meson.build diff --git a/test cases/failing/113 cmake executable dependency/subprojects/cmlib/CMakeLists.txt b/test cases/failing/114 cmake executable dependency/subprojects/cmlib/CMakeLists.txt similarity index 100% rename from test cases/failing/113 cmake executable dependency/subprojects/cmlib/CMakeLists.txt rename to test cases/failing/114 cmake executable dependency/subprojects/cmlib/CMakeLists.txt diff --git a/test cases/failing/113 cmake executable dependency/subprojects/cmlib/main.c b/test cases/failing/114 cmake executable dependency/subprojects/cmlib/main.c similarity index 100% rename from test cases/failing/113 cmake executable dependency/subprojects/cmlib/main.c rename to test cases/failing/114 cmake executable dependency/subprojects/cmlib/main.c diff --git a/test cases/failing/113 cmake executable dependency/test.json b/test cases/failing/114 cmake executable dependency/test.json similarity index 72% rename from test cases/failing/113 cmake executable dependency/test.json rename to test cases/failing/114 cmake executable dependency/test.json index 1cb4a0f0a..82306dd45 100644 --- a/test cases/failing/113 cmake executable dependency/test.json +++ b/test cases/failing/114 cmake executable dependency/test.json @@ -1,7 +1,7 @@ { "stdout": [ { - "line": "test cases/failing/113 cmake executable dependency/meson.build:9:0: ERROR: main is an executable and does not support the dependency() method. Use target() instead." + "line": "test cases/failing/114 cmake executable dependency/meson.build:9:0: ERROR: main is an executable and does not support the dependency() method. Use target() instead." } ] } diff --git a/test cases/failing/114 allow_fallback with fallback/meson.build b/test cases/failing/115 allow_fallback with fallback/meson.build similarity index 100% rename from test cases/failing/114 allow_fallback with fallback/meson.build rename to test cases/failing/115 allow_fallback with fallback/meson.build diff --git a/test cases/failing/114 allow_fallback with fallback/test.json b/test cases/failing/115 allow_fallback with fallback/test.json similarity index 70% rename from test cases/failing/114 allow_fallback with fallback/test.json rename to test cases/failing/115 allow_fallback with fallback/test.json index 1e5712e78..6bdcc519c 100644 --- a/test cases/failing/114 allow_fallback with fallback/test.json +++ b/test cases/failing/115 allow_fallback with fallback/test.json @@ -1,7 +1,7 @@ { "stdout": [ { - "line": "test cases/failing/114 allow_fallback with fallback/meson.build:3:0: ERROR: \"fallback\" and \"allow_fallback\" arguments are mutually exclusive" + "line": "test cases/failing/115 allow_fallback with fallback/meson.build:3:0: ERROR: \"fallback\" and \"allow_fallback\" arguments are mutually exclusive" } ] } diff --git a/test cases/failing/115 nonsensical bindgen/meson.build b/test cases/failing/116 nonsensical bindgen/meson.build similarity index 100% rename from test cases/failing/115 nonsensical bindgen/meson.build rename to test cases/failing/116 nonsensical bindgen/meson.build diff --git a/test cases/failing/115 nonsensical bindgen/src/header.h b/test cases/failing/116 nonsensical bindgen/src/header.h similarity index 100% rename from test cases/failing/115 nonsensical bindgen/src/header.h rename to test cases/failing/116 nonsensical bindgen/src/header.h diff --git a/test cases/failing/115 nonsensical bindgen/src/source.c b/test cases/failing/116 nonsensical bindgen/src/source.c similarity index 100% rename from test cases/failing/115 nonsensical bindgen/src/source.c rename to test cases/failing/116 nonsensical bindgen/src/source.c diff --git a/test cases/failing/115 nonsensical bindgen/test.json b/test cases/failing/116 nonsensical bindgen/test.json similarity index 69% rename from test cases/failing/115 nonsensical bindgen/test.json rename to test cases/failing/116 nonsensical bindgen/test.json index d9249b2b2..b0a38e826 100644 --- a/test cases/failing/115 nonsensical bindgen/test.json +++ b/test cases/failing/116 nonsensical bindgen/test.json @@ -1,7 +1,7 @@ { "stdout": [ { - "line": "test cases/failing/115 nonsensical bindgen/meson.build:17:24: ERROR: bindgen source file must be a C header, not an object or build target" + "line": "test cases/failing/116 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/116 run_target in test/meson.build b/test cases/failing/117 run_target in test/meson.build similarity index 100% rename from test cases/failing/116 run_target in test/meson.build rename to test cases/failing/117 run_target in test/meson.build diff --git a/test cases/failing/116 run_target in test/test.json b/test cases/failing/117 run_target in test/test.json similarity index 77% rename from test cases/failing/116 run_target in test/test.json rename to test cases/failing/117 run_target in test/test.json index 961c1e4cb..ad24367a5 100644 --- a/test cases/failing/116 run_target in test/test.json +++ b/test cases/failing/117 run_target in test/test.json @@ -1,7 +1,7 @@ { "stdout": [ { - "line": "test cases/failing/116 run_target in test/meson.build:4:0: ERROR: test keyword argument 'args' was of type array[RunTarget] but should have been array[str | File | BuildTarget | CustomTarget | CustomTargetIndex]" + "line": "test cases/failing/117 run_target in test/meson.build:4: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/116 run_target in test/trivial.c b/test cases/failing/117 run_target in test/trivial.c similarity index 100% rename from test cases/failing/116 run_target in test/trivial.c rename to test cases/failing/117 run_target in test/trivial.c diff --git a/test cases/failing/117 run_target in add_install_script/meson.build b/test cases/failing/118 run_target in add_install_script/meson.build similarity index 100% rename from test cases/failing/117 run_target in add_install_script/meson.build rename to test cases/failing/118 run_target in add_install_script/meson.build diff --git a/test cases/failing/117 run_target in add_install_script/test.json b/test cases/failing/118 run_target in add_install_script/test.json similarity index 81% rename from test cases/failing/117 run_target in add_install_script/test.json rename to test cases/failing/118 run_target in add_install_script/test.json index fec19410d..a09b1a319 100644 --- a/test cases/failing/117 run_target in add_install_script/test.json +++ b/test cases/failing/118 run_target in add_install_script/test.json @@ -1,7 +1,7 @@ { "stdout": [ { - "line": "test cases/failing/117 run_target in add_install_script/meson.build:4:6: ERROR: meson.add_install_script argument 2 was of type \"RunTarget\" but should have been one of: \"str\", \"File\", \"BuildTarget\", \"CustomTarget\", \"CustomTargetIndex\", \"ExternalProgram\"" + "line": "test cases/failing/118 run_target in add_install_script/meson.build:4: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/117 run_target in add_install_script/trivial.c b/test cases/failing/118 run_target in add_install_script/trivial.c similarity index 100% rename from test cases/failing/117 run_target in add_install_script/trivial.c rename to test cases/failing/118 run_target in add_install_script/trivial.c diff --git a/test cases/failing/118 pathsep in install_symlink/meson.build b/test cases/failing/119 pathsep in install_symlink/meson.build similarity index 100% rename from test cases/failing/118 pathsep in install_symlink/meson.build rename to test cases/failing/119 pathsep in install_symlink/meson.build diff --git a/test cases/failing/118 pathsep in install_symlink/test.json b/test cases/failing/119 pathsep in install_symlink/test.json similarity index 74% rename from test cases/failing/118 pathsep in install_symlink/test.json rename to test cases/failing/119 pathsep in install_symlink/test.json index e3f3a4a88..9df546a25 100644 --- a/test cases/failing/118 pathsep in install_symlink/test.json +++ b/test cases/failing/119 pathsep in install_symlink/test.json @@ -1,7 +1,7 @@ { "stdout": [ { - "line": "test cases/failing/118 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." + "line": "test cases/failing/119 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/unit/99 custom target name/file.txt.in b/test cases/unit/100 custom target name/file.txt.in similarity index 100% rename from test cases/unit/99 custom target name/file.txt.in rename to test cases/unit/100 custom target name/file.txt.in diff --git a/test cases/unit/99 custom target name/meson.build b/test cases/unit/100 custom target name/meson.build similarity index 100% rename from test cases/unit/99 custom target name/meson.build rename to test cases/unit/100 custom target name/meson.build diff --git a/test cases/unit/99 custom target name/subdir/meson.build b/test cases/unit/100 custom target name/subdir/meson.build similarity index 100% rename from test cases/unit/99 custom target name/subdir/meson.build rename to test cases/unit/100 custom target name/subdir/meson.build diff --git a/test cases/unit/99 relative find program/foo.py b/test cases/unit/101 relative find program/foo.py similarity index 100% rename from test cases/unit/99 relative find program/foo.py rename to test cases/unit/101 relative find program/foo.py diff --git a/test cases/unit/99 relative find program/meson.build b/test cases/unit/101 relative find program/meson.build similarity index 100% rename from test cases/unit/99 relative find program/meson.build rename to test cases/unit/101 relative find program/meson.build diff --git a/test cases/unit/99 relative find program/subdir/meson.build b/test cases/unit/101 relative find program/subdir/meson.build similarity index 100% rename from test cases/unit/99 relative find program/subdir/meson.build rename to test cases/unit/101 relative find program/subdir/meson.build diff --git a/test cases/unit/100 rlib linkage/lib2.rs b/test cases/unit/102 rlib linkage/lib2.rs similarity index 100% rename from test cases/unit/100 rlib linkage/lib2.rs rename to test cases/unit/102 rlib linkage/lib2.rs diff --git a/test cases/unit/100 rlib linkage/main.rs b/test cases/unit/102 rlib linkage/main.rs similarity index 100% rename from test cases/unit/100 rlib linkage/main.rs rename to test cases/unit/102 rlib linkage/main.rs diff --git a/test cases/unit/100 rlib linkage/meson.build b/test cases/unit/102 rlib linkage/meson.build similarity index 100% rename from test cases/unit/100 rlib linkage/meson.build rename to test cases/unit/102 rlib linkage/meson.build diff --git a/test cases/unit/101 python without pkgconfig/meson.build b/test cases/unit/103 python without pkgconfig/meson.build similarity index 100% rename from test cases/unit/101 python without pkgconfig/meson.build rename to test cases/unit/103 python without pkgconfig/meson.build diff --git a/test cases/unit/97 link full name/.gitignore b/test cases/unit/98 link full name/.gitignore similarity index 100% rename from test cases/unit/97 link full name/.gitignore rename to test cases/unit/98 link full name/.gitignore diff --git a/test cases/unit/97 link full name/libtestprovider/meson.build b/test cases/unit/98 link full name/libtestprovider/meson.build similarity index 100% rename from test cases/unit/97 link full name/libtestprovider/meson.build rename to test cases/unit/98 link full name/libtestprovider/meson.build diff --git a/test cases/unit/97 link full name/libtestprovider/provider.c b/test cases/unit/98 link full name/libtestprovider/provider.c similarity index 100% rename from test cases/unit/97 link full name/libtestprovider/provider.c rename to test cases/unit/98 link full name/libtestprovider/provider.c diff --git a/test cases/unit/97 link full name/proguser/meson.build b/test cases/unit/98 link full name/proguser/meson.build similarity index 100% rename from test cases/unit/97 link full name/proguser/meson.build rename to test cases/unit/98 link full name/proguser/meson.build diff --git a/test cases/unit/97 link full name/proguser/receiver.c b/test cases/unit/98 link full name/proguser/receiver.c similarity index 100% rename from test cases/unit/97 link full name/proguser/receiver.c rename to test cases/unit/98 link full name/proguser/receiver.c diff --git a/test cases/unit/98 install all targets/bar-custom.txt b/test cases/unit/99 install all targets/bar-custom.txt similarity index 100% rename from test cases/unit/98 install all targets/bar-custom.txt rename to test cases/unit/99 install all targets/bar-custom.txt diff --git a/test cases/unit/98 install all targets/bar-devel.h b/test cases/unit/99 install all targets/bar-devel.h similarity index 100% rename from test cases/unit/98 install all targets/bar-devel.h rename to test cases/unit/99 install all targets/bar-devel.h diff --git a/test cases/unit/98 install all targets/bar-notag.txt b/test cases/unit/99 install all targets/bar-notag.txt similarity index 100% rename from test cases/unit/98 install all targets/bar-notag.txt rename to test cases/unit/99 install all targets/bar-notag.txt diff --git a/test cases/unit/98 install all targets/custom_files/data.txt b/test cases/unit/99 install all targets/custom_files/data.txt similarity index 100% rename from test cases/unit/98 install all targets/custom_files/data.txt rename to test cases/unit/99 install all targets/custom_files/data.txt diff --git a/test cases/unit/98 install all targets/foo.in b/test cases/unit/99 install all targets/foo.in similarity index 100% rename from test cases/unit/98 install all targets/foo.in rename to test cases/unit/99 install all targets/foo.in diff --git a/test cases/unit/98 install all targets/foo1-devel.h b/test cases/unit/99 install all targets/foo1-devel.h similarity index 100% rename from test cases/unit/98 install all targets/foo1-devel.h rename to test cases/unit/99 install all targets/foo1-devel.h diff --git a/test cases/unit/98 install all targets/lib.c b/test cases/unit/99 install all targets/lib.c similarity index 100% rename from test cases/unit/98 install all targets/lib.c rename to test cases/unit/99 install all targets/lib.c diff --git a/test cases/unit/98 install all targets/main.c b/test cases/unit/99 install all targets/main.c similarity index 100% rename from test cases/unit/98 install all targets/main.c rename to test cases/unit/99 install all targets/main.c diff --git a/test cases/unit/98 install all targets/meson.build b/test cases/unit/99 install all targets/meson.build similarity index 100% rename from test cases/unit/98 install all targets/meson.build rename to test cases/unit/99 install all targets/meson.build diff --git a/test cases/unit/98 install all targets/script.py b/test cases/unit/99 install all targets/script.py similarity index 100% rename from test cases/unit/98 install all targets/script.py rename to test cases/unit/99 install all targets/script.py diff --git a/test cases/unit/98 install all targets/subdir/bar2-devel.h b/test cases/unit/99 install all targets/subdir/bar2-devel.h similarity index 100% rename from test cases/unit/98 install all targets/subdir/bar2-devel.h rename to test cases/unit/99 install all targets/subdir/bar2-devel.h diff --git a/test cases/unit/98 install all targets/subdir/foo2.in b/test cases/unit/99 install all targets/subdir/foo2.in similarity index 100% rename from test cases/unit/98 install all targets/subdir/foo2.in rename to test cases/unit/99 install all targets/subdir/foo2.in diff --git a/test cases/unit/98 install all targets/subdir/foo3-devel.h b/test cases/unit/99 install all targets/subdir/foo3-devel.h similarity index 100% rename from test cases/unit/98 install all targets/subdir/foo3-devel.h rename to test cases/unit/99 install all targets/subdir/foo3-devel.h diff --git a/test cases/unit/98 install all targets/subdir/lib.c b/test cases/unit/99 install all targets/subdir/lib.c similarity index 100% rename from test cases/unit/98 install all targets/subdir/lib.c rename to test cases/unit/99 install all targets/subdir/lib.c diff --git a/test cases/unit/98 install all targets/subdir/main.c b/test cases/unit/99 install all targets/subdir/main.c similarity index 100% rename from test cases/unit/98 install all targets/subdir/main.c rename to test cases/unit/99 install all targets/subdir/main.c diff --git a/test cases/unit/98 install all targets/subdir/meson.build b/test cases/unit/99 install all targets/subdir/meson.build similarity index 100% rename from test cases/unit/98 install all targets/subdir/meson.build rename to test cases/unit/99 install all targets/subdir/meson.build diff --git a/test cases/unit/98 install all targets/subdir/script.py b/test cases/unit/99 install all targets/subdir/script.py similarity index 100% rename from test cases/unit/98 install all targets/subdir/script.py rename to test cases/unit/99 install all targets/subdir/script.py diff --git a/unittests/allplatformstests.py b/unittests/allplatformstests.py index b176aa5d3..8b3181e94 100644 --- a/unittests/allplatformstests.py +++ b/unittests/allplatformstests.py @@ -3830,7 +3830,7 @@ class AllPlatformTests(BasePlatformTests): self.assertEqual(sorted(link_args), sorted(['-flto'])) def test_install_tag(self) -> None: - testdir = os.path.join(self.unit_test_dir, '98 install all targets') + testdir = os.path.join(self.unit_test_dir, '99 install all targets') self.init(testdir) self.build() @@ -3952,7 +3952,7 @@ class AllPlatformTests(BasePlatformTests): do_install(None, expected_all, 2) def test_introspect_install_plan(self): - testdir = os.path.join(self.unit_test_dir, '98 install all targets') + testdir = os.path.join(self.unit_test_dir, '99 install all targets') introfile = os.path.join(self.builddir, 'meson-info', 'intro-install_plan.json') self.init(testdir) self.assertPathExists(introfile) @@ -4139,7 +4139,7 @@ class AllPlatformTests(BasePlatformTests): }} ''') - testdir = os.path.join(self.unit_test_dir, '100 rlib linkage') + testdir = os.path.join(self.unit_test_dir, '102 rlib linkage') gen_file = os.path.join(testdir, 'lib.rs') with open(gen_file, 'w') as f: f.write(template.format(0)) @@ -4159,7 +4159,7 @@ class AllPlatformTests(BasePlatformTests): self.assertIn('exit status 39', cm.exception.stdout) def test_custom_target_name(self): - testdir = os.path.join(self.unit_test_dir, '99 custom target name') + testdir = os.path.join(self.unit_test_dir, '100 custom target name') self.init(testdir) out = self.build() if self.backend is Backend.ninja: diff --git a/unittests/linuxliketests.py b/unittests/linuxliketests.py index 8ff0f8e55..594e9f0cc 100644 --- a/unittests/linuxliketests.py +++ b/unittests/linuxliketests.py @@ -1334,7 +1334,7 @@ class LinuxlikeTests(BasePlatformTests): see: https://github.com/mesonbuild/meson/issues/9000 https://stackoverflow.com/questions/48532868/gcc-library-option-with-a-colon-llibevent-a ''' - testdir = os.path.join(self.unit_test_dir, '97 link full name','libtestprovider') + testdir = os.path.join(self.unit_test_dir, '98 link full name','libtestprovider') oldprefix = self.prefix # install into installdir without using DESTDIR installdir = self.installdir @@ -1347,7 +1347,7 @@ class LinuxlikeTests(BasePlatformTests): self.new_builddir() env = {'LIBRARY_PATH': os.path.join(installdir, self.libdir), 'PKG_CONFIG_PATH': os.path.join(installdir, self.libdir, 'pkgconfig')} - testdir = os.path.join(self.unit_test_dir, '97 link full name','proguser') + testdir = os.path.join(self.unit_test_dir, '98 link full name','proguser') self.init(testdir,override_envvars=env) # test for link with full path diff --git a/unittests/platformagnostictests.py b/unittests/platformagnostictests.py index 25f3b1a2f..c5e5233dd 100644 --- a/unittests/platformagnostictests.py +++ b/unittests/platformagnostictests.py @@ -32,7 +32,7 @@ class PlatformAgnosticTests(BasePlatformTests): Tests that find_program() with a relative path does not find the program in current workdir. ''' - testdir = os.path.join(self.unit_test_dir, '99 relative find program') + testdir = os.path.join(self.unit_test_dir, '101 relative find program') self.init(testdir, workdir=testdir) def test_invalid_option_names(self): @@ -68,5 +68,5 @@ class PlatformAgnosticTests(BasePlatformTests): interp.process(fname) def test_python_dependency_without_pkgconfig(self): - testdir = os.path.join(self.unit_test_dir, '101 python without pkgconfig') + testdir = os.path.join(self.unit_test_dir, '103 python without pkgconfig') self.init(testdir, override_envvars={'PKG_CONFIG': 'notfound'})