Condense test directories for RC1.

385 files changed, 83 insertions, 83 deletions

diff --git a/test cases/cmake/26 dependency fallback/main.cpp b/test cases/cmake/27 dependency fallback/main.cpp
index 95079615a..95079615a 100644
--- a/test cases/cmake/26 dependency fallback/main.cpp
+++ b/test cases/cmake/27 dependency fallback/main.cpp
diff --git a/test cases/cmake/26 dependency fallback/meson.build b/test cases/cmake/27 dependency fallback/meson.build
index 871d70c9f..871d70c9f 100644
--- a/test cases/cmake/26 dependency fallback/meson.build
+++ b/test cases/cmake/27 dependency fallback/meson.build
diff --git a/test cases/cmake/26 dependency fallback/subprojects/broken_method.wrap b/test cases/cmake/27 dependency fallback/subprojects/broken_method.wrap
index ce0690a51..ce0690a51 100644
--- a/test cases/cmake/26 dependency fallback/subprojects/broken_method.wrap
+++ b/test cases/cmake/27 dependency fallback/subprojects/broken_method.wrap
diff --git a/test cases/cmake/26 dependency fallback/subprojects/cmMod.wrap b/test cases/cmake/27 dependency fallback/subprojects/cmMod.wrap
index 9e6d855f0..9e6d855f0 100644
--- a/test cases/cmake/26 dependency fallback/subprojects/cmMod.wrap
+++ b/test cases/cmake/27 dependency fallback/subprojects/cmMod.wrap
diff --git a/test cases/cmake/26 dependency fallback/subprojects/cmMod/CMakeLists.txt b/test cases/cmake/27 dependency fallback/subprojects/cmMod/CMakeLists.txt
index d08e55cdf..d08e55cdf 100644
--- a/test cases/cmake/26 dependency fallback/subprojects/cmMod/CMakeLists.txt
+++ b/test cases/cmake/27 dependency fallback/subprojects/cmMod/CMakeLists.txt
diff --git a/test cases/cmake/26 dependency fallback/subprojects/cmMod/cmMod.cpp b/test cases/cmake/27 dependency fallback/subprojects/cmMod/cmMod.cpp
index f4cbea0ce..f4cbea0ce 100644
--- a/test cases/cmake/26 dependency fallback/subprojects/cmMod/cmMod.cpp
+++ b/test cases/cmake/27 dependency fallback/subprojects/cmMod/cmMod.cpp
diff --git a/test cases/cmake/26 dependency fallback/subprojects/cmMod/cmMod.hpp b/test cases/cmake/27 dependency fallback/subprojects/cmMod/cmMod.hpp
index 4445e1f53..4445e1f53 100644
--- a/test cases/cmake/26 dependency fallback/subprojects/cmMod/cmMod.hpp
+++ b/test cases/cmake/27 dependency fallback/subprojects/cmMod/cmMod.hpp
diff --git a/test cases/cmake/26 dependency fallback/subprojects/cmMod/cpp_pch.hpp b/test cases/cmake/27 dependency fallback/subprojects/cmMod/cpp_pch.hpp
index aa7ceb361..aa7ceb361 100644
--- a/test cases/cmake/26 dependency fallback/subprojects/cmMod/cpp_pch.hpp
+++ b/test cases/cmake/27 dependency fallback/subprojects/cmMod/cpp_pch.hpp
diff --git a/test cases/cmake/26 dependency fallback/subprojects/cmake_subp/CMakeLists.txt b/test cases/cmake/27 dependency fallback/subprojects/cmake_subp/CMakeLists.txt
index 6443fcadd..6443fcadd 100644
--- a/test cases/cmake/26 dependency fallback/subprojects/cmake_subp/CMakeLists.txt
+++ b/test cases/cmake/27 dependency fallback/subprojects/cmake_subp/CMakeLists.txt
diff --git a/test cases/cmake/26 dependency fallback/subprojects/force_cmake.wrap b/test cases/cmake/27 dependency fallback/subprojects/force_cmake.wrap
index b24754eca..b24754eca 100644
--- a/test cases/cmake/26 dependency fallback/subprojects/force_cmake.wrap
+++ b/test cases/cmake/27 dependency fallback/subprojects/force_cmake.wrap
diff --git a/test cases/cmake/26 dependency fallback/subprojects/force_cmake/CMakeLists.txt b/test cases/cmake/27 dependency fallback/subprojects/force_cmake/CMakeLists.txt
index 497beb95e..497beb95e 100644
--- a/test cases/cmake/26 dependency fallback/subprojects/force_cmake/CMakeLists.txt
+++ b/test cases/cmake/27 dependency fallback/subprojects/force_cmake/CMakeLists.txt
diff --git a/test cases/cmake/26 dependency fallback/subprojects/force_cmake/meson.build b/test cases/cmake/27 dependency fallback/subprojects/force_cmake/meson.build
index 92649744e..92649744e 100644
--- a/test cases/cmake/26 dependency fallback/subprojects/force_cmake/meson.build
+++ b/test cases/cmake/27 dependency fallback/subprojects/force_cmake/meson.build
diff --git a/test cases/cmake/26 dependency fallback/subprojects/meson_method.wrap b/test cases/cmake/27 dependency fallback/subprojects/meson_method.wrap
index e52701e57..e52701e57 100644
--- a/test cases/cmake/26 dependency fallback/subprojects/meson_method.wrap
+++ b/test cases/cmake/27 dependency fallback/subprojects/meson_method.wrap
diff --git a/test cases/cmake/26 dependency fallback/subprojects/meson_subp/meson.build b/test cases/cmake/27 dependency fallback/subprojects/meson_subp/meson.build
index e4746ce6b..e4746ce6b 100644
--- a/test cases/cmake/26 dependency fallback/subprojects/meson_subp/meson.build
+++ b/test cases/cmake/27 dependency fallback/subprojects/meson_subp/meson.build
diff --git a/test cases/common/262 internal dependency includes in checks/include/test_262_header.h b/test cases/common/263 internal dependency includes in checks/include/test_262_header.h
index 5a2ca62ad..5a2ca62ad 100644
--- a/test cases/common/262 internal dependency includes in checks/include/test_262_header.h
+++ b/test cases/common/263 internal dependency includes in checks/include/test_262_header.h
diff --git a/test cases/common/262 internal dependency includes in checks/meson.build b/test cases/common/263 internal dependency includes in checks/meson.build
index c8b527758..c8b527758 100644
--- a/test cases/common/262 internal dependency includes in checks/meson.build
+++ b/test cases/common/263 internal dependency includes in checks/meson.build
diff --git a/test cases/common/262 required keyword in has functions/meson.build b/test cases/common/264 required keyword in has functions/meson.build
index afd07eab1..afd07eab1 100644
--- a/test cases/common/262 required keyword in has functions/meson.build
+++ b/test cases/common/264 required keyword in has functions/meson.build
diff --git a/test cases/common/262 required keyword in has functions/meson_options.txt b/test cases/common/264 required keyword in has functions/meson_options.txt
index 53175afec..53175afec 100644
--- a/test cases/common/262 required keyword in has functions/meson_options.txt
+++ b/test cases/common/264 required keyword in has functions/meson_options.txt
diff --git a/test cases/common/263 default_options dict/lib.c b/test cases/common/265 default_options dict/lib.c
index 3ef78ee94..3ef78ee94 100644
--- a/test cases/common/263 default_options dict/lib.c
+++ b/test cases/common/265 default_options dict/lib.c
diff --git a/test cases/common/263 default_options dict/meson.build b/test cases/common/265 default_options dict/meson.build
index 06edd7bf7..06edd7bf7 100644
--- a/test cases/common/263 default_options dict/meson.build
+++ b/test cases/common/265 default_options dict/meson.build
diff --git a/test cases/common/263 default_options dict/meson_options.txt b/test cases/common/265 default_options dict/meson_options.txt
index 1b0b0e1a7..1b0b0e1a7 100644
--- a/test cases/common/263 default_options dict/meson_options.txt
+++ b/test cases/common/265 default_options dict/meson_options.txt
diff --git a/test cases/common/264 format string/meson.build b/test cases/common/266 format string/meson.build
index 200cfac40..200cfac40 100644
--- a/test cases/common/264 format string/meson.build
+++ b/test cases/common/266 format string/meson.build
diff --git a/test cases/common/264 format string/meson_options.txt b/test cases/common/266 format string/meson_options.txt
index 2e3917617..2e3917617 100644
--- a/test cases/common/264 format string/meson_options.txt
+++ b/test cases/common/266 format string/meson_options.txt
diff --git a/test cases/common/264 format string/test.json b/test cases/common/266 format string/test.json
index 2369864b2..2369864b2 100644
--- a/test cases/common/264 format string/test.json
+++ b/test cases/common/266 format string/test.json
diff --git a/test cases/common/265 default_options in find_program/meson.build b/test cases/common/267 default_options in find_program/meson.build
index 99d842592..99d842592 100644
--- a/test cases/common/265 default_options in find_program/meson.build
+++ b/test cases/common/267 default_options in find_program/meson.build
diff --git a/test cases/common/265 default_options in find_program/subprojects/dummy.wrap b/test cases/common/267 default_options in find_program/subprojects/dummy.wrap
index 0c03eec44..0c03eec44 100644
--- a/test cases/common/265 default_options in find_program/subprojects/dummy.wrap
+++ b/test cases/common/267 default_options in find_program/subprojects/dummy.wrap
diff --git a/test cases/common/265 default_options in find_program/subprojects/dummy/dummy.c b/test cases/common/267 default_options in find_program/subprojects/dummy/dummy.c
index a51103c3c..a51103c3c 100644
--- a/test cases/common/265 default_options in find_program/subprojects/dummy/dummy.c
+++ b/test cases/common/267 default_options in find_program/subprojects/dummy/dummy.c
diff --git a/test cases/common/265 default_options in find_program/subprojects/dummy/meson.build b/test cases/common/267 default_options in find_program/subprojects/dummy/meson.build
index b6441307f..b6441307f 100644
--- a/test cases/common/265 default_options in find_program/subprojects/dummy/meson.build
+++ b/test cases/common/267 default_options in find_program/subprojects/dummy/meson.build
diff --git a/test cases/common/265 default_options in find_program/subprojects/dummy/meson_options.txt b/test cases/common/267 default_options in find_program/subprojects/dummy/meson_options.txt
index c91a24af7..c91a24af7 100644
--- a/test cases/common/265 default_options in find_program/subprojects/dummy/meson_options.txt
+++ b/test cases/common/267 default_options in find_program/subprojects/dummy/meson_options.txt
diff --git a/test cases/common/266 install functions and follow_symlinks/foo/file1 b/test cases/common/268 install functions and follow_symlinks/foo/file1
index 9daeafb98..9daeafb98 100644
--- a/test cases/common/266 install functions and follow_symlinks/foo/file1
+++ b/test cases/common/268 install functions and follow_symlinks/foo/file1
diff --git a/test cases/common/266 install functions and follow_symlinks/foo/link1 b/test cases/common/268 install functions and follow_symlinks/foo/link1
index 08219db9b..08219db9b 120000
--- a/test cases/common/266 install functions and follow_symlinks/foo/link1
+++ b/test cases/common/268 install functions and follow_symlinks/foo/link1
diff --git a/test cases/common/266 install functions and follow_symlinks/foo/link2.h b/test cases/common/268 install functions and follow_symlinks/foo/link2.h
index 08219db9b..08219db9b 120000
--- a/test cases/common/266 install functions and follow_symlinks/foo/link2.h
+++ b/test cases/common/268 install functions and follow_symlinks/foo/link2.h
diff --git a/test cases/common/266 install functions and follow_symlinks/meson.build b/test cases/common/268 install functions and follow_symlinks/meson.build
index 327c02131..327c02131 100644
--- a/test cases/common/266 install functions and follow_symlinks/meson.build
+++ b/test cases/common/268 install functions and follow_symlinks/meson.build
diff --git a/test cases/common/266 install functions and follow_symlinks/test.json b/test cases/common/268 install functions and follow_symlinks/test.json
index 6a395177d..6a395177d 100644
--- a/test cases/common/266 install functions and follow_symlinks/test.json
+++ b/test cases/common/268 install functions and follow_symlinks/test.json
diff --git a/test cases/common/272 env in generator.process/generate_main.py b/test cases/common/271 env in generator.process/generate_main.py
index 993c5ac03..993c5ac03 100644
--- a/test cases/common/272 env in generator.process/generate_main.py
+++ b/test cases/common/271 env in generator.process/generate_main.py
diff --git a/test cases/common/272 env in generator.process/main.template b/test cases/common/271 env in generator.process/main.template
index 3c3340efc..3c3340efc 100644
--- a/test cases/common/272 env in generator.process/main.template
+++ b/test cases/common/271 env in generator.process/main.template
diff --git a/test cases/common/272 env in generator.process/meson.build b/test cases/common/271 env in generator.process/meson.build
index 5d7404024..5d7404024 100644
--- a/test cases/common/272 env in generator.process/meson.build
+++ b/test cases/common/271 env in generator.process/meson.build
diff --git a/test cases/failing/102 bool in combo/meson.build b/test cases/failing/100 bool in combo/meson.build
index c5efd67ea..c5efd67ea 100644
--- a/test cases/failing/102 bool in combo/meson.build
+++ b/test cases/failing/100 bool in combo/meson.build
diff --git a/test cases/failing/102 bool in combo/meson_options.txt b/test cases/failing/100 bool in combo/meson_options.txt
index 0c8f5de00..0c8f5de00 100644
--- a/test cases/failing/102 bool in combo/meson_options.txt
+++ b/test cases/failing/100 bool in combo/meson_options.txt
diff --git a/test cases/failing/102 bool in combo/nativefile.ini b/test cases/failing/100 bool in combo/nativefile.ini
index b423957cf..b423957cf 100644
--- a/test cases/failing/102 bool in combo/nativefile.ini
+++ b/test cases/failing/100 bool in combo/nativefile.ini
diff --git a/test cases/failing/102 bool in combo/test.json b/test cases/failing/100 bool in combo/test.json
index c0041afec..357d7a875 100644
--- a/test cases/failing/102 bool in combo/test.json
+++ b/test cases/failing/100 bool in combo/test.json
@@ -1,5 +1,5 @@
 {
   "stdout": [
-    { "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\"." }
+    { "line": "test cases/failing/100 bool in combo/meson.build:1:0: ERROR: Value \"True\" (of type \"boolean\") for combo option \"opt\" is not one of the choices. Possible choices are (as string): \"true\", \"false\"." }
   ]
 }
diff --git a/test cases/failing/100 no glib-compile-resources/test.json b/test cases/failing/100 no glib-compile-resources/test.json
deleted file mode 100644
index b9f5fdcf8..000000000
--- a/test cases/failing/100 no glib-compile-resources/test.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "stdout": [
-    {
-      "line": "test cases/failing/100 no glib-compile-resources/meson.build:8:12: ERROR: Program 'glib-compile-resources' not found or not executable"
-    }
-  ]
-}
diff --git a/test cases/failing/103 compiler no lang/meson.build b/test cases/failing/101 compiler no lang/meson.build
index 366bbdd5d..366bbdd5d 100644
--- a/test cases/failing/103 compiler no lang/meson.build
+++ b/test cases/failing/101 compiler no lang/meson.build
diff --git a/test cases/failing/103 compiler no lang/test.json b/test cases/failing/101 compiler no lang/test.json
index 123dcb9c3..364efa9e8 100644
--- a/test cases/failing/103 compiler no lang/test.json
+++ b/test cases/failing/101 compiler no lang/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "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."
+      "line": "test cases/failing/101 compiler no lang/meson.build:2:6: ERROR: Tried to access compiler for language \"c\", not specified for host machine."
     }
   ]
 }
