Condense test directory names.

diff --git a/test cases/failing/101 no glib-compile-resources/meson.build b/test cases/failing/100 no glib-compile-resources/meson.build
similarity index 100%
rename from test cases/failing/101 no glib-compile-resources/meson.build
rename to test cases/failing/100 no glib-compile-resources/meson.build


diff --git a/test cases/failing/101 no glib-compile-resources/test.json b/test cases/failing/100 no glib-compile-resources/test.json
similarity index 65%
rename from test cases/failing/101 no glib-compile-resources/test.json
rename to test cases/failing/100 no glib-compile-resources/test.json
index 7f0c02c..ad9ba29 100644
--- a/test cases/failing/101 no glib-compile-resources/test.json
+++ b/test cases/failing/100 no glib-compile-resources/test.json

@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/101 no glib-compile-resources/meson.build:8:0: ERROR: Program 'glib-compile-resources' not found or not executable"
+      "line": "test cases/failing/100 no glib-compile-resources/meson.build:8:0: ERROR: Program 'glib-compile-resources' not found or not executable"
     }
   ]
 }

diff --git a/test cases/failing/101 no glib-compile-resources/trivial.gresource.xml b/test cases/failing/100 no glib-compile-resources/trivial.gresource.xml
similarity index 100%
rename from test cases/failing/101 no glib-compile-resources/trivial.gresource.xml
rename to test cases/failing/100 no glib-compile-resources/trivial.gresource.xml


diff --git a/test cases/failing/100 no lang/test.json b/test cases/failing/100 no lang/test.json
deleted file mode 100644
index a74adaf..0000000
--- a/test cases/failing/100 no lang/test.json
+++ /dev/null

@@ -1,7 +0,0 @@
-{
-  "stdout": [
-    {
-      "line": "test cases/failing/100 no lang/meson.build:2:0: ERROR: No host machine compiler for 'main.c'"
-    }
-  ]
-}

diff --git a/test cases/failing/102 number in combo/meson.build b/test cases/failing/101 number in combo/meson.build
similarity index 100%
rename from test cases/failing/102 number in combo/meson.build
rename to test cases/failing/101 number in combo/meson.build


diff --git a/test cases/failing/102 number in combo/nativefile.ini b/test cases/failing/101 number in combo/nativefile.ini
similarity index 100%
rename from test cases/failing/102 number in combo/nativefile.ini
rename to test cases/failing/101 number in combo/nativefile.ini


diff --git a/test cases/failing/102 number in combo/test.json b/test cases/failing/101 number in combo/test.json
similarity index 77%
rename from test cases/failing/102 number in combo/test.json
rename to test cases/failing/101 number in combo/test.json
index 8e70a60..5d37df1 100644
--- a/test cases/failing/102 number in combo/test.json
+++ b/test cases/failing/101 number in combo/test.json

@@ -1,5 +1,5 @@
 {
   "stdout": [
-    { "line": "test cases/failing/102 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): \"0\", \"g\", \"1\", \"2\", \"3\", \"s\"." }
+    { "line": "test cases/failing/101 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): \"0\", \"g\", \"1\", \"2\", \"3\", \"s\"." }
   ]
 }

diff --git a/test cases/failing/103 bool in combo/meson.build b/test cases/failing/102 bool in combo/meson.build
similarity index 100%
rename from test cases/failing/103 bool in combo/meson.build
rename to test cases/failing/102 bool in combo/meson.build


diff --git a/test cases/failing/103 bool in combo/meson_options.txt b/test cases/failing/102 bool in combo/meson_options.txt
similarity index 100%
rename from test cases/failing/103 bool in combo/meson_options.txt
rename to test cases/failing/102 bool in combo/meson_options.txt


diff --git a/test cases/failing/103 bool in combo/nativefile.ini b/test cases/failing/102 bool in combo/nativefile.ini
similarity index 100%
rename from test cases/failing/103 bool in combo/nativefile.ini
rename to test cases/failing/102 bool in combo/nativefile.ini


diff --git a/test cases/failing/103 bool in combo/test.json b/test cases/failing/102 bool in combo/test.json
similarity index 73%
rename from test cases/failing/103 bool in combo/test.json
rename to test cases/failing/102 bool in combo/test.json
index 48d4cc3..c0041af 100644
--- a/test cases/failing/103 bool in combo/test.json
+++ b/test cases/failing/102 bool in combo/test.json

@@ -1,5 +1,5 @@
 {
   "stdout": [
-    { "line": "test cases/failing/103 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\"." }
+    { "line": "test cases/failing/102 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/104 compiler no lang/meson.build b/test cases/failing/103 compiler no lang/meson.build
similarity index 100%
rename from test cases/failing/104 compiler no lang/meson.build
rename to test cases/failing/103 compiler no lang/meson.build


diff --git a/test cases/failing/104 compiler no lang/test.json b/test cases/failing/103 compiler no lang/test.json
similarity index 66%
rename from test cases/failing/104 compiler no lang/test.json
rename to test cases/failing/103 compiler no lang/test.json
index d8cc96e..123dcb9 100644
--- a/test cases/failing/104 compiler no lang/test.json
+++ b/test cases/failing/103 compiler no lang/test.json

@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/104 compiler no lang/meson.build:2:6: ERROR: Tried to access compiler for language \"c\", not specified for host machine."
+      "line": "test cases/failing/103 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/105 no fallback/meson.build b/test cases/failing/104 no fallback/meson.build
similarity index 100%
rename from test cases/failing/105 no fallback/meson.build
rename to test cases/failing/104 no fallback/meson.build


diff --git a/test cases/failing/105 no fallback/subprojects/foob/meson.build b/test cases/failing/104 no fallback/subprojects/foob/meson.build
similarity index 100%
rename from test cases/failing/105 no fallback/subprojects/foob/meson.build
rename to test cases/failing/104 no fallback/subprojects/foob/meson.build


diff --git a/test cases/failing/105 no fallback/test.json b/test cases/failing/104 no fallback/test.json
similarity index 100%
rename from test cases/failing/105 no fallback/test.json
rename to test cases/failing/104 no fallback/test.json


diff --git a/test cases/failing/106 feature require/meson.build b/test cases/failing/105 feature require/meson.build
similarity index 100%
rename from test cases/failing/106 feature require/meson.build
rename to test cases/failing/105 feature require/meson.build


diff --git a/test cases/failing/106 feature require/meson_options.txt b/test cases/failing/105 feature require/meson_options.txt
similarity index 100%
rename from test cases/failing/106 feature require/meson_options.txt
rename to test cases/failing/105 feature require/meson_options.txt


diff --git a/test cases/failing/106 feature require/test.json b/test cases/failing/105 feature require/test.json
similarity index 100%
rename from test cases/failing/106 feature require/test.json
rename to test cases/failing/105 feature require/test.json


diff --git a/test cases/failing/107 feature require.bis/meson.build b/test cases/failing/106 feature require.bis/meson.build
similarity index 100%
rename from test cases/failing/107 feature require.bis/meson.build
rename to test cases/failing/106 feature require.bis/meson.build


diff --git a/test cases/failing/107 feature require.bis/meson_options.txt b/test cases/failing/106 feature require.bis/meson_options.txt
similarity index 100%
rename from test cases/failing/107 feature require.bis/meson_options.txt
rename to test cases/failing/106 feature require.bis/meson_options.txt


diff --git a/test cases/failing/107 feature require.bis/test.json b/test cases/failing/106 feature require.bis/test.json
similarity index 100%
rename from test cases/failing/107 feature require.bis/test.json
rename to test cases/failing/106 feature require.bis/test.json


diff --git a/test cases/failing/108 no build get_external_property/meson.build b/test cases/failing/107 no build get_external_property/meson.build
similarity index 100%
rename from test cases/failing/108 no build get_external_property/meson.build
rename to test cases/failing/107 no build get_external_property/meson.build


diff --git a/test cases/failing/108 no build get_external_property/test.json b/test cases/failing/107 no build get_external_property/test.json
similarity index 63%
rename from test cases/failing/108 no build get_external_property/test.json
rename to test cases/failing/107 no build get_external_property/test.json
index d2827f4..b95427e 100644
--- a/test cases/failing/108 no build get_external_property/test.json
+++ b/test cases/failing/107 no build get_external_property/test.json

@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/108 no build get_external_property/meson.build:3:0: ERROR: Unknown property for build machine: nonexisting"
+      "line": "test cases/failing/107 no build get_external_property/meson.build:3:0: ERROR: Unknown property for build machine: nonexisting"
     }
   ]
 }

diff --git a/test cases/failing/109 enter subdir twice/meson.build b/test cases/failing/108 enter subdir twice/meson.build
similarity index 100%
rename from test cases/failing/109 enter subdir twice/meson.build
rename to test cases/failing/108 enter subdir twice/meson.build


diff --git a/test cases/failing/109 enter subdir twice/sub/meson.build b/test cases/failing/108 enter subdir twice/sub/meson.build
similarity index 100%
rename from test cases/failing/109 enter subdir twice/sub/meson.build
rename to test cases/failing/108 enter subdir twice/sub/meson.build


diff --git a/test cases/failing/109 enter subdir twice/test.json b/test cases/failing/108 enter subdir twice/test.json
similarity index 64%
rename from test cases/failing/109 enter subdir twice/test.json
rename to test cases/failing/108 enter subdir twice/test.json
index f7a526c..0a8e127 100644
--- a/test cases/failing/109 enter subdir twice/test.json
+++ b/test cases/failing/108 enter subdir twice/test.json

@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/109 enter subdir twice/meson.build:3:0: ERROR: Tried to enter directory \"sub\", which has already been visited."
+      "line": "test cases/failing/108 enter subdir twice/meson.build:3:0: ERROR: Tried to enter directory \"sub\", which has already been visited."
     }
   ]
 }

diff --git a/test cases/failing/111 invalid fstring/109 invalid fstring/meson.build b/test cases/failing/109 invalid fstring/109 invalid fstring/meson.build
similarity index 100%
rename from test cases/failing/111 invalid fstring/109 invalid fstring/meson.build
rename to test cases/failing/109 invalid fstring/109 invalid fstring/meson.build


diff --git a/test cases/failing/111 invalid fstring/109 invalid fstring/test.json b/test cases/failing/109 invalid fstring/109 invalid fstring/test.json
similarity index 100%
rename from test cases/failing/111 invalid fstring/109 invalid fstring/test.json
rename to test cases/failing/109 invalid fstring/109 invalid fstring/test.json


diff --git a/test cases/failing/111 invalid fstring/meson.build b/test cases/failing/109 invalid fstring/meson.build
similarity index 100%
rename from test cases/failing/111 invalid fstring/meson.build
rename to test cases/failing/109 invalid fstring/meson.build


diff --git a/test cases/failing/111 invalid fstring/test.json b/test cases/failing/109 invalid fstring/test.json
similarity index 63%
rename from test cases/failing/111 invalid fstring/test.json
rename to test cases/failing/109 invalid fstring/test.json
index 89ec40c..a095d62 100644
--- a/test cases/failing/111 invalid fstring/test.json
+++ b/test cases/failing/109 invalid fstring/test.json

@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "line": "test cases/failing/111 invalid fstring/meson.build:3:0: ERROR: Identifier \"foo\" does not name a variable."
+            "line": "test cases/failing/109 invalid fstring/meson.build:3:0: ERROR: Identifier \"foo\" does not name a variable."
         }
     ]
 }

diff --git a/test cases/failing/112 compiler argument checking/meson.build b/test cases/failing/110 compiler argument checking/meson.build
similarity index 100%
rename from test cases/failing/112 compiler argument checking/meson.build
rename to test cases/failing/110 compiler argument checking/meson.build


diff --git a/test cases/failing/112 compiler argument checking/test.json b/test cases/failing/110 compiler argument checking/test.json
similarity index 66%
rename from test cases/failing/112 compiler argument checking/test.json
rename to test cases/failing/110 compiler argument checking/test.json
index f4728db..3de6acb 100644
--- a/test cases/failing/112 compiler argument checking/test.json
+++ b/test cases/failing/110 compiler argument checking/test.json

@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-        "line": "test cases/failing/112 compiler argument checking/meson.build:4:0: ERROR: Compiler for C does not support \"-meson-goober-arg-for-testing\""
+        "line": "test cases/failing/110 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/113 empty fallback/meson.build b/test cases/failing/111 empty fallback/meson.build
similarity index 100%
rename from test cases/failing/113 empty fallback/meson.build
rename to test cases/failing/111 empty fallback/meson.build


diff --git a/test cases/failing/113 empty fallback/subprojects/foo/meson.build b/test cases/failing/111 empty fallback/subprojects/foo/meson.build
similarity index 100%
rename from test cases/failing/113 empty fallback/subprojects/foo/meson.build
rename to test cases/failing/111 empty fallback/subprojects/foo/meson.build


diff --git a/test cases/failing/113 empty fallback/test.json b/test cases/failing/111 empty fallback/test.json
similarity index 65%
rename from test cases/failing/113 empty fallback/test.json
rename to test cases/failing/111 empty fallback/test.json
index c8ed212..02db40b 100644
--- a/test cases/failing/113 empty fallback/test.json
+++ b/test cases/failing/111 empty fallback/test.json

@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "line": "test cases/failing/113 empty fallback/meson.build:6:0: ERROR: Dependency \"foo\" not found, tried pkgconfig and cmake"
+            "line": "test cases/failing/111 empty fallback/meson.build:6:0: ERROR: Dependency \"foo\" not found, tried pkgconfig and cmake"
         }
     ]
 }

diff --git a/test cases/failing/114 cmake executable dependency/meson.build b/test cases/failing/112 cmake executable dependency/meson.build
similarity index 100%
rename from test cases/failing/114 cmake executable dependency/meson.build
rename to test cases/failing/112 cmake executable dependency/meson.build


diff --git a/test cases/failing/114 cmake executable dependency/subprojects/cmlib/CMakeLists.txt b/test cases/failing/112 cmake executable dependency/subprojects/cmlib/CMakeLists.txt
similarity index 100%
rename from test cases/failing/114 cmake executable dependency/subprojects/cmlib/CMakeLists.txt
rename to test cases/failing/112 cmake executable dependency/subprojects/cmlib/CMakeLists.txt


diff --git a/test cases/failing/114 cmake executable dependency/subprojects/cmlib/main.c b/test cases/failing/112 cmake executable dependency/subprojects/cmlib/main.c
similarity index 100%
rename from test cases/failing/114 cmake executable dependency/subprojects/cmlib/main.c
rename to test cases/failing/112 cmake executable dependency/subprojects/cmlib/main.c


diff --git a/test cases/failing/114 cmake executable dependency/test.json b/test cases/failing/112 cmake executable dependency/test.json
similarity index 77%
rename from test cases/failing/114 cmake executable dependency/test.json
rename to test cases/failing/112 cmake executable dependency/test.json
index 951f2e7..c1ccf6c 100644
--- a/test cases/failing/114 cmake executable dependency/test.json
+++ b/test cases/failing/112 cmake executable dependency/test.json

@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "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."
+            "line": "test cases/failing/112 cmake executable dependency/meson.build:9:0: ERROR: main is an executable and does not support the dependency() method. Use target() instead."
         }
     ],
     "tools": {

diff --git a/test cases/failing/115 allow_fallback with fallback/meson.build b/test cases/failing/113 allow_fallback with fallback/meson.build
similarity index 100%
rename from test cases/failing/115 allow_fallback with fallback/meson.build
rename to test cases/failing/113 allow_fallback with fallback/meson.build


diff --git a/test cases/failing/115 allow_fallback with fallback/test.json b/test cases/failing/113 allow_fallback with fallback/test.json
similarity index 70%
rename from test cases/failing/115 allow_fallback with fallback/test.json
rename to test cases/failing/113 allow_fallback with fallback/test.json
index 6bdcc51..58ed475 100644
--- a/test cases/failing/115 allow_fallback with fallback/test.json
+++ b/test cases/failing/113 allow_fallback with fallback/test.json

@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "line": "test cases/failing/115 allow_fallback with fallback/meson.build:3:0: ERROR: \"fallback\" and \"allow_fallback\" arguments are mutually exclusive"
+            "line": "test cases/failing/113 allow_fallback with fallback/meson.build:3:0: ERROR: \"fallback\" and \"allow_fallback\" arguments are mutually exclusive"
         }
     ]
 }

diff --git a/test cases/failing/116 nonsensical bindgen/meson.build b/test cases/failing/114 nonsensical bindgen/meson.build
similarity index 100%
rename from test cases/failing/116 nonsensical bindgen/meson.build
rename to test cases/failing/114 nonsensical bindgen/meson.build


diff --git a/test cases/failing/116 nonsensical bindgen/src/header.h b/test cases/failing/114 nonsensical bindgen/src/header.h
similarity index 100%
rename from test cases/failing/116 nonsensical bindgen/src/header.h
rename to test cases/failing/114 nonsensical bindgen/src/header.h


diff --git a/test cases/failing/116 nonsensical bindgen/src/source.c b/test cases/failing/114 nonsensical bindgen/src/source.c
similarity index 100%
rename from test cases/failing/116 nonsensical bindgen/src/source.c
rename to test cases/failing/114 nonsensical bindgen/src/source.c


diff --git a/test cases/failing/116 nonsensical bindgen/test.json b/test cases/failing/114 nonsensical bindgen/test.json
similarity index 69%
rename from test cases/failing/116 nonsensical bindgen/test.json
rename to test cases/failing/114 nonsensical bindgen/test.json
index b0a38e8..bc85311 100644
--- a/test cases/failing/116 nonsensical bindgen/test.json
+++ b/test cases/failing/114 nonsensical bindgen/test.json

@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "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"
+            "line": "test cases/failing/114 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/117 run_target in test/meson.build b/test cases/failing/115 run_target in test/meson.build
similarity index 100%
rename from test cases/failing/117 run_target in test/meson.build
rename to test cases/failing/115 run_target in test/meson.build


diff --git a/test cases/failing/117 run_target in test/test.json b/test cases/failing/115 run_target in test/test.json
similarity index 77%
rename from test cases/failing/117 run_target in test/test.json
rename to test cases/failing/115 run_target in test/test.json
index ad24367..fce0c47 100644
--- a/test cases/failing/117 run_target in test/test.json
+++ b/test cases/failing/115 run_target in test/test.json

@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "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]"
+            "line": "test cases/failing/115 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/117 run_target in test/trivial.c b/test cases/failing/115 run_target in test/trivial.c
similarity index 100%
rename from test cases/failing/117 run_target in test/trivial.c
rename to test cases/failing/115 run_target in test/trivial.c


diff --git a/test cases/failing/118 run_target in add_install_script/meson.build b/test cases/failing/116 run_target in add_install_script/meson.build
similarity index 100%
rename from test cases/failing/118 run_target in add_install_script/meson.build
rename to test cases/failing/116 run_target in add_install_script/meson.build


diff --git a/test cases/failing/118 run_target in add_install_script/test.json b/test cases/failing/116 run_target in add_install_script/test.json
similarity index 80%
rename from test cases/failing/118 run_target in add_install_script/test.json
rename to test cases/failing/116 run_target in add_install_script/test.json
index a09b1a3..621d510 100644
--- a/test cases/failing/118 run_target in add_install_script/test.json
+++ b/test cases/failing/116 run_target in add_install_script/test.json

@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "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\""
+            "line": "test cases/failing/116 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/118 run_target in add_install_script/trivial.c b/test cases/failing/116 run_target in add_install_script/trivial.c
similarity index 100%
rename from test cases/failing/118 run_target in add_install_script/trivial.c
rename to test cases/failing/116 run_target in add_install_script/trivial.c


diff --git a/test cases/failing/119 pathsep in install_symlink/meson.build b/test cases/failing/117 pathsep in install_symlink/meson.build
similarity index 100%
rename from test cases/failing/119 pathsep in install_symlink/meson.build
rename to test cases/failing/117 pathsep in install_symlink/meson.build


diff --git a/test cases/failing/119 pathsep in install_symlink/test.json b/test cases/failing/117 pathsep in install_symlink/test.json
similarity index 74%
rename from test cases/failing/119 pathsep in install_symlink/test.json
rename to test cases/failing/117 pathsep in install_symlink/test.json
index 9df546a..aa35619 100644
--- a/test cases/failing/119 pathsep in install_symlink/test.json
+++ b/test cases/failing/117 pathsep in install_symlink/test.json

@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "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."
+            "line": "test cases/failing/117 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/120 subproject version conflict/meson.build b/test cases/failing/118 subproject version conflict/meson.build
similarity index 100%
rename from test cases/failing/120 subproject version conflict/meson.build
rename to test cases/failing/118 subproject version conflict/meson.build


diff --git a/test cases/failing/120 subproject version conflict/subprojects/A/meson.build b/test cases/failing/118 subproject version conflict/subprojects/A/meson.build
similarity index 100%
rename from test cases/failing/120 subproject version conflict/subprojects/A/meson.build
rename to test cases/failing/118 subproject version conflict/subprojects/A/meson.build


diff --git a/test cases/failing/120 subproject version conflict/subprojects/B/meson.build b/test cases/failing/118 subproject version conflict/subprojects/B/meson.build
similarity index 100%
rename from test cases/failing/120 subproject version conflict/subprojects/B/meson.build
rename to test cases/failing/118 subproject version conflict/subprojects/B/meson.build


diff --git a/test cases/failing/120 subproject version conflict/test.json b/test cases/failing/118 subproject version conflict/test.json
similarity index 66%
rename from test cases/failing/120 subproject version conflict/test.json
rename to test cases/failing/118 subproject version conflict/test.json
index 7807d68..a31511c 100644
--- a/test cases/failing/120 subproject version conflict/test.json
+++ b/test cases/failing/118 subproject version conflict/test.json

@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "line": "test cases/failing/120 subproject version conflict/meson.build:4:0: ERROR: Subproject B version is 100 but ['1'] required."
+            "line": "test cases/failing/118 subproject version conflict/meson.build:4:0: ERROR: Subproject B version is 100 but ['1'] required."
         }
     ]
 }

diff --git a/test cases/failing/121 structured source empty string/main.rs b/test cases/failing/119 structured source empty string/main.rs
similarity index 100%
rename from test cases/failing/121 structured source empty string/main.rs
rename to test cases/failing/119 structured source empty string/main.rs


diff --git a/test cases/failing/121 structured source empty string/meson.build b/test cases/failing/119 structured source empty string/meson.build
similarity index 100%
rename from test cases/failing/121 structured source empty string/meson.build
rename to test cases/failing/119 structured source empty string/meson.build


diff --git a/test cases/failing/121 structured source empty string/test.json b/test cases/failing/119 structured source empty string/test.json
similarity index 71%
rename from test cases/failing/121 structured source empty string/test.json
rename to test cases/failing/119 structured source empty string/test.json
index feb2af9..3d41fc2 100644
--- a/test cases/failing/121 structured source empty string/test.json
+++ b/test cases/failing/119 structured source empty string/test.json

@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "line": "test cases/failing/121 structured source empty string/meson.build:7:0: ERROR: structured_sources: keys to dictionary argument may not be an empty string."
+            "line": "test cases/failing/119 structured source empty string/meson.build:7:0: ERROR: structured_sources: keys to dictionary argument may not be an empty string."
         }
     ]
 }

diff --git a/test cases/failing/122 structured_sources conflicts/main.rs b/test cases/failing/120 structured_sources conflicts/main.rs
similarity index 100%
rename from test cases/failing/122 structured_sources conflicts/main.rs
rename to test cases/failing/120 structured_sources conflicts/main.rs


diff --git a/test cases/failing/122 structured_sources conflicts/meson.build b/test cases/failing/120 structured_sources conflicts/meson.build
similarity index 100%
rename from test cases/failing/122 structured_sources conflicts/meson.build
rename to test cases/failing/120 structured_sources conflicts/meson.build


diff --git a/test cases/failing/122 structured_sources conflicts/test.json b/test cases/failing/120 structured_sources conflicts/test.json
similarity index 67%
rename from test cases/failing/122 structured_sources conflicts/test.json
rename to test cases/failing/120 structured_sources conflicts/test.json
index 4833f86..2f3d1ef 100644
--- a/test cases/failing/122 structured_sources conflicts/test.json
+++ b/test cases/failing/120 structured_sources conflicts/test.json

@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "line": "test cases/failing/122 structured_sources conflicts/meson.build:7:0: ERROR: Conflicting sources in structured sources: main.rs"
+            "line": "test cases/failing/120 structured_sources conflicts/meson.build:7:0: ERROR: Conflicting sources in structured sources: main.rs"
         }
     ]
 }

diff --git a/test cases/failing/123 missing compiler/meson.build b/test cases/failing/121 missing compiler/meson.build
similarity index 100%
rename from test cases/failing/123 missing compiler/meson.build
rename to test cases/failing/121 missing compiler/meson.build


diff --git a/test cases/failing/123 missing compiler/subprojects/sub/main.c b/test cases/failing/121 missing compiler/subprojects/sub/main.c
similarity index 100%
rename from test cases/failing/123 missing compiler/subprojects/sub/main.c
rename to test cases/failing/121 missing compiler/subprojects/sub/main.c


diff --git a/test cases/failing/123 missing compiler/subprojects/sub/meson.build b/test cases/failing/121 missing compiler/subprojects/sub/meson.build
similarity index 100%
rename from test cases/failing/123 missing compiler/subprojects/sub/meson.build
rename to test cases/failing/121 missing compiler/subprojects/sub/meson.build


diff --git a/test cases/failing/123 missing compiler/test.json b/test cases/failing/121 missing compiler/test.json
similarity index 68%
rename from test cases/failing/123 missing compiler/test.json
rename to test cases/failing/121 missing compiler/test.json
index 915df16..442e331 100644
--- a/test cases/failing/123 missing compiler/test.json
+++ b/test cases/failing/121 missing compiler/test.json

@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "line": "test cases/failing/123 missing compiler/subprojects/sub/meson.build:4:0: ERROR: No host machine compiler for 'subprojects/sub/main.c'"
+            "line": "test cases/failing/121 missing compiler/subprojects/sub/meson.build:4:0: ERROR: No host machine compiler for 'subprojects/sub/main.c'"
         }
     ]
 }

diff --git a/test cases/failing/39 prefix absolute/meson.build b/test cases/failing/38 prefix absolute/meson.build
similarity index 100%
rename from test cases/failing/39 prefix absolute/meson.build
rename to test cases/failing/38 prefix absolute/meson.build


diff --git a/test cases/failing/39 prefix absolute/test.json b/test cases/failing/38 prefix absolute/test.json
similarity index 80%
rename from test cases/failing/39 prefix absolute/test.json
rename to test cases/failing/38 prefix absolute/test.json
index 2770243..859906c 100644
--- a/test cases/failing/39 prefix absolute/test.json
+++ b/test cases/failing/38 prefix absolute/test.json

@@ -5,7 +5,7 @@
   "stdout": [
     {
       "comment": "literal 'some/path/notabs' appears in output, irrespective of os.path.sep, as that's the prefix",
-      "line": "test cases/failing/39 prefix absolute/meson.build:1:0: ERROR: prefix value 'some/path/notabs' must be an absolute path"
+      "line": "test cases/failing/38 prefix absolute/meson.build:1:0: ERROR: prefix value 'some/path/notabs' must be an absolute path"
     }
   ]
 }

diff --git a/test cases/failing/40 kwarg assign/dummy.c b/test cases/failing/39 kwarg assign/dummy.c
similarity index 100%
rename from test cases/failing/40 kwarg assign/dummy.c
rename to test cases/failing/39 kwarg assign/dummy.c


diff --git a/test cases/failing/40 kwarg assign/meson.build b/test cases/failing/39 kwarg assign/meson.build
similarity index 100%
rename from test cases/failing/40 kwarg assign/meson.build
rename to test cases/failing/39 kwarg assign/meson.build


diff --git a/test cases/failing/40 kwarg assign/prog.c b/test cases/failing/39 kwarg assign/prog.c
similarity index 100%
rename from test cases/failing/40 kwarg assign/prog.c
rename to test cases/failing/39 kwarg assign/prog.c


diff --git a/test cases/failing/39 kwarg assign/test.json b/test cases/failing/39 kwarg assign/test.json
new file mode 100644
index 0000000..8fd9d0f
--- /dev/null
+++ b/test cases/failing/39 kwarg assign/test.json

@@ -0,0 +1,7 @@
+{
+  "stdout": [
+    {
+      "line": "test cases/failing/39 kwarg assign/meson.build:3:0: ERROR: Tried to assign values inside an argument list."
+    }
+  ]
+}

diff --git a/test cases/failing/41 custom target plainname many inputs/1.txt b/test cases/failing/40 custom target plainname many inputs/1.txt
similarity index 100%
rename from test cases/failing/41 custom target plainname many inputs/1.txt
rename to test cases/failing/40 custom target plainname many inputs/1.txt


diff --git a/test cases/failing/41 custom target plainname many inputs/2.txt b/test cases/failing/40 custom target plainname many inputs/2.txt
similarity index 100%
rename from test cases/failing/41 custom target plainname many inputs/2.txt
rename to test cases/failing/40 custom target plainname many inputs/2.txt


diff --git a/test cases/failing/41 custom target plainname many inputs/catfiles.py b/test cases/failing/40 custom target plainname many inputs/catfiles.py
similarity index 100%
rename from test cases/failing/41 custom target plainname many inputs/catfiles.py
rename to test cases/failing/40 custom target plainname many inputs/catfiles.py


