575 files changed, 177 insertions, 177 deletions

diff --git a/test cases/failing/101 no glib-compile-resources/meson.build b/test cases/failing/100 no glib-compile-resources/meson.build
index aae0569da..aae0569da 100644
--- a/test cases/failing/101 no glib-compile-resources/meson.build
+++ b/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
index 7f0c02cc6..ad9ba2943 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
index 1447b984d..1447b984d 100644
--- a/test cases/failing/101 no glib-compile-resources/trivial.gresource.xml
+++ b/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 a74adaf60..000000000
--- 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
index 1a647df1a..1a647df1a 100644
--- a/test cases/failing/102 number in combo/meson.build
+++ b/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
index 55f10fc20..55f10fc20 100644
--- a/test cases/failing/102 number in combo/nativefile.ini
+++ b/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
index 8e70a6014..5d37df109 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
index c5efd67ea..c5efd67ea 100644
--- a/test cases/failing/103 bool in combo/meson.build
+++ b/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
index 0c8f5de00..0c8f5de00 100644
--- a/test cases/failing/103 bool in combo/meson_options.txt
+++ b/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
index b423957cf..b423957cf 100644
--- a/test cases/failing/103 bool in combo/nativefile.ini
+++ b/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
index 48d4cc39a..c0041afec 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
index 366bbdd5d..366bbdd5d 100644
--- a/test cases/failing/104 compiler no lang/meson.build
+++ b/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
index d8cc96eef..123dcb9c3 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
index 0101bb84e..0101bb84e 100644
--- a/test cases/failing/105 no fallback/meson.build
+++ b/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
index b2c4814e2..b2c4814e2 100644
--- a/test cases/failing/105 no fallback/subprojects/foob/meson.build
+++ b/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
index e0340616c..e0340616c 100644
--- a/test cases/failing/105 no fallback/test.json
+++ b/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
index d976ae8d6..d976ae8d6 100644
--- a/test cases/failing/106 feature require/meson.build
+++ b/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
index 5910a8737..5910a8737 100644
--- a/test cases/failing/106 feature require/meson_options.txt
+++ b/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
index 7c4640de0..7c4640de0 100644
--- a/test cases/failing/106 feature require/test.json
+++ b/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
index 08c099c85..08c099c85 100644
--- a/test cases/failing/107 feature require.bis/meson.build
+++ b/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
index 5910a8737..5910a8737 100644
--- a/test cases/failing/107 feature require.bis/meson_options.txt
+++ b/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
index 2583990d8..2583990d8 100644
--- a/test cases/failing/107 feature require.bis/test.json
+++ b/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
index 8a4215c9f..8a4215c9f 100644
--- a/test cases/failing/108 no build get_external_property/meson.build
+++ b/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
index d2827f42e..b95427efd 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
index 9343233d5..9343233d5 100644
--- a/test cases/failing/109 enter subdir twice/meson.build
+++ b/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
index d036a3fe5..d036a3fe5 100644
--- a/test cases/failing/109 enter subdir twice/sub/meson.build
+++ b/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
index f7a526c54..0a8e12769 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
index dd22f56b2..dd22f56b2 100644
--- a/test cases/failing/111 invalid fstring/109 invalid fstring/meson.build
+++ b/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
index 71d8f5927..71d8f5927 100644
--- a/test cases/failing/111 invalid fstring/109 invalid fstring/test.json
+++ b/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
index 973df3098..973df3098 100644
--- a/test cases/failing/111 invalid fstring/meson.build
+++ b/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
index 89ec40c4e..a095d62ca 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
index bb1f44768..bb1f44768 100644
--- a/test cases/failing/112 compiler argument checking/meson.build
+++ b/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
index f4728db00..3de6acb25 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
index f4eb5feb9..f4eb5feb9 100644
--- a/test cases/failing/113 empty fallback/meson.build
+++ b/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
index c9e134b5e..c9e134b5e 100644
--- a/test cases/failing/113 empty fallback/subprojects/foo/meson.build
+++ b/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
index c8ed212a8..02db40b27 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
index bfb03ef20..bfb03ef20 100644
--- a/test cases/failing/114 cmake executable dependency/meson.build
+++ b/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
index 006787986..006787986 100644
--- a/test cases/failing/114 cmake executable dependency/subprojects/cmlib/CMakeLists.txt
+++ b/test cases/failing/112 cmake executable dependency/subprojects/cmlib/CMakeLists.txt
diff --git a/test cases/failing/100 no lang/main.c b/test cases/failing/112 cmake executable dependency/subprojects/cmlib/main.c
index 9b6bdc2ec..9b6bdc2ec 100644
--- a/test cases/failing/100 no lang/main.c
+++ b/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
index 951f2e7ad..c1ccf6c64 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
index 2874e424c..2874e424c 100644
--- a/test cases/failing/115 allow_fallback with fallback/meson.build
+++ b/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
index 6bdcc519c..58ed475c0 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
index 6995f672c..6995f672c 100644
--- a/test cases/failing/116 nonsensical bindgen/meson.build
+++ b/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
index 750621f87..750621f87 100644
--- a/test cases/failing/116 nonsensical bindgen/src/header.h
+++ b/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
index d652d28b9..d652d28b9 100644
--- a/test cases/failing/116 nonsensical bindgen/src/source.c
+++ b/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
index b0a38e826..bc85311ab 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
index db7cb30e7..db7cb30e7 100644
--- a/test cases/failing/117 run_target in test/meson.build
+++ b/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
index ad24367a5..fce0c4735 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
index 96612d48b..96612d48b 100644
--- a/test cases/failing/117 run_target in test/trivial.c
+++ b/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
index 9d37a390b..9d37a390b 100644
--- 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
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
index a09b1a319..621d51029 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
index 1b14571ed..1b14571ed 100644
--- 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
diff --git a/test cases/failing/119 pathsep in install_symlink/meson.build b/test cases/failing/117 pathsep in install_symlink/meson.build
index cce82c237..cce82c237 100644
--- a/test cases/failing/119 pathsep in install_symlink/meson.build
+++ b/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
index 9df546a25..aa356194a 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
index ffbcc13a4..ffbcc13a4 100644
--- a/test cases/failing/120 subproject version conflict/meson.build
+++ b/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
index 7da4df0e7..7da4df0e7 100644
--- a/test cases/failing/120 subproject version conflict/subprojects/A/meson.build
+++ b/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
index 0ead9349a..0ead9349a 100644
--- a/test cases/failing/120 subproject version conflict/subprojects/B/meson.build
+++ b/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
index 7807d6878..a31511c36 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
index e69de29bb..e69de29bb 100644
--- a/test cases/failing/121 structured source empty string/main.rs
+++ b/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
index 071599147..071599147 100644
--- a/test cases/failing/121 structured source empty string/meson.build
+++ b/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
index feb2af9e7..3d41fc287 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
index e69de29bb..e69de29bb 100644
--- a/test cases/failing/122 structured_sources conflicts/main.rs
+++ b/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
index 561ad86bc..561ad86bc 100644
--- a/test cases/failing/122 structured_sources conflicts/meson.build
+++ b/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
index 4833f86b1..2f3d1ef0d 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
index 19bdd0c66..19bdd0c66 100644
--- a/test cases/failing/123 missing compiler/meson.build
+++ b/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
index 44e82e227..44e82e227 100644
--- a/test cases/failing/123 missing compiler/subprojects/sub/main.c
+++ b/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
index b60850c9c..b60850c9c 100644
--- a/test cases/failing/123 missing compiler/subprojects/sub/meson.build
+++ b/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
index 915df164c..442e3312d 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
index e2863e79c..e2863e79c 100644
--- a/test cases/failing/39 prefix absolute/meson.build
+++ b/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
index 2770243ee..859906cb7 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
index 16fcdd9f4..16fcdd9f4 100644
--- a/test cases/failing/40 kwarg assign/dummy.c
+++ b/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
index 7d4252100..7d4252100 100644
--- a/test cases/failing/40 kwarg assign/meson.build
+++ b/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
index 11b7fad8e..11b7fad8e 100644
--- a/test cases/failing/40 kwarg assign/prog.c
+++ b/test cases/failing/39 kwarg assign/prog.c
diff --git a/test cases/failing/40 kwarg assign/test.json b/test cases/failing/39 kwarg assign/test.json
index 671eb3fdb..8fd9d0f3e 100644
--- a/test cases/failing/40 kwarg assign/test.json
+++ b/test cases/failing/39 kwarg assign/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/40 kwarg assign/meson.build:3:0: ERROR: Tried to assign values inside an argument list."
+      "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
index d00491fd7..d00491fd7 100644
--- a/test cases/failing/41 custom target plainname many inputs/1.txt
+++ b/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
index 0cfbf0888..0cfbf0888 100644
--- a/test cases/failing/41 custom target plainname many inputs/2.txt
+++ b/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
index 1c53e24e7..1c53e24e7 100644
--- a/test cases/failing/41 custom target plainname many inputs/catfiles.py
+++ b/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
index 1bcfc0672..1bcfc0672 100644
--- a/test cases/failing/41 custom target plainname many inputs/meson.build
+++ b/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
index 66a56f602..05f4d4936 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/42 custom target outputs not matching install_dirs/generator.py b/test cases/failing/41 custom target outputs not matching install_dirs/generator.py
index 4ac61795b..4ac61795b 100755
--- 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
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
index 765e23764..765e23764 100644
--- 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
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
index f9e2ba781..f9e2ba781 100644
--- 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
diff --git a/test cases/failing/43 project name colon/meson.build b/test cases/failing/42 project name colon/meson.build
index 53e947ef2..53e947ef2 100644
--- a/test cases/failing/43 project name colon/meson.build
+++ b/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
index 7a5557473..c3b880e65 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
index 7bbf4b284..7bbf4b284 100644
--- a/test cases/failing/44 abs subdir/bob/meson.build
+++ b/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
index 5425245a7..5425245a7 100644
--- a/test cases/failing/44 abs subdir/meson.build
+++ b/test cases/failing/43 abs subdir/meson.build
diff --git a/test cases/failing/44 abs subdir/test.json b/test cases/failing/43 abs subdir/test.json
index 0aa56f692..201ed44d0 100644
--- a/test cases/failing/44 abs subdir/test.json
+++ b/test cases/failing/43 abs subdir/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/44 abs subdir/meson.build:5:0: ERROR: Subdir argument must be a relative path."
+      "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/45 abspath to srcdir/meson.build b/test cases/failing/44 abspath to srcdir/meson.build
index 964a19b56..964a19b56 100644
--- a/test cases/failing/45 abspath to srcdir/meson.build
+++ b/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
index 177bac1bc..2cc298045 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
index 82ae995d4..82ae995d4 100644
--- a/test cases/failing/46 pkgconfig variables reserved/meson.build
+++ b/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
index e8a6d8330..e8a6d8330 100644
--- a/test cases/failing/46 pkgconfig variables reserved/simple.c
+++ b/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
index bb52e6d72..bb52e6d72 100644
--- a/test cases/failing/46 pkgconfig variables reserved/simple.h
+++ b/test cases/failing/45 pkgconfig variables reserved/simple.h
diff --git a/test cases/failing/46 pkgconfig variables reserved/test.json b/test cases/failing/45 pkgconfig variables reserved/test.json
index b92ee17cd..853eb822b 100644
--- a/test cases/failing/46 pkgconfig variables reserved/test.json
+++ b/test cases/failing/45 pkgconfig variables reserved/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/46 pkgconfig variables reserved/meson.build:8:5: ERROR: Variable \"prefix\" is reserved"
+      "line": "test cases/failing/45 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
index 65d33445c..65d33445c 100644
--- a/test cases/failing/47 pkgconfig variables zero length/meson.build
+++ b/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
index e8a6d8330..e8a6d8330 100644
--- a/test cases/failing/47 pkgconfig variables zero length/simple.c
+++ b/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
index bb52e6d72..bb52e6d72 100644
--- a/test cases/failing/47 pkgconfig variables zero length/simple.h
+++ b/test cases/failing/46 pkgconfig variables zero length/simple.h
diff --git a/test cases/failing/47 pkgconfig variables zero length/test.json b/test cases/failing/46 pkgconfig variables zero length/test.json
index 39ffde4c6..ae8ba2b28 100644
--- a/test cases/failing/47 pkgconfig variables zero length/test.json
+++ b/test cases/failing/46 pkgconfig variables zero length/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/47 pkgconfig variables zero length/meson.build:8:5: ERROR: Empty variable name or value"
+      "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
index 33977b273..33977b273 100644
--- a/test cases/failing/48 pkgconfig variables zero length value/meson.build
+++ b/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
index e8a6d8330..e8a6d8330 100644
--- a/test cases/failing/48 pkgconfig variables zero length value/simple.c
+++ b/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
index bb52e6d72..bb52e6d72 100644
--- a/test cases/failing/48 pkgconfig variables zero length value/simple.h
+++ b/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
index 8aa1bc58f..e9638307c 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/49 pkgconfig variables not key value/meson.build b/test cases/failing/48 pkgconfig variables not key value/meson.build
index 02fa7376f..02fa7376f 100644
--- a/test cases/failing/49 pkgconfig variables not key value/meson.build
+++ b/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
index e8a6d8330..e8a6d8330 100644
--- a/test cases/failing/49 pkgconfig variables not key value/simple.c
+++ b/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
index bb52e6d72..bb52e6d72 100644
--- a/test cases/failing/49 pkgconfig variables not key value/simple.h
+++ b/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
index 082bd7955..decbe71a5 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
index 041bcf3d3..041bcf3d3 100644
--- a/test cases/failing/50 executable comparison/meson.build
+++ b/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
index 0314ff17b..0314ff17b 100644
--- a/test cases/failing/50 executable comparison/prog.c
+++ b/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
index 7f6bd3be7..a37002e22 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
index 7694c2cd2..7694c2cd2 100644
--- a/test cases/failing/51 inconsistent comparison/meson.build
+++ b/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
index bd2655490..171bfa6a0 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
index 29fe1fceb..29fe1fceb 100644
--- a/test cases/failing/52 slashname/meson.build
+++ b/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
index 3baacf601..3baacf601 100644
--- a/test cases/failing/52 slashname/sub/meson.build
+++ b/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
index 722de0abe..722de0abe 100644
--- a/test cases/failing/52 slashname/sub/prog.c
+++ b/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
index eb50e1b83..39346a955 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
index e69de29bb..e69de29bb 100644
--- a/test cases/failing/53 reserved meson prefix/meson-foo/meson.build
+++ b/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
index 1339035ad..1339035ad 100644
--- a/test cases/failing/53 reserved meson prefix/meson.build
+++ b/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
index 502d96af9..707cd73a5 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
index e69de29bb..e69de29bb 100644
--- a/test cases/failing/54 wrong shared crate type/foo.rs
+++ b/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
index 90020faf8..90020faf8 100644
--- a/test cases/failing/54 wrong shared crate type/meson.build
+++ b/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
index a5b796191..5faaece2b 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
index e69de29bb..e69de29bb 100644
--- a/test cases/failing/55 wrong static crate type/foo.rs
+++ b/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
index 179d7cd53..179d7cd53 100644
--- a/test cases/failing/55 wrong static crate type/meson.build
+++ b/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
index 7073f7bf0..83ae5e1b6 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
index 12f27058d..12f27058d 100644
--- a/test cases/failing/56 or on new line/meson.build
+++ b/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
index 3302cf4ec..3302cf4ec 100644
--- a/test cases/failing/56 or on new line/meson_options.txt
+++ b/test cases/failing/55 or on new line/meson_options.txt
diff --git a/test cases/failing/56 or on new line/test.json b/test cases/failing/55 or on new line/test.json
index c55cee6eb..f1b8a673c 100644
--- a/test cases/failing/56 or on new line/test.json
+++ b/test cases/failing/55 or on new line/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/56 or on new line/meson.build:4:8: ERROR: Invalid or clause."
+      "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
index 186b3e595..186b3e595 100644
--- a/test cases/failing/57 link with executable/meson.build
+++ b/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
index dc0124a24..dc0124a24 100644
--- a/test cases/failing/57 link with executable/module.c
+++ b/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
index f3836d7ba..f3836d7ba 100644
--- a/test cases/failing/57 link with executable/prog.c
+++ b/test cases/failing/56 link with executable/prog.c
diff --git a/test cases/failing/57 link with executable/test.json b/test cases/failing/56 link with executable/test.json
index c835a9033..2288783ca 100644
--- a/test cases/failing/57 link with executable/test.json
+++ b/test cases/failing/56 link with executable/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/57 link with executable/meson.build:4:0: ERROR: Link target 'prog' is not linkable."
+      "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/58 assign custom target index/meson.build b/test cases/failing/57 assign custom target index/meson.build
index 7f2a820b8..7f2a820b8 100644
--- a/test cases/failing/58 assign custom target index/meson.build
+++ b/test cases/failing/57 assign custom target index/meson.build
diff --git a/test cases/failing/58 assign custom target index/test.json b/test cases/failing/57 assign custom target index/test.json
index b5aa3263c..392137ac1 100644
--- a/test cases/failing/58 assign custom target index/test.json
+++ b/test cases/failing/57 assign custom target index/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/58 assign custom target index/meson.build:24:0: ERROR: Assignment target must be an id."
+      "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/59 getoption prefix/meson.build b/test cases/failing/58 getoption prefix/meson.build
index 8f85cff2a..8f85cff2a 100644
--- a/test cases/failing/59 getoption prefix/meson.build
+++ b/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
index aa9c3df0f..aa9c3df0f 100644
--- a/test cases/failing/59 getoption prefix/subprojects/abc/meson.build
+++ b/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
index 89e624e24..89e624e24 100644
--- a/test cases/failing/59 getoption prefix/subprojects/abc/meson_options.txt
+++ b/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
index 4485e0465..630dcd99b 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
index 5219cfb96..5219cfb96 100644
--- a/test cases/failing/60 bad option argument/meson.build
+++ b/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
index de1fff6fb..de1fff6fb 100644
--- a/test cases/failing/60 bad option argument/meson_options.txt
+++ b/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
index 38712b6a3..3c5df1b27 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
index f38d6c74c..f38d6c74c 100644
--- a/test cases/failing/61 subproj filegrab/meson.build
+++ b/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
index 0314ff17b..0314ff17b 100644
--- a/test cases/failing/61 subproj filegrab/prog.c
+++ b/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
index 80b988804..80b988804 100644
--- a/test cases/failing/61 subproj filegrab/subprojects/a/meson.build
+++ b/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
index 600e0d515..04a6dbbdd 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
index 30fc69093..30fc69093 100644
--- a/test cases/failing/62 grab subproj/meson.build
+++ b/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
index b346f6d9a..b346f6d9a 100644
--- a/test cases/failing/62 grab subproj/subprojects/foo/meson.build
+++ b/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
index a94b1f5ad..a94b1f5ad 100644
--- a/test cases/failing/62 grab subproj/subprojects/foo/sub.c
+++ b/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
index 1503ad7c6..873ec6c06 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
index 60b926a95..60b926a95 100644
--- a/test cases/failing/63 grab sibling/meson.build
+++ b/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
index 6dd9f61fc..6dd9f61fc 100644
--- a/test cases/failing/63 grab sibling/subprojects/a/meson.build
+++ b/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
index 7c70fe55b..7c70fe55b 100644
--- a/test cases/failing/63 grab sibling/subprojects/b/meson.build
+++ b/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
index 46718c6cc..46718c6cc 100644
--- a/test cases/failing/63 grab sibling/subprojects/b/sneaky.c
+++ b/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
index 91715c7cf..9e7c4bbf1 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
index cb83fff6a..cb83fff6a 100644
--- a/test cases/failing/64 string as link target/meson.build
+++ b/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
index 0314ff17b..0314ff17b 100644
--- a/test cases/failing/64 string as link target/prog.c
+++ b/test cases/failing/63 string as link target/prog.c
diff --git a/test cases/failing/64 string as link target/test.json b/test cases/failing/63 string as link target/test.json
index b07a2ea09..a531d647e 100644
--- a/test cases/failing/64 string as link target/test.json
+++ b/test cases/failing/63 string as link target/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/64 string as link target/meson.build:2:0: ERROR: '' is not a target."
+      "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
index 1ce574738..1ce574738 100644
--- a/test cases/failing/65 dependency not-found and required/meson.build
+++ b/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
index ff2096987..84d14b478 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/66 subproj different versions/main.c b/test cases/failing/65 subproj different versions/main.c
index 8793c623a..8793c623a 100644
--- a/test cases/failing/66 subproj different versions/main.c
+++ b/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
index e964e423e..e964e423e 100644
--- a/test cases/failing/66 subproj different versions/meson.build
+++ b/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
index cd41a6588..cd41a6588 100644
--- a/test cases/failing/66 subproj different versions/subprojects/a/a.c
+++ b/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
index 8f1d49eda..8f1d49eda 100644
--- a/test cases/failing/66 subproj different versions/subprojects/a/a.h
+++ b/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
index e84182a07..e84182a07 100644
--- a/test cases/failing/66 subproj different versions/subprojects/a/meson.build
+++ b/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
index f85f8c3f8..f85f8c3f8 100644
--- a/test cases/failing/66 subproj different versions/subprojects/b/b.c
+++ b/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
index eced786a0..eced786a0 100644
--- a/test cases/failing/66 subproj different versions/subprojects/b/b.h
+++ b/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
index 0398340e6..0398340e6 100644
--- a/test cases/failing/66 subproj different versions/subprojects/b/meson.build
+++ b/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
index 2b15f607c..2b15f607c 100644
--- a/test cases/failing/66 subproj different versions/subprojects/c/c.h
+++ b/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
index 7184933b2..7184933b2 100644
--- a/test cases/failing/66 subproj different versions/subprojects/c/meson.build
+++ b/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
index 19e7b4a49..2f9f70ddc 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
index 937e58749..937e58749 100644
--- a/test cases/failing/67 wrong boost module/meson.build
+++ b/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
index 5f9b21fc8..c65a78c46 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
index e69de29bb..e69de29bb 100644
--- a/test cases/failing/68 install_data rename bad size/file1.txt
+++ b/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
index e69de29bb..e69de29bb 100644
--- a/test cases/failing/68 install_data rename bad size/file2.txt
+++ b/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
index c7cde087d..c7cde087d 100644
--- a/test cases/failing/68 install_data rename bad size/meson.build
+++ b/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
index a3cbb1bf4..af1f0d977 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
index 4832bd49c..4832bd49c 100644
--- a/test cases/failing/69 skip only subdir/meson.build
+++ b/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
index 1ba447b22..1ba447b22 100644
--- a/test cases/failing/69 skip only subdir/subdir/meson.build
+++ b/test cases/failing/68 skip only subdir/subdir/meson.build
diff --git a/test cases/failing/69 skip only subdir/test.json b/test cases/failing/68 skip only subdir/test.json
index 134971a39..4558847dd 100644
--- a/test cases/failing/69 skip only subdir/test.json
+++ b/test cases/failing/68 skip only subdir/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/69 skip only subdir/meson.build:8:0: ERROR: File main.cpp does not exist."
+      "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
index e5f86baaf..e5f86baaf 100644
--- a/test cases/failing/70 dual override/meson.build
+++ b/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
index 49e9b7ad6..49e9b7ad6 100644
--- a/test cases/failing/70 dual override/overrides.py
+++ b/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
index e955dc0fb..784d6b275 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/71 override used/meson.build b/test cases/failing/70 override used/meson.build
index 61885bba1..61885bba1 100644
--- a/test cases/failing/71 override used/meson.build
+++ b/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
index f62ba960d..f62ba960d 100755
--- a/test cases/failing/71 override used/other.py
+++ b/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
index 64c9454c3..64c9454c3 100755
--- a/test cases/failing/71 override used/something.py
+++ b/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
index 6c734e432..adb60aa92 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
index 4bc02ae7b..4bc02ae7b 100644
--- a/test cases/failing/72 run_command unclean exit/meson.build
+++ b/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
index 84dbc5df6..84dbc5df6 100755
--- a/test cases/failing/72 run_command unclean exit/returncode.py
+++ b/test cases/failing/71 run_command unclean exit/returncode.py
diff --git a/test cases/failing/72 run_command unclean exit/test.json b/test cases/failing/71 run_command unclean exit/test.json
index 67a80f425..e9bfb9443 100644
--- a/test cases/failing/72 run_command unclean exit/test.json
+++ b/test cases/failing/71 run_command unclean exit/test.json
@@ -2,7 +2,7 @@
   "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\\."