diff --git a/test cases/failing/101 number in combo/test.json b/test cases/failing/101 number in combo/test.json
deleted file mode 100644
index 4c30f9800..000000000
--- a/test cases/failing/101 number in combo/test.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "stdout": [
-    { "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): \"plain\", \"0\", \"g\", \"1\", \"2\", \"3\", \"s\"." }
-  ]
-}
diff --git a/test cases/failing/104 no fallback/meson.build b/test cases/failing/102 no fallback/meson.build
index 91d6b9370..91d6b9370 100644
--- a/test cases/failing/104 no fallback/meson.build
+++ b/test cases/failing/102 no fallback/meson.build
diff --git a/test cases/failing/104 no fallback/subprojects/foob/meson.build b/test cases/failing/102 no fallback/subprojects/foob/meson.build
index b2c4814e2..b2c4814e2 100644
--- a/test cases/failing/104 no fallback/subprojects/foob/meson.build
+++ b/test cases/failing/102 no fallback/subprojects/foob/meson.build
diff --git a/test cases/failing/104 no fallback/test.json b/test cases/failing/102 no fallback/test.json
index 5fbffe35d..5fbffe35d 100644
--- a/test cases/failing/104 no fallback/test.json
+++ b/test cases/failing/102 no fallback/test.json
diff --git a/test cases/failing/105 feature require/meson.build b/test cases/failing/103 feature require/meson.build
index 8c47e3763..8c47e3763 100644
--- a/test cases/failing/105 feature require/meson.build
+++ b/test cases/failing/103 feature require/meson.build
diff --git a/test cases/failing/105 feature require/meson_options.txt b/test cases/failing/103 feature require/meson_options.txt
index 5910a8737..5910a8737 100644
--- a/test cases/failing/105 feature require/meson_options.txt
+++ b/test cases/failing/103 feature require/meson_options.txt
diff --git a/test cases/failing/105 feature require/test.json b/test cases/failing/103 feature require/test.json
index 2da54948f..2da54948f 100644
--- a/test cases/failing/105 feature require/test.json
+++ b/test cases/failing/103 feature require/test.json
diff --git a/test cases/failing/106 feature require.bis/meson.build b/test cases/failing/104 feature require.bis/meson.build
index 4ea65e5e0..4ea65e5e0 100644
--- a/test cases/failing/106 feature require.bis/meson.build
+++ b/test cases/failing/104 feature require.bis/meson.build
diff --git a/test cases/failing/106 feature require.bis/meson_options.txt b/test cases/failing/104 feature require.bis/meson_options.txt
index 5910a8737..5910a8737 100644
--- a/test cases/failing/106 feature require.bis/meson_options.txt
+++ b/test cases/failing/104 feature require.bis/meson_options.txt
diff --git a/test cases/failing/106 feature require.bis/test.json b/test cases/failing/104 feature require.bis/test.json
index ed488affd..ed488affd 100644
--- a/test cases/failing/106 feature require.bis/test.json
+++ b/test cases/failing/104 feature require.bis/test.json
diff --git a/test cases/failing/107 no build get_external_property/meson.build b/test cases/failing/105 no build get_external_property/meson.build
index 8a4215c9f..8a4215c9f 100644
--- a/test cases/failing/107 no build get_external_property/meson.build
+++ b/test cases/failing/105 no build get_external_property/meson.build
diff --git a/test cases/failing/107 no build get_external_property/test.json b/test cases/failing/105 no build get_external_property/test.json
index ff7438669..e8b282c6f 100644
--- a/test cases/failing/107 no build get_external_property/test.json
+++ b/test cases/failing/105 no build get_external_property/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/107 no build get_external_property/meson.build:3:14: ERROR: Unknown property for build machine: nonexisting"
+      "line": "test cases/failing/105 no build get_external_property/meson.build:3:14: ERROR: Unknown property for build machine: nonexisting"
     }
   ]
 }
diff --git a/test cases/failing/108 enter subdir twice/meson.build b/test cases/failing/106 enter subdir twice/meson.build
index d9bf9f56b..d9bf9f56b 100644
--- a/test cases/failing/108 enter subdir twice/meson.build
+++ b/test cases/failing/106 enter subdir twice/meson.build
diff --git a/test cases/failing/108 enter subdir twice/sub/meson.build b/test cases/failing/106 enter subdir twice/sub/meson.build
index d036a3fe5..d036a3fe5 100644
--- a/test cases/failing/108 enter subdir twice/sub/meson.build
+++ b/test cases/failing/106 enter subdir twice/sub/meson.build
diff --git a/test cases/failing/108 enter subdir twice/test.json b/test cases/failing/106 enter subdir twice/test.json
index 0a8e12769..9a8b11d06 100644
--- a/test cases/failing/108 enter subdir twice/test.json
+++ b/test cases/failing/106 enter subdir twice/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/108 enter subdir twice/meson.build:3:0: ERROR: Tried to enter directory \"sub\", which has already been visited."
+      "line": "test cases/failing/106 enter subdir twice/meson.build:3:0: ERROR: Tried to enter directory \"sub\", which has already been visited."
     }
   ]
 }
diff --git a/test cases/failing/109 invalid fstring/109 invalid fstring/meson.build b/test cases/failing/107 invalid fstring/109 invalid fstring/meson.build
index dd22f56b2..dd22f56b2 100644
--- a/test cases/failing/109 invalid fstring/109 invalid fstring/meson.build
+++ b/test cases/failing/107 invalid fstring/109 invalid fstring/meson.build
diff --git a/test cases/failing/109 invalid fstring/109 invalid fstring/test.json b/test cases/failing/107 invalid fstring/109 invalid fstring/test.json
index 71d8f5927..71d8f5927 100644
--- a/test cases/failing/109 invalid fstring/109 invalid fstring/test.json
+++ b/test cases/failing/107 invalid fstring/109 invalid fstring/test.json
diff --git a/test cases/failing/109 invalid fstring/meson.build b/test cases/failing/107 invalid fstring/meson.build
index 7eb3ccf5c..7eb3ccf5c 100644
--- a/test cases/failing/109 invalid fstring/meson.build
+++ b/test cases/failing/107 invalid fstring/meson.build
diff --git a/test cases/failing/109 invalid fstring/test.json b/test cases/failing/107 invalid fstring/test.json
index 580d08721..ccd82b574 100644
--- a/test cases/failing/109 invalid fstring/test.json
+++ b/test cases/failing/107 invalid fstring/test.json
@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "line": "test cases/failing/109 invalid fstring/meson.build:3:4: ERROR: Identifier \"foo\" does not name a variable."
+            "line": "test cases/failing/107 invalid fstring/meson.build:3:4: ERROR: Identifier \"foo\" does not name a variable."
         }
     ]
 }
diff --git a/test cases/failing/110 compiler argument checking/meson.build b/test cases/failing/108 compiler argument checking/meson.build
index bb1f44768..bb1f44768 100644
--- a/test cases/failing/110 compiler argument checking/meson.build
+++ b/test cases/failing/108 compiler argument checking/meson.build
diff --git a/test cases/failing/110 compiler argument checking/test.json b/test cases/failing/108 compiler argument checking/test.json
index f60c014ce..e9e27af57 100644
--- a/test cases/failing/110 compiler argument checking/test.json
+++ b/test cases/failing/108 compiler argument checking/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-        "line": "test cases/failing/110 compiler argument checking/meson.build:4:25: ERROR: Compiler for C does not support \"-meson-goober-arg-for-testing\""
+        "line": "test cases/failing/108 compiler argument checking/meson.build:4:25: ERROR: Compiler for C does not support \"-meson-goober-arg-for-testing\""
     }
   ]
 }
diff --git a/test cases/failing/111 empty fallback/meson.build b/test cases/failing/109 empty fallback/meson.build
index f4eb5feb9..f4eb5feb9 100644
--- a/test cases/failing/111 empty fallback/meson.build
+++ b/test cases/failing/109 empty fallback/meson.build
diff --git a/test cases/failing/111 empty fallback/subprojects/foo/meson.build b/test cases/failing/109 empty fallback/subprojects/foo/meson.build
index c9e134b5e..c9e134b5e 100644
--- a/test cases/failing/111 empty fallback/subprojects/foo/meson.build
+++ b/test cases/failing/109 empty fallback/subprojects/foo/meson.build
diff --git a/test cases/failing/111 empty fallback/test.json b/test cases/failing/109 empty fallback/test.json
index 022e747ff..46a4ec514 100644
--- a/test cases/failing/111 empty fallback/test.json
+++ b/test cases/failing/109 empty fallback/test.json
@@ -2,7 +2,7 @@
     "stdout": [
         {
             "match": "re",
-            "line": "test cases/failing/111 empty fallback/meson.build:6:0: ERROR: Dependency \"foo\" not found.*"
+            "line": "test cases/failing/109 empty fallback/meson.build:6:0: ERROR: Dependency \"foo\" not found.*"
         }
     ]
 }
diff --git a/test cases/failing/112 cmake executable dependency/meson.build b/test cases/failing/110 cmake executable dependency/meson.build
index 48d8fcbb6..48d8fcbb6 100644
--- a/test cases/failing/112 cmake executable dependency/meson.build
+++ b/test cases/failing/110 cmake executable dependency/meson.build
diff --git a/test cases/failing/112 cmake executable dependency/subprojects/cmlib/CMakeLists.txt b/test cases/failing/110 cmake executable dependency/subprojects/cmlib/CMakeLists.txt
index 006787986..006787986 100644
--- a/test cases/failing/112 cmake executable dependency/subprojects/cmlib/CMakeLists.txt
+++ b/test cases/failing/110 cmake executable dependency/subprojects/cmlib/CMakeLists.txt
diff --git a/test cases/failing/112 cmake executable dependency/subprojects/cmlib/main.c b/test cases/failing/110 cmake executable dependency/subprojects/cmlib/main.c
index 9b6bdc2ec..9b6bdc2ec 100644
--- a/test cases/failing/112 cmake executable dependency/subprojects/cmlib/main.c
+++ b/test cases/failing/110 cmake executable dependency/subprojects/cmlib/main.c
diff --git a/test cases/failing/112 cmake executable dependency/test.json b/test cases/failing/110 cmake executable dependency/test.json
index d425fa292..80d01fe0d 100644
--- a/test cases/failing/112 cmake executable dependency/test.json
+++ b/test cases/failing/110 cmake executable dependency/test.json
@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "line": "test cases/failing/112 cmake executable dependency/meson.build:9:14: ERROR: main is an executable and does not support the dependency() method. Use target() instead."
+            "line": "test cases/failing/110 cmake executable dependency/meson.build:9:14: ERROR: main is an executable and does not support the dependency() method. Use target() instead."
         }
     ],
     "tools": {
diff --git a/test cases/failing/113 allow_fallback with fallback/meson.build b/test cases/failing/111 allow_fallback with fallback/meson.build
index 2874e424c..2874e424c 100644
--- a/test cases/failing/113 allow_fallback with fallback/meson.build
+++ b/test cases/failing/111 allow_fallback with fallback/meson.build
diff --git a/test cases/failing/113 allow_fallback with fallback/test.json b/test cases/failing/111 allow_fallback with fallback/test.json
index 58ed475c0..92aa19af3 100644
--- a/test cases/failing/113 allow_fallback with fallback/test.json
+++ b/test cases/failing/111 allow_fallback with fallback/test.json
@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "line": "test cases/failing/113 allow_fallback with fallback/meson.build:3:0: ERROR: \"fallback\" and \"allow_fallback\" arguments are mutually exclusive"
+            "line": "test cases/failing/111 allow_fallback with fallback/meson.build:3:0: ERROR: \"fallback\" and \"allow_fallback\" arguments are mutually exclusive"
         }
     ]
 }
diff --git a/test cases/failing/114 nonsensical bindgen/meson.build b/test cases/failing/112 nonsensical bindgen/meson.build
index 6995f672c..6995f672c 100644
--- a/test cases/failing/114 nonsensical bindgen/meson.build
+++ b/test cases/failing/112 nonsensical bindgen/meson.build
diff --git a/test cases/failing/114 nonsensical bindgen/src/header.h b/test cases/failing/112 nonsensical bindgen/src/header.h
index 750621f87..750621f87 100644
--- a/test cases/failing/114 nonsensical bindgen/src/header.h
+++ b/test cases/failing/112 nonsensical bindgen/src/header.h
diff --git a/test cases/failing/114 nonsensical bindgen/src/source.c b/test cases/failing/112 nonsensical bindgen/src/source.c
index d652d28b9..d652d28b9 100644
--- a/test cases/failing/114 nonsensical bindgen/src/source.c
+++ b/test cases/failing/112 nonsensical bindgen/src/source.c
diff --git a/test cases/failing/114 nonsensical bindgen/test.json b/test cases/failing/112 nonsensical bindgen/test.json
index bc85311ab..a2b4b7196 100644
--- a/test cases/failing/114 nonsensical bindgen/test.json
+++ b/test cases/failing/112 nonsensical bindgen/test.json
@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "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"
+            "line": "test cases/failing/112 nonsensical bindgen/meson.build:17:24: ERROR: bindgen source file must be a C header, not an object or build target"
         }
     ]
 }
diff --git a/test cases/failing/115 run_target in test/meson.build b/test cases/failing/113 run_target in test/meson.build
index 117009e3f..117009e3f 100644
--- a/test cases/failing/115 run_target in test/meson.build
+++ b/test cases/failing/113 run_target in test/meson.build
diff --git a/test cases/failing/115 run_target in test/test.json b/test cases/failing/113 run_target in test/test.json
index 6eddb7c68..0e1ded4ea 100644
--- a/test cases/failing/115 run_target in test/test.json
+++ b/test cases/failing/113 run_target in test/test.json
@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "line": "test cases/failing/115 run_target in test/meson.build:7:0: ERROR: test keyword argument 'args' was of type array[RunTarget] but should have been array[str | File | BuildTarget | CustomTarget | CustomTargetIndex]"
+            "line": "test cases/failing/113 run_target in test/meson.build:7:0: ERROR: test keyword argument 'args' was of type array[RunTarget] but should have been array[str | File | BuildTarget | CustomTarget | CustomTargetIndex]"
         }
     ]
 }