diff --git a/test cases/failing/41 custom target plainname many inputs/meson.build b/test cases/failing/40 custom target plainname many inputs/meson.build
similarity index 100%
rename from test cases/failing/41 custom target plainname many inputs/meson.build
rename to test cases/failing/40 custom target plainname many inputs/meson.build


diff --git a/test cases/failing/41 custom target plainname many inputs/test.json b/test cases/failing/40 custom target plainname many inputs/test.json
similarity index 75%
rename from test cases/failing/41 custom target plainname many inputs/test.json
rename to test cases/failing/40 custom target plainname many inputs/test.json
index 66a56f6..05f4d49 100644
--- a/test cases/failing/41 custom target plainname many inputs/test.json
+++ b/test cases/failing/40 custom target plainname many inputs/test.json

@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/41 custom target plainname many inputs/meson.build:5:0: ERROR: custom_target: output cannot containe \"@PLAINNAME@\" or \"@BASENAME@\" when there is more than one input (we can't know which to use)"
+      "line": "test cases/failing/40 custom target plainname many inputs/meson.build:5:0: ERROR: custom_target: output cannot containe \"@PLAINNAME@\" or \"@BASENAME@\" when there is more than one input (we can't know which to use)"
     }
   ]
 }

diff --git a/test cases/failing/40 kwarg assign/test.json b/test cases/failing/40 kwarg assign/test.json
deleted file mode 100644
index 671eb3f..0000000
--- a/test cases/failing/40 kwarg assign/test.json
+++ /dev/null

@@ -1,7 +0,0 @@
-{
-  "stdout": [
-    {
-      "line": "test cases/failing/40 kwarg assign/meson.build:3:0: ERROR: Tried to assign values inside an argument list."
-    }
-  ]
-}

diff --git a/test cases/failing/42 custom target outputs not matching install_dirs/generator.py b/test cases/failing/41 custom target outputs not matching install_dirs/generator.py
similarity index 100%
rename from test cases/failing/42 custom target outputs not matching install_dirs/generator.py
rename to test cases/failing/41 custom target outputs not matching install_dirs/generator.py


diff --git a/test cases/failing/42 custom target outputs not matching install_dirs/meson.build b/test cases/failing/41 custom target outputs not matching install_dirs/meson.build
similarity index 100%
rename from test cases/failing/42 custom target outputs not matching install_dirs/meson.build
rename to test cases/failing/41 custom target outputs not matching install_dirs/meson.build


diff --git a/test cases/failing/42 custom target outputs not matching install_dirs/test.json b/test cases/failing/41 custom target outputs not matching install_dirs/test.json
similarity index 100%
rename from test cases/failing/42 custom target outputs not matching install_dirs/test.json
rename to test cases/failing/41 custom target outputs not matching install_dirs/test.json


diff --git a/test cases/failing/43 project name colon/meson.build b/test cases/failing/42 project name colon/meson.build
similarity index 100%
rename from test cases/failing/43 project name colon/meson.build
rename to test cases/failing/42 project name colon/meson.build


diff --git a/test cases/failing/43 project name colon/test.json b/test cases/failing/42 project name colon/test.json
similarity index 60%
rename from test cases/failing/43 project name colon/test.json
rename to test cases/failing/42 project name colon/test.json
index 7a55574..c3b880e 100644
--- a/test cases/failing/43 project name colon/test.json
+++ b/test cases/failing/42 project name colon/test.json

@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/43 project name colon/meson.build:1:0: ERROR: Project name 'name with :' must not contain ':'"
+      "line": "test cases/failing/42 project name colon/meson.build:1:0: ERROR: Project name 'name with :' must not contain ':'"
     }
   ]
 }

diff --git a/test cases/failing/44 abs subdir/bob/meson.build b/test cases/failing/43 abs subdir/bob/meson.build
similarity index 100%
rename from test cases/failing/44 abs subdir/bob/meson.build
rename to test cases/failing/43 abs subdir/bob/meson.build


diff --git a/test cases/failing/44 abs subdir/meson.build b/test cases/failing/43 abs subdir/meson.build
similarity index 100%
rename from test cases/failing/44 abs subdir/meson.build
rename to test cases/failing/43 abs subdir/meson.build


diff --git a/test cases/failing/43 abs subdir/test.json b/test cases/failing/43 abs subdir/test.json
new file mode 100644
index 0000000..201ed44
--- /dev/null
+++ b/test cases/failing/43 abs subdir/test.json

@@ -0,0 +1,7 @@
+{
+  "stdout": [
+    {
+      "line": "test cases/failing/43 abs subdir/meson.build:5:0: ERROR: Subdir argument must be a relative path."
+    }
+  ]
+}

diff --git a/test cases/failing/44 abs subdir/test.json b/test cases/failing/44 abs subdir/test.json
deleted file mode 100644
index 0aa56f6..0000000
--- a/test cases/failing/44 abs subdir/test.json
+++ /dev/null

@@ -1,7 +0,0 @@
-{
-  "stdout": [
-    {
-      "line": "test cases/failing/44 abs subdir/meson.build:5:0: ERROR: Subdir argument must be a relative path."
-    }
-  ]
-}

diff --git a/test cases/failing/45 abspath to srcdir/meson.build b/test cases/failing/44 abspath to srcdir/meson.build
similarity index 100%
rename from test cases/failing/45 abspath to srcdir/meson.build
rename to test cases/failing/44 abspath to srcdir/meson.build


diff --git a/test cases/failing/45 abspath to srcdir/test.json b/test cases/failing/44 abspath to srcdir/test.json
similarity index 60%
rename from test cases/failing/45 abspath to srcdir/test.json
rename to test cases/failing/44 abspath to srcdir/test.json
index 177bac1..2cc2980 100644
--- a/test cases/failing/45 abspath to srcdir/test.json
+++ b/test cases/failing/44 abspath to srcdir/test.json

@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/45 abspath to srcdir/meson.build:3:0: ERROR: Tried to form an absolute path to a source dir."
+      "line": "test cases/failing/44 abspath to srcdir/meson.build:3:0: ERROR: Tried to form an absolute path to a source dir."
     }
   ]
 }

diff --git a/test cases/failing/46 pkgconfig variables reserved/meson.build b/test cases/failing/45 pkgconfig variables reserved/meson.build
similarity index 100%
rename from test cases/failing/46 pkgconfig variables reserved/meson.build
rename to test cases/failing/45 pkgconfig variables reserved/meson.build


diff --git a/test cases/failing/46 pkgconfig variables reserved/simple.c b/test cases/failing/45 pkgconfig variables reserved/simple.c
similarity index 100%
rename from test cases/failing/46 pkgconfig variables reserved/simple.c
rename to test cases/failing/45 pkgconfig variables reserved/simple.c


diff --git a/test cases/failing/46 pkgconfig variables reserved/simple.h b/test cases/failing/45 pkgconfig variables reserved/simple.h
similarity index 100%
rename from test cases/failing/46 pkgconfig variables reserved/simple.h
rename to test cases/failing/45 pkgconfig variables reserved/simple.h


diff --git a/test cases/failing/45 pkgconfig variables reserved/test.json b/test cases/failing/45 pkgconfig variables reserved/test.json
new file mode 100644
index 0000000..853eb82
--- /dev/null
+++ b/test cases/failing/45 pkgconfig variables reserved/test.json

@@ -0,0 +1,7 @@
+{
+  "stdout": [
+    {
+      "line": "test cases/failing/45 pkgconfig variables reserved/meson.build:8:5: ERROR: Variable \"prefix\" is reserved"
+    }
+  ]
+}

diff --git a/test cases/failing/46 pkgconfig variables reserved/test.json b/test cases/failing/46 pkgconfig variables reserved/test.json
deleted file mode 100644
index b92ee17..0000000
--- a/test cases/failing/46 pkgconfig variables reserved/test.json
+++ /dev/null

@@ -1,7 +0,0 @@
-{
-  "stdout": [
-    {
-      "line": "test cases/failing/46 pkgconfig variables reserved/meson.build:8:5: ERROR: Variable \"prefix\" is reserved"
-    }
-  ]
-}

diff --git a/test cases/failing/47 pkgconfig variables zero length/meson.build b/test cases/failing/46 pkgconfig variables zero length/meson.build
similarity index 100%
rename from test cases/failing/47 pkgconfig variables zero length/meson.build
rename to test cases/failing/46 pkgconfig variables zero length/meson.build


diff --git a/test cases/failing/47 pkgconfig variables zero length/simple.c b/test cases/failing/46 pkgconfig variables zero length/simple.c
similarity index 100%
rename from test cases/failing/47 pkgconfig variables zero length/simple.c
rename to test cases/failing/46 pkgconfig variables zero length/simple.c


diff --git a/test cases/failing/47 pkgconfig variables zero length/simple.h b/test cases/failing/46 pkgconfig variables zero length/simple.h
similarity index 100%
rename from test cases/failing/47 pkgconfig variables zero length/simple.h
rename to test cases/failing/46 pkgconfig variables zero length/simple.h


diff --git a/test cases/failing/46 pkgconfig variables zero length/test.json b/test cases/failing/46 pkgconfig variables zero length/test.json
new file mode 100644
index 0000000..ae8ba2b
--- /dev/null
+++ b/test cases/failing/46 pkgconfig variables zero length/test.json

@@ -0,0 +1,7 @@
+{
+  "stdout": [
+    {
+      "line": "test cases/failing/46 pkgconfig variables zero length/meson.build:8:5: ERROR: Empty variable name or value"
+    }
+  ]
+}

diff --git a/test cases/failing/48 pkgconfig variables zero length value/meson.build b/test cases/failing/47 pkgconfig variables zero length value/meson.build
similarity index 100%
rename from test cases/failing/48 pkgconfig variables zero length value/meson.build
rename to test cases/failing/47 pkgconfig variables zero length value/meson.build


diff --git a/test cases/failing/48 pkgconfig variables zero length value/simple.c b/test cases/failing/47 pkgconfig variables zero length value/simple.c
similarity index 100%
rename from test cases/failing/48 pkgconfig variables zero length value/simple.c
rename to test cases/failing/47 pkgconfig variables zero length value/simple.c


diff --git a/test cases/failing/48 pkgconfig variables zero length value/simple.h b/test cases/failing/47 pkgconfig variables zero length value/simple.h
similarity index 100%
rename from test cases/failing/48 pkgconfig variables zero length value/simple.h
rename to test cases/failing/47 pkgconfig variables zero length value/simple.h


diff --git a/test cases/failing/48 pkgconfig variables zero length value/test.json b/test cases/failing/47 pkgconfig variables zero length value/test.json
similarity index 60%
rename from test cases/failing/48 pkgconfig variables zero length value/test.json
rename to test cases/failing/47 pkgconfig variables zero length value/test.json
index 8aa1bc5..e963830 100644
--- a/test cases/failing/48 pkgconfig variables zero length value/test.json
+++ b/test cases/failing/47 pkgconfig variables zero length value/test.json

@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/48 pkgconfig variables zero length value/meson.build:8:5: ERROR: Empty variable name or value"
+      "line": "test cases/failing/47 pkgconfig variables zero length value/meson.build:8:5: ERROR: Empty variable name or value"
     }
   ]
 }

diff --git a/test cases/failing/47 pkgconfig variables zero length/test.json b/test cases/failing/47 pkgconfig variables zero length/test.json
deleted file mode 100644
index 39ffde4..0000000
--- a/test cases/failing/47 pkgconfig variables zero length/test.json
+++ /dev/null

@@ -1,7 +0,0 @@
-{
-  "stdout": [
-    {
-      "line": "test cases/failing/47 pkgconfig variables zero length/meson.build:8:5: ERROR: Empty variable name or value"
-    }
-  ]
-}

diff --git a/test cases/failing/49 pkgconfig variables not key value/meson.build b/test cases/failing/48 pkgconfig variables not key value/meson.build
similarity index 100%
rename from test cases/failing/49 pkgconfig variables not key value/meson.build
rename to test cases/failing/48 pkgconfig variables not key value/meson.build


diff --git a/test cases/failing/49 pkgconfig variables not key value/simple.c b/test cases/failing/48 pkgconfig variables not key value/simple.c
similarity index 100%
rename from test cases/failing/49 pkgconfig variables not key value/simple.c
rename to test cases/failing/48 pkgconfig variables not key value/simple.c


diff --git a/test cases/failing/49 pkgconfig variables not key value/simple.h b/test cases/failing/48 pkgconfig variables not key value/simple.h
similarity index 100%
rename from test cases/failing/49 pkgconfig variables not key value/simple.h
rename to test cases/failing/48 pkgconfig variables not key value/simple.h


diff --git a/test cases/failing/49 pkgconfig variables not key value/test.json b/test cases/failing/48 pkgconfig variables not key value/test.json
similarity index 69%
rename from test cases/failing/49 pkgconfig variables not key value/test.json
rename to test cases/failing/48 pkgconfig variables not key value/test.json
index 082bd79..decbe71 100644
--- a/test cases/failing/49 pkgconfig variables not key value/test.json
+++ b/test cases/failing/48 pkgconfig variables not key value/test.json

@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/49 pkgconfig variables not key value/meson.build:8:5: ERROR: Variable 'this_should_be_key_value' must have a value separated by equals sign."
+      "line": "test cases/failing/48 pkgconfig variables not key value/meson.build:8:5: ERROR: Variable 'this_should_be_key_value' must have a value separated by equals sign."
     }
   ]
 }

diff --git a/test cases/failing/50 executable comparison/meson.build b/test cases/failing/49 executable comparison/meson.build
similarity index 100%
rename from test cases/failing/50 executable comparison/meson.build
rename to test cases/failing/49 executable comparison/meson.build


diff --git a/test cases/failing/50 executable comparison/prog.c b/test cases/failing/49 executable comparison/prog.c
similarity index 100%
rename from test cases/failing/50 executable comparison/prog.c
rename to test cases/failing/49 executable comparison/prog.c


diff --git a/test cases/failing/50 executable comparison/test.json b/test cases/failing/49 executable comparison/test.json
similarity index 73%
rename from test cases/failing/50 executable comparison/test.json
rename to test cases/failing/49 executable comparison/test.json
index 7f6bd3b..a37002e 100644
--- a/test cases/failing/50 executable comparison/test.json
+++ b/test cases/failing/49 executable comparison/test.json

@@ -2,7 +2,7 @@
   "stdout": [
     {
       "match": "re",
-      "line": "test cases/failing/50 executable comparison/meson.build:6:0: ERROR: Object <ExecutableHolder prog1@exe: prog1(.exe)?> of type Executable does not support the `<` operator."
+      "line": "test cases/failing/49 executable comparison/meson.build:6:0: ERROR: Object <ExecutableHolder prog1@exe: prog1(.exe)?> of type Executable does not support the `<` operator."
     }
   ]
 }

diff --git a/test cases/failing/51 inconsistent comparison/meson.build b/test cases/failing/50 inconsistent comparison/meson.build
similarity index 100%
rename from test cases/failing/51 inconsistent comparison/meson.build
rename to test cases/failing/50 inconsistent comparison/meson.build


diff --git a/test cases/failing/51 inconsistent comparison/test.json b/test cases/failing/50 inconsistent comparison/test.json
similarity index 69%
rename from test cases/failing/51 inconsistent comparison/test.json
rename to test cases/failing/50 inconsistent comparison/test.json
index bd26554..171bfa6 100644
--- a/test cases/failing/51 inconsistent comparison/test.json
+++ b/test cases/failing/50 inconsistent comparison/test.json

@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/51 inconsistent comparison/meson.build:5:0: ERROR: Object <[ArrayHolder] holds [list]: []> of type array does not support the `<` operator."
+      "line": "test cases/failing/50 inconsistent comparison/meson.build:5:0: ERROR: Object <[ArrayHolder] holds [list]: []> of type array does not support the `<` operator."
     }
   ]
 }

diff --git a/test cases/failing/52 slashname/meson.build b/test cases/failing/51 slashname/meson.build
similarity index 100%
rename from test cases/failing/52 slashname/meson.build
rename to test cases/failing/51 slashname/meson.build


diff --git a/test cases/failing/52 slashname/sub/meson.build b/test cases/failing/51 slashname/sub/meson.build
similarity index 100%
rename from test cases/failing/52 slashname/sub/meson.build
rename to test cases/failing/51 slashname/sub/meson.build


diff --git a/test cases/failing/52 slashname/sub/prog.c b/test cases/failing/51 slashname/sub/prog.c
similarity index 100%
rename from test cases/failing/52 slashname/sub/prog.c
rename to test cases/failing/51 slashname/sub/prog.c


diff --git a/test cases/failing/52 slashname/test.json b/test cases/failing/51 slashname/test.json
similarity index 67%
rename from test cases/failing/52 slashname/test.json
rename to test cases/failing/51 slashname/test.json
index eb50e1b..39346a9 100644
--- a/test cases/failing/52 slashname/test.json
+++ b/test cases/failing/51 slashname/test.json

@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/52 slashname/meson.build:9:0: ERROR: Target \"sub/prog\" has a path segment pointing to directory \"sub\". This is an error."
+      "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/53 reserved meson prefix/meson-foo/meson.build b/test cases/failing/52 reserved meson prefix/meson-foo/meson.build
similarity index 100%
rename from test cases/failing/53 reserved meson prefix/meson-foo/meson.build
rename to test cases/failing/52 reserved meson prefix/meson-foo/meson.build


diff --git a/test cases/failing/53 reserved meson prefix/meson.build b/test cases/failing/52 reserved meson prefix/meson.build
similarity index 100%
rename from test cases/failing/53 reserved meson prefix/meson.build
rename to test cases/failing/52 reserved meson prefix/meson.build


diff --git a/test cases/failing/53 reserved meson prefix/test.json b/test cases/failing/52 reserved meson prefix/test.json
similarity index 67%
rename from test cases/failing/53 reserved meson prefix/test.json
rename to test cases/failing/52 reserved meson prefix/test.json
index 502d96a..707cd73 100644
--- a/test cases/failing/53 reserved meson prefix/test.json
+++ b/test cases/failing/52 reserved meson prefix/test.json

@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/53 reserved meson prefix/meson.build:3:0: ERROR: The \"meson-\" prefix is reserved and cannot be used for top-level subdir()."
+      "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/54 wrong shared crate type/foo.rs b/test cases/failing/53 wrong shared crate type/foo.rs
similarity index 100%
rename from test cases/failing/54 wrong shared crate type/foo.rs
rename to test cases/failing/53 wrong shared crate type/foo.rs


diff --git a/test cases/failing/54 wrong shared crate type/meson.build b/test cases/failing/53 wrong shared crate type/meson.build
similarity index 100%
rename from test cases/failing/54 wrong shared crate type/meson.build
rename to test cases/failing/53 wrong shared crate type/meson.build


diff --git a/test cases/failing/54 wrong shared crate type/test.json b/test cases/failing/53 wrong shared crate type/test.json
similarity index 71%
rename from test cases/failing/54 wrong shared crate type/test.json
rename to test cases/failing/53 wrong shared crate type/test.json
index a5b7961..5faaece 100644
--- a/test cases/failing/54 wrong shared crate type/test.json
+++ b/test cases/failing/53 wrong shared crate type/test.json

@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/54 wrong shared crate type/meson.build:7:0: ERROR: Crate type \"staticlib\" invalid for dynamic libraries; must be \"dylib\", \"cdylib\", or \"proc-macro\""
+      "line": "test cases/failing/53 wrong shared crate type/meson.build:7:0: ERROR: Crate type \"staticlib\" invalid for dynamic libraries; must be \"dylib\", \"cdylib\", or \"proc-macro\""
     }
   ]
 }

diff --git a/test cases/failing/55 wrong static crate type/foo.rs b/test cases/failing/54 wrong static crate type/foo.rs
similarity index 100%
rename from test cases/failing/55 wrong static crate type/foo.rs
rename to test cases/failing/54 wrong static crate type/foo.rs


diff --git a/test cases/failing/55 wrong static crate type/meson.build b/test cases/failing/54 wrong static crate type/meson.build
similarity index 100%
rename from test cases/failing/55 wrong static crate type/meson.build
rename to test cases/failing/54 wrong static crate type/meson.build


diff --git a/test cases/failing/55 wrong static crate type/test.json b/test cases/failing/54 wrong static crate type/test.json
similarity index 68%
rename from test cases/failing/55 wrong static crate type/test.json
rename to test cases/failing/54 wrong static crate type/test.json
index 7073f7b..83ae5e1 100644
--- a/test cases/failing/55 wrong static crate type/test.json
+++ b/test cases/failing/54 wrong static crate type/test.json

@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/55 wrong static crate type/meson.build:7:0: ERROR: Crate type \"cdylib\" invalid for static libraries; must be \"rlib\" or \"staticlib\""
+      "line": "test cases/failing/54 wrong static crate type/meson.build:7:0: ERROR: Crate type \"cdylib\" invalid for static libraries; must be \"rlib\" or \"staticlib\""
     }
   ]
 }

diff --git a/test cases/failing/56 or on new line/meson.build b/test cases/failing/55 or on new line/meson.build
similarity index 100%
rename from test cases/failing/56 or on new line/meson.build
rename to test cases/failing/55 or on new line/meson.build


diff --git a/test cases/failing/56 or on new line/meson_options.txt b/test cases/failing/55 or on new line/meson_options.txt
similarity index 100%
rename from test cases/failing/56 or on new line/meson_options.txt
rename to test cases/failing/55 or on new line/meson_options.txt


diff --git a/test cases/failing/55 or on new line/test.json b/test cases/failing/55 or on new line/test.json
new file mode 100644
index 0000000..f1b8a67
--- /dev/null
+++ b/test cases/failing/55 or on new line/test.json

@@ -0,0 +1,7 @@
+{
+  "stdout": [
+    {
+      "line": "test cases/failing/55 or on new line/meson.build:4:8: ERROR: Invalid or clause."
+    }
+  ]
+}

diff --git a/test cases/failing/57 link with executable/meson.build b/test cases/failing/56 link with executable/meson.build
similarity index 100%
rename from test cases/failing/57 link with executable/meson.build
rename to test cases/failing/56 link with executable/meson.build


diff --git a/test cases/failing/57 link with executable/module.c b/test cases/failing/56 link with executable/module.c
similarity index 100%
rename from test cases/failing/57 link with executable/module.c
rename to test cases/failing/56 link with executable/module.c


diff --git a/test cases/failing/57 link with executable/prog.c b/test cases/failing/56 link with executable/prog.c
similarity index 100%
rename from test cases/failing/57 link with executable/prog.c
rename to test cases/failing/56 link with executable/prog.c


diff --git a/test cases/failing/56 link with executable/test.json b/test cases/failing/56 link with executable/test.json
new file mode 100644
index 0000000..2288783
--- /dev/null
+++ b/test cases/failing/56 link with executable/test.json

@@ -0,0 +1,7 @@
+{
+  "stdout": [
+    {
+      "line": "test cases/failing/56 link with executable/meson.build:4:0: ERROR: Link target 'prog' is not linkable."
+    }
+  ]
+}

diff --git a/test cases/failing/56 or on new line/test.json b/test cases/failing/56 or on new line/test.json
deleted file mode 100644
index c55cee6..0000000
--- a/test cases/failing/56 or on new line/test.json
+++ /dev/null

@@ -1,7 +0,0 @@
-{
-  "stdout": [
-    {
-      "line": "test cases/failing/56 or on new line/meson.build:4:8: ERROR: Invalid or clause."
-    }
-  ]
-}

diff --git a/test cases/failing/58 assign custom target index/meson.build b/test cases/failing/57 assign custom target index/meson.build
similarity index 100%
rename from test cases/failing/58 assign custom target index/meson.build
rename to test cases/failing/57 assign custom target index/meson.build


diff --git a/test cases/failing/57 assign custom target index/test.json b/test cases/failing/57 assign custom target index/test.json
new file mode 100644
index 0000000..392137a
--- /dev/null
+++ b/test cases/failing/57 assign custom target index/test.json

@@ -0,0 +1,7 @@
+{
+  "stdout": [
+    {
+      "line": "test cases/failing/57 assign custom target index/meson.build:24:0: ERROR: Assignment target must be an id."
+    }
+  ]
+}

diff --git a/test cases/failing/57 link with executable/test.json b/test cases/failing/57 link with executable/test.json
deleted file mode 100644
index c835a90..0000000
--- a/test cases/failing/57 link with executable/test.json
+++ /dev/null

@@ -1,7 +0,0 @@
-{
-  "stdout": [
-    {
-      "line": "test cases/failing/57 link with executable/meson.build:4:0: ERROR: Link target 'prog' is not linkable."
-    }
-  ]
-}

diff --git a/test cases/failing/58 assign custom target index/test.json b/test cases/failing/58 assign custom target index/test.json
deleted file mode 100644
index b5aa326..0000000
--- a/test cases/failing/58 assign custom target index/test.json
+++ /dev/null

@@ -1,7 +0,0 @@
-{
-  "stdout": [
-    {
-      "line": "test cases/failing/58 assign custom target index/meson.build:24:0: ERROR: Assignment target must be an id."
-    }
-  ]
-}

diff --git a/test cases/failing/59 getoption prefix/meson.build b/test cases/failing/58 getoption prefix/meson.build
similarity index 100%
rename from test cases/failing/59 getoption prefix/meson.build
rename to test cases/failing/58 getoption prefix/meson.build


diff --git a/test cases/failing/59 getoption prefix/subprojects/abc/meson.build b/test cases/failing/58 getoption prefix/subprojects/abc/meson.build
similarity index 100%
rename from test cases/failing/59 getoption prefix/subprojects/abc/meson.build
rename to test cases/failing/58 getoption prefix/subprojects/abc/meson.build


diff --git a/test cases/failing/59 getoption prefix/subprojects/abc/meson_options.txt b/test cases/failing/58 getoption prefix/subprojects/abc/meson_options.txt
similarity index 100%
rename from test cases/failing/59 getoption prefix/subprojects/abc/meson_options.txt
rename to test cases/failing/58 getoption prefix/subprojects/abc/meson_options.txt


diff --git a/test cases/failing/59 getoption prefix/test.json b/test cases/failing/58 getoption prefix/test.json
similarity index 72%
rename from test cases/failing/59 getoption prefix/test.json
rename to test cases/failing/58 getoption prefix/test.json
index 4485e04..630dcd9 100644
--- a/test cases/failing/59 getoption prefix/test.json
+++ b/test cases/failing/58 getoption prefix/test.json

@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/59 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."
+      "line": "test cases/failing/58 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/60 bad option argument/meson.build b/test cases/failing/59 bad option argument/meson.build
similarity index 100%
rename from test cases/failing/60 bad option argument/meson.build
rename to test cases/failing/59 bad option argument/meson.build


diff --git a/test cases/failing/60 bad option argument/meson_options.txt b/test cases/failing/59 bad option argument/meson_options.txt
similarity index 100%
rename from test cases/failing/60 bad option argument/meson_options.txt
rename to test cases/failing/59 bad option argument/meson_options.txt


diff --git a/test cases/failing/60 bad option argument/test.json b/test cases/failing/59 bad option argument/test.json
similarity index 62%
rename from test cases/failing/60 bad option argument/test.json
rename to test cases/failing/59 bad option argument/test.json
index 38712b6..3c5df1b 100644
--- a/test cases/failing/60 bad option argument/test.json
+++ b/test cases/failing/59 bad option argument/test.json

@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/60 bad option argument/meson_options.txt:1:0: ERROR: option got unknown keyword arguments \"vaule\""
+      "line": "test cases/failing/59 bad option argument/meson_options.txt:1:0: ERROR: option got unknown keyword arguments \"vaule\""
     }
   ]
 }

diff --git a/test cases/failing/61 subproj filegrab/meson.build b/test cases/failing/60 subproj filegrab/meson.build
similarity index 100%
rename from test cases/failing/61 subproj filegrab/meson.build
rename to test cases/failing/60 subproj filegrab/meson.build


diff --git a/test cases/failing/61 subproj filegrab/prog.c b/test cases/failing/60 subproj filegrab/prog.c
similarity index 100%
rename from test cases/failing/61 subproj filegrab/prog.c
rename to test cases/failing/60 subproj filegrab/prog.c


diff --git a/test cases/failing/61 subproj filegrab/subprojects/a/meson.build b/test cases/failing/60 subproj filegrab/subprojects/a/meson.build
similarity index 100%
rename from test cases/failing/61 subproj filegrab/subprojects/a/meson.build
rename to test cases/failing/60 subproj filegrab/subprojects/a/meson.build


diff --git a/test cases/failing/61 subproj filegrab/test.json b/test cases/failing/60 subproj filegrab/test.json
similarity index 68%
rename from test cases/failing/61 subproj filegrab/test.json
rename to test cases/failing/60 subproj filegrab/test.json
index 600e0d5..04a6dbb 100644
--- a/test cases/failing/61 subproj filegrab/test.json
+++ b/test cases/failing/60 subproj filegrab/test.json

@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/61 subproj filegrab/subprojects/a/meson.build:3:0: ERROR: Sandbox violation: Tried to grab file prog.c outside current (sub)project."
+      "line": "test cases/failing/60 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/62 grab subproj/meson.build b/test cases/failing/61 grab subproj/meson.build
similarity index 100%
rename from test cases/failing/62 grab subproj/meson.build
rename to test cases/failing/61 grab subproj/meson.build


diff --git a/test cases/failing/62 grab subproj/subprojects/foo/meson.build b/test cases/failing/61 grab subproj/subprojects/foo/meson.build
similarity index 100%
rename from test cases/failing/62 grab subproj/subprojects/foo/meson.build
rename to test cases/failing/61 grab subproj/subprojects/foo/meson.build