+      "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
index 87c776f49..87c776f49 100644
--- a/test cases/failing/73 int literal leading zero/meson.build
+++ b/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
index bc41165d7..556e49210 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/74 configuration immutable/input b/test cases/failing/73 configuration immutable/input
index e69de29bb..e69de29bb 100644
--- a/test cases/failing/74 configuration immutable/input
+++ b/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
index b6cac4126..b6cac4126 100644
--- a/test cases/failing/74 configuration immutable/meson.build
+++ b/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
index 1dd172aec..32d942781 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
index bf18b3626..bf18b3626 100644
--- 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
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
index 81b0d5af0..81b0d5af0 100644
--- 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
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
index 8164d8da1..8164d8da1 100644
--- 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
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
index 81ee2aca9..9ca1b9dc3 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
index 323bec64a..323bec64a 100644
--- 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
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
index 846daaf89..846daaf89 100644
--- 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
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
index 44e6377a7..27cb0ab8d 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
index c5a296104..c5a296104 100644
--- 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
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
index 5365f34e5..3b984364b 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
index 3f37e9a06..3f37e9a06 100644
--- a/test cases/failing/78 unfound run/meson.build
+++ b/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
index 0cdcdf209..99464bd7b 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
index b7e04bab4..b7e04bab4 100644
--- a/test cases/failing/79 framework dependency with version/meson.build
+++ b/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
index 9b0d335d7..c9f25a291 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
index 03b2213bb..03b2213bb 100644
--- a/test cases/failing/80 override exe config/foo.c
+++ b/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
index a5d09249c..a5d09249c 100644
--- a/test cases/failing/80 override exe config/meson.build
+++ b/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
index 36c789e9d..1a671a37e 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
index 012709302..012709302 100644
--- a/test cases/failing/81 gl dependency with version/meson.build
+++ b/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
index 86da7359f..cae10da3c 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
index 6023faeb6..6023faeb6 100644
--- a/test cases/failing/82 threads dependency with version/meson.build
+++ b/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
index 9b71468ea..7781b729c 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
index b43a04733..b43a04733 100644
--- a/test cases/failing/83 gtest dependency with version/meson.build
+++ b/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
index 4a44077e2..7cf397beb 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
index 306d5b3e5..306d5b3e5 100644
--- a/test cases/failing/84 dub libray/meson.build
+++ b/test cases/failing/83 dub libray/meson.build
diff --git a/test cases/failing/84 dub libray/test.json b/test cases/failing/83 dub libray/test.json
index 23fe6e5f6..4dcbbedda 100644
--- a/test cases/failing/84 dub libray/test.json
+++ b/test cases/failing/83 dub libray/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/84 dub libray/meson.build:11:0: ERROR: Dependency \"dubtestproject\" not found"
+      "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
index 9a134ea21..9a134ea21 100644
--- a/test cases/failing/85 dub executable/meson.build
+++ b/test cases/failing/84 dub executable/meson.build
diff --git a/test cases/failing/85 dub executable/test.json b/test cases/failing/84 dub executable/test.json
index 4a8674c34..6dfff62d0 100644
--- a/test cases/failing/85 dub executable/test.json
+++ b/test cases/failing/84 dub executable/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/85 dub executable/meson.build:11:0: ERROR: Dependency \"dubtestproject:test1\" not found"
+      "line": "test cases/failing/84 dub executable/meson.build:11:0: ERROR: Dependency \"dubtestproject:test1\" not found"
     }
   ]
 }