diff --git a/test cases/failing/115 run_target in test/trivial.c b/test cases/failing/113 run_target in test/trivial.c
index 96612d48b..96612d48b 100644
--- a/test cases/failing/115 run_target in test/trivial.c
+++ b/test cases/failing/113 run_target in test/trivial.c
diff --git a/test cases/failing/116 run_target in add_install_script/meson.build b/test cases/failing/114 run_target in add_install_script/meson.build
index d3634bfb5..d3634bfb5 100644
--- a/test cases/failing/116 run_target in add_install_script/meson.build
+++ b/test cases/failing/114 run_target in add_install_script/meson.build
diff --git a/test cases/failing/116 run_target in add_install_script/test.json b/test cases/failing/114 run_target in add_install_script/test.json
index 03027e448..0b28f9b15 100644
--- a/test cases/failing/116 run_target in add_install_script/test.json
+++ b/test cases/failing/114 run_target in add_install_script/test.json
@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "line": "test cases/failing/116 run_target in add_install_script/meson.build:7:6: ERROR: meson.add_install_script argument 2 was of type \"RunTarget\" but should have been one of: \"str\", \"File\", \"BuildTarget\", \"CustomTarget\", \"CustomTargetIndex\", \"ExternalProgram\""
+            "line": "test cases/failing/114 run_target in add_install_script/meson.build:7:6: ERROR: meson.add_install_script argument 2 was of type \"RunTarget\" but should have been one of: \"str\", \"File\", \"BuildTarget\", \"CustomTarget\", \"CustomTargetIndex\", \"ExternalProgram\""
         }
     ]
 }
diff --git a/test cases/failing/116 run_target in add_install_script/trivial.c b/test cases/failing/114 run_target in add_install_script/trivial.c
index 1b14571ed..1b14571ed 100644
--- a/test cases/failing/116 run_target in add_install_script/trivial.c
+++ b/test cases/failing/114 run_target in add_install_script/trivial.c
diff --git a/test cases/failing/117 pathsep in install_symlink/meson.build b/test cases/failing/115 pathsep in install_symlink/meson.build
index cce82c237..cce82c237 100644
--- a/test cases/failing/117 pathsep in install_symlink/meson.build
+++ b/test cases/failing/115 pathsep in install_symlink/meson.build
diff --git a/test cases/failing/117 pathsep in install_symlink/test.json b/test cases/failing/115 pathsep in install_symlink/test.json
index aa356194a..fee661f4e 100644
--- a/test cases/failing/117 pathsep in install_symlink/test.json
+++ b/test cases/failing/115 pathsep in install_symlink/test.json
@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "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."
+            "line": "test cases/failing/115 pathsep in install_symlink/meson.build:3:0: ERROR: Link name is \"foo/bar\", but link names cannot contain path separators. The dir part should be in install_dir."
         }
     ]
 }
diff --git a/test cases/failing/118 subproject version conflict/meson.build b/test cases/failing/116 subproject version conflict/meson.build
index ffbcc13a4..ffbcc13a4 100644
--- a/test cases/failing/118 subproject version conflict/meson.build
+++ b/test cases/failing/116 subproject version conflict/meson.build
diff --git a/test cases/failing/118 subproject version conflict/subprojects/A/meson.build b/test cases/failing/116 subproject version conflict/subprojects/A/meson.build
index 7da4df0e7..7da4df0e7 100644
--- a/test cases/failing/118 subproject version conflict/subprojects/A/meson.build
+++ b/test cases/failing/116 subproject version conflict/subprojects/A/meson.build
diff --git a/test cases/failing/118 subproject version conflict/subprojects/B/meson.build b/test cases/failing/116 subproject version conflict/subprojects/B/meson.build
index 0ead9349a..0ead9349a 100644
--- a/test cases/failing/118 subproject version conflict/subprojects/B/meson.build
+++ b/test cases/failing/116 subproject version conflict/subprojects/B/meson.build
diff --git a/test cases/failing/118 subproject version conflict/test.json b/test cases/failing/116 subproject version conflict/test.json
index 81ef85580..c82774496 100644
--- a/test cases/failing/118 subproject version conflict/test.json
+++ b/test cases/failing/116 subproject version conflict/test.json
@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "line": "test cases/failing/118 subproject version conflict/meson.build:4:8: ERROR: Subproject B version is 100 but ['1'] required."
+            "line": "test cases/failing/116 subproject version conflict/meson.build:4:8: ERROR: Subproject B version is 100 but ['1'] required."
         }
     ]
 }
diff --git a/test cases/failing/119 structured source empty string/main.rs b/test cases/failing/117 structured source empty string/main.rs
index e69de29bb..e69de29bb 100644
--- a/test cases/failing/119 structured source empty string/main.rs
+++ b/test cases/failing/117 structured source empty string/main.rs
diff --git a/test cases/failing/119 structured source empty string/meson.build b/test cases/failing/117 structured source empty string/meson.build
index 071599147..071599147 100644
--- a/test cases/failing/119 structured source empty string/meson.build
+++ b/test cases/failing/117 structured source empty string/meson.build
diff --git a/test cases/failing/119 structured source empty string/test.json b/test cases/failing/117 structured source empty string/test.json
index d1d463e1a..7c90b0325 100644
--- a/test cases/failing/119 structured source empty string/test.json
+++ b/test cases/failing/117 structured source empty string/test.json
@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "line": "test cases/failing/119 structured source empty string/meson.build:9:2: ERROR: structured_sources: keys to dictionary argument may not be an empty string."
+            "line": "test cases/failing/117 structured source empty string/meson.build:9:2: ERROR: structured_sources: keys to dictionary argument may not be an empty string."
         }
     ]
 }
diff --git a/test cases/failing/120 structured_sources conflicts/main.rs b/test cases/failing/118 structured_sources conflicts/main.rs
index e69de29bb..e69de29bb 100644
--- a/test cases/failing/120 structured_sources conflicts/main.rs
+++ b/test cases/failing/118 structured_sources conflicts/main.rs
diff --git a/test cases/failing/120 structured_sources conflicts/meson.build b/test cases/failing/118 structured_sources conflicts/meson.build
index 561ad86bc..561ad86bc 100644
--- a/test cases/failing/120 structured_sources conflicts/meson.build
+++ b/test cases/failing/118 structured_sources conflicts/meson.build
diff --git a/test cases/failing/120 structured_sources conflicts/test.json b/test cases/failing/118 structured_sources conflicts/test.json
index 2f3d1ef0d..55b122890 100644
--- a/test cases/failing/120 structured_sources conflicts/test.json
+++ b/test cases/failing/118 structured_sources conflicts/test.json
@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "line": "test cases/failing/120 structured_sources conflicts/meson.build:7:0: ERROR: Conflicting sources in structured sources: main.rs"
+            "line": "test cases/failing/118 structured_sources conflicts/meson.build:7:0: ERROR: Conflicting sources in structured sources: main.rs"
         }
     ]
 }
diff --git a/test cases/failing/121 missing compiler/meson.build b/test cases/failing/119 missing compiler/meson.build
index 19bdd0c66..19bdd0c66 100644
--- a/test cases/failing/121 missing compiler/meson.build
+++ b/test cases/failing/119 missing compiler/meson.build
diff --git a/test cases/failing/121 missing compiler/subprojects/sub/main.c b/test cases/failing/119 missing compiler/subprojects/sub/main.c
index 44e82e227..44e82e227 100644
--- a/test cases/failing/121 missing compiler/subprojects/sub/main.c
+++ b/test cases/failing/119 missing compiler/subprojects/sub/main.c
diff --git a/test cases/failing/121 missing compiler/subprojects/sub/meson.build b/test cases/failing/119 missing compiler/subprojects/sub/meson.build
index b60850c9c..b60850c9c 100644
--- a/test cases/failing/121 missing compiler/subprojects/sub/meson.build
+++ b/test cases/failing/119 missing compiler/subprojects/sub/meson.build
diff --git a/test cases/failing/121 missing compiler/test.json b/test cases/failing/119 missing compiler/test.json
index 442e3312d..c5f3fb1ca 100644
--- a/test cases/failing/121 missing compiler/test.json
+++ b/test cases/failing/119 missing compiler/test.json
@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "line": "test cases/failing/121 missing compiler/subprojects/sub/meson.build:4:0: ERROR: No host machine compiler for 'subprojects/sub/main.c'"
+            "line": "test cases/failing/119 missing compiler/subprojects/sub/meson.build:4:0: ERROR: No host machine compiler for 'subprojects/sub/main.c'"
         }
     ]
 }
diff --git a/test cases/failing/122 cmake subproject error/meson.build b/test cases/failing/120 cmake subproject error/meson.build
index a308239fc..a308239fc 100644
--- a/test cases/failing/122 cmake subproject error/meson.build
+++ b/test cases/failing/120 cmake subproject error/meson.build
diff --git a/test cases/failing/122 cmake subproject error/subprojects/cmlib/CMakeLists.txt b/test cases/failing/120 cmake subproject error/subprojects/cmlib/CMakeLists.txt
index edbe39535..edbe39535 100644
--- a/test cases/failing/122 cmake subproject error/subprojects/cmlib/CMakeLists.txt
+++ b/test cases/failing/120 cmake subproject error/subprojects/cmlib/CMakeLists.txt
diff --git a/test cases/failing/122 cmake subproject error/test.json b/test cases/failing/120 cmake subproject error/test.json
index 57430ebd2..d88e708bf 100644
--- a/test cases/failing/122 cmake subproject error/test.json
+++ b/test cases/failing/120 cmake subproject error/test.json
@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "line": "test cases/failing/122 cmake subproject error/meson.build:8:14: ERROR: Failed to configure the CMake subproject: Fancy error message"
+            "line": "test cases/failing/120 cmake subproject error/meson.build:8:14: ERROR: Failed to configure the CMake subproject: Fancy error message"
         }
     ],
     "tools": {
diff --git a/test cases/failing/123 pkgconfig not relocatable outside prefix/meson.build b/test cases/failing/121 pkgconfig not relocatable outside prefix/meson.build
index 7ebdfc3fe..7ebdfc3fe 100644
--- a/test cases/failing/123 pkgconfig not relocatable outside prefix/meson.build
+++ b/test cases/failing/121 pkgconfig not relocatable outside prefix/meson.build
diff --git a/test cases/failing/123 pkgconfig not relocatable outside prefix/test.json b/test cases/failing/121 pkgconfig not relocatable outside prefix/test.json
index 2ca1320d6..c0dfb87e2 100644
--- a/test cases/failing/123 pkgconfig not relocatable outside prefix/test.json
+++ b/test cases/failing/121 pkgconfig not relocatable outside prefix/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/123 pkgconfig not relocatable outside prefix/meson\\.build:17:5: ERROR: Pkgconfig prefix cannot be outside of the prefix when pkgconfig\\.relocatable=true. Pkgconfig prefix is (C:)?/opt/lib/pkgconfig.",
+      "line": "test cases/failing/121 pkgconfig not relocatable outside prefix/meson\\.build:17:5: ERROR: Pkgconfig prefix cannot be outside of the prefix when pkgconfig\\.relocatable=true. Pkgconfig prefix is (C:)?/opt/lib/pkgconfig.",
       "match": "re"
     }
   ]
diff --git a/test cases/failing/124 subproject sandbox violation/meson.build b/test cases/failing/122 subproject sandbox violation/meson.build
index d41994c46..d41994c46 100644
--- a/test cases/failing/124 subproject sandbox violation/meson.build
+++ b/test cases/failing/122 subproject sandbox violation/meson.build
diff --git a/test cases/failing/124 subproject sandbox violation/meson_options.txt b/test cases/failing/122 subproject sandbox violation/meson_options.txt
index e7b782dba..e7b782dba 100644
--- a/test cases/failing/124 subproject sandbox violation/meson_options.txt
+++ b/test cases/failing/122 subproject sandbox violation/meson_options.txt
diff --git a/test cases/failing/124 subproject sandbox violation/subprojects/subproj1/file.txt b/test cases/failing/122 subproject sandbox violation/subprojects/subproj1/file.txt
index e69de29bb..e69de29bb 100644
--- a/test cases/failing/124 subproject sandbox violation/subprojects/subproj1/file.txt
+++ b/test cases/failing/122 subproject sandbox violation/subprojects/subproj1/file.txt
diff --git a/test cases/failing/124 subproject sandbox violation/subprojects/subproj1/meson.build b/test cases/failing/122 subproject sandbox violation/subprojects/subproj1/meson.build
index bd33bf38d..bd33bf38d 100644
--- a/test cases/failing/124 subproject sandbox violation/subprojects/subproj1/meson.build
+++ b/test cases/failing/122 subproject sandbox violation/subprojects/subproj1/meson.build
diff --git a/test cases/failing/124 subproject sandbox violation/subprojects/subproj1/nested/meson.build b/test cases/failing/122 subproject sandbox violation/subprojects/subproj1/nested/meson.build
index 038c13906..038c13906 100644
--- a/test cases/failing/124 subproject sandbox violation/subprojects/subproj1/nested/meson.build
+++ b/test cases/failing/122 subproject sandbox violation/subprojects/subproj1/nested/meson.build
diff --git a/test cases/failing/124 subproject sandbox violation/subprojects/subproj2/file.txt b/test cases/failing/122 subproject sandbox violation/subprojects/subproj2/file.txt
index e69de29bb..e69de29bb 100644
--- a/test cases/failing/124 subproject sandbox violation/subprojects/subproj2/file.txt
+++ b/test cases/failing/122 subproject sandbox violation/subprojects/subproj2/file.txt
diff --git a/test cases/failing/124 subproject sandbox violation/subprojects/subproj2/meson.build b/test cases/failing/122 subproject sandbox violation/subprojects/subproj2/meson.build
index a6032aa74..a6032aa74 100644
--- a/test cases/failing/124 subproject sandbox violation/subprojects/subproj2/meson.build
+++ b/test cases/failing/122 subproject sandbox violation/subprojects/subproj2/meson.build
diff --git a/test cases/failing/124 subproject sandbox violation/subprojects/subproj2/nested/meson.build b/test cases/failing/122 subproject sandbox violation/subprojects/subproj2/nested/meson.build
index e69de29bb..e69de29bb 100644
--- a/test cases/failing/124 subproject sandbox violation/subprojects/subproj2/nested/meson.build
+++ b/test cases/failing/122 subproject sandbox violation/subprojects/subproj2/nested/meson.build
diff --git a/test cases/failing/124 subproject sandbox violation/subprojects/subproj3/file.txt b/test cases/failing/122 subproject sandbox violation/subprojects/subproj3/file.txt
index e69de29bb..e69de29bb 100644
--- a/test cases/failing/124 subproject sandbox violation/subprojects/subproj3/file.txt
+++ b/test cases/failing/122 subproject sandbox violation/subprojects/subproj3/file.txt
diff --git a/test cases/failing/124 subproject sandbox violation/subprojects/subproj3/meson.build b/test cases/failing/122 subproject sandbox violation/subprojects/subproj3/meson.build
index c4fa64c1c..c4fa64c1c 100644
--- a/test cases/failing/124 subproject sandbox violation/subprojects/subproj3/meson.build
+++ b/test cases/failing/122 subproject sandbox violation/subprojects/subproj3/meson.build
diff --git a/test cases/failing/124 subproject sandbox violation/test.json b/test cases/failing/122 subproject sandbox violation/test.json
index ca3d142ec..4bd402884 100644
--- a/test cases/failing/124 subproject sandbox violation/test.json
+++ b/test cases/failing/122 subproject sandbox violation/test.json
@@ -10,7 +10,7 @@
   },
   "stdout": [
     {
-      "line": "test cases/failing/124 subproject sandbox violation/meson.build:24:0: ERROR: Sandbox violation: Tried to grab file file.txt from a nested subproject."
+      "line": "test cases/failing/122 subproject sandbox violation/meson.build:24:0: ERROR: Sandbox violation: Tried to grab file file.txt from a nested subproject."
     }
   ]
 }