diff --git a/test cases/failing/62 grab subproj/subprojects/foo/sub.c b/test cases/failing/61 grab subproj/subprojects/foo/sub.c
similarity index 100%
rename from test cases/failing/62 grab subproj/subprojects/foo/sub.c
rename to test cases/failing/61 grab subproj/subprojects/foo/sub.c


diff --git a/test cases/failing/62 grab subproj/test.json b/test cases/failing/61 grab subproj/test.json
similarity index 64%
rename from test cases/failing/62 grab subproj/test.json
rename to test cases/failing/61 grab subproj/test.json
index 1503ad7..873ec6c 100644
--- a/test cases/failing/62 grab subproj/test.json
+++ b/test cases/failing/61 grab subproj/test.json

@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/62 grab subproj/meson.build:7:0: ERROR: Sandbox violation: Tried to grab file sub.c from a nested subproject."
+      "line": "test cases/failing/61 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/63 grab sibling/meson.build b/test cases/failing/62 grab sibling/meson.build
similarity index 100%
rename from test cases/failing/63 grab sibling/meson.build
rename to test cases/failing/62 grab sibling/meson.build


diff --git a/test cases/failing/63 grab sibling/subprojects/a/meson.build b/test cases/failing/62 grab sibling/subprojects/a/meson.build
similarity index 100%
rename from test cases/failing/63 grab sibling/subprojects/a/meson.build
rename to test cases/failing/62 grab sibling/subprojects/a/meson.build


diff --git a/test cases/failing/63 grab sibling/subprojects/b/meson.build b/test cases/failing/62 grab sibling/subprojects/b/meson.build
similarity index 100%
rename from test cases/failing/63 grab sibling/subprojects/b/meson.build
rename to test cases/failing/62 grab sibling/subprojects/b/meson.build


diff --git a/test cases/failing/63 grab sibling/subprojects/b/sneaky.c b/test cases/failing/62 grab sibling/subprojects/b/sneaky.c
similarity index 100%
rename from test cases/failing/63 grab sibling/subprojects/b/sneaky.c
rename to test cases/failing/62 grab sibling/subprojects/b/sneaky.c


diff --git a/test cases/failing/63 grab sibling/test.json b/test cases/failing/62 grab sibling/test.json
similarity index 68%
rename from test cases/failing/63 grab sibling/test.json
rename to test cases/failing/62 grab sibling/test.json
index 91715c7..9e7c4bb 100644
--- a/test cases/failing/63 grab sibling/test.json
+++ b/test cases/failing/62 grab sibling/test.json

@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/63 grab sibling/subprojects/a/meson.build:3:0: ERROR: Sandbox violation: Tried to grab file sneaky.c outside current (sub)project."
+      "line": "test cases/failing/62 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/64 string as link target/meson.build b/test cases/failing/63 string as link target/meson.build
similarity index 100%
rename from test cases/failing/64 string as link target/meson.build
rename to test cases/failing/63 string as link target/meson.build


diff --git a/test cases/failing/64 string as link target/prog.c b/test cases/failing/63 string as link target/prog.c
similarity index 100%
rename from test cases/failing/64 string as link target/prog.c
rename to test cases/failing/63 string as link target/prog.c


diff --git a/test cases/failing/63 string as link target/test.json b/test cases/failing/63 string as link target/test.json
new file mode 100644
index 0000000..a531d64
--- /dev/null
+++ b/test cases/failing/63 string as link target/test.json

@@ -0,0 +1,7 @@
+{
+  "stdout": [
+    {
+      "line": "test cases/failing/63 string as link target/meson.build:2:0: ERROR: '' is not a target."
+    }
+  ]
+}

diff --git a/test cases/failing/65 dependency not-found and required/meson.build b/test cases/failing/64 dependency not-found and required/meson.build
similarity index 100%
rename from test cases/failing/65 dependency not-found and required/meson.build
rename to test cases/failing/64 dependency not-found and required/meson.build


diff --git a/test cases/failing/65 dependency not-found and required/test.json b/test cases/failing/64 dependency not-found and required/test.json
similarity index 63%
rename from test cases/failing/65 dependency not-found and required/test.json
rename to test cases/failing/64 dependency not-found and required/test.json
index ff20969..84d14b4 100644
--- a/test cases/failing/65 dependency not-found and required/test.json
+++ b/test cases/failing/64 dependency not-found and required/test.json

@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/65 dependency not-found and required/meson.build:2:0: ERROR: Dependency is required but has no candidates."
+      "line": "test cases/failing/64 dependency not-found and required/meson.build:2:0: ERROR: Dependency is required but has no candidates."
     }
   ]
 }

diff --git a/test cases/failing/64 string as link target/test.json b/test cases/failing/64 string as link target/test.json
deleted file mode 100644
index b07a2ea..0000000
--- a/test cases/failing/64 string as link target/test.json
+++ /dev/null

@@ -1,7 +0,0 @@
-{
-  "stdout": [
-    {
-      "line": "test cases/failing/64 string as link target/meson.build:2:0: ERROR: '' is not a target."
-    }
-  ]
-}

diff --git a/test cases/failing/66 subproj different versions/main.c b/test cases/failing/65 subproj different versions/main.c
similarity index 100%
rename from test cases/failing/66 subproj different versions/main.c
rename to test cases/failing/65 subproj different versions/main.c


diff --git a/test cases/failing/66 subproj different versions/meson.build b/test cases/failing/65 subproj different versions/meson.build
similarity index 100%
rename from test cases/failing/66 subproj different versions/meson.build
rename to test cases/failing/65 subproj different versions/meson.build


diff --git a/test cases/failing/66 subproj different versions/subprojects/a/a.c b/test cases/failing/65 subproj different versions/subprojects/a/a.c
similarity index 100%
rename from test cases/failing/66 subproj different versions/subprojects/a/a.c
rename to test cases/failing/65 subproj different versions/subprojects/a/a.c


diff --git a/test cases/failing/66 subproj different versions/subprojects/a/a.h b/test cases/failing/65 subproj different versions/subprojects/a/a.h
similarity index 100%
rename from test cases/failing/66 subproj different versions/subprojects/a/a.h
rename to test cases/failing/65 subproj different versions/subprojects/a/a.h


diff --git a/test cases/failing/66 subproj different versions/subprojects/a/meson.build b/test cases/failing/65 subproj different versions/subprojects/a/meson.build
similarity index 100%
rename from test cases/failing/66 subproj different versions/subprojects/a/meson.build
rename to test cases/failing/65 subproj different versions/subprojects/a/meson.build


diff --git a/test cases/failing/66 subproj different versions/subprojects/b/b.c b/test cases/failing/65 subproj different versions/subprojects/b/b.c
similarity index 100%
rename from test cases/failing/66 subproj different versions/subprojects/b/b.c
rename to test cases/failing/65 subproj different versions/subprojects/b/b.c


diff --git a/test cases/failing/66 subproj different versions/subprojects/b/b.h b/test cases/failing/65 subproj different versions/subprojects/b/b.h
similarity index 100%
rename from test cases/failing/66 subproj different versions/subprojects/b/b.h
rename to test cases/failing/65 subproj different versions/subprojects/b/b.h


diff --git a/test cases/failing/66 subproj different versions/subprojects/b/meson.build b/test cases/failing/65 subproj different versions/subprojects/b/meson.build
similarity index 100%
rename from test cases/failing/66 subproj different versions/subprojects/b/meson.build
rename to test cases/failing/65 subproj different versions/subprojects/b/meson.build


diff --git a/test cases/failing/66 subproj different versions/subprojects/c/c.h b/test cases/failing/65 subproj different versions/subprojects/c/c.h
similarity index 100%
rename from test cases/failing/66 subproj different versions/subprojects/c/c.h
rename to test cases/failing/65 subproj different versions/subprojects/c/c.h


diff --git a/test cases/failing/66 subproj different versions/subprojects/c/meson.build b/test cases/failing/65 subproj different versions/subprojects/c/meson.build
similarity index 100%
rename from test cases/failing/66 subproj different versions/subprojects/c/meson.build
rename to test cases/failing/65 subproj different versions/subprojects/c/meson.build


diff --git a/test cases/failing/66 subproj different versions/test.json b/test cases/failing/65 subproj different versions/test.json
similarity index 64%
rename from test cases/failing/66 subproj different versions/test.json
rename to test cases/failing/65 subproj different versions/test.json
index 19e7b4a..2f9f70d 100644
--- a/test cases/failing/66 subproj different versions/test.json
+++ b/test cases/failing/65 subproj different versions/test.json

@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/66 subproj different versions/subprojects/b/meson.build:3:0: ERROR: Dependency 'c' is required but not found."
+      "line": "test cases/failing/65 subproj different versions/subprojects/b/meson.build:3:0: ERROR: Dependency 'c' is required but not found."
     }
   ]
 }

diff --git a/test cases/failing/67 wrong boost module/meson.build b/test cases/failing/66 wrong boost module/meson.build
similarity index 100%
rename from test cases/failing/67 wrong boost module/meson.build
rename to test cases/failing/66 wrong boost module/meson.build


diff --git a/test cases/failing/67 wrong boost module/test.json b/test cases/failing/66 wrong boost module/test.json
similarity index 60%
rename from test cases/failing/67 wrong boost module/test.json
rename to test cases/failing/66 wrong boost module/test.json
index 5f9b21f..c65a78c 100644
--- a/test cases/failing/67 wrong boost module/test.json
+++ b/test cases/failing/66 wrong boost module/test.json

@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/67 wrong boost module/meson.build:9:0: ERROR: Dependency \"boost\" not found, tried system"
+      "line": "test cases/failing/66 wrong boost module/meson.build:9:0: ERROR: Dependency \"boost\" not found, tried system"
     }
   ]
 }

diff --git a/test cases/failing/68 install_data rename bad size/file1.txt b/test cases/failing/67 install_data rename bad size/file1.txt
similarity index 100%
rename from test cases/failing/68 install_data rename bad size/file1.txt
rename to test cases/failing/67 install_data rename bad size/file1.txt


diff --git a/test cases/failing/68 install_data rename bad size/file2.txt b/test cases/failing/67 install_data rename bad size/file2.txt
similarity index 100%
rename from test cases/failing/68 install_data rename bad size/file2.txt
rename to test cases/failing/67 install_data rename bad size/file2.txt


diff --git a/test cases/failing/68 install_data rename bad size/meson.build b/test cases/failing/67 install_data rename bad size/meson.build
similarity index 100%
rename from test cases/failing/68 install_data rename bad size/meson.build
rename to test cases/failing/67 install_data rename bad size/meson.build


diff --git a/test cases/failing/68 install_data rename bad size/test.json b/test cases/failing/67 install_data rename bad size/test.json
similarity index 74%
rename from test cases/failing/68 install_data rename bad size/test.json
rename to test cases/failing/67 install_data rename bad size/test.json
index a3cbb1b..af1f0d9 100644
--- a/test cases/failing/68 install_data rename bad size/test.json
+++ b/test cases/failing/67 install_data rename bad size/test.json

@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/68 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."
+      "line": "test cases/failing/67 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/69 skip only subdir/meson.build b/test cases/failing/68 skip only subdir/meson.build
similarity index 100%
rename from test cases/failing/69 skip only subdir/meson.build
rename to test cases/failing/68 skip only subdir/meson.build


diff --git a/test cases/failing/69 skip only subdir/subdir/meson.build b/test cases/failing/68 skip only subdir/subdir/meson.build
similarity index 100%
rename from test cases/failing/69 skip only subdir/subdir/meson.build
rename to test cases/failing/68 skip only subdir/subdir/meson.build


diff --git a/test cases/failing/68 skip only subdir/test.json b/test cases/failing/68 skip only subdir/test.json
new file mode 100644
index 0000000..4558847
--- /dev/null
+++ b/test cases/failing/68 skip only subdir/test.json

@@ -0,0 +1,7 @@
+{
+  "stdout": [
+    {
+      "line": "test cases/failing/68 skip only subdir/meson.build:8:0: ERROR: File main.cpp does not exist."
+    }
+  ]
+}

diff --git a/test cases/failing/70 dual override/meson.build b/test cases/failing/69 dual override/meson.build
similarity index 100%
rename from test cases/failing/70 dual override/meson.build
rename to test cases/failing/69 dual override/meson.build


diff --git a/test cases/failing/70 dual override/overrides.py b/test cases/failing/69 dual override/overrides.py
similarity index 100%
rename from test cases/failing/70 dual override/overrides.py
rename to test cases/failing/69 dual override/overrides.py


diff --git a/test cases/failing/70 dual override/test.json b/test cases/failing/69 dual override/test.json
similarity index 65%
rename from test cases/failing/70 dual override/test.json
rename to test cases/failing/69 dual override/test.json
index e955dc0..784d6b2 100644
--- a/test cases/failing/70 dual override/test.json
+++ b/test cases/failing/69 dual override/test.json

@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/70 dual override/meson.build:5:6: ERROR: Tried to override executable \"override\" which has already been overridden."
+      "line": "test cases/failing/69 dual override/meson.build:5:6: ERROR: Tried to override executable \"override\" which has already been overridden."
     }
   ]
 }

diff --git a/test cases/failing/69 skip only subdir/test.json b/test cases/failing/69 skip only subdir/test.json
deleted file mode 100644
index 134971a..0000000
--- a/test cases/failing/69 skip only subdir/test.json
+++ /dev/null

@@ -1,7 +0,0 @@
-{
-  "stdout": [
-    {
-      "line": "test cases/failing/69 skip only subdir/meson.build:8:0: ERROR: File main.cpp does not exist."
-    }
-  ]
-}

diff --git a/test cases/failing/71 override used/meson.build b/test cases/failing/70 override used/meson.build
similarity index 100%
rename from test cases/failing/71 override used/meson.build
rename to test cases/failing/70 override used/meson.build


diff --git a/test cases/failing/71 override used/other.py b/test cases/failing/70 override used/other.py
similarity index 100%
rename from test cases/failing/71 override used/other.py
rename to test cases/failing/70 override used/other.py


diff --git a/test cases/failing/71 override used/something.py b/test cases/failing/70 override used/something.py
similarity index 100%
rename from test cases/failing/71 override used/something.py
rename to test cases/failing/70 override used/something.py


diff --git a/test cases/failing/71 override used/test.json b/test cases/failing/70 override used/test.json
similarity index 67%
rename from test cases/failing/71 override used/test.json
rename to test cases/failing/70 override used/test.json
index 6c734e4..adb60aa 100644
--- a/test cases/failing/71 override used/test.json
+++ b/test cases/failing/70 override used/test.json

@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/71 override used/meson.build:5:6: ERROR: Tried to override finding of executable \"something.py\" which has already been found."
+      "line": "test cases/failing/70 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/72 run_command unclean exit/meson.build b/test cases/failing/71 run_command unclean exit/meson.build
similarity index 100%
rename from test cases/failing/72 run_command unclean exit/meson.build
rename to test cases/failing/71 run_command unclean exit/meson.build


diff --git a/test cases/failing/72 run_command unclean exit/returncode.py b/test cases/failing/71 run_command unclean exit/returncode.py
similarity index 100%
rename from test cases/failing/72 run_command unclean exit/returncode.py
rename to test cases/failing/71 run_command unclean exit/returncode.py


diff --git a/test cases/failing/71 run_command unclean exit/test.json b/test cases/failing/71 run_command unclean exit/test.json
new file mode 100644
index 0000000..e9bfb94
--- /dev/null
+++ b/test cases/failing/71 run_command unclean exit/test.json

@@ -0,0 +1,8 @@
+{
+  "stdout": [
+    {
+      "match": "re",
+      "line": "test cases/failing/71 run_command unclean exit/meson\\.build:4:0: ERROR: Command \".*[\\\\/]test cases[\\\\/]failing[\\\\/]71 run_command unclean exit[\\\\/]\\.[\\\\/]returncode\\.py 1\" failed with status 1\\."
+    }
+  ]
+}

diff --git a/test cases/failing/73 int literal leading zero/meson.build b/test cases/failing/72 int literal leading zero/meson.build
similarity index 100%
rename from test cases/failing/73 int literal leading zero/meson.build
rename to test cases/failing/72 int literal leading zero/meson.build


diff --git a/test cases/failing/73 int literal leading zero/test.json b/test cases/failing/72 int literal leading zero/test.json
similarity index 69%
rename from test cases/failing/73 int literal leading zero/test.json
rename to test cases/failing/72 int literal leading zero/test.json
index bc41165..556e492 100644
--- a/test cases/failing/73 int literal leading zero/test.json
+++ b/test cases/failing/72 int literal leading zero/test.json

@@ -2,7 +2,7 @@
   "stdout": [
     {
       "comment": "this error message is not very informative",
-      "line": "test cases/failing/73 int literal leading zero/meson.build:5:13: ERROR: Expecting eof got number."
+      "line": "test cases/failing/72 int literal leading zero/meson.build:5:13: ERROR: Expecting eof got number."
     }
   ]
 }

diff --git a/test cases/failing/72 run_command unclean exit/test.json b/test cases/failing/72 run_command unclean exit/test.json
deleted file mode 100644
index 67a80f4..0000000
--- a/test cases/failing/72 run_command unclean exit/test.json
+++ /dev/null

@@ -1,8 +0,0 @@
-{
-  "stdout": [
-    {
-      "match": "re",
-      "line": "test cases/failing/72 run_command unclean exit/meson\\.build:4:0: ERROR: Command \".*[\\\\/]test cases[\\\\/]failing[\\\\/]72 run_command unclean exit[\\\\/]\\.[\\\\/]returncode\\.py 1\" failed with status 1\\."
-    }
-  ]
-}

diff --git a/test cases/failing/74 configuration immutable/input b/test cases/failing/73 configuration immutable/input
similarity index 100%
rename from test cases/failing/74 configuration immutable/input
rename to test cases/failing/73 configuration immutable/input


diff --git a/test cases/failing/74 configuration immutable/meson.build b/test cases/failing/73 configuration immutable/meson.build
similarity index 100%
rename from test cases/failing/74 configuration immutable/meson.build
rename to test cases/failing/73 configuration immutable/meson.build


diff --git a/test cases/failing/74 configuration immutable/test.json b/test cases/failing/73 configuration immutable/test.json
similarity index 65%
rename from test cases/failing/74 configuration immutable/test.json
rename to test cases/failing/73 configuration immutable/test.json
index 1dd172a..32d9427 100644
--- a/test cases/failing/74 configuration immutable/test.json
+++ b/test cases/failing/73 configuration immutable/test.json

@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/74 configuration immutable/meson.build:12:16: ERROR: Can not set values on configuration object that has been used."
+      "line": "test cases/failing/73 configuration immutable/meson.build:12:16: ERROR: Can not set values on configuration object that has been used."
     }
   ]
 }

diff --git a/test cases/failing/75 link with shared module on osx/meson.build b/test cases/failing/74 link with shared module on osx/meson.build
similarity index 100%
rename from test cases/failing/75 link with shared module on osx/meson.build
rename to test cases/failing/74 link with shared module on osx/meson.build


diff --git a/test cases/failing/75 link with shared module on osx/module.c b/test cases/failing/74 link with shared module on osx/module.c
similarity index 100%
rename from test cases/failing/75 link with shared module on osx/module.c
rename to test cases/failing/74 link with shared module on osx/module.c


diff --git a/test cases/failing/75 link with shared module on osx/prog.c b/test cases/failing/74 link with shared module on osx/prog.c
similarity index 100%
rename from test cases/failing/75 link with shared module on osx/prog.c
rename to test cases/failing/74 link with shared module on osx/prog.c


diff --git a/test cases/failing/75 link with shared module on osx/test.json b/test cases/failing/74 link with shared module on osx/test.json
similarity index 68%
rename from test cases/failing/75 link with shared module on osx/test.json
rename to test cases/failing/74 link with shared module on osx/test.json
index 81ee2ac..9ca1b9d 100644
--- a/test cases/failing/75 link with shared module on osx/test.json
+++ b/test cases/failing/74 link with shared module on osx/test.json

@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/75 link with shared module on osx/meson.build:8:0: ERROR: target prog links against shared module mymodule. This is not permitted on OSX"
+      "line": "test cases/failing/74 link with shared module on osx/meson.build:8:0: ERROR: target prog links against shared module mymodule. This is not permitted on OSX"
     }
   ]
 }

diff --git a/test cases/failing/76 non ascii in ascii encoded configure file/config9.h.in b/test cases/failing/75 non ascii in ascii encoded configure file/config9.h.in
similarity index 100%
rename from test cases/failing/76 non ascii in ascii encoded configure file/config9.h.in
rename to test cases/failing/75 non ascii in ascii encoded configure file/config9.h.in


diff --git a/test cases/failing/76 non ascii in ascii encoded configure file/meson.build b/test cases/failing/75 non ascii in ascii encoded configure file/meson.build
similarity index 100%
rename from test cases/failing/76 non ascii in ascii encoded configure file/meson.build
rename to test cases/failing/75 non ascii in ascii encoded configure file/meson.build


diff --git a/test cases/failing/76 non ascii in ascii encoded configure file/test.json b/test cases/failing/75 non ascii in ascii encoded configure file/test.json
similarity index 79%
rename from test cases/failing/76 non ascii in ascii encoded configure file/test.json
rename to test cases/failing/75 non ascii in ascii encoded configure file/test.json
index 44e6377..27cb0ab 100644
--- a/test cases/failing/76 non ascii in ascii encoded configure file/test.json
+++ b/test cases/failing/75 non ascii in ascii encoded configure file/test.json

@@ -2,7 +2,7 @@
   "stdout": [
     {
       "match": "re",
-      "line": "test cases/failing/76 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\\)"
+      "line": "test cases/failing/75 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/77 subproj dependency not-found and required/meson.build b/test cases/failing/76 subproj dependency not-found and required/meson.build
similarity index 100%
rename from test cases/failing/77 subproj dependency not-found and required/meson.build
rename to test cases/failing/76 subproj dependency not-found and required/meson.build


diff --git a/test cases/failing/77 subproj dependency not-found and required/test.json b/test cases/failing/76 subproj dependency not-found and required/test.json
similarity index 68%
rename from test cases/failing/77 subproj dependency not-found and required/test.json
rename to test cases/failing/76 subproj dependency not-found and required/test.json
index 5365f34..3b98436 100644
--- a/test cases/failing/77 subproj dependency not-found and required/test.json
+++ b/test cases/failing/76 subproj dependency not-found and required/test.json

@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/77 subproj dependency not-found and required/meson.build:2:0: ERROR: Neither a subproject directory nor a missing.wrap file was found."
+      "line": "test cases/failing/76 subproj dependency not-found and required/meson.build:2:0: ERROR: Neither a subproject directory nor a missing.wrap file was found."
     }
   ]
 }

diff --git a/test cases/failing/78 unfound run/meson.build b/test cases/failing/77 unfound run/meson.build
similarity index 100%
rename from test cases/failing/78 unfound run/meson.build
rename to test cases/failing/77 unfound run/meson.build


diff --git a/test cases/failing/78 unfound run/test.json b/test cases/failing/77 unfound run/test.json
similarity index 61%
rename from test cases/failing/78 unfound run/test.json
rename to test cases/failing/77 unfound run/test.json
index 0cdcdf2..99464bd 100644
--- a/test cases/failing/78 unfound run/test.json
+++ b/test cases/failing/77 unfound run/test.json

@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/78 unfound run/meson.build:4:0: ERROR: Tried to use non-existing executable 'nonexisting_prog'"
+      "line": "test cases/failing/77 unfound run/meson.build:4:0: ERROR: Tried to use non-existing executable 'nonexisting_prog'"
     }
   ]
 }

diff --git a/test cases/failing/79 framework dependency with version/meson.build b/test cases/failing/78 framework dependency with version/meson.build
similarity index 100%
rename from test cases/failing/79 framework dependency with version/meson.build
rename to test cases/failing/78 framework dependency with version/meson.build


diff --git a/test cases/failing/79 framework dependency with version/test.json b/test cases/failing/78 framework dependency with version/test.json
similarity index 67%
rename from test cases/failing/79 framework dependency with version/test.json
rename to test cases/failing/78 framework dependency with version/test.json
index 9b0d335..c9f25a2 100644
--- a/test cases/failing/79 framework dependency with version/test.json
+++ b/test cases/failing/78 framework dependency with version/test.json

@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/79 framework dependency with version/meson.build:8:0: ERROR: Unknown version of dependency 'appleframeworks', but need ['>0']."
+      "line": "test cases/failing/78 framework dependency with version/meson.build:8:0: ERROR: Unknown version of dependency 'appleframeworks', but need ['>0']."
     }
   ]
 }

diff --git a/test cases/failing/80 override exe config/foo.c b/test cases/failing/79 override exe config/foo.c
similarity index 100%
rename from test cases/failing/80 override exe config/foo.c
rename to test cases/failing/79 override exe config/foo.c


diff --git a/test cases/failing/80 override exe config/meson.build b/test cases/failing/79 override exe config/meson.build
similarity index 100%
rename from test cases/failing/80 override exe config/meson.build
rename to test cases/failing/79 override exe config/meson.build


diff --git a/test cases/failing/80 override exe config/test.json b/test cases/failing/79 override exe config/test.json
similarity index 72%
rename from test cases/failing/80 override exe config/test.json
rename to test cases/failing/79 override exe config/test.json
index 36c789e..1a671a3 100644
--- a/test cases/failing/80 override exe config/test.json
+++ b/test cases/failing/79 override exe config/test.json

@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/80 override exe config/meson.build:6:0: ERROR: Program 'bar' was overridden with the compiled executable 'foo' and therefore cannot be used during configuration"
+      "line": "test cases/failing/79 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/81 gl dependency with version/meson.build b/test cases/failing/80 gl dependency with version/meson.build
similarity index 100%
rename from test cases/failing/81 gl dependency with version/meson.build
rename to test cases/failing/80 gl dependency with version/meson.build


diff --git a/test cases/failing/81 gl dependency with version/test.json b/test cases/failing/80 gl dependency with version/test.json
similarity index 63%
rename from test cases/failing/81 gl dependency with version/test.json
rename to test cases/failing/80 gl dependency with version/test.json
index 86da735..cae10da 100644
--- a/test cases/failing/81 gl dependency with version/test.json
+++ b/test cases/failing/80 gl dependency with version/test.json

@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/81 gl dependency with version/meson.build:9:0: ERROR: Unknown version of dependency 'gl', but need ['>0']."
+      "line": "test cases/failing/80 gl dependency with version/meson.build:9:0: ERROR: Unknown version of dependency 'gl', but need ['>0']."
     }
   ]
 }

diff --git a/test cases/failing/82 threads dependency with version/meson.build b/test cases/failing/81 threads dependency with version/meson.build
similarity index 100%
rename from test cases/failing/82 threads dependency with version/meson.build
rename to test cases/failing/81 threads dependency with version/meson.build


diff --git a/test cases/failing/82 threads dependency with version/test.json b/test cases/failing/81 threads dependency with version/test.json
similarity index 65%
rename from test cases/failing/82 threads dependency with version/test.json
rename to test cases/failing/81 threads dependency with version/test.json
index 9b71468..7781b72 100644
--- a/test cases/failing/82 threads dependency with version/test.json
+++ b/test cases/failing/81 threads dependency with version/test.json

@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/82 threads dependency with version/meson.build:3:0: ERROR: Unknown version of dependency 'threads', but need ['>0']."
+      "line": "test cases/failing/81 threads dependency with version/meson.build:3:0: ERROR: Unknown version of dependency 'threads', but need ['>0']."
     }
   ]
 }

diff --git a/test cases/failing/83 gtest dependency with version/meson.build b/test cases/failing/82 gtest dependency with version/meson.build
similarity index 100%
rename from test cases/failing/83 gtest dependency with version/meson.build
rename to test cases/failing/82 gtest dependency with version/meson.build


diff --git a/test cases/failing/83 gtest dependency with version/test.json b/test cases/failing/82 gtest dependency with version/test.json
similarity index 62%
rename from test cases/failing/83 gtest dependency with version/test.json
rename to test cases/failing/82 gtest dependency with version/test.json
index 4a44077..7cf397b 100644
--- a/test cases/failing/83 gtest dependency with version/test.json
+++ b/test cases/failing/82 gtest dependency with version/test.json

@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/83 gtest dependency with version/meson.build:8:0: ERROR: Dependency 'gtest' is required but not found."
+      "line": "test cases/failing/82 gtest dependency with version/meson.build:8:0: ERROR: Dependency 'gtest' is required but not found."
     }
   ]
 }

diff --git a/test cases/failing/84 dub libray/meson.build b/test cases/failing/83 dub libray/meson.build
similarity index 100%
rename from test cases/failing/84 dub libray/meson.build
rename to test cases/failing/83 dub libray/meson.build


diff --git a/test cases/failing/83 dub libray/test.json b/test cases/failing/83 dub libray/test.json
new file mode 100644
index 0000000..4dcbbed
--- /dev/null
+++ b/test cases/failing/83 dub libray/test.json

@@ -0,0 +1,7 @@
+{
+  "stdout": [
+    {
+      "line": "test cases/failing/83 dub libray/meson.build:11:0: ERROR: Dependency \"dubtestproject\" not found"
+    }
+  ]
+}

diff --git a/test cases/failing/85 dub executable/meson.build b/test cases/failing/84 dub executable/meson.build
similarity index 100%
rename from test cases/failing/85 dub executable/meson.build
rename to test cases/failing/84 dub executable/meson.build