diff --git a/test cases/failing/86 dub compiler/meson.build b/test cases/failing/85 dub compiler/meson.build
index 36f1849e5..36f1849e5 100644
--- a/test cases/failing/86 dub compiler/meson.build
+++ b/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
index ab6caff40..50ee39b31 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/87 subproj not-found dep/meson.build b/test cases/failing/86 subproj not-found dep/meson.build
index 2b17df17e..2b17df17e 100644
--- a/test cases/failing/87 subproj not-found dep/meson.build
+++ b/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
index 5f451f401..5f451f401 100644
--- 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
diff --git a/test cases/failing/87 subproj not-found dep/test.json b/test cases/failing/86 subproj not-found dep/test.json
index 160e9d351..b66264307 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
index e69de29bb..e69de29bb 100644
--- a/test cases/failing/88 invalid configure file/input
+++ b/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
index 08eca2bd0..08eca2bd0 100644
--- a/test cases/failing/88 invalid configure file/meson.build
+++ b/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
index b551f61ae..d8ea73d5f 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
index 06821a278..06821a278 100644
--- a/test cases/failing/89 kwarg dupe/meson.build
+++ b/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
index 5f3fbe6a2..5f3fbe6a2 100644
--- a/test cases/failing/89 kwarg dupe/prog.c
+++ b/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
index ec4660043..cfd68eb42 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
index a67b79877..a67b79877 100644
--- a/test cases/failing/90 missing pch file/meson.build
+++ b/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
index 11b7fad8e..11b7fad8e 100644
--- a/test cases/failing/90 missing pch file/prog.c
+++ b/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
index f55eb4785..638d2e7ef 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
index e69de29bb..e69de29bb 100644
--- a/test cases/failing/91 pch source different folder/include/pch.h
+++ b/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
index d32071772..d32071772 100644
--- a/test cases/failing/91 pch source different folder/meson.build
+++ b/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
index 3fb1295e4..3fb1295e4 100644
--- a/test cases/failing/91 pch source different folder/prog.c
+++ b/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
index e69de29bb..e69de29bb 100644
--- a/test cases/failing/91 pch source different folder/src/pch.c
+++ b/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
index 6309f6c66..cbbac3db0 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
index 536976e35..536976e35 100644
--- a/test cases/failing/92 unknown config tool/meson.build
+++ b/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
index c4484f322..e225167d5 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
index 9ca2fcbaf..9ca2fcbaf 100644
--- a/test cases/failing/93 custom target install data/Info.plist.cpp
+++ b/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
index 00d348cc0..00d348cc0 100644
--- a/test cases/failing/93 custom target install data/meson.build
+++ b/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
index e6eba4c6a..e6eba4c6a 100644
--- a/test cases/failing/93 custom target install data/preproc.py
+++ b/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
index caeafb159..46ab01362 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
index c81a3f764..c81a3f764 100644
--- a/test cases/failing/94 add dict non string key/meson.build
+++ b/test cases/failing/93 add dict non string key/meson.build
diff --git a/test cases/failing/94 add dict non string key/test.json b/test cases/failing/93 add dict non string key/test.json
index 09459dd0c..3ef2dde52 100644
--- a/test cases/failing/94 add dict non string key/test.json
+++ b/test cases/failing/93 add dict non string key/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/94 add dict non string key/meson.build:9:0: ERROR: Key must be a string"
+      "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
index 7a9b523b0..7a9b523b0 100644
--- a/test cases/failing/95 add dict duplicate keys/meson.build
+++ b/test cases/failing/94 add dict duplicate keys/meson.build
diff --git a/test cases/failing/95 add dict duplicate keys/test.json b/test cases/failing/94 add dict duplicate keys/test.json
index ae9a81f34..5b2d7d61f 100644
--- a/test cases/failing/95 add dict duplicate keys/test.json
+++ b/test cases/failing/94 add dict duplicate keys/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/95 add dict duplicate keys/meson.build:9:0: ERROR: Duplicate dictionary key: myKey"
+      "line": "test cases/failing/94 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
index c9567549f..c9567549f 100644
--- a/test cases/failing/96 no host get_external_property/meson.build
+++ b/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
index 3376a0b63..0ef6dd2e2 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/114 cmake executable dependency/subprojects/cmlib/main.c b/test cases/failing/96 no native compiler/main.c
index 9b6bdc2ec..9b6bdc2ec 100644
--- a/test cases/failing/114 cmake executable dependency/subprojects/cmlib/main.c
+++ b/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
index f0126ac15..f0126ac15 100644
--- a/test cases/failing/97 no native compiler/meson.build
+++ b/test cases/failing/96 no native compiler/meson.build
diff --git a/test cases/failing/97 no native compiler/test.json b/test cases/failing/96 no native compiler/test.json
index b79bd3b8e..01077275c 100644
--- a/test cases/failing/97 no native compiler/test.json
+++ b/test cases/failing/96 no native compiler/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/97 no native compiler/meson.build:12:0: ERROR: No host machine compiler for \"main.c\""
+      "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/98 subdir parse error/meson.build b/test cases/failing/97 subdir parse error/meson.build
index ee5bb0cb7..ee5bb0cb7 100644
--- a/test cases/failing/98 subdir parse error/meson.build
+++ b/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
index 3ac5ef938..3ac5ef938 100644
--- a/test cases/failing/98 subdir parse error/subdir/meson.build
+++ b/test cases/failing/97 subdir parse error/subdir/meson.build
diff --git a/test cases/failing/98 subdir parse error/test.json b/test cases/failing/97 subdir parse error/test.json
index 8e0479990..414789ee0 100644
--- a/test cases/failing/98 subdir parse error/test.json
+++ b/test cases/failing/97 subdir parse error/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/98 subdir parse error/subdir/meson.build:1:0: ERROR: Plusassignment target must be an id."
+      "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
index b0347c33f..b0347c33f 100644
--- a/test cases/failing/99 invalid option file/meson.build
+++ b/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
index eef843b53..eef843b53 100644
--- a/test cases/failing/99 invalid option file/meson_options.txt
+++ b/test cases/failing/98 invalid option file/meson_options.txt
diff --git a/test cases/failing/99 invalid option file/test.json b/test cases/failing/98 invalid option file/test.json
index ebfddd894..6ab53931a 100644
--- a/test cases/failing/99 invalid option file/test.json
+++ b/test cases/failing/98 invalid option file/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/99 invalid option file/meson_options.txt:1:0: ERROR: lexer"
+      "line": "test cases/failing/98 invalid option file/meson_options.txt:1:0: ERROR: lexer"
     }
   ]
 }