diff --git a/test cases/failing/125 override and add_project_dependency/inc/lib.h b/test cases/failing/123 override and add_project_dependency/inc/lib.h
index 4cfc47e13..4cfc47e13 100644
--- a/test cases/failing/125 override and add_project_dependency/inc/lib.h
+++ b/test cases/failing/123 override and add_project_dependency/inc/lib.h
diff --git a/test cases/failing/125 override and add_project_dependency/lib.c b/test cases/failing/123 override and add_project_dependency/lib.c
index b8b22a3b7..b8b22a3b7 100644
--- a/test cases/failing/125 override and add_project_dependency/lib.c
+++ b/test cases/failing/123 override and add_project_dependency/lib.c
diff --git a/test cases/failing/125 override and add_project_dependency/meson.build b/test cases/failing/123 override and add_project_dependency/meson.build
index c878b017a..c878b017a 100644
--- a/test cases/failing/125 override and add_project_dependency/meson.build
+++ b/test cases/failing/123 override and add_project_dependency/meson.build
diff --git a/test cases/failing/125 override and add_project_dependency/subprojects/a/meson.build b/test cases/failing/123 override and add_project_dependency/subprojects/a/meson.build
index 4f6f0701c..4f6f0701c 100644
--- a/test cases/failing/125 override and add_project_dependency/subprojects/a/meson.build
+++ b/test cases/failing/123 override and add_project_dependency/subprojects/a/meson.build
diff --git a/test cases/failing/125 override and add_project_dependency/subprojects/a/prog.c b/test cases/failing/123 override and add_project_dependency/subprojects/a/prog.c
index ce60f8142..ce60f8142 100644
--- a/test cases/failing/125 override and add_project_dependency/subprojects/a/prog.c
+++ b/test cases/failing/123 override and add_project_dependency/subprojects/a/prog.c
diff --git a/test cases/failing/125 override and add_project_dependency/test.json b/test cases/failing/123 override and add_project_dependency/test.json
index df749ec7e..e0a4433cb 100644
--- a/test cases/failing/125 override and add_project_dependency/test.json
+++ b/test cases/failing/123 override and add_project_dependency/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/125 override and add_project_dependency/subprojects/a/meson.build:6:0: ERROR: Dependencies must be external dependencies"
+      "line": "test cases/failing/123 override and add_project_dependency/subprojects/a/meson.build:6:0: ERROR: Dependencies must be external dependencies"
     }
   ]
 }
diff --git a/test cases/failing/126 targets before add_project_dependency/inc/lib.h b/test cases/failing/124 targets before add_project_dependency/inc/lib.h
index 4cfc47e13..4cfc47e13 100644
--- a/test cases/failing/126 targets before add_project_dependency/inc/lib.h
+++ b/test cases/failing/124 targets before add_project_dependency/inc/lib.h
diff --git a/test cases/failing/126 targets before add_project_dependency/lib.c b/test cases/failing/124 targets before add_project_dependency/lib.c
index b8b22a3b7..b8b22a3b7 100644
--- a/test cases/failing/126 targets before add_project_dependency/lib.c
+++ b/test cases/failing/124 targets before add_project_dependency/lib.c
diff --git a/test cases/failing/126 targets before add_project_dependency/meson.build b/test cases/failing/124 targets before add_project_dependency/meson.build
index 38fe10235..38fe10235 100644
--- a/test cases/failing/126 targets before add_project_dependency/meson.build
+++ b/test cases/failing/124 targets before add_project_dependency/meson.build
diff --git a/test cases/failing/126 targets before add_project_dependency/test.json b/test cases/failing/124 targets before add_project_dependency/test.json
index d467914cc..d856ba4fd 100644
--- a/test cases/failing/126 targets before add_project_dependency/test.json
+++ b/test cases/failing/124 targets before add_project_dependency/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/126 targets before add_project_dependency/meson.build:5:0: ERROR: Tried to use 'add_project_dependencies' after a build target has been declared."
+      "line": "test cases/failing/124 targets before add_project_dependency/meson.build:5:0: ERROR: Tried to use 'add_project_dependencies' after a build target has been declared."
     }
   ]
 }
diff --git a/test cases/failing/127 extract from unity/meson.build b/test cases/failing/125 extract from unity/meson.build
index 9e3e65f58..9e3e65f58 100644
--- a/test cases/failing/127 extract from unity/meson.build
+++ b/test cases/failing/125 extract from unity/meson.build
diff --git a/test cases/failing/127 extract from unity/src1.c b/test cases/failing/125 extract from unity/src1.c
index da971bbf6..da971bbf6 100644
--- a/test cases/failing/127 extract from unity/src1.c
+++ b/test cases/failing/125 extract from unity/src1.c
diff --git a/test cases/failing/127 extract from unity/src2.c b/test cases/failing/125 extract from unity/src2.c
index a46166933..a46166933 100644
--- a/test cases/failing/127 extract from unity/src2.c
+++ b/test cases/failing/125 extract from unity/src2.c
diff --git a/test cases/failing/127 extract from unity/test.json b/test cases/failing/125 extract from unity/test.json
index 9403481f8..2f6468d36 100644
--- a/test cases/failing/127 extract from unity/test.json
+++ b/test cases/failing/125 extract from unity/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/127 extract from unity/meson.build:4:37: ERROR: Single object files cannot be extracted in Unity builds. You can only extract all the object files for each compiler at once."
+      "line": "test cases/failing/125 extract from unity/meson.build:4:37: ERROR: Single object files cannot be extracted in Unity builds. You can only extract all the object files for each compiler at once."
     }
   ]
 }
diff --git a/test cases/failing/128 subproject object as a dependency/main.c b/test cases/failing/126 subproject object as a dependency/main.c
index 78f2de106..78f2de106 100644
--- a/test cases/failing/128 subproject object as a dependency/main.c
+++ b/test cases/failing/126 subproject object as a dependency/main.c
diff --git a/test cases/failing/128 subproject object as a dependency/meson.build b/test cases/failing/126 subproject object as a dependency/meson.build
index 0114b9a31..0114b9a31 100644
--- a/test cases/failing/128 subproject object as a dependency/meson.build
+++ b/test cases/failing/126 subproject object as a dependency/meson.build
diff --git a/test cases/failing/128 subproject object as a dependency/subprojects/sub/meson.build b/test cases/failing/126 subproject object as a dependency/subprojects/sub/meson.build
index 0adfd6a6e..0adfd6a6e 100644
--- a/test cases/failing/128 subproject object as a dependency/subprojects/sub/meson.build
+++ b/test cases/failing/126 subproject object as a dependency/subprojects/sub/meson.build
diff --git a/test cases/failing/128 subproject object as a dependency/test.json b/test cases/failing/126 subproject object as a dependency/test.json
index b04bf3766..4bf7f5b8b 100644
--- a/test cases/failing/128 subproject object as a dependency/test.json
+++ b/test cases/failing/126 subproject object as a dependency/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/128 subproject object as a dependency/meson.build:3:0: ERROR: Tried to use subproject object as a dependency."
+      "line": "test cases/failing/126 subproject object as a dependency/meson.build:3:0: ERROR: Tried to use subproject object as a dependency."
     }
   ]
 }
diff --git a/test cases/failing/129 generator host binary/exe.c b/test cases/failing/127 generator host binary/exe.c
index 78f2de106..78f2de106 100644
--- a/test cases/failing/129 generator host binary/exe.c
+++ b/test cases/failing/127 generator host binary/exe.c
diff --git a/test cases/failing/129 generator host binary/lib.in b/test cases/failing/127 generator host binary/lib.in
index d0b6ab765..d0b6ab765 100644
--- a/test cases/failing/129 generator host binary/lib.in
+++ b/test cases/failing/127 generator host binary/lib.in
diff --git a/test cases/failing/129 generator host binary/meson.build b/test cases/failing/127 generator host binary/meson.build
index e76933878..e76933878 100644
--- a/test cases/failing/129 generator host binary/meson.build
+++ b/test cases/failing/127 generator host binary/meson.build
diff --git a/test cases/failing/129 generator host binary/test.json b/test cases/failing/127 generator host binary/test.json
index 7e354d60d..7e354d60d 100644
--- a/test cases/failing/129 generator host binary/test.json
+++ b/test cases/failing/127 generator host binary/test.json
diff --git a/test cases/failing/130 invalid ast/meson.build b/test cases/failing/128 invalid ast/meson.build
index 06011c2ca..06011c2ca 100644
--- a/test cases/failing/130 invalid ast/meson.build
+++ b/test cases/failing/128 invalid ast/meson.build
diff --git a/test cases/failing/130 invalid ast/test.json b/test cases/failing/128 invalid ast/test.json
index 285d078ad..e5c3873dc 100644
--- a/test cases/failing/130 invalid ast/test.json
+++ b/test cases/failing/128 invalid ast/test.json
@@ -2,7 +2,7 @@
   "stdout": [
     {
       "match": "re",
-      "line": "test cases/failing/130 invalid ast/meson.build:1:44: ERROR: Meson version is [0-9.]+(\\.rc[0-9]+)? but project requires 0.1.0"
+      "line": "test cases/failing/128 invalid ast/meson.build:1:44: ERROR: Meson version is [0-9.]+(\\.rc[0-9]+)? but project requires 0.1.0"
     }
   ]
 }
diff --git a/test cases/failing/131 invalid project function/meson.build b/test cases/failing/129 invalid project function/meson.build
index 0032c9c95..0032c9c95 100644
--- a/test cases/failing/131 invalid project function/meson.build
+++ b/test cases/failing/129 invalid project function/meson.build
diff --git a/test cases/failing/131 invalid project function/test.json b/test cases/failing/129 invalid project function/test.json
index e6814c665..b28266cb1 100644
--- a/test cases/failing/131 invalid project function/test.json
+++ b/test cases/failing/129 invalid project function/test.json
@@ -2,7 +2,7 @@
   "stdout": [
     {
       "match": "re",
-      "line": "test cases/failing/131 invalid project function/meson.build:1:67: ERROR: Meson version is [0-9.]+(\\.rc[0-9]+)? but project requires 0.1.0"
+      "line": "test cases/failing/129 invalid project function/meson.build:1:67: ERROR: Meson version is [0-9.]+(\\.rc[0-9]+)? but project requires 0.1.0"
     }
   ]
 }
diff --git a/test cases/failing/55 or on new line/meson.build b/test cases/failing/53 or on new line/meson.build
index b0bd08efa..b0bd08efa 100644
--- a/test cases/failing/55 or on new line/meson.build
+++ b/test cases/failing/53 or on new line/meson.build
diff --git a/test cases/failing/55 or on new line/meson_options.txt b/test cases/failing/53 or on new line/meson_options.txt
index 3302cf4ec..3302cf4ec 100644
--- a/test cases/failing/55 or on new line/meson_options.txt
+++ b/test cases/failing/53 or on new line/meson_options.txt
diff --git a/test cases/failing/55 or on new line/test.json b/test cases/failing/53 or on new line/test.json
index f1b8a673c..339002555 100644
--- a/test cases/failing/55 or on new line/test.json
+++ b/test cases/failing/53 or on new line/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/55 or on new line/meson.build:4:8: ERROR: Invalid or clause."
+      "line": "test cases/failing/53 or on new line/meson.build:4:8: ERROR: Invalid or clause."
     }
   ]
 }
diff --git a/test cases/failing/56 link with executable/meson.build b/test cases/failing/54 link with executable/meson.build
index 186b3e595..186b3e595 100644
--- a/test cases/failing/56 link with executable/meson.build
+++ b/test cases/failing/54 link with executable/meson.build
diff --git a/test cases/failing/56 link with executable/module.c b/test cases/failing/54 link with executable/module.c
index dc0124a24..dc0124a24 100644
--- a/test cases/failing/56 link with executable/module.c
+++ b/test cases/failing/54 link with executable/module.c
diff --git a/test cases/failing/56 link with executable/prog.c b/test cases/failing/54 link with executable/prog.c
index f3836d7ba..f3836d7ba 100644
--- a/test cases/failing/56 link with executable/prog.c
+++ b/test cases/failing/54 link with executable/prog.c
diff --git a/test cases/failing/56 link with executable/test.json b/test cases/failing/54 link with executable/test.json
index b137f4f29..2b51bdd5a 100644
--- a/test cases/failing/56 link with executable/test.json
+++ b/test cases/failing/54 link with executable/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/56 link with executable/meson.build:4:4: ERROR: Link target 'prog' is not linkable."
+      "line": "test cases/failing/54 link with executable/meson.build:4:4: ERROR: Link target 'prog' is not linkable."
     }
   ]
 }
diff --git a/test cases/failing/57 assign custom target index/meson.build b/test cases/failing/55 assign custom target index/meson.build
index 7f2a820b8..7f2a820b8 100644
--- a/test cases/failing/57 assign custom target index/meson.build
+++ b/test cases/failing/55 assign custom target index/meson.build
diff --git a/test cases/failing/57 assign custom target index/test.json b/test cases/failing/55 assign custom target index/test.json
index 392137ac1..39983fb67 100644
--- a/test cases/failing/57 assign custom target index/test.json
+++ b/test cases/failing/55 assign custom target index/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/57 assign custom target index/meson.build:24:0: ERROR: Assignment target must be an id."
+      "line": "test cases/failing/55 assign custom target index/meson.build:24:0: ERROR: Assignment target must be an id."
     }
   ]
 }
diff --git a/test cases/failing/58 getoption prefix/meson.build b/test cases/failing/56 getoption prefix/meson.build
index 8f85cff2a..8f85cff2a 100644
--- a/test cases/failing/58 getoption prefix/meson.build
+++ b/test cases/failing/56 getoption prefix/meson.build
diff --git a/test cases/failing/58 getoption prefix/subprojects/abc/meson.build b/test cases/failing/56 getoption prefix/subprojects/abc/meson.build
index aa9c3df0f..aa9c3df0f 100644
--- a/test cases/failing/58 getoption prefix/subprojects/abc/meson.build
+++ b/test cases/failing/56 getoption prefix/subprojects/abc/meson.build
diff --git a/test cases/failing/58 getoption prefix/subprojects/abc/meson_options.txt b/test cases/failing/56 getoption prefix/subprojects/abc/meson_options.txt
index 89e624e24..89e624e24 100644
--- a/test cases/failing/58 getoption prefix/subprojects/abc/meson_options.txt
+++ b/test cases/failing/56 getoption prefix/subprojects/abc/meson_options.txt
diff --git a/test cases/failing/58 getoption prefix/test.json b/test cases/failing/56 getoption prefix/test.json
index 630dcd99b..c52dffc71 100644
--- a/test cases/failing/58 getoption prefix/test.json
+++ b/test cases/failing/56 getoption prefix/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "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."
+      "line": "test cases/failing/56 getoption prefix/meson.build:5:0: ERROR: Having a colon in option name is forbidden, projects are not allowed to directly access options of other subprojects."
     }
   ]
 }