diff --git a/test cases/failing/84 dub executable/test.json b/test cases/failing/84 dub executable/test.json
new file mode 100644
index 0000000..6dfff62
--- /dev/null
+++ b/test cases/failing/84 dub executable/test.json

@@ -0,0 +1,7 @@
+{
+  "stdout": [
+    {
+      "line": "test cases/failing/84 dub executable/meson.build:11:0: ERROR: Dependency \"dubtestproject:test1\" not found"
+    }
+  ]
+}

diff --git a/test cases/failing/84 dub libray/test.json b/test cases/failing/84 dub libray/test.json
deleted file mode 100644
index 23fe6e5..0000000
--- a/test cases/failing/84 dub libray/test.json
+++ /dev/null

@@ -1,7 +0,0 @@
-{
-  "stdout": [
-    {
-      "line": "test cases/failing/84 dub libray/meson.build:11:0: ERROR: Dependency \"dubtestproject\" not found"
-    }
-  ]
-}

diff --git a/test cases/failing/86 dub compiler/meson.build b/test cases/failing/85 dub compiler/meson.build
similarity index 100%
rename from test cases/failing/86 dub compiler/meson.build
rename to test cases/failing/85 dub compiler/meson.build


diff --git a/test cases/failing/86 dub compiler/test.json b/test cases/failing/85 dub compiler/test.json
similarity index 81%
rename from test cases/failing/86 dub compiler/test.json
rename to test cases/failing/85 dub compiler/test.json
index ab6caff..50ee39b 100644
--- a/test cases/failing/86 dub compiler/test.json
+++ b/test cases/failing/85 dub compiler/test.json

@@ -13,7 +13,7 @@
   },
   "stdout": [
     {
-      "line": "test cases/failing/86 dub compiler/meson.build:17:0: ERROR: Dependency \"dubtestproject:test2\" not found"
+      "line": "test cases/failing/85 dub compiler/meson.build:17:0: ERROR: Dependency \"dubtestproject:test2\" not found"
     }
   ]
 }

diff --git a/test cases/failing/85 dub executable/test.json b/test cases/failing/85 dub executable/test.json
deleted file mode 100644
index 4a8674c..0000000
--- a/test cases/failing/85 dub executable/test.json
+++ /dev/null

@@ -1,7 +0,0 @@
-{
-  "stdout": [
-    {
-      "line": "test cases/failing/85 dub executable/meson.build:11:0: ERROR: Dependency \"dubtestproject:test1\" not found"
-    }
-  ]
-}

diff --git a/test cases/failing/87 subproj not-found dep/meson.build b/test cases/failing/86 subproj not-found dep/meson.build
similarity index 100%
rename from test cases/failing/87 subproj not-found dep/meson.build
rename to test cases/failing/86 subproj not-found dep/meson.build


diff --git a/test cases/failing/87 subproj not-found dep/subprojects/somesubproj/meson.build b/test cases/failing/86 subproj not-found dep/subprojects/somesubproj/meson.build
similarity index 100%
rename from test cases/failing/87 subproj not-found dep/subprojects/somesubproj/meson.build
rename to test cases/failing/86 subproj not-found dep/subprojects/somesubproj/meson.build


diff --git a/test cases/failing/87 subproj not-found dep/test.json b/test cases/failing/86 subproj not-found dep/test.json
similarity index 62%
rename from test cases/failing/87 subproj not-found dep/test.json
rename to test cases/failing/86 subproj not-found dep/test.json
index 160e9d3..b662643 100644
--- a/test cases/failing/87 subproj not-found dep/test.json
+++ b/test cases/failing/86 subproj not-found dep/test.json

@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/87 subproj not-found dep/meson.build:2:0: ERROR: Dependency '(anonymous)' is required but not found."
+      "line": "test cases/failing/86 subproj not-found dep/meson.build:2:0: ERROR: Dependency '(anonymous)' is required but not found."
     }
   ]
 }

diff --git a/test cases/failing/88 invalid configure file/input b/test cases/failing/87 invalid configure file/input
similarity index 100%
rename from test cases/failing/88 invalid configure file/input
rename to test cases/failing/87 invalid configure file/input


diff --git a/test cases/failing/88 invalid configure file/meson.build b/test cases/failing/87 invalid configure file/meson.build
similarity index 100%
rename from test cases/failing/88 invalid configure file/meson.build
rename to test cases/failing/87 invalid configure file/meson.build


diff --git a/test cases/failing/88 invalid configure file/test.json b/test cases/failing/87 invalid configure file/test.json
similarity index 67%
rename from test cases/failing/88 invalid configure file/test.json
rename to test cases/failing/87 invalid configure file/test.json
index b551f61..d8ea73d 100644
--- a/test cases/failing/88 invalid configure file/test.json
+++ b/test cases/failing/87 invalid configure file/test.json

@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/88 invalid configure file/meson.build:3:0: ERROR: \"install_dir\" must be specified when \"install\" in a configure_file is true"
+      "line": "test cases/failing/87 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/89 kwarg dupe/meson.build b/test cases/failing/88 kwarg dupe/meson.build
similarity index 100%
rename from test cases/failing/89 kwarg dupe/meson.build
rename to test cases/failing/88 kwarg dupe/meson.build


diff --git a/test cases/failing/89 kwarg dupe/prog.c b/test cases/failing/88 kwarg dupe/prog.c
similarity index 100%
rename from test cases/failing/89 kwarg dupe/prog.c
rename to test cases/failing/88 kwarg dupe/prog.c


diff --git a/test cases/failing/89 kwarg dupe/test.json b/test cases/failing/88 kwarg dupe/test.json
similarity index 65%
rename from test cases/failing/89 kwarg dupe/test.json
rename to test cases/failing/88 kwarg dupe/test.json
index ec46600..cfd68eb 100644
--- a/test cases/failing/89 kwarg dupe/test.json
+++ b/test cases/failing/88 kwarg dupe/test.json

@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/89 kwarg dupe/meson.build:5:0: ERROR: Entry \"install\" defined both as a keyword argument and in a \"kwarg\" entry."
+      "line": "test cases/failing/88 kwarg dupe/meson.build:5:0: ERROR: Entry \"install\" defined both as a keyword argument and in a \"kwarg\" entry."
     }
   ]
 }

diff --git a/test cases/failing/90 missing pch file/meson.build b/test cases/failing/89 missing pch file/meson.build
similarity index 100%
rename from test cases/failing/90 missing pch file/meson.build
rename to test cases/failing/89 missing pch file/meson.build


diff --git a/test cases/failing/90 missing pch file/prog.c b/test cases/failing/89 missing pch file/prog.c
similarity index 100%
rename from test cases/failing/90 missing pch file/prog.c
rename to test cases/failing/89 missing pch file/prog.c


diff --git a/test cases/failing/90 missing pch file/test.json b/test cases/failing/89 missing pch file/test.json
similarity index 74%
rename from test cases/failing/90 missing pch file/test.json
rename to test cases/failing/89 missing pch file/test.json
index f55eb47..638d2e7 100644
--- a/test cases/failing/90 missing pch file/test.json
+++ b/test cases/failing/89 missing pch file/test.json

@@ -2,7 +2,7 @@
   "stdout": [
     {
       "comment": "literal 'pch/prog.h' from meson.build appears in output, irrespective of os.path.sep",
-      "line": "test cases/failing/90 missing pch file/meson.build:2:0: ERROR: File pch/prog.h does not exist."
+      "line": "test cases/failing/89 missing pch file/meson.build:2:0: ERROR: File pch/prog.h does not exist."
     }
   ]
 }

diff --git a/test cases/failing/91 pch source different folder/include/pch.h b/test cases/failing/90 pch source different folder/include/pch.h
similarity index 100%
rename from test cases/failing/91 pch source different folder/include/pch.h
rename to test cases/failing/90 pch source different folder/include/pch.h


diff --git a/test cases/failing/91 pch source different folder/meson.build b/test cases/failing/90 pch source different folder/meson.build
similarity index 100%
rename from test cases/failing/91 pch source different folder/meson.build
rename to test cases/failing/90 pch source different folder/meson.build


diff --git a/test cases/failing/91 pch source different folder/prog.c b/test cases/failing/90 pch source different folder/prog.c
similarity index 100%
rename from test cases/failing/91 pch source different folder/prog.c
rename to test cases/failing/90 pch source different folder/prog.c


diff --git a/test cases/failing/91 pch source different folder/src/pch.c b/test cases/failing/90 pch source different folder/src/pch.c
similarity index 100%
rename from test cases/failing/91 pch source different folder/src/pch.c
rename to test cases/failing/90 pch source different folder/src/pch.c


diff --git a/test cases/failing/91 pch source different folder/test.json b/test cases/failing/90 pch source different folder/test.json
similarity index 62%
rename from test cases/failing/91 pch source different folder/test.json
rename to test cases/failing/90 pch source different folder/test.json
index 6309f6c..cbbac3d 100644
--- a/test cases/failing/91 pch source different folder/test.json
+++ b/test cases/failing/90 pch source different folder/test.json

@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/91 pch source different folder/meson.build:4:0: ERROR: PCH files must be stored in the same folder."
+      "line": "test cases/failing/90 pch source different folder/meson.build:4:0: ERROR: PCH files must be stored in the same folder."
     }
   ]
 }

diff --git a/test cases/failing/92 unknown config tool/meson.build b/test cases/failing/91 unknown config tool/meson.build
similarity index 100%
rename from test cases/failing/92 unknown config tool/meson.build
rename to test cases/failing/91 unknown config tool/meson.build


diff --git a/test cases/failing/92 unknown config tool/test.json b/test cases/failing/91 unknown config tool/test.json
similarity index 60%
rename from test cases/failing/92 unknown config tool/test.json
rename to test cases/failing/91 unknown config tool/test.json
index c4484f3..e225167 100644
--- a/test cases/failing/92 unknown config tool/test.json
+++ b/test cases/failing/91 unknown config tool/test.json

@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/92 unknown config tool/meson.build:2:0: ERROR: Dependency \"no-such-config-tool\" not found"
+      "line": "test cases/failing/91 unknown config tool/meson.build:2:0: ERROR: Dependency \"no-such-config-tool\" not found"
     }
   ]
 }

diff --git a/test cases/failing/93 custom target install data/Info.plist.cpp b/test cases/failing/92 custom target install data/Info.plist.cpp
similarity index 100%
rename from test cases/failing/93 custom target install data/Info.plist.cpp
rename to test cases/failing/92 custom target install data/Info.plist.cpp


diff --git a/test cases/failing/93 custom target install data/meson.build b/test cases/failing/92 custom target install data/meson.build
similarity index 100%
rename from test cases/failing/93 custom target install data/meson.build
rename to test cases/failing/92 custom target install data/meson.build


diff --git a/test cases/failing/93 custom target install data/preproc.py b/test cases/failing/92 custom target install data/preproc.py
similarity index 100%
rename from test cases/failing/93 custom target install data/preproc.py
rename to test cases/failing/92 custom target install data/preproc.py


diff --git a/test cases/failing/93 custom target install data/test.json b/test cases/failing/92 custom target install data/test.json
similarity index 71%
rename from test cases/failing/93 custom target install data/test.json
rename to test cases/failing/92 custom target install data/test.json
index caeafb1..46ab013 100644
--- a/test cases/failing/93 custom target install data/test.json
+++ b/test cases/failing/92 custom target install data/test.json

@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/93 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\""
+      "line": "test cases/failing/92 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/94 add dict non string key/meson.build b/test cases/failing/93 add dict non string key/meson.build
similarity index 100%
rename from test cases/failing/94 add dict non string key/meson.build
rename to test cases/failing/93 add dict non string key/meson.build


diff --git a/test cases/failing/93 add dict non string key/test.json b/test cases/failing/93 add dict non string key/test.json
new file mode 100644
index 0000000..3ef2dde
--- /dev/null
+++ b/test cases/failing/93 add dict non string key/test.json

@@ -0,0 +1,7 @@
+{
+  "stdout": [
+    {
+      "line": "test cases/failing/93 add dict non string key/meson.build:9:0: ERROR: Key must be a string"
+    }
+  ]
+}

diff --git a/test cases/failing/95 add dict duplicate keys/meson.build b/test cases/failing/94 add dict duplicate keys/meson.build
similarity index 100%
rename from test cases/failing/95 add dict duplicate keys/meson.build
rename to test cases/failing/94 add dict duplicate keys/meson.build


diff --git a/test cases/failing/94 add dict duplicate keys/test.json b/test cases/failing/94 add dict duplicate keys/test.json
new file mode 100644
index 0000000..5b2d7d6
--- /dev/null
+++ b/test cases/failing/94 add dict duplicate keys/test.json

@@ -0,0 +1,7 @@
+{
+  "stdout": [
+    {
+      "line": "test cases/failing/94 add dict duplicate keys/meson.build:9:0: ERROR: Duplicate dictionary key: myKey"
+    }
+  ]
+}

diff --git a/test cases/failing/94 add dict non string key/test.json b/test cases/failing/94 add dict non string key/test.json
deleted file mode 100644
index 09459dd..0000000
--- a/test cases/failing/94 add dict non string key/test.json
+++ /dev/null

@@ -1,7 +0,0 @@
-{
-  "stdout": [
-    {
-      "line": "test cases/failing/94 add dict non string key/meson.build:9:0: ERROR: Key must be a string"
-    }
-  ]
-}

diff --git a/test cases/failing/95 add dict duplicate keys/test.json b/test cases/failing/95 add dict duplicate keys/test.json
deleted file mode 100644
index ae9a81f..0000000
--- a/test cases/failing/95 add dict duplicate keys/test.json
+++ /dev/null

@@ -1,7 +0,0 @@
-{
-  "stdout": [
-    {
-      "line": "test cases/failing/95 add dict duplicate keys/meson.build:9:0: ERROR: Duplicate dictionary key: myKey"
-    }
-  ]
-}

diff --git a/test cases/failing/96 no host get_external_property/meson.build b/test cases/failing/95 no host get_external_property/meson.build
similarity index 100%
rename from test cases/failing/96 no host get_external_property/meson.build
rename to test cases/failing/95 no host get_external_property/meson.build


diff --git a/test cases/failing/96 no host get_external_property/test.json b/test cases/failing/95 no host get_external_property/test.json
similarity index 63%
rename from test cases/failing/96 no host get_external_property/test.json
rename to test cases/failing/95 no host get_external_property/test.json
index 3376a0b..0ef6dd2 100644
--- a/test cases/failing/96 no host get_external_property/test.json
+++ b/test cases/failing/95 no host get_external_property/test.json

@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/96 no host get_external_property/meson.build:3:0: ERROR: Unknown property for host machine: nonexisting"
+      "line": "test cases/failing/95 no host get_external_property/meson.build:3:0: ERROR: Unknown property for host machine: nonexisting"
     }
   ]
 }

diff --git a/test cases/failing/97 no native compiler/main.c b/test cases/failing/96 no native compiler/main.c
similarity index 100%
rename from test cases/failing/97 no native compiler/main.c
rename to test cases/failing/96 no native compiler/main.c


diff --git a/test cases/failing/97 no native compiler/meson.build b/test cases/failing/96 no native compiler/meson.build
similarity index 100%
rename from test cases/failing/97 no native compiler/meson.build
rename to test cases/failing/96 no native compiler/meson.build


diff --git a/test cases/failing/96 no native compiler/test.json b/test cases/failing/96 no native compiler/test.json
new file mode 100644
index 0000000..0107727
--- /dev/null
+++ b/test cases/failing/96 no native compiler/test.json

@@ -0,0 +1,7 @@
+{
+  "stdout": [
+    {
+      "line": "test cases/failing/96 no native compiler/meson.build:12:0: ERROR: No host machine compiler for \"main.c\""
+    }
+  ]
+}

diff --git a/test cases/failing/97 no native compiler/test.json b/test cases/failing/97 no native compiler/test.json
deleted file mode 100644
index b79bd3b..0000000
--- a/test cases/failing/97 no native compiler/test.json
+++ /dev/null

@@ -1,7 +0,0 @@
-{
-  "stdout": [
-    {
-      "line": "test cases/failing/97 no native compiler/meson.build:12:0: ERROR: No host machine compiler for \"main.c\""
-    }
-  ]
-}

diff --git a/test cases/failing/98 subdir parse error/meson.build b/test cases/failing/97 subdir parse error/meson.build
similarity index 100%
rename from test cases/failing/98 subdir parse error/meson.build
rename to test cases/failing/97 subdir parse error/meson.build


diff --git a/test cases/failing/98 subdir parse error/subdir/meson.build b/test cases/failing/97 subdir parse error/subdir/meson.build
similarity index 100%
rename from test cases/failing/98 subdir parse error/subdir/meson.build
rename to test cases/failing/97 subdir parse error/subdir/meson.build


diff --git a/test cases/failing/97 subdir parse error/test.json b/test cases/failing/97 subdir parse error/test.json
new file mode 100644
index 0000000..414789e
--- /dev/null
+++ b/test cases/failing/97 subdir parse error/test.json

@@ -0,0 +1,7 @@
+{
+  "stdout": [
+    {
+      "line": "test cases/failing/97 subdir parse error/subdir/meson.build:1:0: ERROR: Plusassignment target must be an id."
+    }
+  ]
+}

diff --git a/test cases/failing/99 invalid option file/meson.build b/test cases/failing/98 invalid option file/meson.build
similarity index 100%
rename from test cases/failing/99 invalid option file/meson.build
rename to test cases/failing/98 invalid option file/meson.build


diff --git a/test cases/failing/99 invalid option file/meson_options.txt b/test cases/failing/98 invalid option file/meson_options.txt
similarity index 100%
rename from test cases/failing/99 invalid option file/meson_options.txt
rename to test cases/failing/98 invalid option file/meson_options.txt


diff --git a/test cases/failing/98 invalid option file/test.json b/test cases/failing/98 invalid option file/test.json
new file mode 100644
index 0000000..6ab5393
--- /dev/null
+++ b/test cases/failing/98 invalid option file/test.json

@@ -0,0 +1,7 @@
+{
+  "stdout": [
+    {
+      "line": "test cases/failing/98 invalid option file/meson_options.txt:1:0: ERROR: lexer"
+    }
+  ]
+}

diff --git a/test cases/failing/98 subdir parse error/test.json b/test cases/failing/98 subdir parse error/test.json
deleted file mode 100644
index 8e04799..0000000
--- a/test cases/failing/98 subdir parse error/test.json
+++ /dev/null

@@ -1,7 +0,0 @@
-{
-  "stdout": [
-    {
-      "line": "test cases/failing/98 subdir parse error/subdir/meson.build:1:0: ERROR: Plusassignment target must be an id."
-    }
-  ]
-}

diff --git a/test cases/failing/99 invalid option file/test.json b/test cases/failing/99 invalid option file/test.json
deleted file mode 100644
index ebfddd8..0000000
--- a/test cases/failing/99 invalid option file/test.json
+++ /dev/null

@@ -1,7 +0,0 @@
-{
-  "stdout": [
-    {
-      "line": "test cases/failing/99 invalid option file/meson_options.txt:1:0: ERROR: lexer"
-    }
-  ]
-}

diff --git a/test cases/failing/100 no lang/main.c b/test cases/failing/99 no lang/main.c
similarity index 100%
rename from test cases/failing/100 no lang/main.c
rename to test cases/failing/99 no lang/main.c


diff --git a/test cases/failing/100 no lang/meson.build b/test cases/failing/99 no lang/meson.build
similarity index 100%
rename from test cases/failing/100 no lang/meson.build
rename to test cases/failing/99 no lang/meson.build


diff --git a/test cases/failing/99 no lang/test.json b/test cases/failing/99 no lang/test.json
new file mode 100644
index 0000000..48c6dd7
--- /dev/null
+++ b/test cases/failing/99 no lang/test.json

@@ -0,0 +1,7 @@
+{
+  "stdout": [
+    {
+      "line": "test cases/failing/99 no lang/meson.build:2:0: ERROR: No host machine compiler for 'main.c'"
+    }
+  ]
+}

diff --git a/test cases/unit/101 relative find program/foo.py b/test cases/unit/100 relative find program/foo.py
similarity index 100%
rename from test cases/unit/101 relative find program/foo.py
rename to test cases/unit/100 relative find program/foo.py


diff --git a/test cases/unit/101 relative find program/meson.build b/test cases/unit/100 relative find program/meson.build
similarity index 100%
rename from test cases/unit/101 relative find program/meson.build
rename to test cases/unit/100 relative find program/meson.build


diff --git a/test cases/unit/101 relative find program/subdir/meson.build b/test cases/unit/100 relative find program/subdir/meson.build
similarity index 100%
rename from test cases/unit/101 relative find program/subdir/meson.build
rename to test cases/unit/100 relative find program/subdir/meson.build


diff --git a/test cases/unit/102 rlib linkage/lib2.rs b/test cases/unit/101 rlib linkage/lib2.rs
similarity index 100%
rename from test cases/unit/102 rlib linkage/lib2.rs
rename to test cases/unit/101 rlib linkage/lib2.rs


diff --git a/test cases/unit/102 rlib linkage/main.rs b/test cases/unit/101 rlib linkage/main.rs
similarity index 100%
rename from test cases/unit/102 rlib linkage/main.rs
rename to test cases/unit/101 rlib linkage/main.rs


diff --git a/test cases/unit/102 rlib linkage/meson.build b/test cases/unit/101 rlib linkage/meson.build
similarity index 100%
rename from test cases/unit/102 rlib linkage/meson.build
rename to test cases/unit/101 rlib linkage/meson.build


diff --git a/test cases/unit/103 python without pkgconfig/meson.build b/test cases/unit/102 python without pkgconfig/meson.build
similarity index 100%
rename from test cases/unit/103 python without pkgconfig/meson.build
rename to test cases/unit/102 python without pkgconfig/meson.build


diff --git a/test cases/unit/104 strip/lib.c b/test cases/unit/103 strip/lib.c
similarity index 100%
rename from test cases/unit/104 strip/lib.c
rename to test cases/unit/103 strip/lib.c


diff --git a/test cases/unit/104 strip/meson.build b/test cases/unit/103 strip/meson.build
similarity index 100%
rename from test cases/unit/104 strip/meson.build
rename to test cases/unit/103 strip/meson.build


diff --git a/test cases/unit/40 external, internal library rpath/built library/bar.c b/test cases/unit/39 external, internal library rpath/built library/bar.c
similarity index 100%
rename from test cases/unit/40 external, internal library rpath/built library/bar.c
rename to test cases/unit/39 external, internal library rpath/built library/bar.c


diff --git a/test cases/unit/40 external, internal library rpath/built library/meson.build b/test cases/unit/39 external, internal library rpath/built library/meson.build
similarity index 100%
rename from test cases/unit/40 external, internal library rpath/built library/meson.build
rename to test cases/unit/39 external, internal library rpath/built library/meson.build


diff --git a/test cases/unit/40 external, internal library rpath/built library/meson_options.txt b/test cases/unit/39 external, internal library rpath/built library/meson_options.txt
similarity index 100%
rename from test cases/unit/40 external, internal library rpath/built library/meson_options.txt
rename to test cases/unit/39 external, internal library rpath/built library/meson_options.txt


diff --git a/test cases/unit/40 external, internal library rpath/built library/prog.c b/test cases/unit/39 external, internal library rpath/built library/prog.c
similarity index 100%
rename from test cases/unit/40 external, internal library rpath/built library/prog.c
rename to test cases/unit/39 external, internal library rpath/built library/prog.c


diff --git a/test cases/unit/40 external, internal library rpath/external library/bar.c b/test cases/unit/39 external, internal library rpath/external library/bar.c
similarity index 100%
rename from test cases/unit/40 external, internal library rpath/external library/bar.c
rename to test cases/unit/39 external, internal library rpath/external library/bar.c


diff --git a/test cases/unit/40 external, internal library rpath/external library/faa.c b/test cases/unit/39 external, internal library rpath/external library/faa.c
similarity index 100%
rename from test cases/unit/40 external, internal library rpath/external library/faa.c
rename to test cases/unit/39 external, internal library rpath/external library/faa.c


diff --git a/test cases/unit/40 external, internal library rpath/external library/foo.c b/test cases/unit/39 external, internal library rpath/external library/foo.c
similarity index 100%
rename from test cases/unit/40 external, internal library rpath/external library/foo.c
rename to test cases/unit/39 external, internal library rpath/external library/foo.c


diff --git a/test cases/unit/40 external, internal library rpath/external library/meson.build b/test cases/unit/39 external, internal library rpath/external library/meson.build
similarity index 100%
rename from test cases/unit/40 external, internal library rpath/external library/meson.build
rename to test cases/unit/39 external, internal library rpath/external library/meson.build


diff --git a/test cases/unit/41 featurenew subprojects/meson.build b/test cases/unit/40 featurenew subprojects/meson.build
similarity index 100%
rename from test cases/unit/41 featurenew subprojects/meson.build
rename to test cases/unit/40 featurenew subprojects/meson.build


diff --git a/test cases/unit/41 featurenew subprojects/subprojects/bar/meson.build b/test cases/unit/40 featurenew subprojects/subprojects/bar/meson.build
similarity index 100%
rename from test cases/unit/41 featurenew subprojects/subprojects/bar/meson.build
rename to test cases/unit/40 featurenew subprojects/subprojects/bar/meson.build


diff --git a/test cases/unit/41 featurenew subprojects/subprojects/baz/meson.build b/test cases/unit/40 featurenew subprojects/subprojects/baz/meson.build
similarity index 100%
rename from test cases/unit/41 featurenew subprojects/subprojects/baz/meson.build
rename to test cases/unit/40 featurenew subprojects/subprojects/baz/meson.build


diff --git a/test cases/unit/41 featurenew subprojects/subprojects/foo/meson.build b/test cases/unit/40 featurenew subprojects/subprojects/foo/meson.build
similarity index 100%
rename from test cases/unit/41 featurenew subprojects/subprojects/foo/meson.build
rename to test cases/unit/40 featurenew subprojects/subprojects/foo/meson.build


diff --git a/test cases/unit/42 rpath order/meson.build b/test cases/unit/41 rpath order/meson.build
similarity index 100%
rename from test cases/unit/42 rpath order/meson.build
rename to test cases/unit/41 rpath order/meson.build


diff --git a/test cases/unit/42 rpath order/myexe.c b/test cases/unit/41 rpath order/myexe.c
similarity index 100%
rename from test cases/unit/42 rpath order/myexe.c
rename to test cases/unit/41 rpath order/myexe.c


diff --git a/test cases/unit/42 rpath order/subprojects/sub1/lib.c b/test cases/unit/41 rpath order/subprojects/sub1/lib.c
similarity index 100%
rename from test cases/unit/42 rpath order/subprojects/sub1/lib.c
rename to test cases/unit/41 rpath order/subprojects/sub1/lib.c


diff --git a/test cases/unit/42 rpath order/subprojects/sub1/meson.build b/test cases/unit/41 rpath order/subprojects/sub1/meson.build
similarity index 100%
rename from test cases/unit/42 rpath order/subprojects/sub1/meson.build
rename to test cases/unit/41 rpath order/subprojects/sub1/meson.build


diff --git a/test cases/unit/42 rpath order/subprojects/sub2/lib.c b/test cases/unit/41 rpath order/subprojects/sub2/lib.c
similarity index 100%
rename from test cases/unit/42 rpath order/subprojects/sub2/lib.c
rename to test cases/unit/41 rpath order/subprojects/sub2/lib.c


diff --git a/test cases/unit/42 rpath order/subprojects/sub2/meson.build b/test cases/unit/41 rpath order/subprojects/sub2/meson.build
similarity index 100%
rename from test cases/unit/42 rpath order/subprojects/sub2/meson.build
rename to test cases/unit/41 rpath order/subprojects/sub2/meson.build


diff --git a/test cases/unit/43 dep order/lib1.c b/test cases/unit/42 dep order/lib1.c
similarity index 100%
rename from test cases/unit/43 dep order/lib1.c
rename to test cases/unit/42 dep order/lib1.c


diff --git a/test cases/unit/43 dep order/lib2.c b/test cases/unit/42 dep order/lib2.c
similarity index 100%
rename from test cases/unit/43 dep order/lib2.c
rename to test cases/unit/42 dep order/lib2.c


diff --git a/test cases/unit/43 dep order/meson.build b/test cases/unit/42 dep order/meson.build
similarity index 100%
rename from test cases/unit/43 dep order/meson.build
rename to test cases/unit/42 dep order/meson.build


diff --git a/test cases/unit/43 dep order/myexe.c b/test cases/unit/42 dep order/myexe.c
similarity index 100%
rename from test cases/unit/43 dep order/myexe.c
rename to test cases/unit/42 dep order/myexe.c


diff --git a/test cases/unit/44 promote wrap/meson.build b/test cases/unit/43 promote wrap/meson.build
similarity index 100%
rename from test cases/unit/44 promote wrap/meson.build
rename to test cases/unit/43 promote wrap/meson.build


diff --git a/test cases/unit/44 promote wrap/subprojects/s1/meson.build b/test cases/unit/43 promote wrap/subprojects/s1/meson.build
similarity index 100%
rename from test cases/unit/44 promote wrap/subprojects/s1/meson.build
rename to test cases/unit/43 promote wrap/subprojects/s1/meson.build


diff --git a/test cases/unit/44 promote wrap/subprojects/s1/subprojects/ambiguous/meson.build b/test cases/unit/43 promote wrap/subprojects/s1/subprojects/ambiguous/meson.build
similarity index 100%
rename from test cases/unit/44 promote wrap/subprojects/s1/subprojects/ambiguous/meson.build
rename to test cases/unit/43 promote wrap/subprojects/s1/subprojects/ambiguous/meson.build