diff --git a/test cases/failing/97 no native compiler/main.c b/test cases/failing/99 no lang/main.c
index 9b6bdc2ec..9b6bdc2ec 100644
--- a/test cases/failing/97 no native compiler/main.c
+++ b/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
index 85c5db8e5..85c5db8e5 100644
--- a/test cases/failing/100 no lang/meson.build
+++ b/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 000000000..48c6dd70e
--- /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
index 21239b74b..21239b74b 100755
--- a/test cases/unit/101 relative find program/foo.py
+++ b/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
index 5745d8acb..5745d8acb 100644
--- a/test cases/unit/101 relative find program/meson.build
+++ b/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
index 475f5f51c..475f5f51c 100644
--- a/test cases/unit/101 relative find program/subdir/meson.build
+++ b/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
index 3487bc5a9..3487bc5a9 100644
--- a/test cases/unit/102 rlib linkage/lib2.rs
+++ b/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
index d0f82e4e1..d0f82e4e1 100644
--- a/test cases/unit/102 rlib linkage/main.rs
+++ b/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
index 2d15b2a14..2d15b2a14 100644
--- a/test cases/unit/102 rlib linkage/meson.build
+++ b/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
index b3a0c42fb..b3a0c42fb 100644
--- a/test cases/unit/103 python without pkgconfig/meson.build
+++ b/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
index 3940fde7e..3940fde7e 100644
--- a/test cases/unit/104 strip/lib.c
+++ b/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
index dff61ab43..dff61ab43 100644
--- a/test cases/unit/104 strip/meson.build
+++ b/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
index 4f5662ebd..4f5662ebd 100644
--- 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
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
index 07fe7bb2b..07fe7bb2b 100644
--- 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
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
index aa1d2ec9b..aa1d2ec9b 100644
--- 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
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
index e3d4cf63f..e3d4cf63f 100644
--- 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
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
index c6f42d651..c6f42d651 100644
--- 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
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
index 473357516..473357516 100644
--- 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
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
index a34e4a885..a34e4a885 100644
--- 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
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
index 06ffa0f72..06ffa0f72 100644
--- 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
diff --git a/test cases/unit/41 featurenew subprojects/meson.build b/test cases/unit/40 featurenew subprojects/meson.build
index d136bed1c..d136bed1c 100644
--- a/test cases/unit/41 featurenew subprojects/meson.build
+++ b/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
index 712a125f7..712a125f7 100644
--- a/test cases/unit/41 featurenew subprojects/subprojects/bar/meson.build
+++ b/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
index 811e7aa4b..811e7aa4b 100644
--- a/test cases/unit/41 featurenew subprojects/subprojects/baz/meson.build
+++ b/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
index 0ef4472bd..0ef4472bd 100644
--- a/test cases/unit/41 featurenew subprojects/subprojects/foo/meson.build
+++ b/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
index a722894e5..a722894e5 100644
--- a/test cases/unit/42 rpath order/meson.build
+++ b/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
index 03b2213bb..03b2213bb 100644
--- a/test cases/unit/42 rpath order/myexe.c
+++ b/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
index e69de29bb..e69de29bb 100644
--- a/test cases/unit/42 rpath order/subprojects/sub1/lib.c
+++ b/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
index 4dd5d0843..4dd5d0843 100644
--- a/test cases/unit/42 rpath order/subprojects/sub1/meson.build
+++ b/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
index e69de29bb..e69de29bb 100644
--- a/test cases/unit/42 rpath order/subprojects/sub2/lib.c
+++ b/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
index bc3510db3..bc3510db3 100644
--- a/test cases/unit/42 rpath order/subprojects/sub2/meson.build
+++ b/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
index e69de29bb..e69de29bb 100644
--- a/test cases/unit/43 dep order/lib1.c
+++ b/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
index e69de29bb..e69de29bb 100644
--- a/test cases/unit/43 dep order/lib2.c
+++ b/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
index 17cf9dfba..17cf9dfba 100644
--- a/test cases/unit/43 dep order/meson.build
+++ b/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
index 8f4c045ee..8f4c045ee 100644
--- a/test cases/unit/43 dep order/myexe.c
+++ b/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
index 5012bf6ed..5012bf6ed 100644
--- a/test cases/unit/44 promote wrap/meson.build
+++ b/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
index 48dc8533d..48dc8533d 100644
--- a/test cases/unit/44 promote wrap/subprojects/s1/meson.build
+++ b/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
index b485d8337..b485d8337 100644
--- 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
diff --git a/test cases/unit/44 promote wrap/subprojects/s2/meson.build b/test cases/unit/43 promote wrap/subprojects/s2/meson.build
index 901bc2aac..901bc2aac 100644
--- a/test cases/unit/44 promote wrap/subprojects/s2/meson.build
+++ b/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
index 09ba4e87f..09ba4e87f 100644
--- a/test cases/unit/44 promote wrap/subprojects/s2/subprojects/ambiguous.wrap
+++ b/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
index 3d07d4cb1..3d07d4cb1 100644
--- a/test cases/unit/45 vscpp17/main.cpp
+++ b/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
index afe740bbc..afe740bbc 100644
--- a/test cases/unit/45 vscpp17/meson.build
+++ b/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
index f0d89ee3e..f0d89ee3e 100755
--- a/test cases/unit/46 native dep pkgconfig var/cross_pkgconfig.py
+++ b/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
index 67d7afa62..67d7afa62 100644
--- 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
diff --git a/test cases/unit/46 native dep pkgconfig var/meson.build b/test cases/unit/45 native dep pkgconfig var/meson.build
index d95dbcdbe..d95dbcdbe 100644
--- a/test cases/unit/46 native dep pkgconfig var/meson.build
+++ b/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
index 37006ddfd..37006ddfd 100644
--- a/test cases/unit/46 native dep pkgconfig var/meson_options.txt
+++ b/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
index affaa97b5..affaa97b5 100644
--- 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
diff --git a/test cases/unit/47 native file binary/meson.build b/test cases/unit/46 native file binary/meson.build
index 2f55fe219..2f55fe219 100644
--- a/test cases/unit/47 native file binary/meson.build
+++ b/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
index 651da0ebe..651da0ebe 100644
--- a/test cases/unit/47 native file binary/meson_options.txt
+++ b/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
index 25927f5a1..25927f5a1 100644
--- a/test cases/unit/48 reconfigure/main.c
+++ b/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
index 4f35458a8..4f35458a8 100644
--- a/test cases/unit/48 reconfigure/meson.build
+++ b/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
index 728f7b782..728f7b782 100644
--- a/test cases/unit/48 reconfigure/meson_options.txt
+++ b/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
index 30fd19d1d..30fd19d1d 100644
--- a/test cases/unit/48 reconfigure/subprojects/sub1/meson.build
+++ b/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
index 34ad76d4e..34ad76d4e 100644
--- a/test cases/unit/49 testsetup default/envcheck.py
+++ b/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
index bdd35b807..bdd35b807 100644
--- a/test cases/unit/49 testsetup default/meson.build
+++ b/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
index 148d40fe4..148d40fe4 100644
--- a/test cases/unit/50 pkgconfig csharp library/meson.build
+++ b/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
index 24d37edf6..24d37edf6 100644
--- a/test cases/unit/50 pkgconfig csharp library/somelib.cs
+++ b/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
index 6d479d60a..6d479d60a 100644
--- a/test cases/unit/51 noncross options/meson.build
+++ b/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
index 0314ff17b..0314ff17b 100644
--- a/test cases/unit/51 noncross options/prog.c
+++ b/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
index afec2d3f7..afec2d3f7 100644
--- a/test cases/unit/51 noncross options/ylib.pc
+++ b/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
index a68d4b170..a68d4b170 100644
--- a/test cases/unit/52 ldflagdedup/bob.c
+++ b/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
index 0bbcc503d..0bbcc503d 100644
--- a/test cases/unit/52 ldflagdedup/meson.build
+++ b/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
index 02c599de3..02c599de3 100644
--- a/test cases/unit/52 ldflagdedup/prog.c
+++ b/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
index b61de9ab1..b61de9ab1 100644
--- a/test cases/unit/53 pkgconfig static link order/meson.build
+++ b/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
index 5c60ac9f3..5c60ac9f3 100644
--- a/test cases/unit/54 clang-format/.clang-format
+++ b/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
index 80c6165f3..80c6165f3 100644
--- a/test cases/unit/54 clang-format/dummydir.h/dummy.dat
+++ b/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
index 430317604..430317604 100644
--- a/test cases/unit/54 clang-format/header_expected_h
+++ b/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
index f2222f305..f2222f305 100644
--- a/test cases/unit/54 clang-format/header_orig_h
+++ b/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
index 09973dbea..09973dbea 100644
--- a/test cases/unit/54 clang-format/meson.build
+++ b/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
index a045966a7..a045966a7 100644
--- a/test cases/unit/54 clang-format/prog_expected_c
+++ b/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
index 23a2b574b..23a2b574b 100644
--- a/test cases/unit/54 clang-format/prog_orig_c
+++ b/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
index 4d0aeebb9..4d0aeebb9 100644
--- a/test cases/unit/55 introspect buildoptions/subprojects/projectBad/meson.build
+++ b/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
index f15d3529f..f15d3529f 100644
--- a/test cases/unit/55 introspect buildoptions/subprojects/projectBad/meson_options.txt
+++ b/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
index 4e215b30b..4e215b30b 100644
--- a/test cases/unit/56 dedup compiler libs/app/app.c
+++ b/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
index 82ac3069d..82ac3069d 100644
--- a/test cases/unit/56 dedup compiler libs/app/meson.build
+++ b/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
index 962d47f30..962d47f30 100644
--- a/test cases/unit/56 dedup compiler libs/liba/liba.c
+++ b/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
index a980cdc6b..a980cdc6b 100644
--- a/test cases/unit/56 dedup compiler libs/liba/liba.h
+++ b/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
index eccfa46c3..eccfa46c3 100644
--- a/test cases/unit/56 dedup compiler libs/liba/meson.build
+++ b/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
index 372086878..372086878 100644
--- a/test cases/unit/56 dedup compiler libs/libb/libb.c
+++ b/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
index 2e4ddd0c7..2e4ddd0c7 100644
--- a/test cases/unit/56 dedup compiler libs/libb/libb.h
+++ b/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
index d59206f8d..d59206f8d 100644
--- a/test cases/unit/56 dedup compiler libs/libb/meson.build
+++ b/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
index fad0ed556..fad0ed556 100644
--- a/test cases/unit/56 dedup compiler libs/meson.build
+++ b/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
index cb09cf399..cb09cf399 100644
--- a/test cases/unit/57 introspection/cp.py
+++ b/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
index 568d5ccd7..568d5ccd7 100644
--- a/test cases/unit/57 introspection/meson.build
+++ b/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
index fc5cb4d2d..fc5cb4d2d 100644
--- a/test cases/unit/57 introspection/meson_options.txt
+++ b/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
index 7640bc70a..7640bc70a 100644
--- a/test cases/unit/57 introspection/sharedlib/meson.build
+++ b/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
index 5030ab75e..5030ab75e 100644
--- a/test cases/unit/57 introspection/sharedlib/shared.cpp
+++ b/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
index dc9b2da28..dc9b2da28 100644
--- a/test cases/unit/57 introspection/sharedlib/shared.hpp
+++ b/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
index 1cbb02039..1cbb02039 100644
--- a/test cases/unit/57 introspection/staticlib/meson.build
+++ b/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
index 37ebc0d80..37ebc0d80 100644
--- a/test cases/unit/57 introspection/staticlib/static.c
+++ b/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
index 06da5089c..06da5089c 100644
--- a/test cases/unit/57 introspection/staticlib/static.h
+++ b/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
index 901e3f1ac..901e3f1ac 100644
--- a/test cases/unit/57 introspection/t1.cpp
+++ b/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
index 8323f4681..8323f4681 100644
--- a/test cases/unit/57 introspection/t2.cpp
+++ b/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
index dd518e809..dd518e809 100644
--- a/test cases/unit/57 introspection/t3.cpp
+++ b/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
index 5b149f672..5b149f672 100644
--- 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
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
index 6d0868720..6d0868720 100644
--- 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
diff --git a/test cases/unit/58 pkg_config_path option/meson.build b/test cases/unit/57 pkg_config_path option/meson.build
index f9ceead06..f9ceead06 100644
--- a/test cases/unit/58 pkg_config_path option/meson.build
+++ b/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
index c7241e7e0..c7241e7e0 100644
--- a/test cases/unit/59 introspect buildoptions/c_compiler.py
+++ b/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
index 709730f19..709730f19 100644
--- a/test cases/unit/59 introspect buildoptions/main.c
+++ b/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
index 36e03e0cc..36e03e0cc 100644
--- a/test cases/unit/59 introspect buildoptions/meson.build
+++ b/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
index 61f9a8db4..61f9a8db4 100644
--- a/test cases/unit/59 introspect buildoptions/meson_options.txt
+++ b/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
index e69de29bb..e69de29bb 100644
--- a/test cases/unit/59 introspect buildoptions/subprojects/evilFile.txt
+++ b/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
index 1ab9ee8a5..1ab9ee8a5 100644
--- a/test cases/unit/59 introspect buildoptions/subprojects/projectA/meson.build
+++ b/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
index fa77f954a..fa77f954a 100644
--- a/test cases/unit/59 introspect buildoptions/subprojects/projectA/meson_options.txt
+++ b/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
index 500c1b9cc..500c1b9cc 100644
--- a/test cases/unit/59 introspect buildoptions/subprojects/projectBad/meson.build
+++ b/test cases/unit/58 introspect buildoptions/subprojects/projectBad/meson.build
diff --git a/test cases/unit/59 introspect buildoptions/subprojects/projectBad/meson_options.txt b/test cases/unit/58 introspect buildoptions/subprojects/projectBad/meson_options.txt
index f15d3529f..f15d3529f 100644
--- a/test cases/unit/59 introspect buildoptions/subprojects/projectBad/meson_options.txt
+++ b/test cases/unit/58 introspect buildoptions/subprojects/projectBad/meson_options.txt
diff --git a/test cases/unit/60 native file override/crossfile b/test cases/unit/59 native file override/crossfile
index 9dc4fbcfc..9dc4fbcfc 100644
--- a/test cases/unit/60 native file override/crossfile
+++ b/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
index 70946c9e7..70946c9e7 100644
--- a/test cases/unit/60 native file override/crossfile2
+++ b/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
index 6ada560ff..6ada560ff 100644
--- a/test cases/unit/60 native file override/meson.build
+++ b/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
index 4d2abf9c6..4d2abf9c6 100644
--- a/test cases/unit/60 native file override/meson_options.txt
+++ b/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
index a39072579..a39072579 100644
--- a/test cases/unit/60 native file override/nativefile
+++ b/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
index 15d5c07dd..15d5c07dd 100755
--- a/test cases/unit/61 identity cross/build_wrapper.py
+++ b/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
index a3a694a4c..a3a694a4c 100755
--- a/test cases/unit/61 identity cross/host_wrapper.py
+++ b/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
index 950137a18..950137a18 100644
--- a/test cases/unit/61 identity cross/meson.build
+++ b/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
index 62f1cc9e6..62f1cc9e6 100644
--- a/test cases/unit/61 identity cross/stuff.h
+++ b/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
index dae1eed75..dae1eed75 100644
--- a/test cases/unit/62 pkgconfig relative paths/pkgconfig/librelativepath.pc
+++ b/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
index 442bbd396..442bbd396 100644
--- a/test cases/unit/63 cmake_prefix_path/meson.build
+++ b/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
index 289b349b8..289b349b8 100644
--- 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
diff --git a/test cases/unit/64 cmake parser/meson.build b/test cases/unit/63 cmake parser/meson.build
index 061bab0b6..061bab0b6 100644
--- a/test cases/unit/64 cmake parser/meson.build
+++ b/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
index 7474eb78d..7474eb78d 100644
--- 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
diff --git a/test cases/unit/65 alias target/main.c b/test cases/unit/64 alias target/main.c
index 0fb4389f7..0fb4389f7 100644
--- a/test cases/unit/65 alias target/main.c
+++ b/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
index bcd4005f4..bcd4005f4 100644
--- a/test cases/unit/65 alias target/meson.build
+++ b/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
index b3f5480b5..b3f5480b5 100644
--- a/test cases/unit/65 alias target/subdir/meson.build
+++ b/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
index e44b54a92..e44b54a92 100644
--- a/test cases/unit/66 static archive stripping/app/appA.c
+++ b/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
index 0ec0b629e..0ec0b629e 100644
--- a/test cases/unit/66 static archive stripping/app/appB.c
+++ b/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
index 118719dec..118719dec 100644
--- a/test cases/unit/66 static archive stripping/app/meson.build
+++ b/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
index a97185e56..a97185e56 100644
--- a/test cases/unit/66 static archive stripping/lib/libA.c
+++ b/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
index e6450cd1e..e6450cd1e 100644
--- a/test cases/unit/66 static archive stripping/lib/libA.h
+++ b/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
index 0200b1f05..0200b1f05 100644
--- a/test cases/unit/66 static archive stripping/lib/libB.c
+++ b/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
index 065a4a411..065a4a411 100644
--- a/test cases/unit/66 static archive stripping/lib/libB.h
+++ b/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
index ae50fa7b4..ae50fa7b4 100644
--- a/test cases/unit/66 static archive stripping/lib/meson.build
+++ b/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
index cc934ad04..cc934ad04 100644
--- a/test cases/unit/67 static link/lib/func1.c
+++ b/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
index 75a911fb7..75a911fb7 100644
--- a/test cases/unit/67 static link/lib/func10.c
+++ b/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
index 1d5119b47..1d5119b47 100644
--- a/test cases/unit/67 static link/lib/func11.c
+++ b/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
index 73db5c073..73db5c073 100644
--- a/test cases/unit/67 static link/lib/func12.c
+++ b/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
index 0277319fc..0277319fc 100644
--- a/test cases/unit/67 static link/lib/func14.c
+++ b/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
index 78303cc2f..78303cc2f 100644
--- a/test cases/unit/67 static link/lib/func15.c
+++ b/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
index 379b6829f..379b6829f 100644
--- a/test cases/unit/67 static link/lib/func16.c
+++ b/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
index d1d8ec498..d1d8ec498 100644
--- a/test cases/unit/67 static link/lib/func17.c
+++ b/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
index c149085ba..c149085ba 100644
--- a/test cases/unit/67 static link/lib/func18.c
+++ b/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
index 69120e4bf..69120e4bf 100644
--- a/test cases/unit/67 static link/lib/func19.c
+++ b/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
index 6b8f53935..6b8f53935 100644
--- a/test cases/unit/67 static link/lib/func2.c
+++ b/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
index 04f9f8939..04f9f8939 100644
--- a/test cases/unit/67 static link/lib/func3.c
+++ b/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
index c44c99099..c44c99099 100644
--- a/test cases/unit/67 static link/lib/func4.c
+++ b/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
index 8e078641c..8e078641c 100644
--- a/test cases/unit/67 static link/lib/func5.c
+++ b/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
index 276fe7d48..276fe7d48 100644
--- a/test cases/unit/67 static link/lib/func6.c
+++ b/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
index 8c1a5368d..8c1a5368d 100644
--- a/test cases/unit/67 static link/lib/func7.c
+++ b/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
index b7b6cd545..b7b6cd545 100644
--- a/test cases/unit/67 static link/lib/func8.c
+++ b/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
index 852252d1a..852252d1a 100644
--- a/test cases/unit/67 static link/lib/func9.c
+++ b/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
index 8f95fc454..8f95fc454 100644
--- a/test cases/unit/67 static link/lib/meson.build
+++ b/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
index dac17f810..dac17f810 100644
--- a/test cases/unit/67 static link/meson.build
+++ b/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
index ffc9b9eb9..ffc9b9eb9 100644
--- a/test cases/unit/67 static link/test1.c
+++ b/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
index 561422af0..561422af0 100644
--- a/test cases/unit/67 static link/test2.c
+++ b/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
index 1216064dc..1216064dc 100644
--- a/test cases/unit/67 static link/test3.c
+++ b/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
index 7c281e026..7c281e026 100644
--- a/test cases/unit/67 static link/test4.c
+++ b/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
index 6020f0e7c..6020f0e7c 100644
--- a/test cases/unit/67 static link/test5.c
+++ b/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
index aa3dbc35d..aa3dbc35d 100644
--- a/test cases/unit/68 test env value/meson.build
+++ b/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
index 4adf62cdb..4adf62cdb 100755
--- a/test cases/unit/68 test env value/test.py
+++ b/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
index 393529479..393529479 100644
--- a/test cases/unit/69 clang-tidy/.clang-tidy
+++ b/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
index 07b35a666..07b35a666 100644
--- a/test cases/unit/69 clang-tidy/cttest.cpp
+++ b/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
index 80c6165f3..80c6165f3 100644
--- a/test cases/unit/69 clang-tidy/dummydir.h/dummy.dat
+++ b/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
index 737474b02..737474b02 100644
--- a/test cases/unit/69 clang-tidy/meson.build
+++ b/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
index 678e8d3a3..678e8d3a3 100644
--- a/test cases/unit/70 cross/crossfile.in
+++ b/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
index acf4f0f17..acf4f0f17 100644
--- a/test cases/unit/70 cross/meson.build
+++ b/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
index 5896d63c8..5896d63c8 100644
--- a/test cases/unit/70 cross/meson_options.txt
+++ b/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
index 2c15ed6f3..2c15ed6f3 100755
--- a/test cases/unit/71 cross test passed/exewrapper.py
+++ b/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
index 4deb74baf..4deb74baf 100644
--- a/test cases/unit/71 cross test passed/meson.build
+++ b/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
index 084c77625..084c77625 100644
--- a/test cases/unit/71 cross test passed/meson_options.txt
+++ b/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
index 257cd30d8..257cd30d8 100644
--- a/test cases/unit/71 cross test passed/script.py
+++ b/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
index 490b4a619..490b4a619 100644
--- a/test cases/unit/71 cross test passed/src/main.c
+++ b/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
index 6e0f69ad3..6e0f69ad3 100644
--- a/test cases/unit/72 summary/meson.build
+++ b/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
index 281c3b672..281c3b672 100644
--- a/test cases/unit/72 summary/meson_options.txt
+++ b/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
index e7d783384..e7d783384 100644
--- a/test cases/unit/72 summary/subprojects/sub/meson.build
+++ b/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
index 2560bd05d..2560bd05d 100644
--- a/test cases/unit/72 summary/subprojects/sub2/meson.build
+++ b/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
index 98a5a269d..98a5a269d 100644
--- a/test cases/unit/72 summary/subprojects/sub2/subprojects/subsub/meson.build
+++ b/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
index 3bd3b250f..3bd3b250f 100644
--- a/test cases/unit/73 wrap file url/meson.build
+++ b/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
index fdb026ca7..fdb026ca7 100644
--- 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
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
index 2ed6ab475..2ed6ab475 100644
--- a/test cases/unit/73 wrap file url/subprojects/foo.tar.xz
+++ b/test cases/unit/72 wrap file url/subprojects/foo.tar.xz
diff --git a/test cases/unit/74 dep files/foo.c b/test cases/unit/73 dep files/foo.c
index e69de29bb..e69de29bb 100644
--- a/test cases/unit/74 dep files/foo.c
+++ b/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
index 4829f563f..4829f563f 100644
--- a/test cases/unit/74 dep files/meson.build
+++ b/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
index be9beadb0..be9beadb0 100644
--- a/test cases/unit/75 pkgconfig prefixes/client/client.c
+++ b/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
index 491937b7b..491937b7b 100644
--- a/test cases/unit/75 pkgconfig prefixes/client/meson.build
+++ b/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
index cc63e3143..cc63e3143 100644
--- a/test cases/unit/75 pkgconfig prefixes/val1/meson.build
+++ b/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
index 591e52162..591e52162 100644
--- a/test cases/unit/75 pkgconfig prefixes/val1/val1.c
+++ b/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
index 6bd435eb9..6bd435eb9 100644
--- a/test cases/unit/75 pkgconfig prefixes/val1/val1.h
+++ b/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
index ce69481ec..ce69481ec 100644
--- a/test cases/unit/75 pkgconfig prefixes/val2/meson.build
+++ b/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
index d7d485730..d7d485730 100644
--- a/test cases/unit/75 pkgconfig prefixes/val2/val2.c
+++ b/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
index 995023da2..995023da2 100644
--- a/test cases/unit/75 pkgconfig prefixes/val2/val2.h
+++ b/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
index 5099c91c7..5099c91c7 100644
--- a/test cases/unit/76 subdir libdir/meson.build
+++ b/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
index 7bfd2c553..7bfd2c553 100644
--- a/test cases/unit/76 subdir libdir/subprojects/flub/meson.build
+++ b/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
index 79dea9d0f..79dea9d0f 100644
--- a/test cases/unit/77 as link whole/bar.c
+++ b/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
index ffeee82fe..ffeee82fe 100644
--- a/test cases/unit/77 as link whole/foo.c
+++ b/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
index 6bc208f1b..6bc208f1b 100644
--- a/test cases/unit/77 as link whole/meson.build
+++ b/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
index 9c5f949b2..9c5f949b2 100644
--- a/test cases/unit/78 nostdlib/meson.build
+++ b/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
index b9216ee81..b9216ee81 100644
--- a/test cases/unit/78 nostdlib/prog.c
+++ b/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
index 67261cb1d..67261cb1d 100644
--- a/test cases/unit/78 nostdlib/subprojects/mylibc/libc.c
+++ b/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
index ff4bdb20f..ff4bdb20f 100644
--- a/test cases/unit/78 nostdlib/subprojects/mylibc/meson.build
+++ b/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
index c3f8f56ca..c3f8f56ca 100644
--- a/test cases/unit/78 nostdlib/subprojects/mylibc/stdio.h
+++ b/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
index 0a6d9729a..0a6d9729a 100644
--- a/test cases/unit/78 nostdlib/subprojects/mylibc/stubstart.s
+++ b/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
index 0bec5eac1..0bec5eac1 100644
--- a/test cases/unit/79 user options for subproject/.gitignore
+++ b/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
index 4976afc58..4976afc58 100644
--- 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
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
index 0bc395b4b..0bc395b4b 100644
--- 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
diff --git a/test cases/unit/80 global-rpath/meson.build b/test cases/unit/79 global-rpath/meson.build
index c67d9e08b..c67d9e08b 100644
--- a/test cases/unit/80 global-rpath/meson.build
+++ b/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
index 3788906dc..3788906dc 100644
--- a/test cases/unit/80 global-rpath/rpathified.cpp
+++ b/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
index e32f38330..e32f38330 100644
--- a/test cases/unit/80 global-rpath/yonder/meson.build
+++ b/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
index b182d34e3..b182d34e3 100644
--- a/test cases/unit/80 global-rpath/yonder/yonder.cpp
+++ b/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
index 9d9ad1617..9d9ad1617 100644
--- a/test cases/unit/80 global-rpath/yonder/yonder.h
+++ b/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
index b0af30a3f..b0af30a3f 100644
--- a/test cases/unit/81 wrap-git/meson.build
+++ b/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
index 2570f7777..2570f7777 100644
--- 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
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
index 8488f4e58..8488f4e58 100644
--- 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
diff --git a/test cases/unit/82 meson version compare/meson.build b/test cases/unit/81 meson version compare/meson.build
index 4affe21df..4affe21df 100644
--- a/test cases/unit/82 meson version compare/meson.build
+++ b/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
index 4c66b70b3..4c66b70b3 100644
--- a/test cases/unit/82 meson version compare/subprojects/foo/meson.build
+++ b/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
index ed25441bf..ed25441bf 100644
--- a/test cases/unit/83 cross only introspect/meson.build
+++ b/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
index d056d6594..d056d6594 100644
--- a/test cases/unit/84 change option choices/meson.build
+++ b/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
index d0326a55b..d0326a55b 100644
--- a/test cases/unit/84 change option choices/meson_options.1.txt
+++ b/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
index 4684673e1..4684673e1 100644
--- a/test cases/unit/84 change option choices/meson_options.2.txt
+++ b/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
index 9b6bdc2ec..9b6bdc2ec 100644
--- a/test cases/unit/85 nested subproject regenerate depends/main.c
+++ b/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
index 569888164..569888164 100644
--- a/test cases/unit/85 nested subproject regenerate depends/meson.build
+++ b/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
index a31db4ade..a31db4ade 100644
--- 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
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
index f91473a6a..f91473a6a 100644
--- 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
diff --git a/test cases/unit/86 cpp modules/main.cpp b/test cases/unit/85 cpp modules/main.cpp
index d825c7d49..d825c7d49 100644
--- a/test cases/unit/86 cpp modules/main.cpp
+++ b/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
index cdc296f43..cdc296f43 100644
--- a/test cases/unit/86 cpp modules/meson.build
+++ b/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
index 3ca4d1448..3ca4d1448 100644
--- a/test cases/unit/86 cpp modules/src0.ixx
+++ b/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
index cea6696de..cea6696de 100644
--- a/test cases/unit/86 cpp modules/src1.ixx
+++ b/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
index 415714cc0..415714cc0 100644
--- a/test cases/unit/86 cpp modules/src2.ixx
+++ b/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
index 96f135c00..96f135c00 100644
--- a/test cases/unit/86 cpp modules/src3.ixx
+++ b/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
index 1ac1a6a64..1ac1a6a64 100644
--- a/test cases/unit/86 cpp modules/src4.ixx
+++ b/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
index 96cf70761..96cf70761 100644
--- a/test cases/unit/86 cpp modules/src5.ixx
+++ b/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
index 760b71cbb..760b71cbb 100644
--- a/test cases/unit/86 cpp modules/src6.ixx
+++ b/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
index 8ce660801..8ce660801 100644
--- a/test cases/unit/86 cpp modules/src7.ixx
+++ b/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
index 6a3ef96f5..6a3ef96f5 100644
--- a/test cases/unit/86 cpp modules/src8.ixx
+++ b/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
index 3ecb3be68..3ecb3be68 100644
--- a/test cases/unit/86 cpp modules/src9.ixx
+++ b/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
index 9f0e26523..9f0e26523 100644
--- a/test cases/unit/87 prelinking/file1.c
+++ b/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
index ce3b11550..ce3b11550 100644
--- a/test cases/unit/87 prelinking/file2.c
+++ b/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
index 85052beb4..85052beb4 100644
--- a/test cases/unit/87 prelinking/file3.c
+++ b/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
index 622364e78..622364e78 100644
--- a/test cases/unit/87 prelinking/file4.c
+++ b/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
index 09a2e5c3d..09a2e5c3d 100644
--- a/test cases/unit/87 prelinking/main.c
+++ b/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
index baa90084b..baa90084b 100644
--- a/test cases/unit/87 prelinking/meson.build
+++ b/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
index f24b621a0..f24b621a0 100644
--- a/test cases/unit/87 prelinking/private_header.h
+++ b/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
index 0cd67862a..0cd67862a 100644
--- a/test cases/unit/87 prelinking/public_header.h
+++ b/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
index 3213780df..3213780df 100644
--- a/test cases/unit/88 run native test/main.c
+++ b/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
index 3bf419c14..3bf419c14 100644
--- a/test cases/unit/88 run native test/meson.build
+++ b/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
index ac57611c8..ac57611c8 100644
--- a/test cases/unit/89 multiple envvars/meson.build
+++ b/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
index 38d3c123b..38d3c123b 100644
--- a/test cases/unit/89 multiple envvars/prog.c
+++ b/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
index 61ccf3a45..61ccf3a45 100644
--- a/test cases/unit/89 multiple envvars/prog.cpp
+++ b/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
index 9e3048b24..9e3048b24 100644
--- a/test cases/unit/90 pkgconfig build rpath order/dummy.pc
+++ b/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
index 76ed8de25..76ed8de25 100644
--- a/test cases/unit/90 pkgconfig build rpath order/meson.build
+++ b/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
index 45b2fa3df..45b2fa3df 100644
--- a/test cases/unit/90 pkgconfig build rpath order/prog.c
+++ b/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
index c7c212370..c7c212370 100644
--- a/test cases/unit/90 pkgconfig build rpath order/prog.cc
+++ b/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
index 6879ec666..6879ec666 100644
--- a/test cases/unit/90 pkgconfig build rpath order/sub/meson.build
+++ b/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
index d56d8b0ea..d56d8b0ea 100644
--- a/test cases/unit/90 pkgconfig build rpath order/sub/stuff.c
+++ b/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
index 271059356..271059356 100644
--- a/test cases/unit/91 devenv/main.c
+++ b/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
index 3b0bb6a24..3b0bb6a24 100644
--- a/test cases/unit/91 devenv/meson.build
+++ b/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
index 46cb845f9..46cb845f9 100644
--- a/test cases/unit/91 devenv/subprojects/sub/foo.c
+++ b/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
index 5cb123209..5cb123209 100644
--- a/test cases/unit/91 devenv/subprojects/sub/meson.build
+++ b/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
index 75497ff3b..75497ff3b 100755
--- a/test cases/unit/91 devenv/test-devenv.py
+++ b/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
index 25927f5a1..25927f5a1 100644
--- a/test cases/unit/92 install skip subprojects/foo.c
+++ b/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
index 421376db9..421376db9 100644
--- a/test cases/unit/92 install skip subprojects/foo.dat
+++ b/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
index a7e26ac6c..a7e26ac6c 100644
--- a/test cases/unit/92 install skip subprojects/foo.h
+++ b/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
index e69de29bb..e69de29bb 100644
--- a/test cases/unit/92 install skip subprojects/foo/foofile
+++ b/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
index cfbae9483..cfbae9483 100644
--- a/test cases/unit/92 install skip subprojects/meson.build
+++ b/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
index 25927f5a1..25927f5a1 100644
--- a/test cases/unit/92 install skip subprojects/subprojects/bar/bar.c
+++ b/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
index 421376db9..421376db9 100644
--- a/test cases/unit/92 install skip subprojects/subprojects/bar/bar.dat
+++ b/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
index a7e26ac6c..a7e26ac6c 100644
--- a/test cases/unit/92 install skip subprojects/subprojects/bar/bar.h
+++ b/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
index 421376db9..421376db9 100644
--- a/test cases/unit/92 install skip subprojects/subprojects/bar/bar/barfile
+++ b/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
index b5b073408..b5b073408 100644
--- a/test cases/unit/92 install skip subprojects/subprojects/bar/meson.build
+++ b/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
index b82aa4173..b82aa4173 100644
--- a/test cases/unit/93 new subproject in configured project/meson.build
+++ b/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
index 12d8395d4..12d8395d4 100644
--- 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
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
index 9713d9f7f..9713d9f7f 100644
--- 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
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
index a833b0c35..a833b0c35 100644
--- 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
diff --git a/test cases/unit/94 clangformat/.clang-format b/test cases/unit/93 clangformat/.clang-format
index 689bc6047..689bc6047 100644
--- a/test cases/unit/94 clangformat/.clang-format
+++ b/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
index 7fc4d5a95..7fc4d5a95 100644
--- a/test cases/unit/94 clangformat/.clang-format-ignore
+++ b/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
index f057c0033..f057c0033 100644
--- a/test cases/unit/94 clangformat/.clang-format-include
+++ b/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
index 8f4af981b..8f4af981b 100644
--- a/test cases/unit/94 clangformat/meson.build
+++ b/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
index 99a0ea60c..99a0ea60c 100644
--- a/test cases/unit/94 clangformat/not-included/badformat.cpp
+++ b/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
index f1d18b7ed..f1d18b7ed 100644
--- a/test cases/unit/94 clangformat/src/badformat.c
+++ b/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
index 99a0ea60c..99a0ea60c 100644
--- a/test cases/unit/94 clangformat/src/badformat.cpp
+++ b/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
index 48e033a72..48e033a72 100644
--- a/test cases/unit/95 custominc/easytogrepfor/genh.py
+++ b/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
index e749753bc..e749753bc 100644
--- a/test cases/unit/95 custominc/easytogrepfor/meson.build
+++ b/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
index 3237441bc..3237441bc 100644
--- a/test cases/unit/95 custominc/helper.c
+++ b/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
index bab113908..bab113908 100644
--- a/test cases/unit/95 custominc/meson.build
+++ b/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
index db9df9d5e..db9df9d5e 100644
--- a/test cases/unit/95 custominc/prog.c
+++ b/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
index e64b22919..e64b22919 100644
--- a/test cases/unit/95 custominc/prog2.c
+++ b/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
index 623a338db..623a338db 100644
--- a/test cases/unit/96 implicit force fallback/meson.build
+++ b/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
index 89a4727dc..89a4727dc 100644
--- a/test cases/unit/96 implicit force fallback/subprojects/something/meson.build
+++ b/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
index c409dcbd1..c409dcbd1 100644
--- a/test cases/unit/97 compiler.links file arg/meson.build
+++ b/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
index 78f2de106..78f2de106 100644
--- a/test cases/unit/97 compiler.links file arg/test.c
+++ b/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
index 812960172..812960172 100644
--- a/test cases/unit/98 link full name/.gitignore
+++ b/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
index 128c213ac..128c213ac 100644
--- a/test cases/unit/98 link full name/libtestprovider/meson.build
+++ b/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
index 5e79966f7..5e79966f7 100644
--- a/test cases/unit/98 link full name/libtestprovider/provider.c
+++ b/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
index 5be5bc998..5be5bc998 100644
--- a/test cases/unit/98 link full name/proguser/meson.build
+++ b/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
index 65e9d8ea1..65e9d8ea1 100644
--- a/test cases/unit/98 link full name/proguser/receiver.c
+++ b/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
index e69de29bb..e69de29bb 100644
--- a/test cases/unit/99 install all targets/bar-custom.txt
+++ b/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
index e69de29bb..e69de29bb 100644
--- a/test cases/unit/99 install all targets/bar-devel.h
+++ b/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
index e69de29bb..e69de29bb 100644
--- a/test cases/unit/99 install all targets/bar-notag.txt
+++ b/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
index 557db03de..557db03de 100644
--- a/test cases/unit/99 install all targets/custom_files/data.txt
+++ b/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
index e69de29bb..e69de29bb 100644
--- a/test cases/unit/99 install all targets/foo.in
+++ b/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
index e69de29bb..e69de29bb 100644
--- a/test cases/unit/99 install all targets/foo1-devel.h
+++ b/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
index 2ea9c7dd1..2ea9c7dd1 100644
--- a/test cases/unit/99 install all targets/lib.c
+++ b/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
index 0fb4389f7..0fb4389f7 100644
--- a/test cases/unit/99 install all targets/main.c
+++ b/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
index 3d131e66d..3d131e66d 100644
--- a/test cases/unit/99 install all targets/meson.build
+++ b/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
index c5f3be9ed..c5f3be9ed 100644
--- a/test cases/unit/99 install all targets/script.py
+++ b/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
index e69de29bb..e69de29bb 100644
--- a/test cases/unit/99 install all targets/subdir/bar2-devel.h
+++ b/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
index e69de29bb..e69de29bb 100644
--- a/test cases/unit/99 install all targets/subdir/foo2.in
+++ b/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
index e69de29bb..e69de29bb 100644
--- a/test cases/unit/99 install all targets/subdir/foo3-devel.h
+++ b/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
index 2ea9c7dd1..2ea9c7dd1 100644
--- a/test cases/unit/99 install all targets/subdir/lib.c
+++ b/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
index 0fb4389f7..0fb4389f7 100644
--- a/test cases/unit/99 install all targets/subdir/main.c
+++ b/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
index 53c796abe..53c796abe 100644
--- a/test cases/unit/99 install all targets/subdir/meson.build
+++ b/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
index c5f3be9ed..c5f3be9ed 100644
--- a/test cases/unit/99 install all targets/subdir/script.py
+++ b/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
index e69de29bb..e69de29bb 100644
--- a/test cases/unit/100 custom target name/file.txt.in
+++ b/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
index 8d148a88d..8d148a88d 100644
--- a/test cases/unit/100 custom target name/meson.build
+++ b/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
index 785a7b366..785a7b366 100644
--- a/test cases/unit/100 custom target name/subdir/meson.build
+++ b/test cases/unit/99 custom target name/subdir/meson.build
diff --git a/unittests/allplatformstests.py b/unittests/allplatformstests.py
index dd8fa661f..8a7fcd754 100644
--- a/unittests/allplatformstests.py
+++ b/unittests/allplatformstests.py
@@ -539,7 +539,7 @@ class AllPlatformTests(BasePlatformTests):
         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 @@ class AllPlatformTests(BasePlatformTests):
                           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 @@ class AllPlatformTests(BasePlatformTests):
 
     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 @@ class AllPlatformTests(BasePlatformTests):
         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 @@ class AllPlatformTests(BasePlatformTests):
         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 @@ class AllPlatformTests(BasePlatformTests):
         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 @@ class AllPlatformTests(BasePlatformTests):
         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 @@ class AllPlatformTests(BasePlatformTests):
     @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 @@ class AllPlatformTests(BasePlatformTests):
     @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 @@ class AllPlatformTests(BasePlatformTests):
             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 @@ class AllPlatformTests(BasePlatformTests):
     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 @@ class AllPlatformTests(BasePlatformTests):
             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 @@ class AllPlatformTests(BasePlatformTests):
         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 @@ class AllPlatformTests(BasePlatformTests):
         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 @@ class AllPlatformTests(BasePlatformTests):
         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 @@ class AllPlatformTests(BasePlatformTests):
         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 @@ class AllPlatformTests(BasePlatformTests):
                 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 @@ class AllPlatformTests(BasePlatformTests):
         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 @@ class AllPlatformTests(BasePlatformTests):
         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 @@ class AllPlatformTests(BasePlatformTests):
         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 @@ class AllPlatformTests(BasePlatformTests):
         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 @@ class AllPlatformTests(BasePlatformTests):
         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 @@ class AllPlatformTests(BasePlatformTests):
             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 @@ class AllPlatformTests(BasePlatformTests):
 
     @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 @@ class AllPlatformTests(BasePlatformTests):
         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 @@ class AllPlatformTests(BasePlatformTests):
             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 @@ class AllPlatformTests(BasePlatformTests):
     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 @@ class AllPlatformTests(BasePlatformTests):
     @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 @@ class AllPlatformTests(BasePlatformTests):
         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 @@ class AllPlatformTests(BasePlatformTests):
         # 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 @@ class AllPlatformTests(BasePlatformTests):
         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 @@ class AllPlatformTests(BasePlatformTests):
         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 @@ class AllPlatformTests(BasePlatformTests):
         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 @@ class AllPlatformTests(BasePlatformTests):
         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 @@ class AllPlatformTests(BasePlatformTests):
         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 @@ class AllPlatformTests(BasePlatformTests):
                 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 @@ class AllPlatformTests(BasePlatformTests):
         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 @@ class AllPlatformTests(BasePlatformTests):
                 }}
             ''')
 
-        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 @@ class AllPlatformTests(BasePlatformTests):
         self.assertIn('exit status 39', cm.exception.stdout)
 
     def test_custom_target_name(self):
-        testdir = os.path.join(self.unit_test_dir, '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 16f7c2454..28bf41555 100644
--- a/unittests/linuxcrosstests.py
+++ b/unittests/linuxcrosstests.py
@@ -86,7 +86,7 @@ class LinuxCrossArmTests(BaseLinuxCrossTests):
     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 @@ class LinuxCrossArmTests(BaseLinuxCrossTests):
 
     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 @@ class LinuxCrossArmTests(BaseLinuxCrossTests):
     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 @@ class LinuxCrossArmTests(BaseLinuxCrossTests):
         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 @@ class LinuxCrossMingwTests(BaseLinuxCrossTests):
 
     @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 ecb653fa6..a942df195 100644
--- a/unittests/linuxliketests.py
+++ b/unittests/linuxliketests.py
@@ -945,7 +945,7 @@ class LinuxlikeTests(BasePlatformTests):
         '''
         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 @@ class LinuxlikeTests(BasePlatformTests):
         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 @@ class LinuxlikeTests(BasePlatformTests):
 
     @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 @@ class LinuxlikeTests(BasePlatformTests):
         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 @@ class LinuxlikeTests(BasePlatformTests):
     @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 @@ class LinuxlikeTests(BasePlatformTests):
         '''
         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 @@ class LinuxlikeTests(BasePlatformTests):
         '''
         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 @@ class LinuxlikeTests(BasePlatformTests):
         '''
         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 @@ class LinuxlikeTests(BasePlatformTests):
         '''
         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 @@ class LinuxlikeTests(BasePlatformTests):
         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 @@ class LinuxlikeTests(BasePlatformTests):
         see: https://github.com/mesonbuild/meson/issues/9000
              https://stackoverflow.com/questions/48532868/gcc-library-option-with-a-colon-llibevent-a
         '''
-        testdir = os.path.join(self.unit_test_dir, '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 @@ class LinuxlikeTests(BasePlatformTests):
         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 @@ class LinuxlikeTests(BasePlatformTests):
         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 @@ class LinuxlikeTests(BasePlatformTests):
 
         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 @@ class LinuxlikeTests(BasePlatformTests):
         # 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 @@ class LinuxlikeTests(BasePlatformTests):
 
     @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 @@ class LinuxlikeTests(BasePlatformTests):
         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 @@ class LinuxlikeTests(BasePlatformTests):
     @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 @@ class LinuxlikeTests(BasePlatformTests):
         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 @@ class LinuxlikeTests(BasePlatformTests):
         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 @@ class LinuxlikeTests(BasePlatformTests):
             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 @@ class LinuxlikeTests(BasePlatformTests):
         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 @@ class LinuxlikeTests(BasePlatformTests):
             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 @@ class LinuxlikeTests(BasePlatformTests):
             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 @@ class LinuxlikeTests(BasePlatformTests):
             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 @@ class LinuxlikeTests(BasePlatformTests):
 
     @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 0a756b572..7d75ebc34 100644
--- a/unittests/machinefiletests.py
+++ b/unittests/machinefiletests.py
@@ -62,7 +62,7 @@ class NativeFileTests(BasePlatformTests):
 
     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 @@ class NativeFileTests(BasePlatformTests):
         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 @@ class NativeFileTests(BasePlatformTests):
         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 @@ class CrossFileTests(BasePlatformTests):
             ''')
 
     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 @@ class CrossFileTests(BasePlatformTests):
             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 @@ class CrossFileTests(BasePlatformTests):
             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 @@ class CrossFileTests(BasePlatformTests):
             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 @@ class CrossFileTests(BasePlatformTests):
         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 @@ class CrossFileTests(BasePlatformTests):
                               '-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 @@ class CrossFileTests(BasePlatformTests):
 
     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 c5e5233dd..b5907a192 100644
--- a/unittests/platformagnostictests.py
+++ b/unittests/platformagnostictests.py
@@ -32,7 +32,7 @@ class PlatformAgnosticTests(BasePlatformTests):
         Tests that find_program() with a relative path does not find the program
         in current workdir.
         '''
-        testdir = os.path.join(self.unit_test_dir, '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 @@ class PlatformAgnosticTests(BasePlatformTests):
         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 d3ad932ea..7339ca848 100644
--- a/unittests/windowstests.py
+++ b/unittests/windowstests.py
@@ -169,7 +169,7 @@ class WindowsTests(BasePlatformTests):
             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 @@ class WindowsTests(BasePlatformTests):
             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):