diff --git a/test cases/failing/59 bad option argument/meson.build b/test cases/failing/57 bad option argument/meson.build
index 5219cfb96..5219cfb96 100644
--- a/test cases/failing/59 bad option argument/meson.build
+++ b/test cases/failing/57 bad option argument/meson.build
diff --git a/test cases/failing/59 bad option argument/meson_options.txt b/test cases/failing/57 bad option argument/meson_options.txt
index 0e0372b89..0e0372b89 100644
--- a/test cases/failing/59 bad option argument/meson_options.txt
+++ b/test cases/failing/57 bad option argument/meson_options.txt
diff --git a/test cases/failing/59 bad option argument/test.json b/test cases/failing/57 bad option argument/test.json
index 9d22a9a22..622acdffc 100644
--- a/test cases/failing/59 bad option argument/test.json
+++ b/test cases/failing/57 bad option argument/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/59 bad option argument/meson_options.txt:1:0: ERROR: string option got unknown keyword arguments \"value_\""
+      "line": "test cases/failing/57 bad option argument/meson_options.txt:1:0: ERROR: string option got unknown keyword arguments \"value_\""
     }
   ]
 }
diff --git a/test cases/failing/60 subproj filegrab/meson.build b/test cases/failing/58 subproj filegrab/meson.build
index b5c484cac..b5c484cac 100644
--- a/test cases/failing/60 subproj filegrab/meson.build
+++ b/test cases/failing/58 subproj filegrab/meson.build
diff --git a/test cases/failing/60 subproj filegrab/prog.c b/test cases/failing/58 subproj filegrab/prog.c
index 0314ff17b..0314ff17b 100644
--- a/test cases/failing/60 subproj filegrab/prog.c
+++ b/test cases/failing/58 subproj filegrab/prog.c
diff --git a/test cases/failing/60 subproj filegrab/subprojects/a/meson.build b/test cases/failing/58 subproj filegrab/subprojects/a/meson.build
index 80b988804..80b988804 100644
--- a/test cases/failing/60 subproj filegrab/subprojects/a/meson.build
+++ b/test cases/failing/58 subproj filegrab/subprojects/a/meson.build
diff --git a/test cases/failing/60 subproj filegrab/test.json b/test cases/failing/58 subproj filegrab/test.json
index 04a6dbbdd..950e109c9 100644
--- a/test cases/failing/60 subproj filegrab/test.json
+++ b/test cases/failing/58 subproj filegrab/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "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."
+      "line": "test cases/failing/58 subproj filegrab/subprojects/a/meson.build:3:0: ERROR: Sandbox violation: Tried to grab file prog.c outside current (sub)project."
     }
   ]
 }
diff --git a/test cases/failing/61 grab subproj/meson.build b/test cases/failing/59 grab subproj/meson.build
index 30fc69093..30fc69093 100644
--- a/test cases/failing/61 grab subproj/meson.build
+++ b/test cases/failing/59 grab subproj/meson.build
diff --git a/test cases/failing/61 grab subproj/subprojects/foo/meson.build b/test cases/failing/59 grab subproj/subprojects/foo/meson.build
index b346f6d9a..b346f6d9a 100644
--- a/test cases/failing/61 grab subproj/subprojects/foo/meson.build
+++ b/test cases/failing/59 grab subproj/subprojects/foo/meson.build
diff --git a/test cases/failing/61 grab subproj/subprojects/foo/sub.c b/test cases/failing/59 grab subproj/subprojects/foo/sub.c
index a94b1f5ad..a94b1f5ad 100644
--- a/test cases/failing/61 grab subproj/subprojects/foo/sub.c
+++ b/test cases/failing/59 grab subproj/subprojects/foo/sub.c
diff --git a/test cases/failing/61 grab subproj/test.json b/test cases/failing/59 grab subproj/test.json
index 873ec6c06..7c9020280 100644
--- a/test cases/failing/61 grab subproj/test.json
+++ b/test cases/failing/59 grab subproj/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/61 grab subproj/meson.build:7:0: ERROR: Sandbox violation: Tried to grab file sub.c from a nested subproject."
+      "line": "test cases/failing/59 grab subproj/meson.build:7:0: ERROR: Sandbox violation: Tried to grab file sub.c from a nested subproject."
     }
   ]
 }
diff --git a/test cases/failing/62 grab sibling/meson.build b/test cases/failing/60 grab sibling/meson.build
index 5ddc295e9..5ddc295e9 100644
--- a/test cases/failing/62 grab sibling/meson.build
+++ b/test cases/failing/60 grab sibling/meson.build
diff --git a/test cases/failing/62 grab sibling/subprojects/a/meson.build b/test cases/failing/60 grab sibling/subprojects/a/meson.build
index 6dd9f61fc..6dd9f61fc 100644
--- a/test cases/failing/62 grab sibling/subprojects/a/meson.build
+++ b/test cases/failing/60 grab sibling/subprojects/a/meson.build
diff --git a/test cases/failing/62 grab sibling/subprojects/b/meson.build b/test cases/failing/60 grab sibling/subprojects/b/meson.build
index 57f261a24..57f261a24 100644
--- a/test cases/failing/62 grab sibling/subprojects/b/meson.build
+++ b/test cases/failing/60 grab sibling/subprojects/b/meson.build
diff --git a/test cases/failing/62 grab sibling/subprojects/b/sneaky.c b/test cases/failing/60 grab sibling/subprojects/b/sneaky.c
index 46718c6cc..46718c6cc 100644
--- a/test cases/failing/62 grab sibling/subprojects/b/sneaky.c
+++ b/test cases/failing/60 grab sibling/subprojects/b/sneaky.c
diff --git a/test cases/failing/62 grab sibling/test.json b/test cases/failing/60 grab sibling/test.json
index 9e7c4bbf1..8f42badb3 100644
--- a/test cases/failing/62 grab sibling/test.json
+++ b/test cases/failing/60 grab sibling/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "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."
+      "line": "test cases/failing/60 grab sibling/subprojects/a/meson.build:3:0: ERROR: Sandbox violation: Tried to grab file sneaky.c outside current (sub)project."
     }
   ]
 }
diff --git a/test cases/failing/63 string as link target/meson.build b/test cases/failing/61 string as link target/meson.build
index cb83fff6a..cb83fff6a 100644
--- a/test cases/failing/63 string as link target/meson.build
+++ b/test cases/failing/61 string as link target/meson.build
diff --git a/test cases/failing/63 string as link target/prog.c b/test cases/failing/61 string as link target/prog.c
index 0314ff17b..0314ff17b 100644
--- a/test cases/failing/63 string as link target/prog.c
+++ b/test cases/failing/61 string as link target/prog.c
diff --git a/test cases/failing/63 string as link target/test.json b/test cases/failing/61 string as link target/test.json
index a531d647e..b7f6bd784 100644
--- a/test cases/failing/63 string as link target/test.json
+++ b/test cases/failing/61 string as link target/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/63 string as link target/meson.build:2:0: ERROR: '' is not a target."
+      "line": "test cases/failing/61 string as link target/meson.build:2:0: ERROR: '' is not a target."
     }
   ]
 }
diff --git a/test cases/failing/64 dependency not-found and required/meson.build b/test cases/failing/62 dependency not-found and required/meson.build
index 1ce574738..1ce574738 100644
--- a/test cases/failing/64 dependency not-found and required/meson.build
+++ b/test cases/failing/62 dependency not-found and required/meson.build
diff --git a/test cases/failing/64 dependency not-found and required/test.json b/test cases/failing/62 dependency not-found and required/test.json
index ceb521e49..69a67ffbb 100644
--- a/test cases/failing/64 dependency not-found and required/test.json
+++ b/test cases/failing/62 dependency not-found and required/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/64 dependency not-found and required/meson.build:2:6: ERROR: Dependency is required but has no candidates."
+      "line": "test cases/failing/62 dependency not-found and required/meson.build:2:6: ERROR: Dependency is required but has no candidates."
     }
   ]
 }
diff --git a/test cases/failing/65 subproj different versions/main.c b/test cases/failing/63 subproj different versions/main.c
index 8793c623a..8793c623a 100644
--- a/test cases/failing/65 subproj different versions/main.c
+++ b/test cases/failing/63 subproj different versions/main.c
diff --git a/test cases/failing/65 subproj different versions/meson.build b/test cases/failing/63 subproj different versions/meson.build
index e964e423e..e964e423e 100644
--- a/test cases/failing/65 subproj different versions/meson.build
+++ b/test cases/failing/63 subproj different versions/meson.build
diff --git a/test cases/failing/65 subproj different versions/subprojects/a/a.c b/test cases/failing/63 subproj different versions/subprojects/a/a.c
index cd41a6588..cd41a6588 100644
--- a/test cases/failing/65 subproj different versions/subprojects/a/a.c
+++ b/test cases/failing/63 subproj different versions/subprojects/a/a.c
diff --git a/test cases/failing/65 subproj different versions/subprojects/a/a.h b/test cases/failing/63 subproj different versions/subprojects/a/a.h
index 8f1d49eda..8f1d49eda 100644
--- a/test cases/failing/65 subproj different versions/subprojects/a/a.h
+++ b/test cases/failing/63 subproj different versions/subprojects/a/a.h
diff --git a/test cases/failing/65 subproj different versions/subprojects/a/meson.build b/test cases/failing/63 subproj different versions/subprojects/a/meson.build
index e84182a07..e84182a07 100644
--- a/test cases/failing/65 subproj different versions/subprojects/a/meson.build
+++ b/test cases/failing/63 subproj different versions/subprojects/a/meson.build
diff --git a/test cases/failing/65 subproj different versions/subprojects/b/b.c b/test cases/failing/63 subproj different versions/subprojects/b/b.c
index f85f8c3f8..f85f8c3f8 100644
--- a/test cases/failing/65 subproj different versions/subprojects/b/b.c
+++ b/test cases/failing/63 subproj different versions/subprojects/b/b.c
diff --git a/test cases/failing/65 subproj different versions/subprojects/b/b.h b/test cases/failing/63 subproj different versions/subprojects/b/b.h
index eced786a0..eced786a0 100644
--- a/test cases/failing/65 subproj different versions/subprojects/b/b.h
+++ b/test cases/failing/63 subproj different versions/subprojects/b/b.h
diff --git a/test cases/failing/65 subproj different versions/subprojects/b/meson.build b/test cases/failing/63 subproj different versions/subprojects/b/meson.build
index 0398340e6..0398340e6 100644
--- a/test cases/failing/65 subproj different versions/subprojects/b/meson.build
+++ b/test cases/failing/63 subproj different versions/subprojects/b/meson.build
diff --git a/test cases/failing/65 subproj different versions/subprojects/c/c.h b/test cases/failing/63 subproj different versions/subprojects/c/c.h
index 2b15f607c..2b15f607c 100644
--- a/test cases/failing/65 subproj different versions/subprojects/c/c.h
+++ b/test cases/failing/63 subproj different versions/subprojects/c/c.h
diff --git a/test cases/failing/65 subproj different versions/subprojects/c/meson.build b/test cases/failing/63 subproj different versions/subprojects/c/meson.build
index 7184933b2..7184933b2 100644
--- a/test cases/failing/65 subproj different versions/subprojects/c/meson.build
+++ b/test cases/failing/63 subproj different versions/subprojects/c/meson.build
diff --git a/test cases/failing/65 subproj different versions/test.json b/test cases/failing/63 subproj different versions/test.json
index d18a823d1..f2535fafd 100644
--- a/test cases/failing/65 subproj different versions/test.json
+++ b/test cases/failing/63 subproj different versions/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/65 subproj different versions/subprojects/b/meson.build:3:8: ERROR: Dependency 'c' is required but not found."
+      "line": "test cases/failing/63 subproj different versions/subprojects/b/meson.build:3:8: ERROR: Dependency 'c' is required but not found."
     }
   ]
 }
diff --git a/test cases/failing/66 wrong boost module/meson.build b/test cases/failing/64 wrong boost module/meson.build
index 937e58749..937e58749 100644
--- a/test cases/failing/66 wrong boost module/meson.build
+++ b/test cases/failing/64 wrong boost module/meson.build
diff --git a/test cases/failing/66 wrong boost module/test.json b/test cases/failing/64 wrong boost module/test.json
index 7d646d4b4..78e206999 100644
--- a/test cases/failing/66 wrong boost module/test.json
+++ b/test cases/failing/64 wrong boost module/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/66 wrong boost module/meson.build:9:10: ERROR: Dependency \"boost\" not found, tried system"
+      "line": "test cases/failing/64 wrong boost module/meson.build:9:10: ERROR: Dependency \"boost\" not found, tried system"
     }
   ]
 }
diff --git a/test cases/failing/67 install_data rename bad size/file1.txt b/test cases/failing/65 install_data rename bad size/file1.txt
index e69de29bb..e69de29bb 100644
--- a/test cases/failing/67 install_data rename bad size/file1.txt
+++ b/test cases/failing/65 install_data rename bad size/file1.txt
diff --git a/test cases/failing/67 install_data rename bad size/file2.txt b/test cases/failing/65 install_data rename bad size/file2.txt
index e69de29bb..e69de29bb 100644
--- a/test cases/failing/67 install_data rename bad size/file2.txt
+++ b/test cases/failing/65 install_data rename bad size/file2.txt
diff --git a/test cases/failing/67 install_data rename bad size/meson.build b/test cases/failing/65 install_data rename bad size/meson.build
index 849bb9aec..849bb9aec 100644
--- a/test cases/failing/67 install_data rename bad size/meson.build
+++ b/test cases/failing/65 install_data rename bad size/meson.build
diff --git a/test cases/failing/67 install_data rename bad size/test.json b/test cases/failing/65 install_data rename bad size/test.json
index af1f0d977..efc62907d 100644
--- a/test cases/failing/67 install_data rename bad size/test.json
+++ b/test cases/failing/65 install_data rename bad size/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "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."
+      "line": "test cases/failing/65 install_data rename bad size/meson.build:3:0: ERROR: \"rename\" and \"sources\" argument lists must be the same length if \"rename\" is given. Rename has 1 elements and sources has 2."
     }
   ]
 }
diff --git a/test cases/failing/68 skip only subdir/meson.build b/test cases/failing/66 skip only subdir/meson.build
index 4832bd49c..4832bd49c 100644
--- a/test cases/failing/68 skip only subdir/meson.build
+++ b/test cases/failing/66 skip only subdir/meson.build
diff --git a/test cases/failing/68 skip only subdir/subdir/meson.build b/test cases/failing/66 skip only subdir/subdir/meson.build
index 1ba447b22..1ba447b22 100644
--- a/test cases/failing/68 skip only subdir/subdir/meson.build
+++ b/test cases/failing/66 skip only subdir/subdir/meson.build
diff --git a/test cases/failing/68 skip only subdir/test.json b/test cases/failing/66 skip only subdir/test.json
index 4558847dd..de21e006c 100644
--- a/test cases/failing/68 skip only subdir/test.json
+++ b/test cases/failing/66 skip only subdir/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/68 skip only subdir/meson.build:8:0: ERROR: File main.cpp does not exist."
+      "line": "test cases/failing/66 skip only subdir/meson.build:8:0: ERROR: File main.cpp does not exist."
     }
   ]
 }