diff --git a/test cases/unit/44 promote wrap/subprojects/s2/meson.build b/test cases/unit/43 promote wrap/subprojects/s2/meson.build
similarity index 100%
rename from test cases/unit/44 promote wrap/subprojects/s2/meson.build
rename to test cases/unit/43 promote wrap/subprojects/s2/meson.build


diff --git a/test cases/unit/44 promote wrap/subprojects/s2/subprojects/ambiguous.wrap b/test cases/unit/43 promote wrap/subprojects/s2/subprojects/ambiguous.wrap
similarity index 100%
rename from test cases/unit/44 promote wrap/subprojects/s2/subprojects/ambiguous.wrap
rename to test cases/unit/43 promote wrap/subprojects/s2/subprojects/ambiguous.wrap


diff --git a/test cases/unit/45 vscpp17/main.cpp b/test cases/unit/44 vscpp17/main.cpp
similarity index 100%
rename from test cases/unit/45 vscpp17/main.cpp
rename to test cases/unit/44 vscpp17/main.cpp


diff --git a/test cases/unit/45 vscpp17/meson.build b/test cases/unit/44 vscpp17/meson.build
similarity index 100%
rename from test cases/unit/45 vscpp17/meson.build
rename to test cases/unit/44 vscpp17/meson.build


diff --git a/test cases/unit/46 native dep pkgconfig var/cross_pkgconfig.py b/test cases/unit/45 native dep pkgconfig var/cross_pkgconfig.py
similarity index 100%
rename from test cases/unit/46 native dep pkgconfig var/cross_pkgconfig.py
rename to test cases/unit/45 native dep pkgconfig var/cross_pkgconfig.py


diff --git a/test cases/unit/46 native dep pkgconfig var/cross_pkgconfig/dep_tester.pc b/test cases/unit/45 native dep pkgconfig var/cross_pkgconfig/dep_tester.pc
similarity index 100%
rename from test cases/unit/46 native dep pkgconfig var/cross_pkgconfig/dep_tester.pc
rename to test cases/unit/45 native dep pkgconfig var/cross_pkgconfig/dep_tester.pc


diff --git a/test cases/unit/46 native dep pkgconfig var/meson.build b/test cases/unit/45 native dep pkgconfig var/meson.build
similarity index 100%
rename from test cases/unit/46 native dep pkgconfig var/meson.build
rename to test cases/unit/45 native dep pkgconfig var/meson.build


diff --git a/test cases/unit/46 native dep pkgconfig var/meson_options.txt b/test cases/unit/45 native dep pkgconfig var/meson_options.txt
similarity index 100%
rename from test cases/unit/46 native dep pkgconfig var/meson_options.txt
rename to test cases/unit/45 native dep pkgconfig var/meson_options.txt


diff --git a/test cases/unit/46 native dep pkgconfig var/native_pkgconfig/dep_tester.pc b/test cases/unit/45 native dep pkgconfig var/native_pkgconfig/dep_tester.pc
similarity index 100%
rename from test cases/unit/46 native dep pkgconfig var/native_pkgconfig/dep_tester.pc
rename to test cases/unit/45 native dep pkgconfig var/native_pkgconfig/dep_tester.pc


diff --git a/test cases/unit/47 native file binary/meson.build b/test cases/unit/46 native file binary/meson.build
similarity index 100%
rename from test cases/unit/47 native file binary/meson.build
rename to test cases/unit/46 native file binary/meson.build


diff --git a/test cases/unit/47 native file binary/meson_options.txt b/test cases/unit/46 native file binary/meson_options.txt
similarity index 100%
rename from test cases/unit/47 native file binary/meson_options.txt
rename to test cases/unit/46 native file binary/meson_options.txt


diff --git a/test cases/unit/48 reconfigure/main.c b/test cases/unit/47 reconfigure/main.c
similarity index 100%
rename from test cases/unit/48 reconfigure/main.c
rename to test cases/unit/47 reconfigure/main.c


diff --git a/test cases/unit/48 reconfigure/meson.build b/test cases/unit/47 reconfigure/meson.build
similarity index 100%
rename from test cases/unit/48 reconfigure/meson.build
rename to test cases/unit/47 reconfigure/meson.build


diff --git a/test cases/unit/48 reconfigure/meson_options.txt b/test cases/unit/47 reconfigure/meson_options.txt
similarity index 100%
rename from test cases/unit/48 reconfigure/meson_options.txt
rename to test cases/unit/47 reconfigure/meson_options.txt


diff --git a/test cases/unit/48 reconfigure/subprojects/sub1/meson.build b/test cases/unit/47 reconfigure/subprojects/sub1/meson.build
similarity index 100%
rename from test cases/unit/48 reconfigure/subprojects/sub1/meson.build
rename to test cases/unit/47 reconfigure/subprojects/sub1/meson.build


diff --git a/test cases/unit/49 testsetup default/envcheck.py b/test cases/unit/48 testsetup default/envcheck.py
similarity index 100%
rename from test cases/unit/49 testsetup default/envcheck.py
rename to test cases/unit/48 testsetup default/envcheck.py


diff --git a/test cases/unit/49 testsetup default/meson.build b/test cases/unit/48 testsetup default/meson.build
similarity index 100%
rename from test cases/unit/49 testsetup default/meson.build
rename to test cases/unit/48 testsetup default/meson.build


diff --git a/test cases/unit/50 pkgconfig csharp library/meson.build b/test cases/unit/49 pkgconfig csharp library/meson.build
similarity index 100%
rename from test cases/unit/50 pkgconfig csharp library/meson.build
rename to test cases/unit/49 pkgconfig csharp library/meson.build


diff --git a/test cases/unit/50 pkgconfig csharp library/somelib.cs b/test cases/unit/49 pkgconfig csharp library/somelib.cs
similarity index 100%
rename from test cases/unit/50 pkgconfig csharp library/somelib.cs
rename to test cases/unit/49 pkgconfig csharp library/somelib.cs


diff --git a/test cases/unit/51 noncross options/meson.build b/test cases/unit/50 noncross options/meson.build
similarity index 100%
rename from test cases/unit/51 noncross options/meson.build
rename to test cases/unit/50 noncross options/meson.build


diff --git a/test cases/unit/51 noncross options/prog.c b/test cases/unit/50 noncross options/prog.c
similarity index 100%
rename from test cases/unit/51 noncross options/prog.c
rename to test cases/unit/50 noncross options/prog.c


diff --git a/test cases/unit/51 noncross options/ylib.pc b/test cases/unit/50 noncross options/ylib.pc
similarity index 100%
rename from test cases/unit/51 noncross options/ylib.pc
rename to test cases/unit/50 noncross options/ylib.pc


diff --git a/test cases/unit/52 ldflagdedup/bob.c b/test cases/unit/51 ldflagdedup/bob.c
similarity index 100%
rename from test cases/unit/52 ldflagdedup/bob.c
rename to test cases/unit/51 ldflagdedup/bob.c


diff --git a/test cases/unit/52 ldflagdedup/meson.build b/test cases/unit/51 ldflagdedup/meson.build
similarity index 100%
rename from test cases/unit/52 ldflagdedup/meson.build
rename to test cases/unit/51 ldflagdedup/meson.build


diff --git a/test cases/unit/52 ldflagdedup/prog.c b/test cases/unit/51 ldflagdedup/prog.c
similarity index 100%
rename from test cases/unit/52 ldflagdedup/prog.c
rename to test cases/unit/51 ldflagdedup/prog.c


diff --git a/test cases/unit/53 pkgconfig static link order/meson.build b/test cases/unit/52 pkgconfig static link order/meson.build
similarity index 100%
rename from test cases/unit/53 pkgconfig static link order/meson.build
rename to test cases/unit/52 pkgconfig static link order/meson.build


diff --git a/test cases/unit/54 clang-format/.clang-format b/test cases/unit/53 clang-format/.clang-format
similarity index 100%
rename from test cases/unit/54 clang-format/.clang-format
rename to test cases/unit/53 clang-format/.clang-format


diff --git a/test cases/unit/54 clang-format/dummydir.h/dummy.dat b/test cases/unit/53 clang-format/dummydir.h/dummy.dat
similarity index 100%
rename from test cases/unit/54 clang-format/dummydir.h/dummy.dat
rename to test cases/unit/53 clang-format/dummydir.h/dummy.dat


diff --git a/test cases/unit/54 clang-format/header_expected_h b/test cases/unit/53 clang-format/header_expected_h
similarity index 100%
rename from test cases/unit/54 clang-format/header_expected_h
rename to test cases/unit/53 clang-format/header_expected_h


diff --git a/test cases/unit/54 clang-format/header_orig_h b/test cases/unit/53 clang-format/header_orig_h
similarity index 100%
rename from test cases/unit/54 clang-format/header_orig_h
rename to test cases/unit/53 clang-format/header_orig_h


diff --git a/test cases/unit/54 clang-format/meson.build b/test cases/unit/53 clang-format/meson.build
similarity index 100%
rename from test cases/unit/54 clang-format/meson.build
rename to test cases/unit/53 clang-format/meson.build


diff --git a/test cases/unit/54 clang-format/prog_expected_c b/test cases/unit/53 clang-format/prog_expected_c
similarity index 100%
rename from test cases/unit/54 clang-format/prog_expected_c
rename to test cases/unit/53 clang-format/prog_expected_c


diff --git a/test cases/unit/54 clang-format/prog_orig_c b/test cases/unit/53 clang-format/prog_orig_c
similarity index 100%
rename from test cases/unit/54 clang-format/prog_orig_c
rename to test cases/unit/53 clang-format/prog_orig_c


diff --git a/test cases/unit/55 introspect buildoptions/subprojects/projectBad/meson.build b/test cases/unit/54 introspect buildoptions/subprojects/projectBad/meson.build
similarity index 100%
rename from test cases/unit/55 introspect buildoptions/subprojects/projectBad/meson.build
rename to test cases/unit/54 introspect buildoptions/subprojects/projectBad/meson.build


diff --git a/test cases/unit/55 introspect buildoptions/subprojects/projectBad/meson_options.txt b/test cases/unit/54 introspect buildoptions/subprojects/projectBad/meson_options.txt
similarity index 100%
rename from test cases/unit/55 introspect buildoptions/subprojects/projectBad/meson_options.txt
rename to test cases/unit/54 introspect buildoptions/subprojects/projectBad/meson_options.txt


diff --git a/test cases/unit/56 dedup compiler libs/app/app.c b/test cases/unit/55 dedup compiler libs/app/app.c
similarity index 100%
rename from test cases/unit/56 dedup compiler libs/app/app.c
rename to test cases/unit/55 dedup compiler libs/app/app.c


diff --git a/test cases/unit/56 dedup compiler libs/app/meson.build b/test cases/unit/55 dedup compiler libs/app/meson.build
similarity index 100%
rename from test cases/unit/56 dedup compiler libs/app/meson.build
rename to test cases/unit/55 dedup compiler libs/app/meson.build


diff --git a/test cases/unit/56 dedup compiler libs/liba/liba.c b/test cases/unit/55 dedup compiler libs/liba/liba.c
similarity index 100%
rename from test cases/unit/56 dedup compiler libs/liba/liba.c
rename to test cases/unit/55 dedup compiler libs/liba/liba.c


diff --git a/test cases/unit/56 dedup compiler libs/liba/liba.h b/test cases/unit/55 dedup compiler libs/liba/liba.h
similarity index 100%
rename from test cases/unit/56 dedup compiler libs/liba/liba.h
rename to test cases/unit/55 dedup compiler libs/liba/liba.h


diff --git a/test cases/unit/56 dedup compiler libs/liba/meson.build b/test cases/unit/55 dedup compiler libs/liba/meson.build
similarity index 100%
rename from test cases/unit/56 dedup compiler libs/liba/meson.build
rename to test cases/unit/55 dedup compiler libs/liba/meson.build


diff --git a/test cases/unit/56 dedup compiler libs/libb/libb.c b/test cases/unit/55 dedup compiler libs/libb/libb.c
similarity index 100%
rename from test cases/unit/56 dedup compiler libs/libb/libb.c
rename to test cases/unit/55 dedup compiler libs/libb/libb.c


diff --git a/test cases/unit/56 dedup compiler libs/libb/libb.h b/test cases/unit/55 dedup compiler libs/libb/libb.h
similarity index 100%
rename from test cases/unit/56 dedup compiler libs/libb/libb.h
rename to test cases/unit/55 dedup compiler libs/libb/libb.h


diff --git a/test cases/unit/56 dedup compiler libs/libb/meson.build b/test cases/unit/55 dedup compiler libs/libb/meson.build
similarity index 100%
rename from test cases/unit/56 dedup compiler libs/libb/meson.build
rename to test cases/unit/55 dedup compiler libs/libb/meson.build


diff --git a/test cases/unit/56 dedup compiler libs/meson.build b/test cases/unit/55 dedup compiler libs/meson.build
similarity index 100%
rename from test cases/unit/56 dedup compiler libs/meson.build
rename to test cases/unit/55 dedup compiler libs/meson.build


diff --git a/test cases/unit/57 introspection/cp.py b/test cases/unit/56 introspection/cp.py
similarity index 100%
rename from test cases/unit/57 introspection/cp.py
rename to test cases/unit/56 introspection/cp.py


diff --git a/test cases/unit/57 introspection/meson.build b/test cases/unit/56 introspection/meson.build
similarity index 100%
rename from test cases/unit/57 introspection/meson.build
rename to test cases/unit/56 introspection/meson.build


diff --git a/test cases/unit/57 introspection/meson_options.txt b/test cases/unit/56 introspection/meson_options.txt
similarity index 100%
rename from test cases/unit/57 introspection/meson_options.txt
rename to test cases/unit/56 introspection/meson_options.txt


diff --git a/test cases/unit/57 introspection/sharedlib/meson.build b/test cases/unit/56 introspection/sharedlib/meson.build
similarity index 100%
rename from test cases/unit/57 introspection/sharedlib/meson.build
rename to test cases/unit/56 introspection/sharedlib/meson.build


diff --git a/test cases/unit/57 introspection/sharedlib/shared.cpp b/test cases/unit/56 introspection/sharedlib/shared.cpp
similarity index 100%
rename from test cases/unit/57 introspection/sharedlib/shared.cpp
rename to test cases/unit/56 introspection/sharedlib/shared.cpp


diff --git a/test cases/unit/57 introspection/sharedlib/shared.hpp b/test cases/unit/56 introspection/sharedlib/shared.hpp
similarity index 100%
rename from test cases/unit/57 introspection/sharedlib/shared.hpp
rename to test cases/unit/56 introspection/sharedlib/shared.hpp


diff --git a/test cases/unit/57 introspection/staticlib/meson.build b/test cases/unit/56 introspection/staticlib/meson.build
similarity index 100%
rename from test cases/unit/57 introspection/staticlib/meson.build
rename to test cases/unit/56 introspection/staticlib/meson.build


diff --git a/test cases/unit/57 introspection/staticlib/static.c b/test cases/unit/56 introspection/staticlib/static.c
similarity index 100%
rename from test cases/unit/57 introspection/staticlib/static.c
rename to test cases/unit/56 introspection/staticlib/static.c


diff --git a/test cases/unit/57 introspection/staticlib/static.h b/test cases/unit/56 introspection/staticlib/static.h
similarity index 100%
rename from test cases/unit/57 introspection/staticlib/static.h
rename to test cases/unit/56 introspection/staticlib/static.h


diff --git a/test cases/unit/57 introspection/t1.cpp b/test cases/unit/56 introspection/t1.cpp
similarity index 100%
rename from test cases/unit/57 introspection/t1.cpp
rename to test cases/unit/56 introspection/t1.cpp


diff --git a/test cases/unit/57 introspection/t2.cpp b/test cases/unit/56 introspection/t2.cpp
similarity index 100%
rename from test cases/unit/57 introspection/t2.cpp
rename to test cases/unit/56 introspection/t2.cpp


diff --git a/test cases/unit/57 introspection/t3.cpp b/test cases/unit/56 introspection/t3.cpp
similarity index 100%
rename from test cases/unit/57 introspection/t3.cpp
rename to test cases/unit/56 introspection/t3.cpp


diff --git a/test cases/unit/58 pkg_config_path option/build_extra_path/totally_made_up_dep.pc b/test cases/unit/57 pkg_config_path option/build_extra_path/totally_made_up_dep.pc
similarity index 100%
rename from test cases/unit/58 pkg_config_path option/build_extra_path/totally_made_up_dep.pc
rename to test cases/unit/57 pkg_config_path option/build_extra_path/totally_made_up_dep.pc


diff --git a/test cases/unit/58 pkg_config_path option/host_extra_path/totally_made_up_dep.pc b/test cases/unit/57 pkg_config_path option/host_extra_path/totally_made_up_dep.pc
similarity index 100%
rename from test cases/unit/58 pkg_config_path option/host_extra_path/totally_made_up_dep.pc
rename to test cases/unit/57 pkg_config_path option/host_extra_path/totally_made_up_dep.pc


diff --git a/test cases/unit/58 pkg_config_path option/meson.build b/test cases/unit/57 pkg_config_path option/meson.build
similarity index 100%
rename from test cases/unit/58 pkg_config_path option/meson.build
rename to test cases/unit/57 pkg_config_path option/meson.build


diff --git a/test cases/unit/59 introspect buildoptions/c_compiler.py b/test cases/unit/58 introspect buildoptions/c_compiler.py
similarity index 100%
rename from test cases/unit/59 introspect buildoptions/c_compiler.py
rename to test cases/unit/58 introspect buildoptions/c_compiler.py


diff --git a/test cases/unit/59 introspect buildoptions/main.c b/test cases/unit/58 introspect buildoptions/main.c
similarity index 100%
rename from test cases/unit/59 introspect buildoptions/main.c
rename to test cases/unit/58 introspect buildoptions/main.c


diff --git a/test cases/unit/59 introspect buildoptions/meson.build b/test cases/unit/58 introspect buildoptions/meson.build
similarity index 100%
rename from test cases/unit/59 introspect buildoptions/meson.build
rename to test cases/unit/58 introspect buildoptions/meson.build


diff --git a/test cases/unit/59 introspect buildoptions/meson_options.txt b/test cases/unit/58 introspect buildoptions/meson_options.txt
similarity index 100%
rename from test cases/unit/59 introspect buildoptions/meson_options.txt
rename to test cases/unit/58 introspect buildoptions/meson_options.txt


diff --git a/test cases/unit/59 introspect buildoptions/subprojects/evilFile.txt b/test cases/unit/58 introspect buildoptions/subprojects/evilFile.txt
similarity index 100%
rename from test cases/unit/59 introspect buildoptions/subprojects/evilFile.txt
rename to test cases/unit/58 introspect buildoptions/subprojects/evilFile.txt


diff --git a/test cases/unit/59 introspect buildoptions/subprojects/projectA/meson.build b/test cases/unit/58 introspect buildoptions/subprojects/projectA/meson.build
similarity index 100%
rename from test cases/unit/59 introspect buildoptions/subprojects/projectA/meson.build
rename to test cases/unit/58 introspect buildoptions/subprojects/projectA/meson.build


diff --git a/test cases/unit/59 introspect buildoptions/subprojects/projectA/meson_options.txt b/test cases/unit/58 introspect buildoptions/subprojects/projectA/meson_options.txt
similarity index 100%
rename from test cases/unit/59 introspect buildoptions/subprojects/projectA/meson_options.txt
rename to test cases/unit/58 introspect buildoptions/subprojects/projectA/meson_options.txt


diff --git a/test cases/unit/59 introspect buildoptions/subprojects/projectBad/meson.build b/test cases/unit/58 introspect buildoptions/subprojects/projectBad/meson.build
similarity index 100%
rename from test cases/unit/59 introspect buildoptions/subprojects/projectBad/meson.build
rename to test cases/unit/58 introspect buildoptions/subprojects/projectBad/meson.build


diff --git a/test cases/unit/55 introspect buildoptions/subprojects/projectBad/meson_options.txt b/test cases/unit/58 introspect buildoptions/subprojects/projectBad/meson_options.txt
similarity index 100%
copy from test cases/unit/55 introspect buildoptions/subprojects/projectBad/meson_options.txt
copy to test cases/unit/58 introspect buildoptions/subprojects/projectBad/meson_options.txt


diff --git a/test cases/unit/59 introspect buildoptions/subprojects/projectBad/meson_options.txt b/test cases/unit/59 introspect buildoptions/subprojects/projectBad/meson_options.txt
deleted file mode 100644
index f15d352..0000000
--- a/test cases/unit/59 introspect buildoptions/subprojects/projectBad/meson_options.txt
+++ /dev/null

@@ -1 +0,0 @@
-option('should_not_appear', type: 'integer', min: 0, value: 125)

diff --git a/test cases/unit/60 native file override/crossfile b/test cases/unit/59 native file override/crossfile
similarity index 100%
rename from test cases/unit/60 native file override/crossfile
rename to test cases/unit/59 native file override/crossfile


diff --git a/test cases/unit/60 native file override/crossfile2 b/test cases/unit/59 native file override/crossfile2
similarity index 100%
rename from test cases/unit/60 native file override/crossfile2
rename to test cases/unit/59 native file override/crossfile2


diff --git a/test cases/unit/60 native file override/meson.build b/test cases/unit/59 native file override/meson.build
similarity index 100%
rename from test cases/unit/60 native file override/meson.build
rename to test cases/unit/59 native file override/meson.build


diff --git a/test cases/unit/60 native file override/meson_options.txt b/test cases/unit/59 native file override/meson_options.txt
similarity index 100%
rename from test cases/unit/60 native file override/meson_options.txt
rename to test cases/unit/59 native file override/meson_options.txt


diff --git a/test cases/unit/60 native file override/nativefile b/test cases/unit/59 native file override/nativefile
similarity index 100%
rename from test cases/unit/60 native file override/nativefile
rename to test cases/unit/59 native file override/nativefile


diff --git a/test cases/unit/61 identity cross/build_wrapper.py b/test cases/unit/60 identity cross/build_wrapper.py
similarity index 100%
rename from test cases/unit/61 identity cross/build_wrapper.py
rename to test cases/unit/60 identity cross/build_wrapper.py


diff --git a/test cases/unit/61 identity cross/host_wrapper.py b/test cases/unit/60 identity cross/host_wrapper.py
similarity index 100%
rename from test cases/unit/61 identity cross/host_wrapper.py
rename to test cases/unit/60 identity cross/host_wrapper.py


diff --git a/test cases/unit/61 identity cross/meson.build b/test cases/unit/60 identity cross/meson.build
similarity index 100%
rename from test cases/unit/61 identity cross/meson.build
rename to test cases/unit/60 identity cross/meson.build


diff --git a/test cases/unit/61 identity cross/stuff.h b/test cases/unit/60 identity cross/stuff.h
similarity index 100%
rename from test cases/unit/61 identity cross/stuff.h
rename to test cases/unit/60 identity cross/stuff.h


diff --git a/test cases/unit/62 pkgconfig relative paths/pkgconfig/librelativepath.pc b/test cases/unit/61 pkgconfig relative paths/pkgconfig/librelativepath.pc
similarity index 100%
rename from test cases/unit/62 pkgconfig relative paths/pkgconfig/librelativepath.pc
rename to test cases/unit/61 pkgconfig relative paths/pkgconfig/librelativepath.pc


diff --git a/test cases/unit/63 cmake_prefix_path/meson.build b/test cases/unit/62 cmake_prefix_path/meson.build
similarity index 100%
rename from test cases/unit/63 cmake_prefix_path/meson.build
rename to test cases/unit/62 cmake_prefix_path/meson.build


diff --git a/test cases/unit/63 cmake_prefix_path/prefix/lib/cmake/mesontest/mesontest-config.cmake b/test cases/unit/62 cmake_prefix_path/prefix/lib/cmake/mesontest/mesontest-config.cmake
similarity index 100%
rename from test cases/unit/63 cmake_prefix_path/prefix/lib/cmake/mesontest/mesontest-config.cmake
rename to test cases/unit/62 cmake_prefix_path/prefix/lib/cmake/mesontest/mesontest-config.cmake


diff --git a/test cases/unit/64 cmake parser/meson.build b/test cases/unit/63 cmake parser/meson.build
similarity index 100%
rename from test cases/unit/64 cmake parser/meson.build
rename to test cases/unit/63 cmake parser/meson.build


diff --git a/test cases/unit/64 cmake parser/prefix/lib/cmake/mesontest/mesontest-config.cmake b/test cases/unit/63 cmake parser/prefix/lib/cmake/mesontest/mesontest-config.cmake
similarity index 100%
rename from test cases/unit/64 cmake parser/prefix/lib/cmake/mesontest/mesontest-config.cmake
rename to test cases/unit/63 cmake parser/prefix/lib/cmake/mesontest/mesontest-config.cmake


diff --git a/test cases/unit/65 alias target/main.c b/test cases/unit/64 alias target/main.c
similarity index 100%
rename from test cases/unit/65 alias target/main.c
rename to test cases/unit/64 alias target/main.c


diff --git a/test cases/unit/65 alias target/meson.build b/test cases/unit/64 alias target/meson.build
similarity index 100%
rename from test cases/unit/65 alias target/meson.build
rename to test cases/unit/64 alias target/meson.build


diff --git a/test cases/unit/65 alias target/subdir/meson.build b/test cases/unit/64 alias target/subdir/meson.build
similarity index 100%
rename from test cases/unit/65 alias target/subdir/meson.build
rename to test cases/unit/64 alias target/subdir/meson.build


diff --git a/test cases/unit/66 static archive stripping/app/appA.c b/test cases/unit/65 static archive stripping/app/appA.c
similarity index 100%
rename from test cases/unit/66 static archive stripping/app/appA.c
rename to test cases/unit/65 static archive stripping/app/appA.c


diff --git a/test cases/unit/66 static archive stripping/app/appB.c b/test cases/unit/65 static archive stripping/app/appB.c
similarity index 100%
rename from test cases/unit/66 static archive stripping/app/appB.c
rename to test cases/unit/65 static archive stripping/app/appB.c


diff --git a/test cases/unit/66 static archive stripping/app/meson.build b/test cases/unit/65 static archive stripping/app/meson.build
similarity index 100%
rename from test cases/unit/66 static archive stripping/app/meson.build
rename to test cases/unit/65 static archive stripping/app/meson.build


diff --git a/test cases/unit/66 static archive stripping/lib/libA.c b/test cases/unit/65 static archive stripping/lib/libA.c
similarity index 100%
rename from test cases/unit/66 static archive stripping/lib/libA.c
rename to test cases/unit/65 static archive stripping/lib/libA.c


diff --git a/test cases/unit/66 static archive stripping/lib/libA.h b/test cases/unit/65 static archive stripping/lib/libA.h
similarity index 100%
rename from test cases/unit/66 static archive stripping/lib/libA.h
rename to test cases/unit/65 static archive stripping/lib/libA.h


diff --git a/test cases/unit/66 static archive stripping/lib/libB.c b/test cases/unit/65 static archive stripping/lib/libB.c
similarity index 100%
rename from test cases/unit/66 static archive stripping/lib/libB.c
rename to test cases/unit/65 static archive stripping/lib/libB.c


diff --git a/test cases/unit/66 static archive stripping/lib/libB.h b/test cases/unit/65 static archive stripping/lib/libB.h
similarity index 100%
rename from test cases/unit/66 static archive stripping/lib/libB.h
rename to test cases/unit/65 static archive stripping/lib/libB.h


diff --git a/test cases/unit/66 static archive stripping/lib/meson.build b/test cases/unit/65 static archive stripping/lib/meson.build
similarity index 100%
rename from test cases/unit/66 static archive stripping/lib/meson.build
rename to test cases/unit/65 static archive stripping/lib/meson.build


diff --git a/test cases/unit/67 static link/lib/func1.c b/test cases/unit/66 static link/lib/func1.c
similarity index 100%
rename from test cases/unit/67 static link/lib/func1.c
rename to test cases/unit/66 static link/lib/func1.c


diff --git a/test cases/unit/67 static link/lib/func10.c b/test cases/unit/66 static link/lib/func10.c
similarity index 100%
rename from test cases/unit/67 static link/lib/func10.c
rename to test cases/unit/66 static link/lib/func10.c


diff --git a/test cases/unit/67 static link/lib/func11.c b/test cases/unit/66 static link/lib/func11.c
similarity index 100%
rename from test cases/unit/67 static link/lib/func11.c
rename to test cases/unit/66 static link/lib/func11.c


diff --git a/test cases/unit/67 static link/lib/func12.c b/test cases/unit/66 static link/lib/func12.c
similarity index 100%
rename from test cases/unit/67 static link/lib/func12.c
rename to test cases/unit/66 static link/lib/func12.c


diff --git a/test cases/unit/67 static link/lib/func14.c b/test cases/unit/66 static link/lib/func14.c
similarity index 100%
rename from test cases/unit/67 static link/lib/func14.c
rename to test cases/unit/66 static link/lib/func14.c


diff --git a/test cases/unit/67 static link/lib/func15.c b/test cases/unit/66 static link/lib/func15.c
similarity index 100%
rename from test cases/unit/67 static link/lib/func15.c
rename to test cases/unit/66 static link/lib/func15.c


diff --git a/test cases/unit/67 static link/lib/func16.c b/test cases/unit/66 static link/lib/func16.c
similarity index 100%
rename from test cases/unit/67 static link/lib/func16.c
rename to test cases/unit/66 static link/lib/func16.c