diff --git a/test cases/failing/69 dual override/meson.build b/test cases/failing/67 dual override/meson.build
index 999b8bc14..999b8bc14 100644
--- a/test cases/failing/69 dual override/meson.build
+++ b/test cases/failing/67 dual override/meson.build
diff --git a/test cases/failing/69 dual override/overrides.py b/test cases/failing/67 dual override/overrides.py
index 49e9b7ad6..49e9b7ad6 100644
--- a/test cases/failing/69 dual override/overrides.py
+++ b/test cases/failing/67 dual override/overrides.py
diff --git a/test cases/failing/69 dual override/test.json b/test cases/failing/67 dual override/test.json
index 784d6b275..b50f3aca8 100644
--- a/test cases/failing/69 dual override/test.json
+++ b/test cases/failing/67 dual override/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/69 dual override/meson.build:5:6: ERROR: Tried to override executable \"override\" which has already been overridden."
+      "line": "test cases/failing/67 dual override/meson.build:5:6: ERROR: Tried to override executable \"override\" which has already been overridden."
     }
   ]
 }
diff --git a/test cases/failing/70 override used/meson.build b/test cases/failing/68 override used/meson.build
index 582fc1b05..582fc1b05 100644
--- a/test cases/failing/70 override used/meson.build
+++ b/test cases/failing/68 override used/meson.build
diff --git a/test cases/failing/70 override used/other.py b/test cases/failing/68 override used/other.py
index f62ba960d..f62ba960d 100755
--- a/test cases/failing/70 override used/other.py
+++ b/test cases/failing/68 override used/other.py
diff --git a/test cases/failing/70 override used/something.py b/test cases/failing/68 override used/something.py
index 64c9454c3..64c9454c3 100755
--- a/test cases/failing/70 override used/something.py
+++ b/test cases/failing/68 override used/something.py
diff --git a/test cases/failing/70 override used/test.json b/test cases/failing/68 override used/test.json
index adb60aa92..f11aac619 100644
--- a/test cases/failing/70 override used/test.json
+++ b/test cases/failing/68 override used/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "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."
+      "line": "test cases/failing/68 override used/meson.build:5:6: ERROR: Tried to override finding of executable \"something.py\" which has already been found."
     }
   ]
 }
diff --git a/test cases/failing/71 run_command unclean exit/meson.build b/test cases/failing/69 run_command unclean exit/meson.build
index f6bf895a8..f6bf895a8 100644
--- a/test cases/failing/71 run_command unclean exit/meson.build
+++ b/test cases/failing/69 run_command unclean exit/meson.build
diff --git a/test cases/failing/71 run_command unclean exit/returncode.py b/test cases/failing/69 run_command unclean exit/returncode.py
index 84dbc5df6..84dbc5df6 100755
--- a/test cases/failing/71 run_command unclean exit/returncode.py
+++ b/test cases/failing/69 run_command unclean exit/returncode.py
diff --git a/test cases/failing/71 run_command unclean exit/test.json b/test cases/failing/69 run_command unclean exit/test.json
index ca5fcbad1..96c2141fc 100644
--- a/test cases/failing/71 run_command unclean exit/test.json
+++ b/test cases/failing/69 run_command unclean exit/test.json
@@ -2,7 +2,7 @@
   "stdout": [
     {
       "match": "re",
-      "line": "test cases/failing/71 run_command unclean exit/meson\\.build:4:0: ERROR: Command `.*['\"].*[\\\\/]test cases[\\\\/]failing[\\\\/]71 run_command unclean exit[\\\\/]\\.[\\\\/]returncode\\.py['\"] 1` failed with status 1\\."
+      "line": "test cases/failing/69 run_command unclean exit/meson\\.build:4:0: ERROR: Command `.*['\"].*[\\\\/]test cases[\\\\/]failing[\\\\/]69 run_command unclean exit[\\\\/]\\.[\\\\/]returncode\\.py['\"] 1` failed with status 1\\."
     }
   ]
 }
diff --git a/test cases/failing/72 int literal leading zero/meson.build b/test cases/failing/70 int literal leading zero/meson.build
index 87c776f49..87c776f49 100644
--- a/test cases/failing/72 int literal leading zero/meson.build
+++ b/test cases/failing/70 int literal leading zero/meson.build
diff --git a/test cases/failing/72 int literal leading zero/test.json b/test cases/failing/70 int literal leading zero/test.json
index 556e49210..fafbf0d04 100644
--- a/test cases/failing/72 int literal leading zero/test.json
+++ b/test cases/failing/70 int literal leading zero/test.json
@@ -2,7 +2,7 @@
   "stdout": [
     {
       "comment": "this error message is not very informative",
-      "line": "test cases/failing/72 int literal leading zero/meson.build:5:13: ERROR: Expecting eof got number."
+      "line": "test cases/failing/70 int literal leading zero/meson.build:5:13: ERROR: Expecting eof got number."
     }
   ]
 }
diff --git a/test cases/failing/73 configuration immutable/input b/test cases/failing/71 configuration immutable/input
index e69de29bb..e69de29bb 100644
--- a/test cases/failing/73 configuration immutable/input
+++ b/test cases/failing/71 configuration immutable/input
diff --git a/test cases/failing/73 configuration immutable/meson.build b/test cases/failing/71 configuration immutable/meson.build
index b6cac4126..b6cac4126 100644
--- a/test cases/failing/73 configuration immutable/meson.build
+++ b/test cases/failing/71 configuration immutable/meson.build
diff --git a/test cases/failing/73 configuration immutable/test.json b/test cases/failing/71 configuration immutable/test.json
index 32d942781..af1a65ddd 100644
--- a/test cases/failing/73 configuration immutable/test.json
+++ b/test cases/failing/71 configuration immutable/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/73 configuration immutable/meson.build:12:16: ERROR: Can not set values on configuration object that has been used."
+      "line": "test cases/failing/71 configuration immutable/meson.build:12:16: ERROR: Can not set values on configuration object that has been used."
     }
   ]
 }
diff --git a/test cases/failing/74 link with shared module on osx/meson.build b/test cases/failing/72 link with shared module on osx/meson.build
index bf18b3626..bf18b3626 100644
--- a/test cases/failing/74 link with shared module on osx/meson.build
+++ b/test cases/failing/72 link with shared module on osx/meson.build
diff --git a/test cases/failing/74 link with shared module on osx/module.c b/test cases/failing/72 link with shared module on osx/module.c
index 81b0d5af0..81b0d5af0 100644
--- a/test cases/failing/74 link with shared module on osx/module.c
+++ b/test cases/failing/72 link with shared module on osx/module.c
diff --git a/test cases/failing/74 link with shared module on osx/prog.c b/test cases/failing/72 link with shared module on osx/prog.c
index 8164d8da1..8164d8da1 100644
--- a/test cases/failing/74 link with shared module on osx/prog.c
+++ b/test cases/failing/72 link with shared module on osx/prog.c
diff --git a/test cases/failing/74 link with shared module on osx/test.json b/test cases/failing/72 link with shared module on osx/test.json
index 09e990616..1a2d78cd7 100644
--- a/test cases/failing/74 link with shared module on osx/test.json
+++ b/test cases/failing/72 link with shared module on osx/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/74 link with shared module on osx/meson.build:8:4: ERROR: target prog links against shared module mymodule. This is not permitted on OSX"
+      "line": "test cases/failing/72 link with shared module on osx/meson.build:8:4: ERROR: target prog links against shared module mymodule. This is not permitted on OSX"
     }
   ]
 }
diff --git a/test cases/failing/75 non-ascii in ascii encoded configure file/config9.h.in b/test cases/failing/73 non-ascii in ascii encoded configure file/config9.h.in
index 323bec64a..323bec64a 100644
--- a/test cases/failing/75 non-ascii in ascii encoded configure file/config9.h.in
+++ b/test cases/failing/73 non-ascii in ascii encoded configure file/config9.h.in
diff --git a/test cases/failing/75 non-ascii in ascii encoded configure file/meson.build b/test cases/failing/73 non-ascii in ascii encoded configure file/meson.build
index eadb627cd..eadb627cd 100644
--- a/test cases/failing/75 non-ascii in ascii encoded configure file/meson.build
+++ b/test cases/failing/73 non-ascii in ascii encoded configure file/meson.build
diff --git a/test cases/failing/75 non-ascii in ascii encoded configure file/test.json b/test cases/failing/73 non-ascii in ascii encoded configure file/test.json
index 3d797f923..63f5bef85 100644
--- a/test cases/failing/75 non-ascii in ascii encoded configure file/test.json
+++ b/test cases/failing/73 non-ascii in ascii encoded configure file/test.json
@@ -2,7 +2,7 @@
   "stdout": [
     {
       "match": "re",
-      "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\\)"
+      "line": "test cases/failing/73 non-ascii in ascii encoded configure file/meson\\.build:5:0: ERROR: Could not write output file .*[\\\\/]config9\\.h: 'ascii' codec can't encode character '\\\\u0434' in position 17: ordinal not in range\\(128\\)"
     }
   ]
 }
diff --git a/test cases/failing/76 subproj dependency not-found and required/meson.build b/test cases/failing/74 subproj dependency not-found and required/meson.build
index c5a296104..c5a296104 100644
--- a/test cases/failing/76 subproj dependency not-found and required/meson.build
+++ b/test cases/failing/74 subproj dependency not-found and required/meson.build
diff --git a/test cases/failing/76 subproj dependency not-found and required/test.json b/test cases/failing/74 subproj dependency not-found and required/test.json
index 52d3a0fef..997bc56b2 100644
--- a/test cases/failing/76 subproj dependency not-found and required/test.json
+++ b/test cases/failing/74 subproj dependency not-found and required/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/76 subproj dependency not-found and required/meson.build:2:10: ERROR: Neither a subproject directory nor a missing.wrap file was found."
+      "line": "test cases/failing/74 subproj dependency not-found and required/meson.build:2:10: ERROR: Neither a subproject directory nor a missing.wrap file was found."
     }
   ]
 }
diff --git a/test cases/failing/77 unfound run/meson.build b/test cases/failing/75 unfound run/meson.build
index 3f37e9a06..3f37e9a06 100644
--- a/test cases/failing/77 unfound run/meson.build
+++ b/test cases/failing/75 unfound run/meson.build
diff --git a/test cases/failing/77 unfound run/test.json b/test cases/failing/75 unfound run/test.json
index 99464bd7b..855c2a477 100644
--- a/test cases/failing/77 unfound run/test.json
+++ b/test cases/failing/75 unfound run/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/77 unfound run/meson.build:4:0: ERROR: Tried to use non-existing executable 'nonexisting_prog'"
+      "line": "test cases/failing/75 unfound run/meson.build:4:0: ERROR: Tried to use non-existing executable 'nonexisting_prog'"
     }
   ]
 }
diff --git a/test cases/failing/78 framework dependency with version/meson.build b/test cases/failing/76 framework dependency with version/meson.build
index ee315ebcb..ee315ebcb 100644
--- a/test cases/failing/78 framework dependency with version/meson.build
+++ b/test cases/failing/76 framework dependency with version/meson.build
diff --git a/test cases/failing/78 framework dependency with version/test.json b/test cases/failing/76 framework dependency with version/test.json
index 8a708316b..07b4a6eba 100644
--- a/test cases/failing/78 framework dependency with version/test.json
+++ b/test cases/failing/76 framework dependency with version/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/78 framework dependency with version/meson.build:8:6: ERROR: Dependency lookup for appleframeworks with method 'framework' failed: Unknown version, but need ['>0']."
+      "line": "test cases/failing/76 framework dependency with version/meson.build:8:6: ERROR: Dependency lookup for appleframeworks with method 'framework' failed: Unknown version, but need ['>0']."
     }
   ]
 }
diff --git a/test cases/failing/79 override exe config/foo.c b/test cases/failing/77 override exe config/foo.c
index 03b2213bb..03b2213bb 100644
--- a/test cases/failing/79 override exe config/foo.c
+++ b/test cases/failing/77 override exe config/foo.c
diff --git a/test cases/failing/79 override exe config/meson.build b/test cases/failing/77 override exe config/meson.build
index a5d09249c..a5d09249c 100644
--- a/test cases/failing/79 override exe config/meson.build
+++ b/test cases/failing/77 override exe config/meson.build
diff --git a/test cases/failing/79 override exe config/test.json b/test cases/failing/77 override exe config/test.json
index 1a671a37e..a0dd7ae6e 100644
--- a/test cases/failing/79 override exe config/test.json
+++ b/test cases/failing/77 override exe config/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "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"
+      "line": "test cases/failing/77 override exe config/meson.build:6:0: ERROR: Program 'bar' was overridden with the compiled executable 'foo' and therefore cannot be used during configuration"
     }
   ]
 }
diff --git a/test cases/failing/80 gl dependency with version/meson.build b/test cases/failing/78 gl dependency with version/meson.build
index 012709302..012709302 100644
--- a/test cases/failing/80 gl dependency with version/meson.build
+++ b/test cases/failing/78 gl dependency with version/meson.build
diff --git a/test cases/failing/80 gl dependency with version/test.json b/test cases/failing/78 gl dependency with version/test.json
index 73d470a70..fbd9ff9ee 100644
--- a/test cases/failing/80 gl dependency with version/test.json
+++ b/test cases/failing/78 gl dependency with version/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/80 gl dependency with version/meson.build:9:6: ERROR: Dependency lookup for gl with method 'system' failed: Unknown version, but need ['>0']."
+      "line": "test cases/failing/78 gl dependency with version/meson.build:9:6: ERROR: Dependency lookup for gl with method 'system' failed: Unknown version, but need ['>0']."
     }
   ]
 }
diff --git a/test cases/failing/81 threads dependency with version/meson.build b/test cases/failing/79 threads dependency with version/meson.build
index 6023faeb6..6023faeb6 100644
--- a/test cases/failing/81 threads dependency with version/meson.build
+++ b/test cases/failing/79 threads dependency with version/meson.build
diff --git a/test cases/failing/81 threads dependency with version/test.json b/test cases/failing/79 threads dependency with version/test.json
index 2c12d6912..890695b64 100644
--- a/test cases/failing/81 threads dependency with version/test.json
+++ b/test cases/failing/79 threads dependency with version/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/81 threads dependency with version/meson.build:3:6: ERROR: Dependency lookup for threads with method 'system' failed: Unknown version, but need ['>0']."
+      "line": "test cases/failing/79 threads dependency with version/meson.build:3:6: ERROR: Dependency lookup for threads with method 'system' failed: Unknown version, but need ['>0']."
     }
   ]
 }
diff --git a/test cases/failing/82 gtest dependency with version/meson.build b/test cases/failing/80 gtest dependency with version/meson.build
index efbffe1e7..efbffe1e7 100644
--- a/test cases/failing/82 gtest dependency with version/meson.build
+++ b/test cases/failing/80 gtest dependency with version/meson.build
diff --git a/test cases/failing/82 gtest dependency with version/test.json b/test cases/failing/80 gtest dependency with version/test.json
index 4eb816eff..3f9934d49 100644
--- a/test cases/failing/82 gtest dependency with version/test.json
+++ b/test cases/failing/80 gtest dependency with version/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/82 gtest dependency with version/meson.build:8:6: ERROR: Dependency 'gtest' is required but not found."
+      "line": "test cases/failing/80 gtest dependency with version/meson.build:8:6: ERROR: Dependency 'gtest' is required but not found."
     }
   ]
 }