diff --git a/test cases/unit/67 static link/lib/func17.c b/test cases/unit/66 static link/lib/func17.c
similarity index 100%
rename from test cases/unit/67 static link/lib/func17.c
rename to test cases/unit/66 static link/lib/func17.c


diff --git a/test cases/unit/67 static link/lib/func18.c b/test cases/unit/66 static link/lib/func18.c
similarity index 100%
rename from test cases/unit/67 static link/lib/func18.c
rename to test cases/unit/66 static link/lib/func18.c


diff --git a/test cases/unit/67 static link/lib/func19.c b/test cases/unit/66 static link/lib/func19.c
similarity index 100%
rename from test cases/unit/67 static link/lib/func19.c
rename to test cases/unit/66 static link/lib/func19.c


diff --git a/test cases/unit/67 static link/lib/func2.c b/test cases/unit/66 static link/lib/func2.c
similarity index 100%
rename from test cases/unit/67 static link/lib/func2.c
rename to test cases/unit/66 static link/lib/func2.c


diff --git a/test cases/unit/67 static link/lib/func3.c b/test cases/unit/66 static link/lib/func3.c
similarity index 100%
rename from test cases/unit/67 static link/lib/func3.c
rename to test cases/unit/66 static link/lib/func3.c


diff --git a/test cases/unit/67 static link/lib/func4.c b/test cases/unit/66 static link/lib/func4.c
similarity index 100%
rename from test cases/unit/67 static link/lib/func4.c
rename to test cases/unit/66 static link/lib/func4.c


diff --git a/test cases/unit/67 static link/lib/func5.c b/test cases/unit/66 static link/lib/func5.c
similarity index 100%
rename from test cases/unit/67 static link/lib/func5.c
rename to test cases/unit/66 static link/lib/func5.c


diff --git a/test cases/unit/67 static link/lib/func6.c b/test cases/unit/66 static link/lib/func6.c
similarity index 100%
rename from test cases/unit/67 static link/lib/func6.c
rename to test cases/unit/66 static link/lib/func6.c


diff --git a/test cases/unit/67 static link/lib/func7.c b/test cases/unit/66 static link/lib/func7.c
similarity index 100%
rename from test cases/unit/67 static link/lib/func7.c
rename to test cases/unit/66 static link/lib/func7.c


diff --git a/test cases/unit/67 static link/lib/func8.c b/test cases/unit/66 static link/lib/func8.c
similarity index 100%
rename from test cases/unit/67 static link/lib/func8.c
rename to test cases/unit/66 static link/lib/func8.c


diff --git a/test cases/unit/67 static link/lib/func9.c b/test cases/unit/66 static link/lib/func9.c
similarity index 100%
rename from test cases/unit/67 static link/lib/func9.c
rename to test cases/unit/66 static link/lib/func9.c


diff --git a/test cases/unit/67 static link/lib/meson.build b/test cases/unit/66 static link/lib/meson.build
similarity index 100%
rename from test cases/unit/67 static link/lib/meson.build
rename to test cases/unit/66 static link/lib/meson.build


diff --git a/test cases/unit/67 static link/meson.build b/test cases/unit/66 static link/meson.build
similarity index 100%
rename from test cases/unit/67 static link/meson.build
rename to test cases/unit/66 static link/meson.build


diff --git a/test cases/unit/67 static link/test1.c b/test cases/unit/66 static link/test1.c
similarity index 100%
rename from test cases/unit/67 static link/test1.c
rename to test cases/unit/66 static link/test1.c


diff --git a/test cases/unit/67 static link/test2.c b/test cases/unit/66 static link/test2.c
similarity index 100%
rename from test cases/unit/67 static link/test2.c
rename to test cases/unit/66 static link/test2.c


diff --git a/test cases/unit/67 static link/test3.c b/test cases/unit/66 static link/test3.c
similarity index 100%
rename from test cases/unit/67 static link/test3.c
rename to test cases/unit/66 static link/test3.c


diff --git a/test cases/unit/67 static link/test4.c b/test cases/unit/66 static link/test4.c
similarity index 100%
rename from test cases/unit/67 static link/test4.c
rename to test cases/unit/66 static link/test4.c


diff --git a/test cases/unit/67 static link/test5.c b/test cases/unit/66 static link/test5.c
similarity index 100%
rename from test cases/unit/67 static link/test5.c
rename to test cases/unit/66 static link/test5.c


diff --git a/test cases/unit/68 test env value/meson.build b/test cases/unit/67 test env value/meson.build
similarity index 100%
rename from test cases/unit/68 test env value/meson.build
rename to test cases/unit/67 test env value/meson.build


diff --git a/test cases/unit/68 test env value/test.py b/test cases/unit/67 test env value/test.py
similarity index 100%
rename from test cases/unit/68 test env value/test.py
rename to test cases/unit/67 test env value/test.py


diff --git a/test cases/unit/69 clang-tidy/.clang-tidy b/test cases/unit/68 clang-tidy/.clang-tidy
similarity index 100%
rename from test cases/unit/69 clang-tidy/.clang-tidy
rename to test cases/unit/68 clang-tidy/.clang-tidy


diff --git a/test cases/unit/69 clang-tidy/cttest.cpp b/test cases/unit/68 clang-tidy/cttest.cpp
similarity index 100%
rename from test cases/unit/69 clang-tidy/cttest.cpp
rename to test cases/unit/68 clang-tidy/cttest.cpp


diff --git a/test cases/unit/69 clang-tidy/dummydir.h/dummy.dat b/test cases/unit/68 clang-tidy/dummydir.h/dummy.dat
similarity index 100%
rename from test cases/unit/69 clang-tidy/dummydir.h/dummy.dat
rename to test cases/unit/68 clang-tidy/dummydir.h/dummy.dat


diff --git a/test cases/unit/69 clang-tidy/meson.build b/test cases/unit/68 clang-tidy/meson.build
similarity index 100%
rename from test cases/unit/69 clang-tidy/meson.build
rename to test cases/unit/68 clang-tidy/meson.build


diff --git a/test cases/unit/70 cross/crossfile.in b/test cases/unit/69 cross/crossfile.in
similarity index 100%
rename from test cases/unit/70 cross/crossfile.in
rename to test cases/unit/69 cross/crossfile.in


diff --git a/test cases/unit/70 cross/meson.build b/test cases/unit/69 cross/meson.build
similarity index 100%
rename from test cases/unit/70 cross/meson.build
rename to test cases/unit/69 cross/meson.build


diff --git a/test cases/unit/70 cross/meson_options.txt b/test cases/unit/69 cross/meson_options.txt
similarity index 100%
rename from test cases/unit/70 cross/meson_options.txt
rename to test cases/unit/69 cross/meson_options.txt


diff --git a/test cases/unit/71 cross test passed/exewrapper.py b/test cases/unit/70 cross test passed/exewrapper.py
similarity index 100%
rename from test cases/unit/71 cross test passed/exewrapper.py
rename to test cases/unit/70 cross test passed/exewrapper.py


diff --git a/test cases/unit/71 cross test passed/meson.build b/test cases/unit/70 cross test passed/meson.build
similarity index 100%
rename from test cases/unit/71 cross test passed/meson.build
rename to test cases/unit/70 cross test passed/meson.build


diff --git a/test cases/unit/71 cross test passed/meson_options.txt b/test cases/unit/70 cross test passed/meson_options.txt
similarity index 100%
rename from test cases/unit/71 cross test passed/meson_options.txt
rename to test cases/unit/70 cross test passed/meson_options.txt


diff --git a/test cases/unit/71 cross test passed/script.py b/test cases/unit/70 cross test passed/script.py
similarity index 100%
rename from test cases/unit/71 cross test passed/script.py
rename to test cases/unit/70 cross test passed/script.py


diff --git a/test cases/unit/71 cross test passed/src/main.c b/test cases/unit/70 cross test passed/src/main.c
similarity index 100%
rename from test cases/unit/71 cross test passed/src/main.c
rename to test cases/unit/70 cross test passed/src/main.c


diff --git a/test cases/unit/72 summary/meson.build b/test cases/unit/71 summary/meson.build
similarity index 100%
rename from test cases/unit/72 summary/meson.build
rename to test cases/unit/71 summary/meson.build


diff --git a/test cases/unit/72 summary/meson_options.txt b/test cases/unit/71 summary/meson_options.txt
similarity index 100%
rename from test cases/unit/72 summary/meson_options.txt
rename to test cases/unit/71 summary/meson_options.txt


diff --git a/test cases/unit/72 summary/subprojects/sub/meson.build b/test cases/unit/71 summary/subprojects/sub/meson.build
similarity index 100%
rename from test cases/unit/72 summary/subprojects/sub/meson.build
rename to test cases/unit/71 summary/subprojects/sub/meson.build


diff --git a/test cases/unit/72 summary/subprojects/sub2/meson.build b/test cases/unit/71 summary/subprojects/sub2/meson.build
similarity index 100%
rename from test cases/unit/72 summary/subprojects/sub2/meson.build
rename to test cases/unit/71 summary/subprojects/sub2/meson.build


diff --git a/test cases/unit/72 summary/subprojects/sub2/subprojects/subsub/meson.build b/test cases/unit/71 summary/subprojects/sub2/subprojects/subsub/meson.build
similarity index 100%
rename from test cases/unit/72 summary/subprojects/sub2/subprojects/subsub/meson.build
rename to test cases/unit/71 summary/subprojects/sub2/subprojects/subsub/meson.build


diff --git a/test cases/unit/73 wrap file url/meson.build b/test cases/unit/72 wrap file url/meson.build
similarity index 100%
rename from test cases/unit/73 wrap file url/meson.build
rename to test cases/unit/72 wrap file url/meson.build


diff --git a/test cases/unit/73 wrap file url/subprojects/foo-patch.tar.xz b/test cases/unit/72 wrap file url/subprojects/foo-patch.tar.xz
similarity index 100%
rename from test cases/unit/73 wrap file url/subprojects/foo-patch.tar.xz
rename to test cases/unit/72 wrap file url/subprojects/foo-patch.tar.xz
Binary files differ

diff --git a/test cases/unit/73 wrap file url/subprojects/foo.tar.xz b/test cases/unit/72 wrap file url/subprojects/foo.tar.xz
similarity index 100%
rename from test cases/unit/73 wrap file url/subprojects/foo.tar.xz
rename to test cases/unit/72 wrap file url/subprojects/foo.tar.xz
Binary files differ

diff --git a/test cases/unit/74 dep files/foo.c b/test cases/unit/73 dep files/foo.c
similarity index 100%
rename from test cases/unit/74 dep files/foo.c
rename to test cases/unit/73 dep files/foo.c


diff --git a/test cases/unit/74 dep files/meson.build b/test cases/unit/73 dep files/meson.build
similarity index 100%
rename from test cases/unit/74 dep files/meson.build
rename to test cases/unit/73 dep files/meson.build


diff --git a/test cases/unit/75 pkgconfig prefixes/client/client.c b/test cases/unit/74 pkgconfig prefixes/client/client.c
similarity index 100%
rename from test cases/unit/75 pkgconfig prefixes/client/client.c
rename to test cases/unit/74 pkgconfig prefixes/client/client.c


diff --git a/test cases/unit/75 pkgconfig prefixes/client/meson.build b/test cases/unit/74 pkgconfig prefixes/client/meson.build
similarity index 100%
rename from test cases/unit/75 pkgconfig prefixes/client/meson.build
rename to test cases/unit/74 pkgconfig prefixes/client/meson.build


diff --git a/test cases/unit/75 pkgconfig prefixes/val1/meson.build b/test cases/unit/74 pkgconfig prefixes/val1/meson.build
similarity index 100%
rename from test cases/unit/75 pkgconfig prefixes/val1/meson.build
rename to test cases/unit/74 pkgconfig prefixes/val1/meson.build


diff --git a/test cases/unit/75 pkgconfig prefixes/val1/val1.c b/test cases/unit/74 pkgconfig prefixes/val1/val1.c
similarity index 100%
rename from test cases/unit/75 pkgconfig prefixes/val1/val1.c
rename to test cases/unit/74 pkgconfig prefixes/val1/val1.c


diff --git a/test cases/unit/75 pkgconfig prefixes/val1/val1.h b/test cases/unit/74 pkgconfig prefixes/val1/val1.h
similarity index 100%
rename from test cases/unit/75 pkgconfig prefixes/val1/val1.h
rename to test cases/unit/74 pkgconfig prefixes/val1/val1.h


diff --git a/test cases/unit/75 pkgconfig prefixes/val2/meson.build b/test cases/unit/74 pkgconfig prefixes/val2/meson.build
similarity index 100%
rename from test cases/unit/75 pkgconfig prefixes/val2/meson.build
rename to test cases/unit/74 pkgconfig prefixes/val2/meson.build


diff --git a/test cases/unit/75 pkgconfig prefixes/val2/val2.c b/test cases/unit/74 pkgconfig prefixes/val2/val2.c
similarity index 100%
rename from test cases/unit/75 pkgconfig prefixes/val2/val2.c
rename to test cases/unit/74 pkgconfig prefixes/val2/val2.c


diff --git a/test cases/unit/75 pkgconfig prefixes/val2/val2.h b/test cases/unit/74 pkgconfig prefixes/val2/val2.h
similarity index 100%
rename from test cases/unit/75 pkgconfig prefixes/val2/val2.h
rename to test cases/unit/74 pkgconfig prefixes/val2/val2.h


diff --git a/test cases/unit/76 subdir libdir/meson.build b/test cases/unit/75 subdir libdir/meson.build
similarity index 100%
rename from test cases/unit/76 subdir libdir/meson.build
rename to test cases/unit/75 subdir libdir/meson.build


diff --git a/test cases/unit/76 subdir libdir/subprojects/flub/meson.build b/test cases/unit/75 subdir libdir/subprojects/flub/meson.build
similarity index 100%
rename from test cases/unit/76 subdir libdir/subprojects/flub/meson.build
rename to test cases/unit/75 subdir libdir/subprojects/flub/meson.build


diff --git a/test cases/unit/77 as link whole/bar.c b/test cases/unit/76 as link whole/bar.c
similarity index 100%
rename from test cases/unit/77 as link whole/bar.c
rename to test cases/unit/76 as link whole/bar.c


diff --git a/test cases/unit/77 as link whole/foo.c b/test cases/unit/76 as link whole/foo.c
similarity index 100%
rename from test cases/unit/77 as link whole/foo.c
rename to test cases/unit/76 as link whole/foo.c


diff --git a/test cases/unit/77 as link whole/meson.build b/test cases/unit/76 as link whole/meson.build
similarity index 100%
rename from test cases/unit/77 as link whole/meson.build
rename to test cases/unit/76 as link whole/meson.build


diff --git a/test cases/unit/78 nostdlib/meson.build b/test cases/unit/77 nostdlib/meson.build
similarity index 100%
rename from test cases/unit/78 nostdlib/meson.build
rename to test cases/unit/77 nostdlib/meson.build


diff --git a/test cases/unit/78 nostdlib/prog.c b/test cases/unit/77 nostdlib/prog.c
similarity index 100%
rename from test cases/unit/78 nostdlib/prog.c
rename to test cases/unit/77 nostdlib/prog.c


diff --git a/test cases/unit/78 nostdlib/subprojects/mylibc/libc.c b/test cases/unit/77 nostdlib/subprojects/mylibc/libc.c
similarity index 100%
rename from test cases/unit/78 nostdlib/subprojects/mylibc/libc.c
rename to test cases/unit/77 nostdlib/subprojects/mylibc/libc.c


diff --git a/test cases/unit/78 nostdlib/subprojects/mylibc/meson.build b/test cases/unit/77 nostdlib/subprojects/mylibc/meson.build
similarity index 100%
rename from test cases/unit/78 nostdlib/subprojects/mylibc/meson.build
rename to test cases/unit/77 nostdlib/subprojects/mylibc/meson.build


diff --git a/test cases/unit/78 nostdlib/subprojects/mylibc/stdio.h b/test cases/unit/77 nostdlib/subprojects/mylibc/stdio.h
similarity index 100%
rename from test cases/unit/78 nostdlib/subprojects/mylibc/stdio.h
rename to test cases/unit/77 nostdlib/subprojects/mylibc/stdio.h


diff --git a/test cases/unit/78 nostdlib/subprojects/mylibc/stubstart.s b/test cases/unit/77 nostdlib/subprojects/mylibc/stubstart.s
similarity index 100%
rename from test cases/unit/78 nostdlib/subprojects/mylibc/stubstart.s
rename to test cases/unit/77 nostdlib/subprojects/mylibc/stubstart.s


diff --git a/test cases/unit/79 user options for subproject/.gitignore b/test cases/unit/78 user options for subproject/.gitignore
similarity index 100%
rename from test cases/unit/79 user options for subproject/.gitignore
rename to test cases/unit/78 user options for subproject/.gitignore


diff --git a/test cases/unit/79 user options for subproject/75 user options for subproject/.gitignore b/test cases/unit/78 user options for subproject/75 user options for subproject/.gitignore
similarity index 100%
rename from test cases/unit/79 user options for subproject/75 user options for subproject/.gitignore
rename to test cases/unit/78 user options for subproject/75 user options for subproject/.gitignore


diff --git a/test cases/unit/79 user options for subproject/75 user options for subproject/meson.build b/test cases/unit/78 user options for subproject/75 user options for subproject/meson.build
similarity index 100%
rename from test cases/unit/79 user options for subproject/75 user options for subproject/meson.build
rename to test cases/unit/78 user options for subproject/75 user options for subproject/meson.build


diff --git a/test cases/unit/80 global-rpath/meson.build b/test cases/unit/79 global-rpath/meson.build
similarity index 100%
rename from test cases/unit/80 global-rpath/meson.build
rename to test cases/unit/79 global-rpath/meson.build


diff --git a/test cases/unit/80 global-rpath/rpathified.cpp b/test cases/unit/79 global-rpath/rpathified.cpp
similarity index 100%
rename from test cases/unit/80 global-rpath/rpathified.cpp
rename to test cases/unit/79 global-rpath/rpathified.cpp


diff --git a/test cases/unit/80 global-rpath/yonder/meson.build b/test cases/unit/79 global-rpath/yonder/meson.build
similarity index 100%
rename from test cases/unit/80 global-rpath/yonder/meson.build
rename to test cases/unit/79 global-rpath/yonder/meson.build


diff --git a/test cases/unit/80 global-rpath/yonder/yonder.cpp b/test cases/unit/79 global-rpath/yonder/yonder.cpp
similarity index 100%
rename from test cases/unit/80 global-rpath/yonder/yonder.cpp
rename to test cases/unit/79 global-rpath/yonder/yonder.cpp


diff --git a/test cases/unit/80 global-rpath/yonder/yonder.h b/test cases/unit/79 global-rpath/yonder/yonder.h
similarity index 100%
rename from test cases/unit/80 global-rpath/yonder/yonder.h
rename to test cases/unit/79 global-rpath/yonder/yonder.h


diff --git a/test cases/unit/81 wrap-git/meson.build b/test cases/unit/80 wrap-git/meson.build
similarity index 100%
rename from test cases/unit/81 wrap-git/meson.build
rename to test cases/unit/80 wrap-git/meson.build


diff --git a/test cases/unit/81 wrap-git/subprojects/packagefiles/wrap_git_builddef/meson.build b/test cases/unit/80 wrap-git/subprojects/packagefiles/wrap_git_builddef/meson.build
similarity index 100%
rename from test cases/unit/81 wrap-git/subprojects/packagefiles/wrap_git_builddef/meson.build
rename to test cases/unit/80 wrap-git/subprojects/packagefiles/wrap_git_builddef/meson.build


diff --git a/test cases/unit/81 wrap-git/subprojects/wrap_git_upstream/main.c b/test cases/unit/80 wrap-git/subprojects/wrap_git_upstream/main.c
similarity index 100%
rename from test cases/unit/81 wrap-git/subprojects/wrap_git_upstream/main.c
rename to test cases/unit/80 wrap-git/subprojects/wrap_git_upstream/main.c


diff --git a/test cases/unit/82 meson version compare/meson.build b/test cases/unit/81 meson version compare/meson.build
similarity index 100%
rename from test cases/unit/82 meson version compare/meson.build
rename to test cases/unit/81 meson version compare/meson.build


diff --git a/test cases/unit/82 meson version compare/subprojects/foo/meson.build b/test cases/unit/81 meson version compare/subprojects/foo/meson.build
similarity index 100%
rename from test cases/unit/82 meson version compare/subprojects/foo/meson.build
rename to test cases/unit/81 meson version compare/subprojects/foo/meson.build


diff --git a/test cases/unit/83 cross only introspect/meson.build b/test cases/unit/82 cross only introspect/meson.build
similarity index 100%
rename from test cases/unit/83 cross only introspect/meson.build
rename to test cases/unit/82 cross only introspect/meson.build


diff --git a/test cases/unit/84 change option choices/meson.build b/test cases/unit/83 change option choices/meson.build
similarity index 100%
rename from test cases/unit/84 change option choices/meson.build
rename to test cases/unit/83 change option choices/meson.build


diff --git a/test cases/unit/84 change option choices/meson_options.1.txt b/test cases/unit/83 change option choices/meson_options.1.txt
similarity index 100%
rename from test cases/unit/84 change option choices/meson_options.1.txt
rename to test cases/unit/83 change option choices/meson_options.1.txt


diff --git a/test cases/unit/84 change option choices/meson_options.2.txt b/test cases/unit/83 change option choices/meson_options.2.txt
similarity index 100%
rename from test cases/unit/84 change option choices/meson_options.2.txt
rename to test cases/unit/83 change option choices/meson_options.2.txt


diff --git a/test cases/unit/85 nested subproject regenerate depends/main.c b/test cases/unit/84 nested subproject regenerate depends/main.c
similarity index 100%
rename from test cases/unit/85 nested subproject regenerate depends/main.c
rename to test cases/unit/84 nested subproject regenerate depends/main.c


diff --git a/test cases/unit/85 nested subproject regenerate depends/meson.build b/test cases/unit/84 nested subproject regenerate depends/meson.build
similarity index 100%
rename from test cases/unit/85 nested subproject regenerate depends/meson.build
rename to test cases/unit/84 nested subproject regenerate depends/meson.build


diff --git a/test cases/unit/85 nested subproject regenerate depends/subprojects/sub1/meson.build b/test cases/unit/84 nested subproject regenerate depends/subprojects/sub1/meson.build
similarity index 100%
rename from test cases/unit/85 nested subproject regenerate depends/subprojects/sub1/meson.build
rename to test cases/unit/84 nested subproject regenerate depends/subprojects/sub1/meson.build


diff --git a/test cases/unit/85 nested subproject regenerate depends/subprojects/sub2/CMakeLists.txt b/test cases/unit/84 nested subproject regenerate depends/subprojects/sub2/CMakeLists.txt
similarity index 100%
rename from test cases/unit/85 nested subproject regenerate depends/subprojects/sub2/CMakeLists.txt
rename to test cases/unit/84 nested subproject regenerate depends/subprojects/sub2/CMakeLists.txt


diff --git a/test cases/unit/86 cpp modules/main.cpp b/test cases/unit/85 cpp modules/main.cpp
similarity index 100%
rename from test cases/unit/86 cpp modules/main.cpp
rename to test cases/unit/85 cpp modules/main.cpp


diff --git a/test cases/unit/86 cpp modules/meson.build b/test cases/unit/85 cpp modules/meson.build
similarity index 100%
rename from test cases/unit/86 cpp modules/meson.build
rename to test cases/unit/85 cpp modules/meson.build


diff --git a/test cases/unit/86 cpp modules/src0.ixx b/test cases/unit/85 cpp modules/src0.ixx
similarity index 100%
rename from test cases/unit/86 cpp modules/src0.ixx
rename to test cases/unit/85 cpp modules/src0.ixx


diff --git a/test cases/unit/86 cpp modules/src1.ixx b/test cases/unit/85 cpp modules/src1.ixx
similarity index 100%
rename from test cases/unit/86 cpp modules/src1.ixx
rename to test cases/unit/85 cpp modules/src1.ixx


diff --git a/test cases/unit/86 cpp modules/src2.ixx b/test cases/unit/85 cpp modules/src2.ixx
similarity index 100%
rename from test cases/unit/86 cpp modules/src2.ixx
rename to test cases/unit/85 cpp modules/src2.ixx


diff --git a/test cases/unit/86 cpp modules/src3.ixx b/test cases/unit/85 cpp modules/src3.ixx
similarity index 100%
rename from test cases/unit/86 cpp modules/src3.ixx
rename to test cases/unit/85 cpp modules/src3.ixx


diff --git a/test cases/unit/86 cpp modules/src4.ixx b/test cases/unit/85 cpp modules/src4.ixx
similarity index 100%
rename from test cases/unit/86 cpp modules/src4.ixx
rename to test cases/unit/85 cpp modules/src4.ixx


diff --git a/test cases/unit/86 cpp modules/src5.ixx b/test cases/unit/85 cpp modules/src5.ixx
similarity index 100%
rename from test cases/unit/86 cpp modules/src5.ixx
rename to test cases/unit/85 cpp modules/src5.ixx


diff --git a/test cases/unit/86 cpp modules/src6.ixx b/test cases/unit/85 cpp modules/src6.ixx
similarity index 100%
rename from test cases/unit/86 cpp modules/src6.ixx
rename to test cases/unit/85 cpp modules/src6.ixx


diff --git a/test cases/unit/86 cpp modules/src7.ixx b/test cases/unit/85 cpp modules/src7.ixx
similarity index 100%
rename from test cases/unit/86 cpp modules/src7.ixx
rename to test cases/unit/85 cpp modules/src7.ixx


diff --git a/test cases/unit/86 cpp modules/src8.ixx b/test cases/unit/85 cpp modules/src8.ixx
similarity index 100%
rename from test cases/unit/86 cpp modules/src8.ixx
rename to test cases/unit/85 cpp modules/src8.ixx


diff --git a/test cases/unit/86 cpp modules/src9.ixx b/test cases/unit/85 cpp modules/src9.ixx
similarity index 100%
rename from test cases/unit/86 cpp modules/src9.ixx
rename to test cases/unit/85 cpp modules/src9.ixx


diff --git a/test cases/unit/87 prelinking/file1.c b/test cases/unit/86 prelinking/file1.c
similarity index 100%
rename from test cases/unit/87 prelinking/file1.c
rename to test cases/unit/86 prelinking/file1.c


diff --git a/test cases/unit/87 prelinking/file2.c b/test cases/unit/86 prelinking/file2.c
similarity index 100%
rename from test cases/unit/87 prelinking/file2.c
rename to test cases/unit/86 prelinking/file2.c


diff --git a/test cases/unit/87 prelinking/file3.c b/test cases/unit/86 prelinking/file3.c
similarity index 100%
rename from test cases/unit/87 prelinking/file3.c
rename to test cases/unit/86 prelinking/file3.c


diff --git a/test cases/unit/87 prelinking/file4.c b/test cases/unit/86 prelinking/file4.c
similarity index 100%
rename from test cases/unit/87 prelinking/file4.c
rename to test cases/unit/86 prelinking/file4.c


diff --git a/test cases/unit/87 prelinking/main.c b/test cases/unit/86 prelinking/main.c
similarity index 100%
rename from test cases/unit/87 prelinking/main.c
rename to test cases/unit/86 prelinking/main.c


diff --git a/test cases/unit/87 prelinking/meson.build b/test cases/unit/86 prelinking/meson.build
similarity index 100%
rename from test cases/unit/87 prelinking/meson.build
rename to test cases/unit/86 prelinking/meson.build


diff --git a/test cases/unit/87 prelinking/private_header.h b/test cases/unit/86 prelinking/private_header.h
similarity index 100%
rename from test cases/unit/87 prelinking/private_header.h
rename to test cases/unit/86 prelinking/private_header.h


diff --git a/test cases/unit/87 prelinking/public_header.h b/test cases/unit/86 prelinking/public_header.h
similarity index 100%
rename from test cases/unit/87 prelinking/public_header.h
rename to test cases/unit/86 prelinking/public_header.h


diff --git a/test cases/unit/88 run native test/main.c b/test cases/unit/87 run native test/main.c
similarity index 100%
rename from test cases/unit/88 run native test/main.c
rename to test cases/unit/87 run native test/main.c


diff --git a/test cases/unit/88 run native test/meson.build b/test cases/unit/87 run native test/meson.build
similarity index 100%
rename from test cases/unit/88 run native test/meson.build
rename to test cases/unit/87 run native test/meson.build


diff --git a/test cases/unit/89 multiple envvars/meson.build b/test cases/unit/88 multiple envvars/meson.build
similarity index 100%
rename from test cases/unit/89 multiple envvars/meson.build
rename to test cases/unit/88 multiple envvars/meson.build


diff --git a/test cases/unit/89 multiple envvars/prog.c b/test cases/unit/88 multiple envvars/prog.c
similarity index 100%
rename from test cases/unit/89 multiple envvars/prog.c
rename to test cases/unit/88 multiple envvars/prog.c


diff --git a/test cases/unit/89 multiple envvars/prog.cpp b/test cases/unit/88 multiple envvars/prog.cpp
similarity index 100%
rename from test cases/unit/89 multiple envvars/prog.cpp
rename to test cases/unit/88 multiple envvars/prog.cpp


diff --git a/test cases/unit/90 pkgconfig build rpath order/dummy.pc b/test cases/unit/89 pkgconfig build rpath order/dummy.pc
similarity index 100%
rename from test cases/unit/90 pkgconfig build rpath order/dummy.pc
rename to test cases/unit/89 pkgconfig build rpath order/dummy.pc