diff --git a/test cases/failing/83 dub library/meson.build b/test cases/failing/81 dub library/meson.build
index 306d5b3e5..306d5b3e5 100644
--- a/test cases/failing/83 dub library/meson.build
+++ b/test cases/failing/81 dub library/meson.build
diff --git a/test cases/failing/83 dub library/test.json b/test cases/failing/81 dub library/test.json
index e4248f4f0..2db91eed5 100644
--- a/test cases/failing/83 dub library/test.json
+++ b/test cases/failing/81 dub library/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/83 dub library/meson.build:11:0: ERROR: Dependency \"dubtestproject\" not found"
+      "line": "test cases/failing/81 dub library/meson.build:11:0: ERROR: Dependency \"dubtestproject\" not found"
     }
   ]
 }
diff --git a/test cases/failing/84 dub executable/meson.build b/test cases/failing/82 dub executable/meson.build
index 9a134ea21..9a134ea21 100644
--- a/test cases/failing/84 dub executable/meson.build
+++ b/test cases/failing/82 dub executable/meson.build
diff --git a/test cases/failing/84 dub executable/test.json b/test cases/failing/82 dub executable/test.json
index 6dfff62d0..8ae46b848 100644
--- a/test cases/failing/84 dub executable/test.json
+++ b/test cases/failing/82 dub executable/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/84 dub executable/meson.build:11:0: ERROR: Dependency \"dubtestproject:test1\" not found"
+      "line": "test cases/failing/82 dub executable/meson.build:11:0: ERROR: Dependency \"dubtestproject:test1\" not found"
     }
   ]
 }
diff --git a/test cases/failing/85 dub compiler/meson.build b/test cases/failing/83 dub compiler/meson.build
index 36f1849e5..36f1849e5 100644
--- a/test cases/failing/85 dub compiler/meson.build
+++ b/test cases/failing/83 dub compiler/meson.build
diff --git a/test cases/failing/85 dub compiler/test.json b/test cases/failing/83 dub compiler/test.json
index 50ee39b31..07241d21e 100644
--- a/test cases/failing/85 dub compiler/test.json
+++ b/test cases/failing/83 dub compiler/test.json
@@ -13,7 +13,7 @@
   },
   "stdout": [
     {
-      "line": "test cases/failing/85 dub compiler/meson.build:17:0: ERROR: Dependency \"dubtestproject:test2\" not found"
+      "line": "test cases/failing/83 dub compiler/meson.build:17:0: ERROR: Dependency \"dubtestproject:test2\" not found"
     }
   ]
 }
diff --git a/test cases/failing/86 subproj not-found dep/meson.build b/test cases/failing/84 subproj not-found dep/meson.build
index 2b17df17e..2b17df17e 100644
--- a/test cases/failing/86 subproj not-found dep/meson.build
+++ b/test cases/failing/84 subproj not-found dep/meson.build
diff --git a/test cases/failing/86 subproj not-found dep/subprojects/somesubproj/meson.build b/test cases/failing/84 subproj not-found dep/subprojects/somesubproj/meson.build
index 5f451f401..5f451f401 100644
--- a/test cases/failing/86 subproj not-found dep/subprojects/somesubproj/meson.build
+++ b/test cases/failing/84 subproj not-found dep/subprojects/somesubproj/meson.build
diff --git a/test cases/failing/86 subproj not-found dep/test.json b/test cases/failing/84 subproj not-found dep/test.json
index c1acb9a62..bea1ed0e3 100644
--- a/test cases/failing/86 subproj not-found dep/test.json
+++ b/test cases/failing/84 subproj not-found dep/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/86 subproj not-found dep/meson.build:2:10: ERROR: Dependency '(anonymous)' is required but not found."
+      "line": "test cases/failing/84 subproj not-found dep/meson.build:2:10: ERROR: Dependency '(anonymous)' is required but not found."
     }
   ]
 }
diff --git a/test cases/failing/87 invalid configure file/input b/test cases/failing/85 invalid configure file/input
index e69de29bb..e69de29bb 100644
--- a/test cases/failing/87 invalid configure file/input
+++ b/test cases/failing/85 invalid configure file/input
diff --git a/test cases/failing/87 invalid configure file/meson.build b/test cases/failing/85 invalid configure file/meson.build
index 08eca2bd0..08eca2bd0 100644
--- a/test cases/failing/87 invalid configure file/meson.build
+++ b/test cases/failing/85 invalid configure file/meson.build
diff --git a/test cases/failing/87 invalid configure file/test.json b/test cases/failing/85 invalid configure file/test.json
index d8ea73d5f..1cee20880 100644
--- a/test cases/failing/87 invalid configure file/test.json
+++ b/test cases/failing/85 invalid configure file/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "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"
+      "line": "test cases/failing/85 invalid configure file/meson.build:3:0: ERROR: \"install_dir\" must be specified when \"install\" in a configure_file is true"
     }
   ]
 }
diff --git a/test cases/failing/88 kwarg dupe/meson.build b/test cases/failing/86 kwarg dupe/meson.build
index 06821a278..06821a278 100644
--- a/test cases/failing/88 kwarg dupe/meson.build
+++ b/test cases/failing/86 kwarg dupe/meson.build
diff --git a/test cases/failing/88 kwarg dupe/prog.c b/test cases/failing/86 kwarg dupe/prog.c
index 5f3fbe6a2..5f3fbe6a2 100644
--- a/test cases/failing/88 kwarg dupe/prog.c
+++ b/test cases/failing/86 kwarg dupe/prog.c
diff --git a/test cases/failing/88 kwarg dupe/test.json b/test cases/failing/86 kwarg dupe/test.json
index d152725c9..229debbea 100644
--- a/test cases/failing/88 kwarg dupe/test.json
+++ b/test cases/failing/86 kwarg dupe/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/88 kwarg dupe/meson.build:6:2: ERROR: Entry \"install\" defined both as a keyword argument and in a \"kwarg\" entry."
+      "line": "test cases/failing/86 kwarg dupe/meson.build:6:2: ERROR: Entry \"install\" defined both as a keyword argument and in a \"kwarg\" entry."
     }
   ]
 }
diff --git a/test cases/failing/89 missing pch file/meson.build b/test cases/failing/87 missing pch file/meson.build
index a67b79877..a67b79877 100644
--- a/test cases/failing/89 missing pch file/meson.build
+++ b/test cases/failing/87 missing pch file/meson.build
diff --git a/test cases/failing/89 missing pch file/prog.c b/test cases/failing/87 missing pch file/prog.c
index 11b7fad8e..11b7fad8e 100644
--- a/test cases/failing/89 missing pch file/prog.c
+++ b/test cases/failing/87 missing pch file/prog.c
diff --git a/test cases/failing/89 missing pch file/test.json b/test cases/failing/87 missing pch file/test.json
index 1924bbf3d..a54acb7a7 100644
--- a/test cases/failing/89 missing pch file/test.json
+++ b/test cases/failing/87 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/89 missing pch file/meson.build:2:6: ERROR: File pch/prog.h does not exist."
+      "line": "test cases/failing/87 missing pch file/meson.build:2:6: ERROR: File pch/prog.h does not exist."
     }
   ]
 }
diff --git a/test cases/failing/90 pch source different folder/include/pch.h b/test cases/failing/88 pch source different folder/include/pch.h
index e69de29bb..e69de29bb 100644
--- a/test cases/failing/90 pch source different folder/include/pch.h
+++ b/test cases/failing/88 pch source different folder/include/pch.h
diff --git a/test cases/failing/90 pch source different folder/meson.build b/test cases/failing/88 pch source different folder/meson.build
index d32071772..d32071772 100644
--- a/test cases/failing/90 pch source different folder/meson.build
+++ b/test cases/failing/88 pch source different folder/meson.build
diff --git a/test cases/failing/90 pch source different folder/prog.c b/test cases/failing/88 pch source different folder/prog.c
index 3fb1295e4..3fb1295e4 100644
--- a/test cases/failing/90 pch source different folder/prog.c
+++ b/test cases/failing/88 pch source different folder/prog.c
diff --git a/test cases/failing/90 pch source different folder/src/pch.c b/test cases/failing/88 pch source different folder/src/pch.c
index e69de29bb..e69de29bb 100644
--- a/test cases/failing/90 pch source different folder/src/pch.c
+++ b/test cases/failing/88 pch source different folder/src/pch.c
diff --git a/test cases/failing/90 pch source different folder/test.json b/test cases/failing/88 pch source different folder/test.json
index 49cdcb0f7..60fa4e0a6 100644
--- a/test cases/failing/90 pch source different folder/test.json
+++ b/test cases/failing/88 pch source different folder/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/90 pch source different folder/meson.build:4:6: ERROR: PCH files must be stored in the same folder."
+      "line": "test cases/failing/88 pch source different folder/meson.build:4:6: ERROR: PCH files must be stored in the same folder."
     }
   ]
 }
diff --git a/test cases/failing/91 unknown config tool/meson.build b/test cases/failing/89 unknown config tool/meson.build
index 536976e35..536976e35 100644
--- a/test cases/failing/91 unknown config tool/meson.build
+++ b/test cases/failing/89 unknown config tool/meson.build
diff --git a/test cases/failing/91 unknown config tool/test.json b/test cases/failing/89 unknown config tool/test.json
index e225167d5..f5c0d96ab 100644
--- a/test cases/failing/91 unknown config tool/test.json
+++ b/test cases/failing/89 unknown config tool/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/91 unknown config tool/meson.build:2:0: ERROR: Dependency \"no-such-config-tool\" not found"
+      "line": "test cases/failing/89 unknown config tool/meson.build:2:0: ERROR: Dependency \"no-such-config-tool\" not found"
     }
   ]
 }
diff --git a/test cases/failing/92 custom target install data/Info.plist.cpp b/test cases/failing/90 custom target install data/Info.plist.cpp
index 9ca2fcbaf..9ca2fcbaf 100644
--- a/test cases/failing/92 custom target install data/Info.plist.cpp
+++ b/test cases/failing/90 custom target install data/Info.plist.cpp
diff --git a/test cases/failing/92 custom target install data/meson.build b/test cases/failing/90 custom target install data/meson.build
index 00d348cc0..00d348cc0 100644
--- a/test cases/failing/92 custom target install data/meson.build
+++ b/test cases/failing/90 custom target install data/meson.build
diff --git a/test cases/failing/92 custom target install data/preproc.py b/test cases/failing/90 custom target install data/preproc.py
index e6eba4c6a..e6eba4c6a 100644
--- a/test cases/failing/92 custom target install data/preproc.py
+++ b/test cases/failing/90 custom target install data/preproc.py
diff --git a/test cases/failing/92 custom target install data/test.json b/test cases/failing/90 custom target install data/test.json
index 46ab01362..d495163f2 100644
--- a/test cases/failing/92 custom target install data/test.json
+++ b/test cases/failing/90 custom target install data/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "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\""
+      "line": "test cases/failing/90 custom target install data/meson.build:11:0: ERROR: install_data argument 1 was of type \"CustomTarget\" but should have been one of: \"str\", \"File\""
     }
   ]
 }
diff --git a/test cases/failing/93 add dict non string key/meson.build b/test cases/failing/91 add dict non string key/meson.build
index c81a3f764..c81a3f764 100644
--- a/test cases/failing/93 add dict non string key/meson.build
+++ b/test cases/failing/91 add dict non string key/meson.build
diff --git a/test cases/failing/93 add dict non string key/test.json b/test cases/failing/91 add dict non string key/test.json
index 0ca2f532a..db506b2e0 100644
--- a/test cases/failing/93 add dict non string key/test.json
+++ b/test cases/failing/91 add dict non string key/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/93 add dict non string key/meson.build:9:9: ERROR: Key must be a string"
+      "line": "test cases/failing/91 add dict non string key/meson.build:9:9: ERROR: Key must be a string"
     }
   ]
 }
diff --git a/test cases/failing/94 add dict duplicate keys/meson.build b/test cases/failing/92 add dict duplicate keys/meson.build
index 7a9b523b0..7a9b523b0 100644
--- a/test cases/failing/94 add dict duplicate keys/meson.build
+++ b/test cases/failing/92 add dict duplicate keys/meson.build
diff --git a/test cases/failing/94 add dict duplicate keys/test.json b/test cases/failing/92 add dict duplicate keys/test.json
index 23a557374..b428a5387 100644
--- a/test cases/failing/94 add dict duplicate keys/test.json
+++ b/test cases/failing/92 add dict duplicate keys/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/94 add dict duplicate keys/meson.build:9:27: ERROR: Duplicate dictionary key: myKey"
+      "line": "test cases/failing/92 add dict duplicate keys/meson.build:9:27: ERROR: Duplicate dictionary key: myKey"
     }
   ]
 }
diff --git a/test cases/failing/95 no host get_external_property/meson.build b/test cases/failing/93 no host get_external_property/meson.build
index c9567549f..c9567549f 100644
--- a/test cases/failing/95 no host get_external_property/meson.build
+++ b/test cases/failing/93 no host get_external_property/meson.build
diff --git a/test cases/failing/95 no host get_external_property/test.json b/test cases/failing/93 no host get_external_property/test.json
index 18507e715..b26f3c9b6 100644
--- a/test cases/failing/95 no host get_external_property/test.json
+++ b/test cases/failing/93 no host get_external_property/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/95 no host get_external_property/meson.build:3:14: ERROR: Unknown property for host machine: nonexisting"
+      "line": "test cases/failing/93 no host get_external_property/meson.build:3:14: ERROR: Unknown property for host machine: nonexisting"
     }
   ]
 }
diff --git a/test cases/failing/96 no native compiler/main.c b/test cases/failing/94 no native compiler/main.c
index 9b6bdc2ec..9b6bdc2ec 100644
--- a/test cases/failing/96 no native compiler/main.c
+++ b/test cases/failing/94 no native compiler/main.c
diff --git a/test cases/failing/96 no native compiler/meson.build b/test cases/failing/94 no native compiler/meson.build
index f0126ac15..f0126ac15 100644
--- a/test cases/failing/96 no native compiler/meson.build
+++ b/test cases/failing/94 no native compiler/meson.build
diff --git a/test cases/failing/96 no native compiler/test.json b/test cases/failing/94 no native compiler/test.json
index 01077275c..7181c6b7e 100644
--- a/test cases/failing/96 no native compiler/test.json
+++ b/test cases/failing/94 no native compiler/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/96 no native compiler/meson.build:12:0: ERROR: No host machine compiler for \"main.c\""
+      "line": "test cases/failing/94 no native compiler/meson.build:12:0: ERROR: No host machine compiler for \"main.c\""
     }
   ]
 }
diff --git a/test cases/failing/97 subdir parse error/meson.build b/test cases/failing/95 subdir parse error/meson.build
index a744396ca..a744396ca 100644
--- a/test cases/failing/97 subdir parse error/meson.build
+++ b/test cases/failing/95 subdir parse error/meson.build
diff --git a/test cases/failing/97 subdir parse error/subdir/meson.build b/test cases/failing/95 subdir parse error/subdir/meson.build
index 3ac5ef938..3ac5ef938 100644
--- a/test cases/failing/97 subdir parse error/subdir/meson.build
+++ b/test cases/failing/95 subdir parse error/subdir/meson.build
diff --git a/test cases/failing/97 subdir parse error/test.json b/test cases/failing/95 subdir parse error/test.json
index 414789ee0..c94ed58d4 100644
--- a/test cases/failing/97 subdir parse error/test.json
+++ b/test cases/failing/95 subdir parse error/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/97 subdir parse error/subdir/meson.build:1:0: ERROR: Plusassignment target must be an id."
+      "line": "test cases/failing/95 subdir parse error/subdir/meson.build:1:0: ERROR: Plusassignment target must be an id."
     }
   ]
 }