diff --git a/test cases/unit/90 pkgconfig build rpath order/meson.build b/test cases/unit/89 pkgconfig build rpath order/meson.build
similarity index 100%
rename from test cases/unit/90 pkgconfig build rpath order/meson.build
rename to test cases/unit/89 pkgconfig build rpath order/meson.build


diff --git a/test cases/unit/90 pkgconfig build rpath order/prog.c b/test cases/unit/89 pkgconfig build rpath order/prog.c
similarity index 100%
rename from test cases/unit/90 pkgconfig build rpath order/prog.c
rename to test cases/unit/89 pkgconfig build rpath order/prog.c


diff --git a/test cases/unit/90 pkgconfig build rpath order/prog.cc b/test cases/unit/89 pkgconfig build rpath order/prog.cc
similarity index 100%
rename from test cases/unit/90 pkgconfig build rpath order/prog.cc
rename to test cases/unit/89 pkgconfig build rpath order/prog.cc


diff --git a/test cases/unit/90 pkgconfig build rpath order/sub/meson.build b/test cases/unit/89 pkgconfig build rpath order/sub/meson.build
similarity index 100%
rename from test cases/unit/90 pkgconfig build rpath order/sub/meson.build
rename to test cases/unit/89 pkgconfig build rpath order/sub/meson.build


diff --git a/test cases/unit/90 pkgconfig build rpath order/sub/stuff.c b/test cases/unit/89 pkgconfig build rpath order/sub/stuff.c
similarity index 100%
rename from test cases/unit/90 pkgconfig build rpath order/sub/stuff.c
rename to test cases/unit/89 pkgconfig build rpath order/sub/stuff.c


diff --git a/test cases/unit/91 devenv/main.c b/test cases/unit/90 devenv/main.c
similarity index 100%
rename from test cases/unit/91 devenv/main.c
rename to test cases/unit/90 devenv/main.c


diff --git a/test cases/unit/91 devenv/meson.build b/test cases/unit/90 devenv/meson.build
similarity index 100%
rename from test cases/unit/91 devenv/meson.build
rename to test cases/unit/90 devenv/meson.build


diff --git a/test cases/unit/91 devenv/subprojects/sub/foo.c b/test cases/unit/90 devenv/subprojects/sub/foo.c
similarity index 100%
rename from test cases/unit/91 devenv/subprojects/sub/foo.c
rename to test cases/unit/90 devenv/subprojects/sub/foo.c


diff --git a/test cases/unit/91 devenv/subprojects/sub/meson.build b/test cases/unit/90 devenv/subprojects/sub/meson.build
similarity index 100%
rename from test cases/unit/91 devenv/subprojects/sub/meson.build
rename to test cases/unit/90 devenv/subprojects/sub/meson.build


diff --git a/test cases/unit/91 devenv/test-devenv.py b/test cases/unit/90 devenv/test-devenv.py
similarity index 100%
rename from test cases/unit/91 devenv/test-devenv.py
rename to test cases/unit/90 devenv/test-devenv.py


diff --git a/test cases/unit/92 install skip subprojects/foo.c b/test cases/unit/91 install skip subprojects/foo.c
similarity index 100%
rename from test cases/unit/92 install skip subprojects/foo.c
rename to test cases/unit/91 install skip subprojects/foo.c


diff --git a/test cases/unit/92 install skip subprojects/foo.dat b/test cases/unit/91 install skip subprojects/foo.dat
similarity index 100%
rename from test cases/unit/92 install skip subprojects/foo.dat
rename to test cases/unit/91 install skip subprojects/foo.dat


diff --git a/test cases/unit/92 install skip subprojects/foo.h b/test cases/unit/91 install skip subprojects/foo.h
similarity index 100%
rename from test cases/unit/92 install skip subprojects/foo.h
rename to test cases/unit/91 install skip subprojects/foo.h


diff --git a/test cases/unit/92 install skip subprojects/foo/foofile b/test cases/unit/91 install skip subprojects/foo/foofile
similarity index 100%
rename from test cases/unit/92 install skip subprojects/foo/foofile
rename to test cases/unit/91 install skip subprojects/foo/foofile


diff --git a/test cases/unit/92 install skip subprojects/meson.build b/test cases/unit/91 install skip subprojects/meson.build
similarity index 100%
rename from test cases/unit/92 install skip subprojects/meson.build
rename to test cases/unit/91 install skip subprojects/meson.build


diff --git a/test cases/unit/92 install skip subprojects/subprojects/bar/bar.c b/test cases/unit/91 install skip subprojects/subprojects/bar/bar.c
similarity index 100%
rename from test cases/unit/92 install skip subprojects/subprojects/bar/bar.c
rename to test cases/unit/91 install skip subprojects/subprojects/bar/bar.c


diff --git a/test cases/unit/92 install skip subprojects/subprojects/bar/bar.dat b/test cases/unit/91 install skip subprojects/subprojects/bar/bar.dat
similarity index 100%
rename from test cases/unit/92 install skip subprojects/subprojects/bar/bar.dat
rename to test cases/unit/91 install skip subprojects/subprojects/bar/bar.dat


diff --git a/test cases/unit/92 install skip subprojects/subprojects/bar/bar.h b/test cases/unit/91 install skip subprojects/subprojects/bar/bar.h
similarity index 100%
rename from test cases/unit/92 install skip subprojects/subprojects/bar/bar.h
rename to test cases/unit/91 install skip subprojects/subprojects/bar/bar.h


diff --git a/test cases/unit/92 install skip subprojects/subprojects/bar/bar/barfile b/test cases/unit/91 install skip subprojects/subprojects/bar/bar/barfile
similarity index 100%
rename from test cases/unit/92 install skip subprojects/subprojects/bar/bar/barfile
rename to test cases/unit/91 install skip subprojects/subprojects/bar/bar/barfile


diff --git a/test cases/unit/92 install skip subprojects/subprojects/bar/meson.build b/test cases/unit/91 install skip subprojects/subprojects/bar/meson.build
similarity index 100%
rename from test cases/unit/92 install skip subprojects/subprojects/bar/meson.build
rename to test cases/unit/91 install skip subprojects/subprojects/bar/meson.build


diff --git a/test cases/unit/93 new subproject in configured project/meson.build b/test cases/unit/92 new subproject in configured project/meson.build
similarity index 100%
rename from test cases/unit/93 new subproject in configured project/meson.build
rename to test cases/unit/92 new subproject in configured project/meson.build


diff --git a/test cases/unit/93 new subproject in configured project/meson_options.txt b/test cases/unit/92 new subproject in configured project/meson_options.txt
similarity index 100%
rename from test cases/unit/93 new subproject in configured project/meson_options.txt
rename to test cases/unit/92 new subproject in configured project/meson_options.txt


diff --git a/test cases/unit/93 new subproject in configured project/subprojects/sub/foo.c b/test cases/unit/92 new subproject in configured project/subprojects/sub/foo.c
similarity index 100%
rename from test cases/unit/93 new subproject in configured project/subprojects/sub/foo.c
rename to test cases/unit/92 new subproject in configured project/subprojects/sub/foo.c


diff --git a/test cases/unit/93 new subproject in configured project/subprojects/sub/meson.build b/test cases/unit/92 new subproject in configured project/subprojects/sub/meson.build
similarity index 100%
rename from test cases/unit/93 new subproject in configured project/subprojects/sub/meson.build
rename to test cases/unit/92 new subproject in configured project/subprojects/sub/meson.build


diff --git a/test cases/unit/94 clangformat/.clang-format b/test cases/unit/93 clangformat/.clang-format
similarity index 100%
rename from test cases/unit/94 clangformat/.clang-format
rename to test cases/unit/93 clangformat/.clang-format


diff --git a/test cases/unit/94 clangformat/.clang-format-ignore b/test cases/unit/93 clangformat/.clang-format-ignore
similarity index 100%
rename from test cases/unit/94 clangformat/.clang-format-ignore
rename to test cases/unit/93 clangformat/.clang-format-ignore


diff --git a/test cases/unit/94 clangformat/.clang-format-include b/test cases/unit/93 clangformat/.clang-format-include
similarity index 100%
rename from test cases/unit/94 clangformat/.clang-format-include
rename to test cases/unit/93 clangformat/.clang-format-include


diff --git a/test cases/unit/94 clangformat/meson.build b/test cases/unit/93 clangformat/meson.build
similarity index 100%
rename from test cases/unit/94 clangformat/meson.build
rename to test cases/unit/93 clangformat/meson.build


diff --git a/test cases/unit/94 clangformat/not-included/badformat.cpp b/test cases/unit/93 clangformat/not-included/badformat.cpp
similarity index 100%
rename from test cases/unit/94 clangformat/not-included/badformat.cpp
rename to test cases/unit/93 clangformat/not-included/badformat.cpp


diff --git a/test cases/unit/94 clangformat/src/badformat.c b/test cases/unit/93 clangformat/src/badformat.c
similarity index 100%
rename from test cases/unit/94 clangformat/src/badformat.c
rename to test cases/unit/93 clangformat/src/badformat.c


diff --git a/test cases/unit/94 clangformat/src/badformat.cpp b/test cases/unit/93 clangformat/src/badformat.cpp
similarity index 100%
rename from test cases/unit/94 clangformat/src/badformat.cpp
rename to test cases/unit/93 clangformat/src/badformat.cpp


diff --git a/test cases/unit/95 custominc/easytogrepfor/genh.py b/test cases/unit/94 custominc/easytogrepfor/genh.py
similarity index 100%
rename from test cases/unit/95 custominc/easytogrepfor/genh.py
rename to test cases/unit/94 custominc/easytogrepfor/genh.py


diff --git a/test cases/unit/95 custominc/easytogrepfor/meson.build b/test cases/unit/94 custominc/easytogrepfor/meson.build
similarity index 100%
rename from test cases/unit/95 custominc/easytogrepfor/meson.build
rename to test cases/unit/94 custominc/easytogrepfor/meson.build


diff --git a/test cases/unit/95 custominc/helper.c b/test cases/unit/94 custominc/helper.c
similarity index 100%
rename from test cases/unit/95 custominc/helper.c
rename to test cases/unit/94 custominc/helper.c


diff --git a/test cases/unit/95 custominc/meson.build b/test cases/unit/94 custominc/meson.build
similarity index 100%
rename from test cases/unit/95 custominc/meson.build
rename to test cases/unit/94 custominc/meson.build


diff --git a/test cases/unit/95 custominc/prog.c b/test cases/unit/94 custominc/prog.c
similarity index 100%
rename from test cases/unit/95 custominc/prog.c
rename to test cases/unit/94 custominc/prog.c


diff --git a/test cases/unit/95 custominc/prog2.c b/test cases/unit/94 custominc/prog2.c
similarity index 100%
rename from test cases/unit/95 custominc/prog2.c
rename to test cases/unit/94 custominc/prog2.c


diff --git a/test cases/unit/96 implicit force fallback/meson.build b/test cases/unit/95 implicit force fallback/meson.build
similarity index 100%
rename from test cases/unit/96 implicit force fallback/meson.build
rename to test cases/unit/95 implicit force fallback/meson.build


diff --git a/test cases/unit/96 implicit force fallback/subprojects/something/meson.build b/test cases/unit/95 implicit force fallback/subprojects/something/meson.build
similarity index 100%
rename from test cases/unit/96 implicit force fallback/subprojects/something/meson.build
rename to test cases/unit/95 implicit force fallback/subprojects/something/meson.build


diff --git a/test cases/unit/97 compiler.links file arg/meson.build b/test cases/unit/96 compiler.links file arg/meson.build
similarity index 100%
rename from test cases/unit/97 compiler.links file arg/meson.build
rename to test cases/unit/96 compiler.links file arg/meson.build


diff --git a/test cases/unit/97 compiler.links file arg/test.c b/test cases/unit/96 compiler.links file arg/test.c
similarity index 100%
rename from test cases/unit/97 compiler.links file arg/test.c
rename to test cases/unit/96 compiler.links file arg/test.c


diff --git a/test cases/unit/98 link full name/.gitignore b/test cases/unit/97 link full name/.gitignore
similarity index 100%
rename from test cases/unit/98 link full name/.gitignore
rename to test cases/unit/97 link full name/.gitignore


diff --git a/test cases/unit/98 link full name/libtestprovider/meson.build b/test cases/unit/97 link full name/libtestprovider/meson.build
similarity index 100%
rename from test cases/unit/98 link full name/libtestprovider/meson.build
rename to test cases/unit/97 link full name/libtestprovider/meson.build


diff --git a/test cases/unit/98 link full name/libtestprovider/provider.c b/test cases/unit/97 link full name/libtestprovider/provider.c
similarity index 100%
rename from test cases/unit/98 link full name/libtestprovider/provider.c
rename to test cases/unit/97 link full name/libtestprovider/provider.c


diff --git a/test cases/unit/98 link full name/proguser/meson.build b/test cases/unit/97 link full name/proguser/meson.build
similarity index 100%
rename from test cases/unit/98 link full name/proguser/meson.build
rename to test cases/unit/97 link full name/proguser/meson.build


diff --git a/test cases/unit/98 link full name/proguser/receiver.c b/test cases/unit/97 link full name/proguser/receiver.c
similarity index 100%
rename from test cases/unit/98 link full name/proguser/receiver.c
rename to test cases/unit/97 link full name/proguser/receiver.c


diff --git a/test cases/unit/99 install all targets/bar-custom.txt b/test cases/unit/98 install all targets/bar-custom.txt
similarity index 100%
rename from test cases/unit/99 install all targets/bar-custom.txt
rename to test cases/unit/98 install all targets/bar-custom.txt


diff --git a/test cases/unit/99 install all targets/bar-devel.h b/test cases/unit/98 install all targets/bar-devel.h
similarity index 100%
rename from test cases/unit/99 install all targets/bar-devel.h
rename to test cases/unit/98 install all targets/bar-devel.h


diff --git a/test cases/unit/99 install all targets/bar-notag.txt b/test cases/unit/98 install all targets/bar-notag.txt
similarity index 100%
rename from test cases/unit/99 install all targets/bar-notag.txt
rename to test cases/unit/98 install all targets/bar-notag.txt


diff --git a/test cases/unit/99 install all targets/custom_files/data.txt b/test cases/unit/98 install all targets/custom_files/data.txt
similarity index 100%
rename from test cases/unit/99 install all targets/custom_files/data.txt
rename to test cases/unit/98 install all targets/custom_files/data.txt


diff --git a/test cases/unit/99 install all targets/foo.in b/test cases/unit/98 install all targets/foo.in
similarity index 100%
rename from test cases/unit/99 install all targets/foo.in
rename to test cases/unit/98 install all targets/foo.in


diff --git a/test cases/unit/99 install all targets/foo1-devel.h b/test cases/unit/98 install all targets/foo1-devel.h
similarity index 100%
rename from test cases/unit/99 install all targets/foo1-devel.h
rename to test cases/unit/98 install all targets/foo1-devel.h


diff --git a/test cases/unit/99 install all targets/lib.c b/test cases/unit/98 install all targets/lib.c
similarity index 100%
rename from test cases/unit/99 install all targets/lib.c
rename to test cases/unit/98 install all targets/lib.c


diff --git a/test cases/unit/99 install all targets/main.c b/test cases/unit/98 install all targets/main.c
similarity index 100%
rename from test cases/unit/99 install all targets/main.c
rename to test cases/unit/98 install all targets/main.c


diff --git a/test cases/unit/99 install all targets/meson.build b/test cases/unit/98 install all targets/meson.build
similarity index 100%
rename from test cases/unit/99 install all targets/meson.build
rename to test cases/unit/98 install all targets/meson.build


diff --git a/test cases/unit/99 install all targets/script.py b/test cases/unit/98 install all targets/script.py
similarity index 100%
rename from test cases/unit/99 install all targets/script.py
rename to test cases/unit/98 install all targets/script.py


diff --git a/test cases/unit/99 install all targets/subdir/bar2-devel.h b/test cases/unit/98 install all targets/subdir/bar2-devel.h
similarity index 100%
rename from test cases/unit/99 install all targets/subdir/bar2-devel.h
rename to test cases/unit/98 install all targets/subdir/bar2-devel.h


diff --git a/test cases/unit/99 install all targets/subdir/foo2.in b/test cases/unit/98 install all targets/subdir/foo2.in
similarity index 100%
rename from test cases/unit/99 install all targets/subdir/foo2.in
rename to test cases/unit/98 install all targets/subdir/foo2.in


diff --git a/test cases/unit/99 install all targets/subdir/foo3-devel.h b/test cases/unit/98 install all targets/subdir/foo3-devel.h
similarity index 100%
rename from test cases/unit/99 install all targets/subdir/foo3-devel.h
rename to test cases/unit/98 install all targets/subdir/foo3-devel.h


diff --git a/test cases/unit/99 install all targets/subdir/lib.c b/test cases/unit/98 install all targets/subdir/lib.c
similarity index 100%
rename from test cases/unit/99 install all targets/subdir/lib.c
rename to test cases/unit/98 install all targets/subdir/lib.c


diff --git a/test cases/unit/99 install all targets/subdir/main.c b/test cases/unit/98 install all targets/subdir/main.c
similarity index 100%
rename from test cases/unit/99 install all targets/subdir/main.c
rename to test cases/unit/98 install all targets/subdir/main.c


diff --git a/test cases/unit/99 install all targets/subdir/meson.build b/test cases/unit/98 install all targets/subdir/meson.build
similarity index 100%
rename from test cases/unit/99 install all targets/subdir/meson.build
rename to test cases/unit/98 install all targets/subdir/meson.build


diff --git a/test cases/unit/99 install all targets/subdir/script.py b/test cases/unit/98 install all targets/subdir/script.py
similarity index 100%
rename from test cases/unit/99 install all targets/subdir/script.py
rename to test cases/unit/98 install all targets/subdir/script.py


diff --git a/test cases/unit/100 custom target name/file.txt.in b/test cases/unit/99 custom target name/file.txt.in
similarity index 100%
rename from test cases/unit/100 custom target name/file.txt.in
rename to test cases/unit/99 custom target name/file.txt.in


diff --git a/test cases/unit/100 custom target name/meson.build b/test cases/unit/99 custom target name/meson.build
similarity index 100%
rename from test cases/unit/100 custom target name/meson.build
rename to test cases/unit/99 custom target name/meson.build


diff --git a/test cases/unit/100 custom target name/subdir/meson.build b/test cases/unit/99 custom target name/subdir/meson.build
similarity index 100%
rename from test cases/unit/100 custom target name/subdir/meson.build
rename to test cases/unit/99 custom target name/subdir/meson.build


diff --git a/unittests/allplatformstests.py b/unittests/allplatformstests.py
index dd8fa66..8a7fcd7 100644
--- a/unittests/allplatformstests.py
+++ b/unittests/allplatformstests.py

@@ -539,7 +539,7 @@
         self.run_tests()
 
     def test_implicit_forcefallback(self):
-        testdir = os.path.join(self.unit_test_dir, '96 implicit force fallback')
+        testdir = os.path.join(self.unit_test_dir, '95 implicit force fallback')
         with self.assertRaises(subprocess.CalledProcessError):
             self.init(testdir)
         self.init(testdir, extra_args=['--wrap-mode=forcefallback'])
@@ -645,7 +645,7 @@
                           self.mtest_command + ['--setup=main:onlyinbar'])
 
     def test_testsetup_default(self):
-        testdir = os.path.join(self.unit_test_dir, '49 testsetup default')
+        testdir = os.path.join(self.unit_test_dir, '48 testsetup default')
         self.init(testdir)
         self.build()
 
@@ -1716,7 +1716,7 @@
 
     def test_options_with_choices_changing(self) -> None:
         """Detect when options like arrays or combos have their choices change."""
-        testdir = Path(os.path.join(self.unit_test_dir, '84 change option choices'))
+        testdir = Path(os.path.join(self.unit_test_dir, '83 change option choices'))
         options1 = str(testdir / 'meson_options.1.txt')
         options2 = str(testdir / 'meson_options.2.txt')
 
@@ -1787,7 +1787,7 @@
         self.build()
 
     def test_subproject_promotion_wrap(self):
-        testdir = os.path.join(self.unit_test_dir, '44 promote wrap')
+        testdir = os.path.join(self.unit_test_dir, '43 promote wrap')
         workdir = os.path.join(self.builddir, 'work')
         shutil.copytree(testdir, workdir)
         spdir = os.path.join(workdir, 'subprojects')
@@ -1834,9 +1834,9 @@
         for (t, f) in [
             ('10 out of bounds', 'meson.build'),
             ('18 wrong plusassign', 'meson.build'),
-            ('60 bad option argument', 'meson_options.txt'),
-            ('98 subdir parse error', os.path.join('subdir', 'meson.build')),
-            ('99 invalid option file', 'meson_options.txt'),
+            ('59 bad option argument', 'meson_options.txt'),
+            ('97 subdir parse error', os.path.join('subdir', 'meson.build')),
+            ('98 invalid option file', 'meson_options.txt'),
         ]:
             tdir = os.path.join(self.src_root, 'test cases', 'failing', t)
 
@@ -1960,7 +1960,7 @@
         self.assertIn(msg, out)
 
     def test_mixed_language_linker_check(self):
-        testdir = os.path.join(self.unit_test_dir, '97 compiler.links file arg')
+        testdir = os.path.join(self.unit_test_dir, '96 compiler.links file arg')
         self.init(testdir)
         cmds = self.get_meson_log_compiler_checks()
         self.assertEqual(len(cmds), 5)
@@ -2278,7 +2278,7 @@
         self.wipe()
 
     def test_feature_check_usage_subprojects(self):
-        testdir = os.path.join(self.unit_test_dir, '41 featurenew subprojects')
+        testdir = os.path.join(self.unit_test_dir, '40 featurenew subprojects')
         out = self.init(testdir)
         # Parent project warns correctly
         self.assertRegex(out, "WARNING: Project targeting '>=0.45'.*'0.47.0': dict")