diff --git a/test cases/failing/98 invalid option file/meson.build b/test cases/failing/96 invalid option file/meson.build
index b0347c33f..b0347c33f 100644
--- a/test cases/failing/98 invalid option file/meson.build
+++ b/test cases/failing/96 invalid option file/meson.build
diff --git a/test cases/failing/98 invalid option file/meson_options.txt b/test cases/failing/96 invalid option file/meson_options.txt
index eef843b53..eef843b53 100644
--- a/test cases/failing/98 invalid option file/meson_options.txt
+++ b/test cases/failing/96 invalid option file/meson_options.txt
diff --git a/test cases/failing/98 invalid option file/test.json b/test cases/failing/96 invalid option file/test.json
index 6ab53931a..5f1a89f7c 100644
--- a/test cases/failing/98 invalid option file/test.json
+++ b/test cases/failing/96 invalid option file/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/98 invalid option file/meson_options.txt:1:0: ERROR: lexer"
+      "line": "test cases/failing/96 invalid option file/meson_options.txt:1:0: ERROR: lexer"
     }
   ]
 }
diff --git a/test cases/failing/99 no lang/main.c b/test cases/failing/97 no lang/main.c
index 9b6bdc2ec..9b6bdc2ec 100644
--- a/test cases/failing/99 no lang/main.c
+++ b/test cases/failing/97 no lang/main.c
diff --git a/test cases/failing/99 no lang/meson.build b/test cases/failing/97 no lang/meson.build
index 85c5db8e5..85c5db8e5 100644
--- a/test cases/failing/99 no lang/meson.build
+++ b/test cases/failing/97 no lang/meson.build
diff --git a/test cases/failing/99 no lang/test.json b/test cases/failing/97 no lang/test.json
index 48c6dd70e..a2af0a197 100644
--- a/test cases/failing/99 no lang/test.json
+++ b/test cases/failing/97 no lang/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/99 no lang/meson.build:2:0: ERROR: No host machine compiler for 'main.c'"
+      "line": "test cases/failing/97 no lang/meson.build:2:0: ERROR: No host machine compiler for 'main.c'"
     }
   ]
 }
diff --git a/test cases/failing/100 no glib-compile-resources/meson.build b/test cases/failing/98 no glib-compile-resources/meson.build
index aae0569da..aae0569da 100644
--- a/test cases/failing/100 no glib-compile-resources/meson.build
+++ b/test cases/failing/98 no glib-compile-resources/meson.build
diff --git a/test cases/failing/98 no glib-compile-resources/test.json b/test cases/failing/98 no glib-compile-resources/test.json
new file mode 100644
index 000000000..d5edd7692
--- /dev/null
+++ b/test cases/failing/98 no glib-compile-resources/test.json
@@ -0,0 +1,7 @@
+{
+  "stdout": [
+    {
+      "line": "test cases/failing/98 no glib-compile-resources/meson.build:8:12: ERROR: Program 'glib-compile-resources' not found or not executable"
+    }
+  ]
+}
diff --git a/test cases/failing/100 no glib-compile-resources/trivial.gresource.xml b/test cases/failing/98 no glib-compile-resources/trivial.gresource.xml
index 1447b984d..1447b984d 100644
--- a/test cases/failing/100 no glib-compile-resources/trivial.gresource.xml
+++ b/test cases/failing/98 no glib-compile-resources/trivial.gresource.xml
diff --git a/test cases/failing/101 number in combo/meson.build b/test cases/failing/99 number in combo/meson.build
index 1a647df1a..1a647df1a 100644
--- a/test cases/failing/101 number in combo/meson.build
+++ b/test cases/failing/99 number in combo/meson.build
diff --git a/test cases/failing/101 number in combo/nativefile.ini b/test cases/failing/99 number in combo/nativefile.ini
index 55f10fc20..55f10fc20 100644
--- a/test cases/failing/101 number in combo/nativefile.ini
+++ b/test cases/failing/99 number in combo/nativefile.ini
diff --git a/test cases/failing/99 number in combo/test.json b/test cases/failing/99 number in combo/test.json
new file mode 100644
index 000000000..f59812e3b
--- /dev/null
+++ b/test cases/failing/99 number in combo/test.json
@@ -0,0 +1,5 @@
+{
+  "stdout": [
+    { "line": "test cases/failing/99 number in combo/meson.build:1:0: ERROR: Value \"1\" (of type \"number\") for combo option \"Optimization level\" is not one of the choices. Possible choices are (as string): \"plain\", \"0\", \"g\", \"1\", \"2\", \"3\", \"s\"." }
+  ]
+}
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 014a61751..014a61751 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 7d8163c3b..7d8163c3b 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/105 debug function/meson.build b/test cases/unit/104 debug function/meson.build
index c3f4c769f..c3f4c769f 100644
--- a/test cases/unit/105 debug function/meson.build
+++ b/test cases/unit/104 debug function/meson.build
diff --git a/test cases/unit/106 pkgconfig relocatable with absolute path/meson.build b/test cases/unit/105 pkgconfig relocatable with absolute path/meson.build
index ff2128624..ff2128624 100644
--- a/test cases/unit/106 pkgconfig relocatable with absolute path/meson.build
+++ b/test cases/unit/105 pkgconfig relocatable with absolute path/meson.build
diff --git a/test cases/unit/110 replace unencodable xml chars/meson.build b/test cases/unit/111 replace unencodable xml chars/meson.build
index 73485b073..73485b073 100644
--- a/test cases/unit/110 replace unencodable xml chars/meson.build
+++ b/test cases/unit/111 replace unencodable xml chars/meson.build
diff --git a/test cases/unit/110 replace unencodable xml chars/script.py b/test cases/unit/111 replace unencodable xml chars/script.py
index 2f2d4d67b..2f2d4d67b 100644
--- a/test cases/unit/110 replace unencodable xml chars/script.py
+++ b/test cases/unit/111 replace unencodable xml chars/script.py
diff --git a/test cases/unit/111 classpath/com/mesonbuild/Simple.java b/test cases/unit/112 classpath/com/mesonbuild/Simple.java
index 325a49a21..325a49a21 100644
--- a/test cases/unit/111 classpath/com/mesonbuild/Simple.java
+++ b/test cases/unit/112 classpath/com/mesonbuild/Simple.java
diff --git a/test cases/unit/111 classpath/meson.build b/test cases/unit/112 classpath/meson.build
index e6b9b840a..e6b9b840a 100644
--- a/test cases/unit/111 classpath/meson.build
+++ b/test cases/unit/112 classpath/meson.build
diff --git a/test cases/unit/112 list build options/meson.build b/test cases/unit/113 list build options/meson.build
index 2d634d38f..2d634d38f 100644
--- a/test cases/unit/112 list build options/meson.build
+++ b/test cases/unit/113 list build options/meson.build
diff --git a/test cases/unit/112 list build options/meson_options.txt b/test cases/unit/113 list build options/meson_options.txt
index d84f22a34..d84f22a34 100644
--- a/test cases/unit/112 list build options/meson_options.txt
+++ b/test cases/unit/113 list build options/meson_options.txt
diff --git a/test cases/unit/113 complex link cases/main.c b/test cases/unit/114 complex link cases/main.c
index 739b413af..739b413af 100644
--- a/test cases/unit/113 complex link cases/main.c
+++ b/test cases/unit/114 complex link cases/main.c
diff --git a/test cases/unit/113 complex link cases/meson.build b/test cases/unit/114 complex link cases/meson.build
index 3b4b898df..3b4b898df 100644
--- a/test cases/unit/113 complex link cases/meson.build
+++ b/test cases/unit/114 complex link cases/meson.build
diff --git a/test cases/unit/113 complex link cases/s1.c b/test cases/unit/114 complex link cases/s1.c
index 68bba4949..68bba4949 100644
--- a/test cases/unit/113 complex link cases/s1.c
+++ b/test cases/unit/114 complex link cases/s1.c
diff --git a/test cases/unit/113 complex link cases/s2.c b/test cases/unit/114 complex link cases/s2.c
index 835870c04..835870c04 100644
--- a/test cases/unit/113 complex link cases/s2.c
+++ b/test cases/unit/114 complex link cases/s2.c
diff --git a/test cases/unit/113 complex link cases/s3.c b/test cases/unit/114 complex link cases/s3.c
index 08e062010..08e062010 100644
--- a/test cases/unit/113 complex link cases/s3.c
+++ b/test cases/unit/114 complex link cases/s3.c
diff --git a/test cases/unit/114 c cpp stds/meson.build b/test cases/unit/115 c cpp stds/meson.build
index 0b15efc08..0b15efc08 100644
--- a/test cases/unit/114 c cpp stds/meson.build
+++ b/test cases/unit/115 c cpp stds/meson.build
diff --git a/test cases/unit/114 empty project/expected_mods.json b/test cases/unit/116 empty project/expected_mods.json
index 7463bcb12..7463bcb12 100644
--- a/test cases/unit/114 empty project/expected_mods.json
+++ b/test cases/unit/116 empty project/expected_mods.json
diff --git a/test cases/unit/114 empty project/meson.build b/test cases/unit/116 empty project/meson.build
index b92b9b411..b92b9b411 100644
--- a/test cases/unit/114 empty project/meson.build
+++ b/test cases/unit/116 empty project/meson.build
diff --git a/test cases/unit/115 genvslite/main.cpp b/test cases/unit/117 genvslite/main.cpp
index ca250bdd6..ca250bdd6 100644
--- a/test cases/unit/115 genvslite/main.cpp
+++ b/test cases/unit/117 genvslite/main.cpp
diff --git a/test cases/unit/115 genvslite/meson.build b/test cases/unit/117 genvslite/meson.build
index 3445d7f33..3445d7f33 100644
--- a/test cases/unit/115 genvslite/meson.build
+++ b/test cases/unit/117 genvslite/meson.build
diff --git a/test cases/unit/116 meson package cache dir/cache_dir/bar/meson.build b/test cases/unit/118 meson package cache dir/cache_dir/bar/meson.build
index dca36f656..dca36f656 100644
--- a/test cases/unit/116 meson package cache dir/cache_dir/bar/meson.build
+++ b/test cases/unit/118 meson package cache dir/cache_dir/bar/meson.build
diff --git a/test cases/unit/116 meson package cache dir/cache_dir/foo.zip b/test cases/unit/118 meson package cache dir/cache_dir/foo.zip
index 91bc36aca..91bc36aca 100644
--- a/test cases/unit/116 meson package cache dir/cache_dir/foo.zip
+++ b/test cases/unit/118 meson package cache dir/cache_dir/foo.zip
diff --git a/test cases/unit/116 meson package cache dir/meson.build b/test cases/unit/118 meson package cache dir/meson.build
index 2057bba89..2057bba89 100644
--- a/test cases/unit/116 meson package cache dir/meson.build
+++ b/test cases/unit/118 meson package cache dir/meson.build
diff --git a/test cases/unit/116 meson package cache dir/subprojects/bar.wrap b/test cases/unit/118 meson package cache dir/subprojects/bar.wrap
index 3ec58343b..3ec58343b 100644
--- a/test cases/unit/116 meson package cache dir/subprojects/bar.wrap
+++ b/test cases/unit/118 meson package cache dir/subprojects/bar.wrap
diff --git a/test cases/unit/116 meson package cache dir/subprojects/foo.wrap b/test cases/unit/118 meson package cache dir/subprojects/foo.wrap
index b7dd41de5..b7dd41de5 100644
--- a/test cases/unit/116 meson package cache dir/subprojects/foo.wrap
+++ b/test cases/unit/118 meson package cache dir/subprojects/foo.wrap
diff --git a/test cases/unit/117 openssl cmake bug/meson.build b/test cases/unit/119 openssl cmake bug/meson.build
index d08a8ef42..d08a8ef42 100644
--- a/test cases/unit/117 openssl cmake bug/meson.build
+++ b/test cases/unit/119 openssl cmake bug/meson.build
diff --git a/test cases/unit/117 openssl cmake bug/nativefile.ini b/test cases/unit/119 openssl cmake bug/nativefile.ini
index dd6b0ff29..dd6b0ff29 100644
--- a/test cases/unit/117 openssl cmake bug/nativefile.ini
+++ b/test cases/unit/119 openssl cmake bug/nativefile.ini
diff --git a/test cases/unit/118 rewrite/meson.build b/test cases/unit/120 rewrite/meson.build
index 7d0330b9e..7d0330b9e 100644
--- a/test cases/unit/118 rewrite/meson.build
+++ b/test cases/unit/120 rewrite/meson.build
diff --git a/test cases/unit/119 executable suffix/main.c b/test cases/unit/121 executable suffix/main.c
index 78f2de106..78f2de106 100644
--- a/test cases/unit/119 executable suffix/main.c
+++ b/test cases/unit/121 executable suffix/main.c
diff --git a/test cases/unit/119 executable suffix/meson.build b/test cases/unit/121 executable suffix/meson.build
index 8f952260c..8f952260c 100644
--- a/test cases/unit/119 executable suffix/meson.build
+++ b/test cases/unit/121 executable suffix/meson.build
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 d661ae4ca..d661ae4ca 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/excludes/excluded.txt b/test cases/unit/98 install all targets/excludes/excluded.txt
index 59b064403..59b064403 100644
--- a/test cases/unit/99 install all targets/excludes/excluded.txt
+++ b/test cases/unit/98 install all targets/excludes/excluded.txt
diff --git a/test cases/unit/99 install all targets/excludes/excluded/placeholder.txt b/test cases/unit/98 install all targets/excludes/excluded/placeholder.txt
index 3b94f9157..3b94f9157 100644
--- a/test cases/unit/99 install all targets/excludes/excluded/placeholder.txt
+++ b/test cases/unit/98 install all targets/excludes/excluded/placeholder.txt
diff --git a/test cases/unit/99 install all targets/excludes/installed.txt b/test cases/unit/98 install all targets/excludes/installed.txt
index 84376928c..84376928c 100644
--- a/test cases/unit/99 install all targets/excludes/installed.txt
+++ b/test cases/unit/98 install all targets/excludes/installed.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 c5f33a054..c5f33a054 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/99 install all targets/subprojects/subproject/aaa.txt b/test cases/unit/98 install all targets/subprojects/subproject/aaa.txt
index 43d5a8ed6..43d5a8ed6 100644
--- a/test cases/unit/99 install all targets/subprojects/subproject/aaa.txt
+++ b/test cases/unit/98 install all targets/subprojects/subproject/aaa.txt
diff --git a/test cases/unit/99 install all targets/subprojects/subproject/bbb.txt b/test cases/unit/98 install all targets/subprojects/subproject/bbb.txt
index ba629238c..ba629238c 100644
--- a/test cases/unit/99 install all targets/subprojects/subproject/bbb.txt
+++ b/test cases/unit/98 install all targets/subprojects/subproject/bbb.txt
diff --git a/test cases/unit/99 install all targets/subprojects/subproject/meson.build b/test cases/unit/98 install all targets/subprojects/subproject/meson.build
index ff474ace1..ff474ace1 100644
--- a/test cases/unit/99 install all targets/subprojects/subproject/meson.build
+++ b/test cases/unit/98 install all targets/subprojects/subproject/meson.build
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 82876149f..82876149f 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