@@ -2360,7 +2360,7 @@
     @skipIf(is_windows(), 'Help needed with fixing this test on windows')
     def test_native_dep_pkgconfig(self):
         testdir = os.path.join(self.unit_test_dir,
-                               '46 native dep pkgconfig var')
+                               '45 native dep pkgconfig var')
         with tempfile.NamedTemporaryFile(mode='w', delete=False) as crossfile:
             crossfile.write(textwrap.dedent(
                 '''[binaries]
@@ -2387,7 +2387,7 @@
     @skipIf(is_windows(), 'Help needed with fixing this test on windows')
     def test_pkg_config_libdir(self):
         testdir = os.path.join(self.unit_test_dir,
-                               '46 native dep pkgconfig var')
+                               '45 native dep pkgconfig var')
         with tempfile.NamedTemporaryFile(mode='w', delete=False) as crossfile:
             crossfile.write(textwrap.dedent(
                 '''[binaries]
@@ -2421,7 +2421,7 @@
             pickle.dump(obj, f)
 
     def test_reconfigure(self):
-        testdir = os.path.join(self.unit_test_dir, '48 reconfigure')
+        testdir = os.path.join(self.unit_test_dir, '47 reconfigure')
         self.init(testdir, extra_args=['-Dopt1=val1', '-Dsub1:werror=true'])
         self.setconf('-Dopt2=val2')
 
@@ -2572,7 +2572,7 @@
     def test_clang_format(self):
         if self.backend is not Backend.ninja:
             raise SkipTest(f'Clang-format is for now only supported on Ninja, not {self.backend.name}')
-        testdir = os.path.join(self.unit_test_dir, '54 clang-format')
+        testdir = os.path.join(self.unit_test_dir, '53 clang-format')
 
         # Ensure that test project is in git even when running meson from tarball.
         srcdir = os.path.join(self.builddir, 'src')
@@ -2626,7 +2626,7 @@
             raise SkipTest('Clang-tidy breaks when ccache is used and "c++" not in path.')
         if is_osx():
             raise SkipTest('Apple ships a broken clang-tidy that chokes on -pipe.')
-        testdir = os.path.join(self.unit_test_dir, '69 clang-tidy')
+        testdir = os.path.join(self.unit_test_dir, '68 clang-tidy')
         dummydir = os.path.join(testdir, 'dummydir.h')
         self.init(testdir, override_envvars={'CXX': 'c++'})
         out = self.run_target('clang-tidy')
@@ -2634,7 +2634,7 @@
         self.assertNotIn(dummydir, out)
 
     def test_identity_cross(self):
-        testdir = os.path.join(self.unit_test_dir, '70 cross')
+        testdir = os.path.join(self.unit_test_dir, '69 cross')
         # Do a build to generate a cross file where the host is this target
         self.init(testdir, extra_args=['-Dgenerate=true'])
         self.meson_cross_files = [os.path.join(self.builddir, "crossfile")]
@@ -2644,7 +2644,7 @@
         self.init(testdir)
 
     def test_introspect_buildoptions_without_configured_build(self):
-        testdir = os.path.join(self.unit_test_dir, '59 introspect buildoptions')
+        testdir = os.path.join(self.unit_test_dir, '58 introspect buildoptions')
         testfile = os.path.join(testdir, 'meson.build')
         res_nb = self.introspect_directory(testfile, ['--buildoptions'] + self.meson_args)
         self.init(testdir, default_args=False)
@@ -2654,11 +2654,11 @@
         self.assertListEqual(sorted(res_nb, key=lambda x: x['name']), sorted(res_wb, key=lambda x: x['name']))
 
     def test_meson_configure_from_source_does_not_crash(self):
-        testdir = os.path.join(self.unit_test_dir, '59 introspect buildoptions')
+        testdir = os.path.join(self.unit_test_dir, '58 introspect buildoptions')
         self._run(self.mconf_command + [testdir])
 
     def test_introspect_buildoptions_cross_only(self):
-        testdir = os.path.join(self.unit_test_dir, '83 cross only introspect')
+        testdir = os.path.join(self.unit_test_dir, '82 cross only introspect')
         testfile = os.path.join(testdir, 'meson.build')
         res = self.introspect_directory(testfile, ['--buildoptions'] + self.meson_args)
         optnames = [o['name'] for o in res]
@@ -2666,7 +2666,7 @@
         self.assertNotIn('build.c_args', optnames)
 
     def test_introspect_json_flat(self):
-        testdir = os.path.join(self.unit_test_dir, '57 introspection')
+        testdir = os.path.join(self.unit_test_dir, '56 introspection')
         self.init(testdir, extra_args=['-Dlayout=flat'])
         infodir = os.path.join(self.builddir, 'meson-info')
         self.assertPathExists(infodir)
@@ -2679,7 +2679,7 @@
                 assert os.path.relpath(out, self.builddir).startswith('meson-out')
 
     def test_introspect_json_dump(self):
-        testdir = os.path.join(self.unit_test_dir, '57 introspection')
+        testdir = os.path.join(self.unit_test_dir, '56 introspection')
         self.init(testdir)
         infodir = os.path.join(self.builddir, 'meson-info')
         self.assertPathExists(infodir)
@@ -2881,7 +2881,7 @@
         self.assertDictEqual(targets_to_find, {})
 
     def test_introspect_file_dump_equals_all(self):
-        testdir = os.path.join(self.unit_test_dir, '57 introspection')
+        testdir = os.path.join(self.unit_test_dir, '56 introspection')
         self.init(testdir)
         res_all = self.introspect('--all')
         res_file = {}
@@ -2909,7 +2909,7 @@
         self.assertEqual(res_all, res_file)
 
     def test_introspect_meson_info(self):
-        testdir = os.path.join(self.unit_test_dir, '57 introspection')
+        testdir = os.path.join(self.unit_test_dir, '56 introspection')
         introfile = os.path.join(self.builddir, 'meson-info', 'meson-info.json')
         self.init(testdir)
         self.assertPathExists(introfile)
@@ -2923,7 +2923,7 @@
         self.assertEqual(res1['build_files_updated'], True)
 
     def test_introspect_config_update(self):
-        testdir = os.path.join(self.unit_test_dir, '57 introspection')
+        testdir = os.path.join(self.unit_test_dir, '56 introspection')
         introfile = os.path.join(self.builddir, 'meson-info', 'intro-buildoptions.json')
         self.init(testdir)
         self.assertPathExists(introfile)
@@ -2951,7 +2951,7 @@
         self.assertListEqual(res1, res2)
 
     def test_introspect_targets_from_source(self):
-        testdir = os.path.join(self.unit_test_dir, '57 introspection')
+        testdir = os.path.join(self.unit_test_dir, '56 introspection')
         testfile = os.path.join(testdir, 'meson.build')
         introfile = os.path.join(self.builddir, 'meson-info', 'intro-targets.json')
         self.init(testdir)
@@ -2983,7 +2983,7 @@
         self.assertListEqual(res_nb, res_wb)
 
     def test_introspect_ast_source(self):
-        testdir = os.path.join(self.unit_test_dir, '57 introspection')
+        testdir = os.path.join(self.unit_test_dir, '56 introspection')
         testfile = os.path.join(testdir, 'meson.build')
         res_nb = self.introspect_directory(testfile, ['--ast'] + self.meson_args)
 
@@ -3061,7 +3061,7 @@
             self.assertEqual(node_counter[n], c)
 
     def test_introspect_dependencies_from_source(self):
-        testdir = os.path.join(self.unit_test_dir, '57 introspection')
+        testdir = os.path.join(self.unit_test_dir, '56 introspection')
         testfile = os.path.join(testdir, 'meson.build')
         res_nb = self.introspect_directory(testfile, ['--scan-dependencies'] + self.meson_args)
         expected = [
@@ -3112,16 +3112,16 @@
 
     @skip_if_no_cmake
     def test_cmake_prefix_path(self):
-        testdir = os.path.join(self.unit_test_dir, '63 cmake_prefix_path')
+        testdir = os.path.join(self.unit_test_dir, '62 cmake_prefix_path')
         self.init(testdir, extra_args=['-Dcmake_prefix_path=' + os.path.join(testdir, 'prefix')])
 
     @skip_if_no_cmake
     def test_cmake_parser(self):
-        testdir = os.path.join(self.unit_test_dir, '64 cmake parser')
+        testdir = os.path.join(self.unit_test_dir, '63 cmake parser')
         self.init(testdir, extra_args=['-Dcmake_prefix_path=' + os.path.join(testdir, 'prefix')])
 
     def test_alias_target(self):
-        testdir = os.path.join(self.unit_test_dir, '65 alias target')
+        testdir = os.path.join(self.unit_test_dir, '64 alias target')
         self.init(testdir)
         self.build()
         self.assertPathDoesNotExist(os.path.join(self.builddir, 'prog' + exe_suffix))
@@ -3138,7 +3138,7 @@
         self._run(self.mconf_command + [self.builddir])
 
     def test_summary(self):
-        testdir = os.path.join(self.unit_test_dir, '72 summary')
+        testdir = os.path.join(self.unit_test_dir, '71 summary')
         out = self.init(testdir, extra_args=['-Denabled_opt=enabled'])
         expected = textwrap.dedent(r'''
             Some Subproject 2.0
@@ -3279,7 +3279,7 @@
             self.assertPathDoesNotExist(os.path.join(self.builddir, get_exe_name('trivialprog')))
 
     def test_spurious_reconfigure_built_dep_file(self):
-        testdir = os.path.join(self.unit_test_dir, '74 dep files')
+        testdir = os.path.join(self.unit_test_dir, '73 dep files')
 
         # Regression test: Spurious reconfigure was happening when build
         # directory is inside source directory.
@@ -3573,7 +3573,7 @@
     def test_wrap_git(self):
         with tempfile.TemporaryDirectory() as tmpdir:
             srcdir = os.path.join(tmpdir, 'src')
-            shutil.copytree(os.path.join(self.unit_test_dir, '81 wrap-git'), srcdir)
+            shutil.copytree(os.path.join(self.unit_test_dir, '80 wrap-git'), srcdir)
             upstream = os.path.join(srcdir, 'subprojects', 'wrap_git_upstream')
             upstream_uri = Path(upstream).as_uri()
             _git_init(upstream)
@@ -3605,7 +3605,7 @@
     @skipUnless(is_linux() and (re.search('^i.86$|^x86$|^x64$|^x86_64$|^amd64$', platform.processor()) is not None),
         'Requires ASM compiler for x86 or x86_64 platform currently only available on Linux CI runners')
     def test_nostdlib(self):
-        testdir = os.path.join(self.unit_test_dir, '78 nostdlib')
+        testdir = os.path.join(self.unit_test_dir, '77 nostdlib')
         machinefile = os.path.join(self.builddir, 'machine.txt')
         with open(machinefile, 'w', encoding='utf-8') as f:
             f.write(textwrap.dedent('''
@@ -3626,7 +3626,7 @@
         self.build()
 
     def test_meson_version_compare(self):
-        testdir = os.path.join(self.unit_test_dir, '82 meson version compare')
+        testdir = os.path.join(self.unit_test_dir, '81 meson version compare')
         out = self.init(testdir)
         self.assertNotRegex(out, r'WARNING')
 
@@ -3683,7 +3683,7 @@
         # files for that project are changed
         if os.environ.get('MESON_CI_JOBNAME') == 'linux-bionic-gcc':
             raise SkipTest('Unsupported CMake version')
-        testdir = os.path.join(self.unit_test_dir, '85 nested subproject regenerate depends')
+        testdir = os.path.join(self.unit_test_dir, '84 nested subproject regenerate depends')
         cmakefile = Path(testdir) / 'subprojects' / 'sub2' / 'CMakeLists.txt'
         self.init(testdir)
         self.build()
@@ -3701,7 +3701,7 @@
         envs = {'CPPFLAGS': '-DCPPFLAG',
                 'CFLAGS': '-DCFLAG',
                 'CXXFLAGS': '-DCXXFLAG'}
-        srcdir = os.path.join(self.unit_test_dir, '89 multiple envvars')
+        srcdir = os.path.join(self.unit_test_dir, '88 multiple envvars')
         self.init(srcdir, override_envvars=envs)
         self.build()
 
@@ -3711,7 +3711,7 @@
         self.init(srcdir, extra_args=['-Dbuild.b_lto=true'])
 
     def test_install_skip_subprojects(self):
-        testdir = os.path.join(self.unit_test_dir, '92 install skip subprojects')
+        testdir = os.path.join(self.unit_test_dir, '91 install skip subprojects')
         self.init(testdir)
         self.build()
 
@@ -3757,14 +3757,14 @@
         check_installed_files(['--skip-subprojects', 'another'], all_expected)
 
     def test_adding_subproject_to_configure_project(self) -> None:
-        srcdir = os.path.join(self.unit_test_dir, '93 new subproject in configured project')
+        srcdir = os.path.join(self.unit_test_dir, '92 new subproject in configured project')
         self.init(srcdir)
         self.build()
         self.setconf('-Duse-sub=true')
         self.build()
 
     def test_devenv(self):
-        testdir = os.path.join(self.unit_test_dir, '91 devenv')
+        testdir = os.path.join(self.unit_test_dir, '90 devenv')
         self.init(testdir)
         self.build()
 
@@ -3780,7 +3780,7 @@
         if not shutil.which('clang-format'):
             raise SkipTest('clang-format not found')
 
-        testdir = os.path.join(self.unit_test_dir, '94 clangformat')
+        testdir = os.path.join(self.unit_test_dir, '93 clangformat')
         newdir = os.path.join(self.builddir, 'testdir')
         shutil.copytree(testdir, newdir)
         self.new_builddir()
@@ -3805,7 +3805,7 @@
         self.build('clang-format-check')
 
     def test_custom_target_implicit_include(self):
-        testdir = os.path.join(self.unit_test_dir, '95 custominc')
+        testdir = os.path.join(self.unit_test_dir, '94 custominc')
         self.init(testdir)
         self.build()
         compdb = self.get_compdb()
@@ -3845,7 +3845,7 @@
                 self.assertEqual(sorted(link_args), sorted(['-flto']))
 
     def test_install_tag(self) -> None:
-        testdir = os.path.join(self.unit_test_dir, '99 install all targets')
+        testdir = os.path.join(self.unit_test_dir, '98 install all targets')
         self.init(testdir)
         self.build()
 
@@ -3988,7 +3988,7 @@
         do_install(None, expected_all, 2)
 
     def test_introspect_install_plan(self):
-        testdir = os.path.join(self.unit_test_dir, '99 install all targets')
+        testdir = os.path.join(self.unit_test_dir, '98 install all targets')
         introfile = os.path.join(self.builddir, 'meson-info', 'intro-install_plan.json')
         self.init(testdir)
         self.assertPathExists(introfile)
@@ -4180,7 +4180,7 @@
                 }}
             ''')
 
-        testdir = os.path.join(self.unit_test_dir, '102 rlib linkage')
+        testdir = os.path.join(self.unit_test_dir, '101 rlib linkage')
         gen_file = os.path.join(testdir, 'lib.rs')
         with open(gen_file, 'w') as f:
             f.write(template.format(0))
@@ -4200,7 +4200,7 @@
         self.assertIn('exit status 39', cm.exception.stdout)
 
     def test_custom_target_name(self):
-        testdir = os.path.join(self.unit_test_dir, '100 custom target name')
+        testdir = os.path.join(self.unit_test_dir, '99 custom target name')
         self.init(testdir)
         out = self.build()
         if self.backend is Backend.ninja:

diff --git a/unittests/linuxcrosstests.py b/unittests/linuxcrosstests.py
index 16f7c24..28bf415 100644
--- a/unittests/linuxcrosstests.py
+++ b/unittests/linuxcrosstests.py

@@ -86,7 +86,7 @@
     def test_cross_libdir_subproject(self):
         # Guard against a regression where calling "subproject"
         # would reset the value of libdir to its default value.
-        testdir = os.path.join(self.unit_test_dir, '76 subdir libdir')
+        testdir = os.path.join(self.unit_test_dir, '75 subdir libdir')
         self.init(testdir, extra_args=['--libdir=fuf'])
         for i in self.introspect('--buildoptions'):
             if i['name'] == 'libdir':
@@ -96,7 +96,7 @@
 
     def test_std_remains(self):
         # C_std defined in project options must be in effect also when cross compiling.
-        testdir = os.path.join(self.unit_test_dir, '51 noncross options')
+        testdir = os.path.join(self.unit_test_dir, '50 noncross options')
         self.init(testdir)
         compdb = self.get_compdb()
         self.assertRegex(compdb[0]['command'], '-std=c99')
@@ -106,7 +106,7 @@
     def test_pkg_config_option(self):
         if not shutil.which('arm-linux-gnueabihf-pkg-config'):
             raise unittest.SkipTest('Cross-pkgconfig not found.')
-        testdir = os.path.join(self.unit_test_dir, '58 pkg_config_path option')
+        testdir = os.path.join(self.unit_test_dir, '57 pkg_config_path option')
         self.init(testdir, extra_args=[
             '-Dbuild.pkg_config_path=' + os.path.join(testdir, 'build_extra_path'),
             '-Dpkg_config_path=' + os.path.join(testdir, 'host_extra_path'),
@@ -117,7 +117,7 @@
         https://github.com/mesonbuild/meson/issues/7997
         check run native test in crossbuild without exe wrapper
         '''
-        testdir = os.path.join(self.unit_test_dir, '88 run native test')
+        testdir = os.path.join(self.unit_test_dir, '87 run native test')
         stamp_file = os.path.join(self.builddir, 'native_test_has_run.stamp')
         self.init(testdir)
         self.build()
@@ -185,7 +185,7 @@
 
     @skipIfNoPkgconfig
     def test_cross_pkg_config_option(self):
-        testdir = os.path.join(self.unit_test_dir, '58 pkg_config_path option')
+        testdir = os.path.join(self.unit_test_dir, '57 pkg_config_path option')
         self.init(testdir, extra_args=[
             '-Dbuild.pkg_config_path=' + os.path.join(testdir, 'build_extra_path'),
             '-Dpkg_config_path=' + os.path.join(testdir, 'host_extra_path'),

diff --git a/unittests/linuxliketests.py b/unittests/linuxliketests.py
index ecb653f..a942df1 100644
--- a/unittests/linuxliketests.py
+++ b/unittests/linuxliketests.py

@@ -945,7 +945,7 @@
         '''
         if is_cygwin():
             raise SkipTest('Windows PE/COFF binaries do not use RPATH')
-        testdir = os.path.join(self.unit_test_dir, '90 pkgconfig build rpath order')
+        testdir = os.path.join(self.unit_test_dir, '89 pkgconfig build rpath order')
         self.init(testdir, override_envvars={'PKG_CONFIG_PATH': testdir})
         self.build()
         build_rpath = get_rpath(os.path.join(self.builddir, 'prog'))
@@ -964,7 +964,7 @@
         if is_osx():
             raise SkipTest('Global RPATHs via LDFLAGS not yet supported on MacOS (does anybody need it?)')
 
-        testdir = os.path.join(self.unit_test_dir, '80 global-rpath')
+        testdir = os.path.join(self.unit_test_dir, '79 global-rpath')
         oldinstalldir = self.installdir
 
         # Build and install an external library without DESTDIR.
@@ -1129,7 +1129,7 @@
 
     @skipIfNoPkgconfig
     def test_pkgconfig_relative_paths(self):
-        testdir = os.path.join(self.unit_test_dir, '62 pkgconfig relative paths')
+        testdir = os.path.join(self.unit_test_dir, '61 pkgconfig relative paths')
         pkg_dir = os.path.join(testdir, 'pkgconfig')
         self.assertPathExists(os.path.join(pkg_dir, 'librelativepath.pc'))
 
@@ -1183,7 +1183,7 @@
         Check that Meson produces valid static archives with --strip enabled
         '''
         with tempfile.TemporaryDirectory() as tempdirname:
-            testdirbase = os.path.join(self.unit_test_dir, '66 static archive stripping')
+            testdirbase = os.path.join(self.unit_test_dir, '65 static archive stripping')
 
             # build lib
             self.new_builddir()
@@ -1220,7 +1220,7 @@
     @skipIfNoPkgconfig
     @skip_if_not_language('cs')
     def test_pkgconfig_csharp_library(self):
-        testdir = os.path.join(self.unit_test_dir, '50 pkgconfig csharp library')
+        testdir = os.path.join(self.unit_test_dir, '49 pkgconfig csharp library')
         self.init(testdir)
         myenv = os.environ.copy()
         myenv['PKG_CONFIG_PATH'] = _prepend_pkg_config_path(self.privatedir)
@@ -1233,7 +1233,7 @@
         '''
         Test that libraries are listed before their dependencies.
         '''
-        testdir = os.path.join(self.unit_test_dir, '53 pkgconfig static link order')
+        testdir = os.path.join(self.unit_test_dir, '52 pkgconfig static link order')
         self.init(testdir)
         myenv = os.environ.copy()
         myenv['PKG_CONFIG_PATH'] = _prepend_pkg_config_path(self.privatedir)
@@ -1245,7 +1245,7 @@
         '''
         Test that the dependencies are always listed in a deterministic order.
         '''
-        testdir = os.path.join(self.unit_test_dir, '43 dep order')
+        testdir = os.path.join(self.unit_test_dir, '42 dep order')
         self.init(testdir)
         with open(os.path.join(self.builddir, 'build.ninja'), encoding='utf-8') as bfile:
             for line in bfile:
@@ -1260,7 +1260,7 @@
         '''
         if is_cygwin():
             raise SkipTest('rpath are not used on Cygwin')
-        testdir = os.path.join(self.unit_test_dir, '42 rpath order')
+        testdir = os.path.join(self.unit_test_dir, '41 rpath order')
         self.init(testdir)
         if is_osx():
             rpathre = re.compile(r'-rpath,.*/subprojects/sub1.*-rpath,.*/subprojects/sub2')
@@ -1296,7 +1296,7 @@
         '''
         oldprefix = self.prefix
         # Install external library so we can find it
-        testdir = os.path.join(self.unit_test_dir, '40 external, internal library rpath', 'external library')
+        testdir = os.path.join(self.unit_test_dir, '39 external, internal library rpath', 'external library')
         # install into installdir without using DESTDIR
         installdir = self.installdir
         self.prefix = installdir
@@ -1308,7 +1308,7 @@
         self.new_builddir()
         env = {'LIBRARY_PATH': os.path.join(installdir, self.libdir),
                'PKG_CONFIG_PATH': _prepend_pkg_config_path(os.path.join(installdir, self.libdir, 'pkgconfig'))}
-        testdir = os.path.join(self.unit_test_dir, '40 external, internal library rpath', 'built library')
+        testdir = os.path.join(self.unit_test_dir, '39 external, internal library rpath', 'built library')
         # install into installdir without using DESTDIR
         self.prefix = self.installdir
         self.init(testdir, override_envvars=env)
@@ -1348,7 +1348,7 @@
         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, '98 link full name','libtestprovider')
+        testdir = os.path.join(self.unit_test_dir, '97 link full name','libtestprovider')
         oldprefix = self.prefix
         # install into installdir without using DESTDIR
         installdir = self.installdir
@@ -1361,7 +1361,7 @@
         self.new_builddir()
         env = {'LIBRARY_PATH': os.path.join(installdir, self.libdir),
                'PKG_CONFIG_PATH': _prepend_pkg_config_path(os.path.join(installdir, self.libdir, 'pkgconfig'))}
-        testdir = os.path.join(self.unit_test_dir, '98 link full name','proguser')
+        testdir = os.path.join(self.unit_test_dir, '97 link full name','proguser')
         self.init(testdir,override_envvars=env)
 
         # test for link with full path
@@ -1394,7 +1394,7 @@
         oldinstalldir = self.installdir
 
         # Build and install both external libraries without DESTDIR
-        val1dir = os.path.join(self.unit_test_dir, '75 pkgconfig prefixes', 'val1')
+        val1dir = os.path.join(self.unit_test_dir, '74 pkgconfig prefixes', 'val1')
         val1prefix = os.path.join(oldinstalldir, 'val1')
         self.prefix = val1prefix
         self.installdir = val1prefix
@@ -1405,7 +1405,7 @@
 
         env1 = {}
         env1['PKG_CONFIG_PATH'] = os.path.join(val1prefix, self.libdir, 'pkgconfig')
-        val2dir = os.path.join(self.unit_test_dir, '75 pkgconfig prefixes', 'val2')
+        val2dir = os.path.join(self.unit_test_dir, '74 pkgconfig prefixes', 'val2')
         val2prefix = os.path.join(oldinstalldir, 'val2')
         self.prefix = val2prefix
         self.installdir = val2prefix
@@ -1417,7 +1417,7 @@
         # Build, install, and run the client program
         env2 = {}
         env2['PKG_CONFIG_PATH'] = os.path.join(val2prefix, self.libdir, 'pkgconfig')
-        testdir = os.path.join(self.unit_test_dir, '75 pkgconfig prefixes', 'client')
+        testdir = os.path.join(self.unit_test_dir, '74 pkgconfig prefixes', 'client')
         testprefix = os.path.join(oldinstalldir, 'client')
         self.prefix = testprefix
         self.installdir = testprefix
@@ -1471,7 +1471,7 @@
 
     @skipIfNoPkgconfigDep('gmodule-2.0')
     def test_ldflag_dedup(self):
-        testdir = os.path.join(self.unit_test_dir, '52 ldflagdedup')
+        testdir = os.path.join(self.unit_test_dir, '51 ldflagdedup')
         if is_cygwin() or is_osx():
             raise SkipTest('Not applicable on Cygwin or OSX.')
         env = get_fake_env()
@@ -1489,7 +1489,7 @@
         self.assertEqual(max_count, 1, 'Export dynamic incorrectly deduplicated.')
 
     def test_compiler_libs_static_dedup(self):
-        testdir = os.path.join(self.unit_test_dir, '56 dedup compiler libs')
+        testdir = os.path.join(self.unit_test_dir, '55 dedup compiler libs')
         self.init(testdir)
         build_ninja = os.path.join(self.builddir, 'build.ninja')
         with open(build_ninja, encoding='utf-8') as f:
@@ -1504,7 +1504,7 @@
     @skipIfNoPkgconfig
     def test_noncross_options(self):
         # C_std defined in project options must be in effect also when native compiling.
-        testdir = os.path.join(self.unit_test_dir, '51 noncross options')
+        testdir = os.path.join(self.unit_test_dir, '50 noncross options')
         self.init(testdir, extra_args=['-Dpkg_config_path=' + testdir])
         compdb = self.get_compdb()
         self.assertEqual(len(compdb), 2)
@@ -1513,7 +1513,7 @@
         self.build()
 
     def test_identity_cross(self):
-        testdir = os.path.join(self.unit_test_dir, '61 identity cross')
+        testdir = os.path.join(self.unit_test_dir, '60 identity cross')
 
         constantsfile = tempfile.NamedTemporaryFile(mode='w')
         constantsfile.write(textwrap.dedent('''\
@@ -1542,7 +1542,7 @@
         self.init(testdir)
 
     def test_identity_cross_env(self):
-        testdir = os.path.join(self.unit_test_dir, '61 identity cross')
+        testdir = os.path.join(self.unit_test_dir, '60 identity cross')
         env = {
             'CC_FOR_BUILD': '"' + os.path.join(testdir, 'build_wrapper.py') + '"',
         }
@@ -1562,7 +1562,7 @@
             raise SkipTest("Cygwin doesn't support LD_LIBRARY_PATH.")
 
         # Build some libraries and install them
-        testdir = os.path.join(self.unit_test_dir, '67 static link/lib')
+        testdir = os.path.join(self.unit_test_dir, '66 static link/lib')
         libdir = os.path.join(self.installdir, self.libdir)
         oldprefix = self.prefix
         self.prefix = self.installdir
@@ -1574,7 +1574,7 @@
         self.prefix = oldprefix
         meson_args = [f'-Dc_link_args=-L{libdir}',
                       '--fatal-meson-warnings']
-        testdir = os.path.join(self.unit_test_dir, '67 static link')
+        testdir = os.path.join(self.unit_test_dir, '66 static link')
         env = {'PKG_CONFIG_LIBDIR': os.path.join(libdir, 'pkgconfig')}
         self.init(testdir, extra_args=meson_args, override_envvars=env)
         self.build()
@@ -1648,7 +1648,7 @@
             return hashlib.sha256(f.read()).hexdigest()
 
     def test_wrap_with_file_url(self):
-        testdir = os.path.join(self.unit_test_dir, '73 wrap file url')
+        testdir = os.path.join(self.unit_test_dir, '72 wrap file url')
         source_filename = os.path.join(testdir, 'subprojects', 'foo.tar.xz')
         patch_filename = os.path.join(testdir, 'subprojects', 'foo-patch.tar.xz')
         wrap_filename = os.path.join(testdir, 'subprojects', 'foo.wrap')
@@ -1705,7 +1705,7 @@
             self.init(d, override_envvars={'PKG_CONFIG_LIBDIR': privatedir})
 
     def test_as_link_whole(self):
-        testdir = os.path.join(self.unit_test_dir, '77 as link whole')
+        testdir = os.path.join(self.unit_test_dir, '76 as link whole')
         self.init(testdir)
         with open(os.path.join(self.privatedir, 'bar1.pc'), encoding='utf-8') as f:
             content = f.read()
@@ -1722,7 +1722,7 @@
             raise SkipTest('Prelinking not supported on Darwin.')
         if 'clang' in os.environ.get('CC', 'dummy'):
             raise SkipTest('Prelinking not supported with Clang.')
-        testdir = os.path.join(self.unit_test_dir, '87 prelinking')
+        testdir = os.path.join(self.unit_test_dir, '86 prelinking')
         env = get_fake_env(testdir, self.builddir, self.prefix)
         cc = detect_c_compiler(env, MachineChoice.HOST)
         if cc.id == "gcc":
@@ -1777,7 +1777,7 @@
 
     @skipUnless(is_linux(), 'Test only applicable to Linux')
     def test_install_strip(self):
-        testdir = os.path.join(self.unit_test_dir, '104 strip')
+        testdir = os.path.join(self.unit_test_dir, '103 strip')
         self.init(testdir)
         self.build()
 

diff --git a/unittests/machinefiletests.py b/unittests/machinefiletests.py
index 0a756b5..7d75ebc 100644
--- a/unittests/machinefiletests.py
+++ b/unittests/machinefiletests.py

@@ -62,7 +62,7 @@
 
     def setUp(self):
         super().setUp()
-        self.testcase = os.path.join(self.unit_test_dir, '47 native file binary')
+        self.testcase = os.path.join(self.unit_test_dir, '46 native file binary')
         self.current_config = 0
         self.current_wrapper = 0
 
@@ -379,12 +379,12 @@
         self.assertEqual(compiler.version, '1.2345')
 
     def test_native_file_dirs(self):
-        testcase = os.path.join(self.unit_test_dir, '60 native file override')
+        testcase = os.path.join(self.unit_test_dir, '59 native file override')
         self.init(testcase, default_args=False,
                   extra_args=['--native-file', os.path.join(testcase, 'nativefile')])
 
     def test_native_file_dirs_overridden(self):
-        testcase = os.path.join(self.unit_test_dir, '60 native file override')
+        testcase = os.path.join(self.unit_test_dir, '59 native file override')
         self.init(testcase, default_args=False,
                   extra_args=['--native-file', os.path.join(testcase, 'nativefile'),
                               '-Ddef_libdir=liblib', '-Dlibdir=liblib'])
@@ -422,7 +422,7 @@
         self.init(testcase, extra_args=['--native-file', config, '-Dother_one=false'])
 
     def test_user_options_subproject(self):
-        testcase = os.path.join(self.unit_test_dir, '79 user options for subproject')
+        testcase = os.path.join(self.unit_test_dir, '78 user options for subproject')
 
         s = os.path.join(testcase, 'subprojects')
         if not os.path.exists(s):
@@ -650,7 +650,7 @@
             ''')
 
     def test_needs_exe_wrapper_true(self):
-        testdir = os.path.join(self.unit_test_dir, '71 cross test passed')
+        testdir = os.path.join(self.unit_test_dir, '70 cross test passed')
         with tempfile.TemporaryDirectory() as d:
             p = Path(d) / 'crossfile'
             with p.open('wt', encoding='utf-8') as f:
@@ -660,7 +660,7 @@
             self.assertRegex(out, r'Skipped:\s*1\s*\n')
 
     def test_needs_exe_wrapper_false(self):
-        testdir = os.path.join(self.unit_test_dir, '71 cross test passed')
+        testdir = os.path.join(self.unit_test_dir, '70 cross test passed')
         with tempfile.TemporaryDirectory() as d:
             p = Path(d) / 'crossfile'
             with p.open('wt', encoding='utf-8') as f:
@@ -670,7 +670,7 @@
             self.assertNotRegex(out, r'Skipped:\s*1\n')
 
     def test_needs_exe_wrapper_true_wrapper(self):
-        testdir = os.path.join(self.unit_test_dir, '71 cross test passed')
+        testdir = os.path.join(self.unit_test_dir, '70 cross test passed')
         with tempfile.TemporaryDirectory() as d:
             s = Path(d) / 'wrapper.py'
             with s.open('wt', encoding='utf-8') as f:
@@ -687,7 +687,7 @@
             self.assertRegex(out, r'Ok:\s*3\s*\n')
 
     def test_cross_exe_passed_no_wrapper(self):
-        testdir = os.path.join(self.unit_test_dir, '71 cross test passed')
+        testdir = os.path.join(self.unit_test_dir, '70 cross test passed')
         with tempfile.TemporaryDirectory() as d:
             p = Path(d) / 'crossfile'
             with p.open('wt', encoding='utf-8') as f:
@@ -756,7 +756,7 @@
         return filename
 
     def test_cross_file_dirs(self):
-        testcase = os.path.join(self.unit_test_dir, '60 native file override')
+        testcase = os.path.join(self.unit_test_dir, '59 native file override')
         self.init(testcase, default_args=False,
                   extra_args=['--native-file', os.path.join(testcase, 'nativefile'),
                               '--cross-file', os.path.join(testcase, 'crossfile'),
@@ -774,7 +774,7 @@
                               '-Ddef_sysconfdir=sysconfbar'])
 
     def test_cross_file_dirs_overridden(self):
-        testcase = os.path.join(self.unit_test_dir, '60 native file override')
+        testcase = os.path.join(self.unit_test_dir, '59 native file override')
         self.init(testcase, default_args=False,
                   extra_args=['--native-file', os.path.join(testcase, 'nativefile'),
                               '--cross-file', os.path.join(testcase, 'crossfile'),
@@ -793,7 +793,7 @@
 
     def test_cross_file_dirs_chain(self):
         # crossfile2 overrides crossfile overrides nativefile
-        testcase = os.path.join(self.unit_test_dir, '60 native file override')
+        testcase = os.path.join(self.unit_test_dir, '59 native file override')
         self.init(testcase, default_args=False,
                   extra_args=['--native-file', os.path.join(testcase, 'nativefile'),
                               '--cross-file', os.path.join(testcase, 'crossfile'),

diff --git a/unittests/platformagnostictests.py b/unittests/platformagnostictests.py
index c5e5233..b5907a1 100644
--- a/unittests/platformagnostictests.py
+++ b/unittests/platformagnostictests.py

@@ -32,7 +32,7 @@
         Tests that find_program() with a relative path does not find the program
         in current workdir.
         '''
-        testdir = os.path.join(self.unit_test_dir, '101 relative find program')
+        testdir = os.path.join(self.unit_test_dir, '100 relative find program')
         self.init(testdir, workdir=testdir)
 
     def test_invalid_option_names(self):
@@ -68,5 +68,5 @@
         interp.process(fname)
 
     def test_python_dependency_without_pkgconfig(self):
-        testdir = os.path.join(self.unit_test_dir, '103 python without pkgconfig')
+        testdir = os.path.join(self.unit_test_dir, '102 python without pkgconfig')
         self.init(testdir, override_envvars={'PKG_CONFIG': 'notfound'})

diff --git a/unittests/windowstests.py b/unittests/windowstests.py
index d3ad932..7339ca8 100644
--- a/unittests/windowstests.py
+++ b/unittests/windowstests.py

@@ -169,7 +169,7 @@
             self.assertRebuiltTarget('prog_1')
 
     def test_msvc_cpp17(self):
-        testdir = os.path.join(self.unit_test_dir, '45 vscpp17')
+        testdir = os.path.join(self.unit_test_dir, '44 vscpp17')
 
         env = get_fake_env(testdir, self.builddir, self.prefix)
         cc = detect_c_compiler(env, MachineChoice.HOST)
@@ -357,7 +357,7 @@
             raise SkipTest('C++ modules is only supported with Visual Studio.')
         if version_compare(os.environ['VSCMD_VER'], '<16.10.0'):
             raise SkipTest('C++ modules are only supported with VS 2019 Preview or newer.')
-        self.init(os.path.join(self.unit_test_dir, '86 cpp modules'))
+        self.init(os.path.join(self.unit_test_dir, '85 cpp modules'))
         self.build()
 
     def test_non_utf8_fails(self):