Condense directory names for rc1.

425 files changed, 118 insertions, 118 deletions

diff --git a/test cases/failing/100 compiler no lang/test.json b/test cases/failing/100 compiler no lang/test.json
deleted file mode 100644
index 935d79d1c..000000000
--- a/test cases/failing/100 compiler no lang/test.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "stdout": [
-    {
-      "line": "test cases/failing/100 compiler no lang/meson.build:2:6: ERROR: Tried to access compiler for language \"c\", not specified for host machine."
-    }
-  ]
-}
diff --git a/test cases/failing/101 no fallback/meson.build b/test cases/failing/100 no fallback/meson.build
index 91d6b9370..91d6b9370 100644
--- a/test cases/failing/101 no fallback/meson.build
+++ b/test cases/failing/100 no fallback/meson.build
diff --git a/test cases/failing/101 no fallback/subprojects/foob/meson.build b/test cases/failing/100 no fallback/subprojects/foob/meson.build
index b2c4814e2..b2c4814e2 100644
--- a/test cases/failing/101 no fallback/subprojects/foob/meson.build
+++ b/test cases/failing/100 no fallback/subprojects/foob/meson.build
diff --git a/test cases/failing/101 no fallback/test.json b/test cases/failing/100 no fallback/test.json
index 5fbffe35d..5fbffe35d 100644
--- a/test cases/failing/101 no fallback/test.json
+++ b/test cases/failing/100 no fallback/test.json
diff --git a/test cases/failing/102 feature require/meson.build b/test cases/failing/101 feature require/meson.build
index 8c47e3763..8c47e3763 100644
--- a/test cases/failing/102 feature require/meson.build
+++ b/test cases/failing/101 feature require/meson.build
diff --git a/test cases/failing/102 feature require/meson_options.txt b/test cases/failing/101 feature require/meson_options.txt
index 5910a8737..5910a8737 100644
--- a/test cases/failing/102 feature require/meson_options.txt
+++ b/test cases/failing/101 feature require/meson_options.txt
diff --git a/test cases/failing/102 feature require/test.json b/test cases/failing/101 feature require/test.json
index 2da54948f..2da54948f 100644
--- a/test cases/failing/102 feature require/test.json
+++ b/test cases/failing/101 feature require/test.json
diff --git a/test cases/failing/103 feature require.bis/meson.build b/test cases/failing/102 feature require.bis/meson.build
index 4ea65e5e0..4ea65e5e0 100644
--- a/test cases/failing/103 feature require.bis/meson.build
+++ b/test cases/failing/102 feature require.bis/meson.build
diff --git a/test cases/failing/103 feature require.bis/meson_options.txt b/test cases/failing/102 feature require.bis/meson_options.txt
index 5910a8737..5910a8737 100644
--- a/test cases/failing/103 feature require.bis/meson_options.txt
+++ b/test cases/failing/102 feature require.bis/meson_options.txt
diff --git a/test cases/failing/103 feature require.bis/test.json b/test cases/failing/102 feature require.bis/test.json
index ed488affd..ed488affd 100644
--- a/test cases/failing/103 feature require.bis/test.json
+++ b/test cases/failing/102 feature require.bis/test.json
diff --git a/test cases/failing/104 no build get_external_property/meson.build b/test cases/failing/103 no build get_external_property/meson.build
index 8a4215c9f..8a4215c9f 100644
--- a/test cases/failing/104 no build get_external_property/meson.build
+++ b/test cases/failing/103 no build get_external_property/meson.build
diff --git a/test cases/failing/104 no build get_external_property/test.json b/test cases/failing/103 no build get_external_property/test.json
index 5792213b0..74ecb759b 100644
--- a/test cases/failing/104 no build get_external_property/test.json
+++ b/test cases/failing/103 no build get_external_property/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/104 no build get_external_property/meson.build:3:14: ERROR: Unknown property for build machine: nonexisting"
+      "line": "test cases/failing/103 no build get_external_property/meson.build:3:14: ERROR: Unknown property for build machine: nonexisting"
     }
   ]
 }
diff --git a/test cases/failing/105 enter subdir twice/meson.build b/test cases/failing/104 enter subdir twice/meson.build
index d9bf9f56b..d9bf9f56b 100644
--- a/test cases/failing/105 enter subdir twice/meson.build
+++ b/test cases/failing/104 enter subdir twice/meson.build
diff --git a/test cases/failing/105 enter subdir twice/sub/meson.build b/test cases/failing/104 enter subdir twice/sub/meson.build
index d036a3fe5..d036a3fe5 100644
--- a/test cases/failing/105 enter subdir twice/sub/meson.build
+++ b/test cases/failing/104 enter subdir twice/sub/meson.build
diff --git a/test cases/failing/105 enter subdir twice/test.json b/test cases/failing/104 enter subdir twice/test.json
index 80e8c101a..9d6388999 100644
--- a/test cases/failing/105 enter subdir twice/test.json
+++ b/test cases/failing/104 enter subdir twice/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/105 enter subdir twice/meson.build:3:0: ERROR: Tried to enter directory \"sub\", which has already been visited."
+      "line": "test cases/failing/104 enter subdir twice/meson.build:3:0: ERROR: Tried to enter directory \"sub\", which has already been visited."
     }
   ]
 }
diff --git a/test cases/failing/106 invalid fstring/109 invalid fstring/meson.build b/test cases/failing/105 invalid fstring/109 invalid fstring/meson.build
index dd22f56b2..dd22f56b2 100644
--- a/test cases/failing/106 invalid fstring/109 invalid fstring/meson.build
+++ b/test cases/failing/105 invalid fstring/109 invalid fstring/meson.build
diff --git a/test cases/failing/106 invalid fstring/109 invalid fstring/test.json b/test cases/failing/105 invalid fstring/109 invalid fstring/test.json
index 71d8f5927..71d8f5927 100644
--- a/test cases/failing/106 invalid fstring/109 invalid fstring/test.json
+++ b/test cases/failing/105 invalid fstring/109 invalid fstring/test.json
diff --git a/test cases/failing/106 invalid fstring/meson.build b/test cases/failing/105 invalid fstring/meson.build
index 7eb3ccf5c..7eb3ccf5c 100644
--- a/test cases/failing/106 invalid fstring/meson.build
+++ b/test cases/failing/105 invalid fstring/meson.build
diff --git a/test cases/failing/106 invalid fstring/test.json b/test cases/failing/105 invalid fstring/test.json
index 8d5342885..ae2a53196 100644
--- a/test cases/failing/106 invalid fstring/test.json
+++ b/test cases/failing/105 invalid fstring/test.json
@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "line": "test cases/failing/106 invalid fstring/meson.build:3:4: ERROR: Identifier \"foo\" does not name a variable."
+            "line": "test cases/failing/105 invalid fstring/meson.build:3:4: ERROR: Identifier \"foo\" does not name a variable."
         }
     ]
 }
diff --git a/test cases/failing/107 compiler argument checking/meson.build b/test cases/failing/106 compiler argument checking/meson.build
index bb1f44768..bb1f44768 100644
--- a/test cases/failing/107 compiler argument checking/meson.build
+++ b/test cases/failing/106 compiler argument checking/meson.build
diff --git a/test cases/failing/107 compiler argument checking/test.json b/test cases/failing/106 compiler argument checking/test.json
index a1576aa69..262db69f3 100644
--- a/test cases/failing/107 compiler argument checking/test.json
+++ b/test cases/failing/106 compiler argument checking/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-        "line": "test cases/failing/107 compiler argument checking/meson.build:4:25: ERROR: Compiler for C does not support \"-meson-goober-arg-for-testing\""
+        "line": "test cases/failing/106 compiler argument checking/meson.build:4:25: ERROR: Compiler for C does not support \"-meson-goober-arg-for-testing\""
     }
   ]
 }
diff --git a/test cases/failing/108 empty fallback/meson.build b/test cases/failing/107 empty fallback/meson.build
index f4eb5feb9..f4eb5feb9 100644
--- a/test cases/failing/108 empty fallback/meson.build
+++ b/test cases/failing/107 empty fallback/meson.build
diff --git a/test cases/failing/108 empty fallback/subprojects/foo/meson.build b/test cases/failing/107 empty fallback/subprojects/foo/meson.build
index c9e134b5e..c9e134b5e 100644
--- a/test cases/failing/108 empty fallback/subprojects/foo/meson.build
+++ b/test cases/failing/107 empty fallback/subprojects/foo/meson.build
diff --git a/test cases/failing/108 empty fallback/test.json b/test cases/failing/107 empty fallback/test.json
index c63188231..3d69a58f9 100644
--- a/test cases/failing/108 empty fallback/test.json
+++ b/test cases/failing/107 empty fallback/test.json
@@ -2,7 +2,7 @@
     "stdout": [
         {
             "match": "re",
-            "line": "test cases/failing/108 empty fallback/meson.build:6:0: ERROR: Dependency \"foo\" not found.*"
+            "line": "test cases/failing/107 empty fallback/meson.build:6:0: ERROR: Dependency \"foo\" not found.*"
         }
     ]
 }
diff --git a/test cases/failing/109 cmake executable dependency/meson.build b/test cases/failing/108 cmake executable dependency/meson.build
index 0fc0f9b6a..0fc0f9b6a 100644
--- a/test cases/failing/109 cmake executable dependency/meson.build
+++ b/test cases/failing/108 cmake executable dependency/meson.build
diff --git a/test cases/failing/109 cmake executable dependency/subprojects/cmlib/CMakeLists.txt b/test cases/failing/108 cmake executable dependency/subprojects/cmlib/CMakeLists.txt
index e927eae8f..e927eae8f 100644
--- a/test cases/failing/109 cmake executable dependency/subprojects/cmlib/CMakeLists.txt
+++ b/test cases/failing/108 cmake executable dependency/subprojects/cmlib/CMakeLists.txt
diff --git a/test cases/failing/109 cmake executable dependency/subprojects/cmlib/main.c b/test cases/failing/108 cmake executable dependency/subprojects/cmlib/main.c
index 9b6bdc2ec..9b6bdc2ec 100644
--- a/test cases/failing/109 cmake executable dependency/subprojects/cmlib/main.c
+++ b/test cases/failing/108 cmake executable dependency/subprojects/cmlib/main.c
diff --git a/test cases/failing/109 cmake executable dependency/test.json b/test cases/failing/108 cmake executable dependency/test.json
index 92a6ee1c5..5a88b0dac 100644
--- a/test cases/failing/109 cmake executable dependency/test.json
+++ b/test cases/failing/108 cmake executable dependency/test.json
@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "line": "test cases/failing/109 cmake executable dependency/meson.build:5:14: ERROR: main is an executable and does not support the dependency() method. Use target() instead."
+            "line": "test cases/failing/108 cmake executable dependency/meson.build:5:14: ERROR: main is an executable and does not support the dependency() method. Use target() instead."
         }
     ],
     "tools": {
diff --git a/test cases/failing/110 allow_fallback with fallback/meson.build b/test cases/failing/109 allow_fallback with fallback/meson.build
index 2874e424c..2874e424c 100644
--- a/test cases/failing/110 allow_fallback with fallback/meson.build
+++ b/test cases/failing/109 allow_fallback with fallback/meson.build
diff --git a/test cases/failing/110 allow_fallback with fallback/test.json b/test cases/failing/109 allow_fallback with fallback/test.json
index b558eccae..76917b1ab 100644
--- a/test cases/failing/110 allow_fallback with fallback/test.json
+++ b/test cases/failing/109 allow_fallback with fallback/test.json
@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "line": "test cases/failing/110 allow_fallback with fallback/meson.build:3:0: ERROR: \"fallback\" and \"allow_fallback\" arguments are mutually exclusive"
+            "line": "test cases/failing/109 allow_fallback with fallback/meson.build:3:0: ERROR: \"fallback\" and \"allow_fallback\" arguments are mutually exclusive"
         }
     ]
 }
diff --git a/test cases/failing/111 nonsensical bindgen/meson.build b/test cases/failing/110 nonsensical bindgen/meson.build
index 40e9a2d9c..40e9a2d9c 100644
--- a/test cases/failing/111 nonsensical bindgen/meson.build
+++ b/test cases/failing/110 nonsensical bindgen/meson.build
diff --git a/test cases/failing/111 nonsensical bindgen/src/header.h b/test cases/failing/110 nonsensical bindgen/src/header.h
index 5299f13d5..5299f13d5 100644
--- a/test cases/failing/111 nonsensical bindgen/src/header.h
+++ b/test cases/failing/110 nonsensical bindgen/src/header.h
diff --git a/test cases/failing/111 nonsensical bindgen/src/source.c b/test cases/failing/110 nonsensical bindgen/src/source.c
index d968ba4c2..d968ba4c2 100644
--- a/test cases/failing/111 nonsensical bindgen/src/source.c
+++ b/test cases/failing/110 nonsensical bindgen/src/source.c
diff --git a/test cases/failing/111 nonsensical bindgen/test.json b/test cases/failing/110 nonsensical bindgen/test.json
index f2dc92c89..43cfa3a9b 100644
--- a/test cases/failing/111 nonsensical bindgen/test.json
+++ b/test cases/failing/110 nonsensical bindgen/test.json
@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "line": "test cases/failing/111 nonsensical bindgen/meson.build:17:24: ERROR: bindgen source file must be a C header, not an object or build target"
+            "line": "test cases/failing/110 nonsensical bindgen/meson.build:17:24: ERROR: bindgen source file must be a C header, not an object or build target"
         }
     ]
 }
diff --git a/test cases/failing/112 run_target in test/meson.build b/test cases/failing/111 run_target in test/meson.build
index 117009e3f..117009e3f 100644
--- a/test cases/failing/112 run_target in test/meson.build
+++ b/test cases/failing/111 run_target in test/meson.build
diff --git a/test cases/failing/112 run_target in test/test.json b/test cases/failing/111 run_target in test/test.json
index 515897899..c0ec0e6ce 100644
--- a/test cases/failing/112 run_target in test/test.json
+++ b/test cases/failing/111 run_target in test/test.json
@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "line": "test cases/failing/112 run_target in test/meson.build:7:0: ERROR: test keyword argument 'args' was of type array[RunTarget] but should have been array[str | File | BuildTarget | CustomTarget | CustomTargetIndex | ExternalProgram]"
+            "line": "test cases/failing/111 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 | ExternalProgram]"
         }
     ]
 }
diff --git a/test cases/failing/112 run_target in test/trivial.c b/test cases/failing/111 run_target in test/trivial.c
index 96612d48b..96612d48b 100644
--- a/test cases/failing/112 run_target in test/trivial.c
+++ b/test cases/failing/111 run_target in test/trivial.c
diff --git a/test cases/failing/113 run_target in add_install_script/meson.build b/test cases/failing/112 run_target in add_install_script/meson.build
index d3634bfb5..d3634bfb5 100644
--- a/test cases/failing/113 run_target in add_install_script/meson.build
+++ b/test cases/failing/112 run_target in add_install_script/meson.build
diff --git a/test cases/failing/113 run_target in add_install_script/test.json b/test cases/failing/112 run_target in add_install_script/test.json
index c9ed33ecf..7753c315b 100644
--- a/test cases/failing/113 run_target in add_install_script/test.json
+++ b/test cases/failing/112 run_target in add_install_script/test.json
@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "line": "test cases/failing/113 run_target in add_install_script/meson.build:7:6: ERROR: meson.add_install_script argument 2 was of type \"RunTarget\" but should have been one of: \"str\", \"File\", \"BuildTarget\", \"CustomTarget\", \"CustomTargetIndex\", \"ExternalProgram\""
+            "line": "test cases/failing/112 run_target in add_install_script/meson.build:7:6: ERROR: meson.add_install_script argument 2 was of type \"RunTarget\" but should have been one of: \"str\", \"File\", \"BuildTarget\", \"CustomTarget\", \"CustomTargetIndex\", \"ExternalProgram\""
         }
     ]
 }
diff --git a/test cases/failing/113 run_target in add_install_script/trivial.c b/test cases/failing/112 run_target in add_install_script/trivial.c
index 1b14571ed..1b14571ed 100644
--- a/test cases/failing/113 run_target in add_install_script/trivial.c
+++ b/test cases/failing/112 run_target in add_install_script/trivial.c
diff --git a/test cases/failing/114 pathsep in install_symlink/meson.build b/test cases/failing/113 pathsep in install_symlink/meson.build
index cce82c237..cce82c237 100644
--- a/test cases/failing/114 pathsep in install_symlink/meson.build
+++ b/test cases/failing/113 pathsep in install_symlink/meson.build
diff --git a/test cases/failing/114 pathsep in install_symlink/test.json b/test cases/failing/113 pathsep in install_symlink/test.json
index bca4e0e1d..bbf25e266 100644
--- a/test cases/failing/114 pathsep in install_symlink/test.json
+++ b/test cases/failing/113 pathsep in install_symlink/test.json
@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "line": "test cases/failing/114 pathsep in install_symlink/meson.build:3:0: ERROR: Link name is \"foo/bar\", but link names cannot contain path separators. The dir part should be in install_dir."
+            "line": "test cases/failing/113 pathsep in install_symlink/meson.build:3:0: ERROR: Link name is \"foo/bar\", but link names cannot contain path separators. The dir part should be in install_dir."
         }
     ]
 }
diff --git a/test cases/failing/115 subproject version conflict/meson.build b/test cases/failing/114 subproject version conflict/meson.build
index ffbcc13a4..ffbcc13a4 100644
--- a/test cases/failing/115 subproject version conflict/meson.build
+++ b/test cases/failing/114 subproject version conflict/meson.build
diff --git a/test cases/failing/115 subproject version conflict/subprojects/A/meson.build b/test cases/failing/114 subproject version conflict/subprojects/A/meson.build
index 7da4df0e7..7da4df0e7 100644
--- a/test cases/failing/115 subproject version conflict/subprojects/A/meson.build
+++ b/test cases/failing/114 subproject version conflict/subprojects/A/meson.build
diff --git a/test cases/failing/115 subproject version conflict/subprojects/B/meson.build b/test cases/failing/114 subproject version conflict/subprojects/B/meson.build
index 0ead9349a..0ead9349a 100644
--- a/test cases/failing/115 subproject version conflict/subprojects/B/meson.build
+++ b/test cases/failing/114 subproject version conflict/subprojects/B/meson.build
diff --git a/test cases/failing/115 subproject version conflict/test.json b/test cases/failing/114 subproject version conflict/test.json
index 23c7eb5e9..654897292 100644
--- a/test cases/failing/115 subproject version conflict/test.json
+++ b/test cases/failing/114 subproject version conflict/test.json
@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "line": "test cases/failing/115 subproject version conflict/meson.build:4:8: ERROR: Subproject B version is 100 but ['1'] required."
+            "line": "test cases/failing/114 subproject version conflict/meson.build:4:8: ERROR: Subproject B version is 100 but ['1'] required."
         }
     ]
 }
diff --git a/test cases/failing/116 structured source empty string/main.rs b/test cases/failing/115 structured source empty string/main.rs
index e69de29bb..e69de29bb 100644
--- a/test cases/failing/116 structured source empty string/main.rs
+++ b/test cases/failing/115 structured source empty string/main.rs
diff --git a/test cases/failing/116 structured source empty string/meson.build b/test cases/failing/115 structured source empty string/meson.build
index 071599147..071599147 100644
--- a/test cases/failing/116 structured source empty string/meson.build
+++ b/test cases/failing/115 structured source empty string/meson.build
diff --git a/test cases/failing/116 structured source empty string/test.json b/test cases/failing/115 structured source empty string/test.json
index 00efbe39a..48c1c83dc 100644
--- a/test cases/failing/116 structured source empty string/test.json
+++ b/test cases/failing/115 structured source empty string/test.json
@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "line": "test cases/failing/116 structured source empty string/meson.build:9:2: ERROR: structured_sources: keys to dictionary argument may not be an empty string."
+            "line": "test cases/failing/115 structured source empty string/meson.build:9:2: ERROR: structured_sources: keys to dictionary argument may not be an empty string."
         }
     ]
 }
diff --git a/test cases/failing/117 structured_sources conflicts/main.rs b/test cases/failing/116 structured_sources conflicts/main.rs
index e69de29bb..e69de29bb 100644
--- a/test cases/failing/117 structured_sources conflicts/main.rs
+++ b/test cases/failing/116 structured_sources conflicts/main.rs
diff --git a/test cases/failing/117 structured_sources conflicts/meson.build b/test cases/failing/116 structured_sources conflicts/meson.build
index 561ad86bc..561ad86bc 100644
--- a/test cases/failing/117 structured_sources conflicts/meson.build
+++ b/test cases/failing/116 structured_sources conflicts/meson.build
diff --git a/test cases/failing/117 structured_sources conflicts/test.json b/test cases/failing/116 structured_sources conflicts/test.json
index a7201b5f3..7b539231c 100644
--- a/test cases/failing/117 structured_sources conflicts/test.json
+++ b/test cases/failing/116 structured_sources conflicts/test.json
@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "line": "test cases/failing/117 structured_sources conflicts/meson.build:7:0: ERROR: Conflicting sources in structured sources: main.rs"
+            "line": "test cases/failing/116 structured_sources conflicts/meson.build:7:0: ERROR: Conflicting sources in structured sources: main.rs"
         }
     ]
 }
diff --git a/test cases/failing/118 missing compiler/meson.build b/test cases/failing/117 missing compiler/meson.build
index 19bdd0c66..19bdd0c66 100644
--- a/test cases/failing/118 missing compiler/meson.build
+++ b/test cases/failing/117 missing compiler/meson.build
diff --git a/test cases/failing/118 missing compiler/subprojects/sub/main.c b/test cases/failing/117 missing compiler/subprojects/sub/main.c
index 44e82e227..44e82e227 100644
--- a/test cases/failing/118 missing compiler/subprojects/sub/main.c
+++ b/test cases/failing/117 missing compiler/subprojects/sub/main.c
diff --git a/test cases/failing/118 missing compiler/subprojects/sub/meson.build b/test cases/failing/117 missing compiler/subprojects/sub/meson.build
index b60850c9c..b60850c9c 100644
--- a/test cases/failing/118 missing compiler/subprojects/sub/meson.build
+++ b/test cases/failing/117 missing compiler/subprojects/sub/meson.build
diff --git a/test cases/failing/118 missing compiler/test.json b/test cases/failing/117 missing compiler/test.json
index a2494e4bc..525e92706 100644
--- a/test cases/failing/118 missing compiler/test.json
+++ b/test cases/failing/117 missing compiler/test.json
@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "line": "test cases/failing/118 missing compiler/subprojects/sub/meson.build:4:0: ERROR: No host machine compiler for 'subprojects/sub/main.c'"
+            "line": "test cases/failing/117 missing compiler/subprojects/sub/meson.build:4:0: ERROR: No host machine compiler for 'subprojects/sub/main.c'"
         }
     ]
 }
diff --git a/test cases/failing/119 cmake subproject error/meson.build b/test cases/failing/118 cmake subproject error/meson.build
index 9304af7e8..9304af7e8 100644
--- a/test cases/failing/119 cmake subproject error/meson.build
+++ b/test cases/failing/118 cmake subproject error/meson.build
diff --git a/test cases/failing/119 cmake subproject error/subprojects/cmlib/CMakeLists.txt b/test cases/failing/118 cmake subproject error/subprojects/cmlib/CMakeLists.txt
index a845525b8..a845525b8 100644
--- a/test cases/failing/119 cmake subproject error/subprojects/cmlib/CMakeLists.txt
+++ b/test cases/failing/118 cmake subproject error/subprojects/cmlib/CMakeLists.txt
diff --git a/test cases/failing/119 cmake subproject error/test.json b/test cases/failing/118 cmake subproject error/test.json
index d8271a22a..4e47f896c 100644
--- a/test cases/failing/119 cmake subproject error/test.json
+++ b/test cases/failing/118 cmake subproject error/test.json
@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "line": "test cases/failing/119 cmake subproject error/meson.build:4:14: ERROR: Failed to configure the CMake subproject: Fancy error message"
+            "line": "test cases/failing/118 cmake subproject error/meson.build:4:14: ERROR: Failed to configure the CMake subproject: Fancy error message"
         }
     ],
     "tools": {
diff --git a/test cases/failing/120 pkgconfig not relocatable outside prefix/meson.build b/test cases/failing/119 pkgconfig not relocatable outside prefix/meson.build
index 7ebdfc3fe..7ebdfc3fe 100644
--- a/test cases/failing/120 pkgconfig not relocatable outside prefix/meson.build
+++ b/test cases/failing/119 pkgconfig not relocatable outside prefix/meson.build
diff --git a/test cases/failing/120 pkgconfig not relocatable outside prefix/test.json b/test cases/failing/119 pkgconfig not relocatable outside prefix/test.json
index 32c6e0931..1bb249453 100644
--- a/test cases/failing/120 pkgconfig not relocatable outside prefix/test.json
+++ b/test cases/failing/119 pkgconfig not relocatable outside prefix/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/120 pkgconfig not relocatable outside prefix/meson\\.build:17:5: ERROR: Pkgconfig prefix cannot be outside of the prefix when pkgconfig\\.relocatable=true. Pkgconfig prefix is (C:)?/opt/lib/pkgconfig.",
+      "line": "test cases/failing/119 pkgconfig not relocatable outside prefix/meson\\.build:17:5: ERROR: Pkgconfig prefix cannot be outside of the prefix when pkgconfig\\.relocatable=true. Pkgconfig prefix is (C:)?/opt/lib/pkgconfig.",
       "match": "re"
     }
   ]
diff --git a/test cases/failing/121 subproject sandbox violation/meson.build b/test cases/failing/120 subproject sandbox violation/meson.build
index d41994c46..d41994c46 100644
--- a/test cases/failing/121 subproject sandbox violation/meson.build
+++ b/test cases/failing/120 subproject sandbox violation/meson.build
diff --git a/test cases/failing/121 subproject sandbox violation/meson_options.txt b/test cases/failing/120 subproject sandbox violation/meson_options.txt
index e7b782dba..e7b782dba 100644
--- a/test cases/failing/121 subproject sandbox violation/meson_options.txt
+++ b/test cases/failing/120 subproject sandbox violation/meson_options.txt
diff --git a/test cases/failing/121 subproject sandbox violation/subprojects/subproj1/file.txt b/test cases/failing/120 subproject sandbox violation/subprojects/subproj1/file.txt
index e69de29bb..e69de29bb 100644
--- a/test cases/failing/121 subproject sandbox violation/subprojects/subproj1/file.txt
+++ b/test cases/failing/120 subproject sandbox violation/subprojects/subproj1/file.txt
diff --git a/test cases/failing/121 subproject sandbox violation/subprojects/subproj1/meson.build b/test cases/failing/120 subproject sandbox violation/subprojects/subproj1/meson.build
index bd33bf38d..bd33bf38d 100644
--- a/test cases/failing/121 subproject sandbox violation/subprojects/subproj1/meson.build
+++ b/test cases/failing/120 subproject sandbox violation/subprojects/subproj1/meson.build
diff --git a/test cases/failing/121 subproject sandbox violation/subprojects/subproj1/nested/meson.build b/test cases/failing/120 subproject sandbox violation/subprojects/subproj1/nested/meson.build
index 038c13906..038c13906 100644
--- a/test cases/failing/121 subproject sandbox violation/subprojects/subproj1/nested/meson.build
+++ b/test cases/failing/120 subproject sandbox violation/subprojects/subproj1/nested/meson.build
diff --git a/test cases/failing/121 subproject sandbox violation/subprojects/subproj2/file.txt b/test cases/failing/120 subproject sandbox violation/subprojects/subproj2/file.txt
index e69de29bb..e69de29bb 100644
--- a/test cases/failing/121 subproject sandbox violation/subprojects/subproj2/file.txt
+++ b/test cases/failing/120 subproject sandbox violation/subprojects/subproj2/file.txt
diff --git a/test cases/failing/121 subproject sandbox violation/subprojects/subproj2/meson.build b/test cases/failing/120 subproject sandbox violation/subprojects/subproj2/meson.build
index a6032aa74..a6032aa74 100644
--- a/test cases/failing/121 subproject sandbox violation/subprojects/subproj2/meson.build
+++ b/test cases/failing/120 subproject sandbox violation/subprojects/subproj2/meson.build
diff --git a/test cases/failing/121 subproject sandbox violation/subprojects/subproj2/nested/meson.build b/test cases/failing/120 subproject sandbox violation/subprojects/subproj2/nested/meson.build
index e69de29bb..e69de29bb 100644
--- a/test cases/failing/121 subproject sandbox violation/subprojects/subproj2/nested/meson.build
+++ b/test cases/failing/120 subproject sandbox violation/subprojects/subproj2/nested/meson.build
diff --git a/test cases/failing/121 subproject sandbox violation/subprojects/subproj3/file.txt b/test cases/failing/120 subproject sandbox violation/subprojects/subproj3/file.txt
index e69de29bb..e69de29bb 100644
--- a/test cases/failing/121 subproject sandbox violation/subprojects/subproj3/file.txt
+++ b/test cases/failing/120 subproject sandbox violation/subprojects/subproj3/file.txt
diff --git a/test cases/failing/121 subproject sandbox violation/subprojects/subproj3/meson.build b/test cases/failing/120 subproject sandbox violation/subprojects/subproj3/meson.build
index c4fa64c1c..c4fa64c1c 100644
--- a/test cases/failing/121 subproject sandbox violation/subprojects/subproj3/meson.build
+++ b/test cases/failing/120 subproject sandbox violation/subprojects/subproj3/meson.build
diff --git a/test cases/failing/121 subproject sandbox violation/test.json b/test cases/failing/120 subproject sandbox violation/test.json
index d8c28d702..d50607608 100644
--- a/test cases/failing/121 subproject sandbox violation/test.json
+++ b/test cases/failing/120 subproject sandbox violation/test.json
@@ -10,7 +10,7 @@
   },
   "stdout": [
     {
-      "line": "test cases/failing/121 subproject sandbox violation/meson.build:24:0: ERROR: Sandbox violation: Tried to grab file file.txt from a nested subproject."
+      "line": "test cases/failing/120 subproject sandbox violation/meson.build:24:0: ERROR: Sandbox violation: Tried to grab file file.txt from a nested subproject."
     }
   ]
 }
diff --git a/test cases/failing/122 override and add_project_dependency/inc/lib.h b/test cases/failing/121 override and add_project_dependency/inc/lib.h
index 4cfc47e13..4cfc47e13 100644
--- a/test cases/failing/122 override and add_project_dependency/inc/lib.h
+++ b/test cases/failing/121 override and add_project_dependency/inc/lib.h
diff --git a/test cases/failing/122 override and add_project_dependency/lib.c b/test cases/failing/121 override and add_project_dependency/lib.c
index b8b22a3b7..b8b22a3b7 100644
--- a/test cases/failing/122 override and add_project_dependency/lib.c
+++ b/test cases/failing/121 override and add_project_dependency/lib.c
diff --git a/test cases/failing/122 override and add_project_dependency/meson.build b/test cases/failing/121 override and add_project_dependency/meson.build
index c878b017a..c878b017a 100644
--- a/test cases/failing/122 override and add_project_dependency/meson.build
+++ b/test cases/failing/121 override and add_project_dependency/meson.build
diff --git a/test cases/failing/122 override and add_project_dependency/subprojects/a/meson.build b/test cases/failing/121 override and add_project_dependency/subprojects/a/meson.build
index 4f6f0701c..4f6f0701c 100644
--- a/test cases/failing/122 override and add_project_dependency/subprojects/a/meson.build
+++ b/test cases/failing/121 override and add_project_dependency/subprojects/a/meson.build
diff --git a/test cases/failing/122 override and add_project_dependency/subprojects/a/prog.c b/test cases/failing/121 override and add_project_dependency/subprojects/a/prog.c
index ce60f8142..ce60f8142 100644
--- a/test cases/failing/122 override and add_project_dependency/subprojects/a/prog.c
+++ b/test cases/failing/121 override and add_project_dependency/subprojects/a/prog.c
diff --git a/test cases/failing/122 override and add_project_dependency/test.json b/test cases/failing/121 override and add_project_dependency/test.json
index 08eb0c6b4..e762359f7 100644
--- a/test cases/failing/122 override and add_project_dependency/test.json
+++ b/test cases/failing/121 override and add_project_dependency/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/122 override and add_project_dependency/subprojects/a/meson.build:6:0: ERROR: Dependencies must be external dependencies"
+      "line": "test cases/failing/121 override and add_project_dependency/subprojects/a/meson.build:6:0: ERROR: Dependencies must be external dependencies"
     }
   ]
 }
diff --git a/test cases/failing/123 targets before add_project_dependency/inc/lib.h b/test cases/failing/122 targets before add_project_dependency/inc/lib.h
index 4cfc47e13..4cfc47e13 100644
--- a/test cases/failing/123 targets before add_project_dependency/inc/lib.h
+++ b/test cases/failing/122 targets before add_project_dependency/inc/lib.h
diff --git a/test cases/failing/123 targets before add_project_dependency/lib.c b/test cases/failing/122 targets before add_project_dependency/lib.c
index b8b22a3b7..b8b22a3b7 100644
--- a/test cases/failing/123 targets before add_project_dependency/lib.c
+++ b/test cases/failing/122 targets before add_project_dependency/lib.c
diff --git a/test cases/failing/123 targets before add_project_dependency/meson.build b/test cases/failing/122 targets before add_project_dependency/meson.build
index 38fe10235..38fe10235 100644
--- a/test cases/failing/123 targets before add_project_dependency/meson.build
+++ b/test cases/failing/122 targets before add_project_dependency/meson.build
diff --git a/test cases/failing/123 targets before add_project_dependency/test.json b/test cases/failing/122 targets before add_project_dependency/test.json
index 4a21eec55..674467a10 100644
--- a/test cases/failing/123 targets before add_project_dependency/test.json
+++ b/test cases/failing/122 targets before add_project_dependency/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/123 targets before add_project_dependency/meson.build:5:0: ERROR: Tried to use 'add_project_dependencies' after a build target has been declared."
+      "line": "test cases/failing/122 targets before add_project_dependency/meson.build:5:0: ERROR: Tried to use 'add_project_dependencies' after a build target has been declared."
     }
   ]
 }
diff --git a/test cases/failing/124 extract from unity/meson.build b/test cases/failing/123 extract from unity/meson.build
index 9e3e65f58..9e3e65f58 100644
--- a/test cases/failing/124 extract from unity/meson.build
+++ b/test cases/failing/123 extract from unity/meson.build
diff --git a/test cases/failing/124 extract from unity/src1.c b/test cases/failing/123 extract from unity/src1.c
index da971bbf6..da971bbf6 100644
--- a/test cases/failing/124 extract from unity/src1.c
+++ b/test cases/failing/123 extract from unity/src1.c
diff --git a/test cases/failing/124 extract from unity/src2.c b/test cases/failing/123 extract from unity/src2.c
index a46166933..a46166933 100644
--- a/test cases/failing/124 extract from unity/src2.c
+++ b/test cases/failing/123 extract from unity/src2.c
diff --git a/test cases/failing/124 extract from unity/test.json b/test cases/failing/123 extract from unity/test.json
index ef76d2f4f..ce9f1053c 100644
--- a/test cases/failing/124 extract from unity/test.json
+++ b/test cases/failing/123 extract from unity/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/124 extract from unity/meson.build:4:37: ERROR: Single object files cannot be extracted in Unity builds. You can only extract all the object files for each compiler at once."
+      "line": "test cases/failing/123 extract from unity/meson.build:4:37: ERROR: Single object files cannot be extracted in Unity builds. You can only extract all the object files for each compiler at once."
     }
   ]
 }
diff --git a/test cases/failing/125 subproject object as a dependency/main.c b/test cases/failing/124 subproject object as a dependency/main.c
index 78f2de106..78f2de106 100644
--- a/test cases/failing/125 subproject object as a dependency/main.c
+++ b/test cases/failing/124 subproject object as a dependency/main.c
diff --git a/test cases/failing/125 subproject object as a dependency/meson.build b/test cases/failing/124 subproject object as a dependency/meson.build
index 0114b9a31..0114b9a31 100644
--- a/test cases/failing/125 subproject object as a dependency/meson.build
+++ b/test cases/failing/124 subproject object as a dependency/meson.build
diff --git a/test cases/failing/125 subproject object as a dependency/subprojects/sub/meson.build b/test cases/failing/124 subproject object as a dependency/subprojects/sub/meson.build
index 0adfd6a6e..0adfd6a6e 100644
--- a/test cases/failing/125 subproject object as a dependency/subprojects/sub/meson.build
+++ b/test cases/failing/124 subproject object as a dependency/subprojects/sub/meson.build
diff --git a/test cases/failing/125 subproject object as a dependency/test.json b/test cases/failing/124 subproject object as a dependency/test.json
index 0cb257151..a0eea225f 100644
--- a/test cases/failing/125 subproject object as a dependency/test.json
+++ b/test cases/failing/124 subproject object as a dependency/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/125 subproject object as a dependency/meson.build:3:0: ERROR: Tried to use subproject object as a dependency."
+      "line": "test cases/failing/124 subproject object as a dependency/meson.build:3:0: ERROR: Tried to use subproject object as a dependency."
     }
   ]
 }
diff --git a/test cases/failing/126 generator host binary/exe.c b/test cases/failing/125 generator host binary/exe.c
index 78f2de106..78f2de106 100644
--- a/test cases/failing/126 generator host binary/exe.c
+++ b/test cases/failing/125 generator host binary/exe.c
diff --git a/test cases/failing/126 generator host binary/lib.in b/test cases/failing/125 generator host binary/lib.in
index d0b6ab765..d0b6ab765 100644
--- a/test cases/failing/126 generator host binary/lib.in
+++ b/test cases/failing/125 generator host binary/lib.in
diff --git a/test cases/failing/126 generator host binary/meson.build b/test cases/failing/125 generator host binary/meson.build
index e76933878..e76933878 100644
--- a/test cases/failing/126 generator host binary/meson.build
+++ b/test cases/failing/125 generator host binary/meson.build
diff --git a/test cases/failing/126 generator host binary/test.json b/test cases/failing/125 generator host binary/test.json
index c633622cf..c633622cf 100644
--- a/test cases/failing/126 generator host binary/test.json
+++ b/test cases/failing/125 generator host binary/test.json
diff --git a/test cases/failing/127 invalid ast/meson.build b/test cases/failing/126 invalid ast/meson.build
index 06011c2ca..06011c2ca 100644
--- a/test cases/failing/127 invalid ast/meson.build
+++ b/test cases/failing/126 invalid ast/meson.build
diff --git a/test cases/failing/127 invalid ast/test.json b/test cases/failing/126 invalid ast/test.json
index db7bfe821..7dc0684e4 100644
--- a/test cases/failing/127 invalid ast/test.json
+++ b/test cases/failing/126 invalid ast/test.json
@@ -2,7 +2,7 @@
   "stdout": [
     {
       "match": "re",
-      "line": "test cases/failing/127 invalid ast/meson.build:1:44: ERROR: Meson version is [0-9.]+(\\.rc[0-9]+)? but project requires 0.1.0"
+      "line": "test cases/failing/126 invalid ast/meson.build:1:44: ERROR: Meson version is [0-9.]+(\\.rc[0-9]+)? but project requires 0.1.0"
     }
   ]
 }
diff --git a/test cases/failing/128 invalid project function/meson.build b/test cases/failing/127 invalid project function/meson.build
index 0032c9c95..0032c9c95 100644
--- a/test cases/failing/128 invalid project function/meson.build
+++ b/test cases/failing/127 invalid project function/meson.build
diff --git a/test cases/failing/128 invalid project function/test.json b/test cases/failing/127 invalid project function/test.json
index 17c1ac652..bf9cc164f 100644
--- a/test cases/failing/128 invalid project function/test.json
+++ b/test cases/failing/127 invalid project function/test.json
@@ -2,7 +2,7 @@
   "stdout": [
     {
       "match": "re",
-      "line": "test cases/failing/128 invalid project function/meson.build:1:67: ERROR: Meson version is [0-9.]+(\\.rc[0-9]+)? but project requires 0.1.0"
+      "line": "test cases/failing/127 invalid project function/meson.build:1:67: ERROR: Meson version is [0-9.]+(\\.rc[0-9]+)? but project requires 0.1.0"
     }
   ]
 }
diff --git a/test cases/failing/129 utf8 with bom/meson.build b/test cases/failing/128 utf8 with bom/meson.build
index 492a0c691..492a0c691 100644
--- a/test cases/failing/129 utf8 with bom/meson.build
+++ b/test cases/failing/128 utf8 with bom/meson.build
diff --git a/test cases/failing/129 utf8 with bom/test.json b/test cases/failing/128 utf8 with bom/test.json
index ec2df13bb..8b12ba2ca 100644
--- a/test cases/failing/129 utf8 with bom/test.json
+++ b/test cases/failing/128 utf8 with bom/test.json
@@ -1,7 +1,7 @@
 {
     "stdout": [
       {
-        "line": "test cases/failing/129 utf8 with bom/meson.build:0:0: ERROR: Builder file must be encoded in UTF-8 (with no BOM)"
+        "line": "test cases/failing/128 utf8 with bom/meson.build:0:0: ERROR: Builder file must be encoded in UTF-8 (with no BOM)"
       }
     ]
   }
diff --git a/test cases/failing/130 utf8 with bom subdir/meson.build b/test cases/failing/129 utf8 with bom subdir/meson.build
index 8d3bbd7e8..8d3bbd7e8 100644
--- a/test cases/failing/130 utf8 with bom subdir/meson.build
+++ b/test cases/failing/129 utf8 with bom subdir/meson.build
diff --git a/test cases/failing/130 utf8 with bom subdir/subdir/meson.build b/test cases/failing/129 utf8 with bom subdir/subdir/meson.build
index dbf2b9cc7..dbf2b9cc7 100644
--- a/test cases/failing/130 utf8 with bom subdir/subdir/meson.build
+++ b/test cases/failing/129 utf8 with bom subdir/subdir/meson.build
diff --git a/test cases/failing/130 utf8 with bom subdir/test.json b/test cases/failing/129 utf8 with bom subdir/test.json
index bbaea1b30..66a97d75c 100644
--- a/test cases/failing/130 utf8 with bom subdir/test.json
+++ b/test cases/failing/129 utf8 with bom subdir/test.json
@@ -1,7 +1,7 @@
 {
     "stdout": [
       {
-        "line": "test cases/failing/130 utf8 with bom subdir/subdir/meson.build:0:0: ERROR: Builder file must be encoded in UTF-8 (with no BOM)"
+        "line": "test cases/failing/129 utf8 with bom subdir/subdir/meson.build:0:0: ERROR: Builder file must be encoded in UTF-8 (with no BOM)"
       }
     ]
   }
diff --git a/test cases/failing/131 utf8 with bom options/meson.build b/test cases/failing/130 utf8 with bom options/meson.build
index 50413e031..50413e031 100644
--- a/test cases/failing/131 utf8 with bom options/meson.build
+++ b/test cases/failing/130 utf8 with bom options/meson.build
diff --git a/test cases/failing/131 utf8 with bom options/meson.options b/test cases/failing/130 utf8 with bom options/meson.options
index 250c03279..250c03279 100644
--- a/test cases/failing/131 utf8 with bom options/meson.options
+++ b/test cases/failing/130 utf8 with bom options/meson.options
diff --git a/test cases/failing/131 utf8 with bom options/test.json b/test cases/failing/130 utf8 with bom options/test.json
index e6391c57d..f11a78f36 100644
--- a/test cases/failing/131 utf8 with bom options/test.json
+++ b/test cases/failing/130 utf8 with bom options/test.json
@@ -1,7 +1,7 @@
 {
     "stdout": [
       {
-        "line": "test cases/failing/131 utf8 with bom options/meson.options:0:0: ERROR: Builder file must be encoded in UTF-8 (with no BOM)"
+        "line": "test cases/failing/130 utf8 with bom options/meson.options:0:0: ERROR: Builder file must be encoded in UTF-8 (with no BOM)"
       }
     ]
   }
diff --git a/test cases/failing/132 module use inside project decl/meson.build b/test cases/failing/131 module use inside project decl/meson.build
index 8f82a5d30..8f82a5d30 100644
--- a/test cases/failing/132 module use inside project decl/meson.build
+++ b/test cases/failing/131 module use inside project decl/meson.build
diff --git a/test cases/failing/132 module use inside project decl/test.json b/test cases/failing/131 module use inside project decl/test.json
index 33e377b84..4fef50104 100644
--- a/test cases/failing/132 module use inside project decl/test.json
+++ b/test cases/failing/131 module use inside project decl/test.json
@@ -1,7 +1,7 @@
 {
     "stdout": [
       {
-        "line": "test cases/failing/132 module use inside project decl/meson.build:4:21: ERROR: Module methods (python.find_installation) cannot be invoked during project declaration."
+        "line": "test cases/failing/131 module use inside project decl/meson.build:4:21: ERROR: Module methods (python.find_installation) cannot be invoked during project declaration."
       }
     ]
   }
diff --git a/test cases/failing/133 dub missing dependency/dub.json b/test cases/failing/132 dub missing dependency/dub.json
index 1ad9ddcc1..1ad9ddcc1 100644
--- a/test cases/failing/133 dub missing dependency/dub.json
+++ b/test cases/failing/132 dub missing dependency/dub.json
diff --git a/test cases/failing/133 dub missing dependency/dub.selections.json b/test cases/failing/132 dub missing dependency/dub.selections.json
index 322586b10..322586b10 100644
--- a/test cases/failing/133 dub missing dependency/dub.selections.json
+++ b/test cases/failing/132 dub missing dependency/dub.selections.json
diff --git a/test cases/failing/133 dub missing dependency/meson.build b/test cases/failing/132 dub missing dependency/meson.build
index fcccb3b41..fcccb3b41 100644
--- a/test cases/failing/133 dub missing dependency/meson.build
+++ b/test cases/failing/132 dub missing dependency/meson.build
diff --git a/test cases/failing/133 dub missing dependency/source/app.d b/test cases/failing/132 dub missing dependency/source/app.d
index d66321b3c..d66321b3c 100644
--- a/test cases/failing/133 dub missing dependency/source/app.d
+++ b/test cases/failing/132 dub missing dependency/source/app.d
diff --git a/test cases/failing/133 dub missing dependency/test.json b/test cases/failing/132 dub missing dependency/test.json
index e58dbc7aa..e58dbc7aa 100644
--- a/test cases/failing/133 dub missing dependency/test.json
+++ b/test cases/failing/132 dub missing dependency/test.json
diff --git a/test cases/failing/134 java sources in non jar target/Test.java b/test cases/failing/133 java sources in non jar target/Test.java
index e69de29bb..e69de29bb 100644
--- a/test cases/failing/134 java sources in non jar target/Test.java
+++ b/test cases/failing/133 java sources in non jar target/Test.java
diff --git a/test cases/failing/134 java sources in non jar target/meson.build b/test cases/failing/133 java sources in non jar target/meson.build
index 0aa802a48..0aa802a48 100644
--- a/test cases/failing/134 java sources in non jar target/meson.build
+++ b/test cases/failing/133 java sources in non jar target/meson.build
diff --git a/test cases/failing/134 java sources in non jar target/test.json b/test cases/failing/133 java sources in non jar target/test.json
index 271ac36af..877ea1674 100644
--- a/test cases/failing/134 java sources in non jar target/test.json
+++ b/test cases/failing/133 java sources in non jar target/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/134 java sources in non jar target/meson.build:3:0: ERROR: Build target of type \"executable\" cannot build java source: \"Test.java\". Use \"jar\" instead."
+      "line": "test cases/failing/133 java sources in non jar target/meson.build:3:0: ERROR: Build target of type \"executable\" cannot build java source: \"Test.java\". Use \"jar\" instead."
     }
   ]
 }
diff --git a/test cases/failing/135 rust link_language/f.rs b/test cases/failing/134 rust link_language/f.rs
index da0f5d925..da0f5d925 100644
--- a/test cases/failing/135 rust link_language/f.rs
+++ b/test cases/failing/134 rust link_language/f.rs
diff --git a/test cases/failing/135 rust link_language/meson.build b/test cases/failing/134 rust link_language/meson.build
index 7fd223ddd..7fd223ddd 100644
--- a/test cases/failing/135 rust link_language/meson.build
+++ b/test cases/failing/134 rust link_language/meson.build
diff --git a/test cases/failing/135 rust link_language/test.json b/test cases/failing/134 rust link_language/test.json
index c72bb05e1..e144149c6 100644
--- a/test cases/failing/135 rust link_language/test.json
+++ b/test cases/failing/134 rust link_language/test.json
@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "line": "test cases/failing/135 rust link_language/meson.build:10:0: ERROR: cannot build Rust sources with a different link_language"
+            "line": "test cases/failing/134 rust link_language/meson.build:10:0: ERROR: cannot build Rust sources with a different link_language"
         }
     ]
 }
diff --git a/test cases/failing/136 invalid build_subdir/existing-dir/config.h.in b/test cases/failing/135 invalid build_subdir/existing-dir/config.h.in
index 14a155874..14a155874 100644
--- a/test cases/failing/136 invalid build_subdir/existing-dir/config.h.in
+++ b/test cases/failing/135 invalid build_subdir/existing-dir/config.h.in
diff --git a/test cases/failing/136 invalid build_subdir/meson.build b/test cases/failing/135 invalid build_subdir/meson.build
index b54ec9a0b..b54ec9a0b 100644
--- a/test cases/failing/136 invalid build_subdir/meson.build
+++ b/test cases/failing/135 invalid build_subdir/meson.build
diff --git a/test cases/failing/136 invalid build_subdir/test.json b/test cases/failing/135 invalid build_subdir/test.json
index f8e56dae5..aecc4e956 100644
--- a/test cases/failing/136 invalid build_subdir/test.json
+++ b/test cases/failing/135 invalid build_subdir/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/136 invalid build_subdir/meson.build:18:0: ERROR: Build subdir \"existing-dir\" in \"config.h\" exists in source tree."
+      "line": "test cases/failing/135 invalid build_subdir/meson.build:18:0: ERROR: Build subdir \"existing-dir\" in \"config.h\" exists in source tree."
     }
   ]
 }
diff --git a/test cases/failing/17 same target/file.c b/test cases/failing/16 same target/file.c
index 741237235..741237235 100644
--- a/test cases/failing/17 same target/file.c
+++ b/test cases/failing/16 same target/file.c
diff --git a/test cases/failing/17 same target/meson.build b/test cases/failing/16 same target/meson.build
index ee586d0f4..ee586d0f4 100644
--- a/test cases/failing/17 same target/meson.build
+++ b/test cases/failing/16 same target/meson.build
diff --git a/test cases/failing/17 same target/test.json b/test cases/failing/16 same target/test.json
index 0005ba4a8..ec154b1dd 100644
--- a/test cases/failing/17 same target/test.json
+++ b/test cases/failing/16 same target/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/17 same target/meson.build:4:0: ERROR: Tried to create target \"foo\", but a target of that name already exists."
+      "line": "test cases/failing/16 same target/meson.build:4:0: ERROR: Tried to create target \"foo\", but a target of that name already exists."
     }
   ]
 }
diff --git a/test cases/failing/18 wrong plusassign/meson.build b/test cases/failing/17 wrong plusassign/meson.build
index af7727a1e..af7727a1e 100644
--- a/test cases/failing/18 wrong plusassign/meson.build
+++ b/test cases/failing/17 wrong plusassign/meson.build
diff --git a/test cases/failing/18 wrong plusassign/test.json b/test cases/failing/17 wrong plusassign/test.json
index c698f85b9..a613d7bd1 100644
--- a/test cases/failing/18 wrong plusassign/test.json
+++ b/test cases/failing/17 wrong plusassign/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/18 wrong plusassign/meson.build:3:0: ERROR: Plusassignment target must be an id."
+      "line": "test cases/failing/17 wrong plusassign/meson.build:3:0: ERROR: Plusassignment target must be an id."
     }
   ]
 }
diff --git a/test cases/failing/19 target clash/clash.c b/test cases/failing/18 target clash/clash.c
index 2daa06cf6..2daa06cf6 100644
--- a/test cases/failing/19 target clash/clash.c
+++ b/test cases/failing/18 target clash/clash.c
diff --git a/test cases/failing/19 target clash/meson.build b/test cases/failing/18 target clash/meson.build
index 4fd09348e..4fd09348e 100644
--- a/test cases/failing/19 target clash/meson.build
+++ b/test cases/failing/18 target clash/meson.build
diff --git a/test cases/failing/19 target clash/test.json b/test cases/failing/18 target clash/test.json
index d22b894c4..d22b894c4 100644
--- a/test cases/failing/19 target clash/test.json
+++ b/test cases/failing/18 target clash/test.json
diff --git a/test cases/failing/20 version/meson.build b/test cases/failing/19 version/meson.build
index d25a39540..d25a39540 100644
--- a/test cases/failing/20 version/meson.build
+++ b/test cases/failing/19 version/meson.build
diff --git a/test cases/failing/20 version/test.json b/test cases/failing/19 version/test.json
index 565fbf290..f78e34c41 100644
--- a/test cases/failing/20 version/test.json
+++ b/test cases/failing/19 version/test.json
@@ -2,7 +2,7 @@
   "stdout": [
     {
       "match": "re",
-      "line": "test cases/failing/20 version/meson\\.build:1:44: ERROR: Meson version is .* but project requires >100\\.0\\.0"
+      "line": "test cases/failing/19 version/meson\\.build:1:44: ERROR: Meson version is .* but project requires >100\\.0\\.0"
     }
   ]
 }
diff --git a/test cases/failing/21 subver/meson.build b/test cases/failing/20 subver/meson.build
index ea0f9146a..ea0f9146a 100644
--- a/test cases/failing/21 subver/meson.build
+++ b/test cases/failing/20 subver/meson.build
diff --git a/test cases/failing/21 subver/subprojects/foo/meson.build b/test cases/failing/20 subver/subprojects/foo/meson.build
index 615ee92bd..615ee92bd 100644
--- a/test cases/failing/21 subver/subprojects/foo/meson.build
+++ b/test cases/failing/20 subver/subprojects/foo/meson.build
diff --git a/test cases/failing/21 subver/test.json b/test cases/failing/20 subver/test.json
index 694b777a3..86f4e5b6e 100644
--- a/test cases/failing/21 subver/test.json
+++ b/test cases/failing/20 subver/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/21 subver/meson.build:3:4: ERROR: Subproject foo version is 1.0.0 but ['>1.0.0'] required."
+      "line": "test cases/failing/20 subver/meson.build:3:4: ERROR: Subproject foo version is 1.0.0 but ['>1.0.0'] required."
     }
   ]
 }
diff --git a/test cases/failing/22 assert/meson.build b/test cases/failing/21 assert/meson.build
index 45cff07aa..45cff07aa 100644
--- a/test cases/failing/22 assert/meson.build
+++ b/test cases/failing/21 assert/meson.build
diff --git a/test cases/failing/22 assert/test.json b/test cases/failing/21 assert/test.json
index edae9996e..8f80c2d8a 100644
--- a/test cases/failing/22 assert/test.json
+++ b/test cases/failing/21 assert/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/22 assert/meson.build:3:0: ERROR: Assert failed: I am fail."
+      "line": "test cases/failing/21 assert/meson.build:3:0: ERROR: Assert failed: I am fail."
     }
   ]
 }
diff --git a/test cases/failing/23 rel testdir/meson.build b/test cases/failing/22 rel testdir/meson.build
index c10558b34..c10558b34 100644
--- a/test cases/failing/23 rel testdir/meson.build
+++ b/test cases/failing/22 rel testdir/meson.build
diff --git a/test cases/failing/23 rel testdir/simple.c b/test cases/failing/22 rel testdir/simple.c
index 11b7fad8e..11b7fad8e 100644
--- a/test cases/failing/23 rel testdir/simple.c
+++ b/test cases/failing/22 rel testdir/simple.c
diff --git a/test cases/failing/23 rel testdir/test.json b/test cases/failing/22 rel testdir/test.json
index bc80bc634..c16acf9ba 100644
--- a/test cases/failing/23 rel testdir/test.json
+++ b/test cases/failing/22 rel testdir/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/23 rel testdir/meson.build:4:0: ERROR: test keyword argument \"workdir\" must be an absolute path"
+      "line": "test cases/failing/22 rel testdir/meson.build:4:0: ERROR: test keyword argument \"workdir\" must be an absolute path"
     }
   ]
 }
diff --git a/test cases/failing/24 int conversion/meson.build b/test cases/failing/23 int conversion/meson.build
index 8db72f301..8db72f301 100644
--- a/test cases/failing/24 int conversion/meson.build
+++ b/test cases/failing/23 int conversion/meson.build
diff --git a/test cases/failing/24 int conversion/test.json b/test cases/failing/23 int conversion/test.json
index e749928fa..df3fdd586 100644
--- a/test cases/failing/24 int conversion/test.json
+++ b/test cases/failing/23 int conversion/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/24 int conversion/meson.build:3:13: ERROR: String 'notanumber' cannot be converted to int"
+      "line": "test cases/failing/23 int conversion/meson.build:3:13: ERROR: String 'notanumber' cannot be converted to int"
     }
   ]
 }
diff --git a/test cases/failing/25 badlang/meson.build b/test cases/failing/24 badlang/meson.build
index a31059b16..a31059b16 100644
--- a/test cases/failing/25 badlang/meson.build
+++ b/test cases/failing/24 badlang/meson.build
diff --git a/test cases/failing/25 badlang/test.json b/test cases/failing/24 badlang/test.json
index 0b23fd7e5..bf387c248 100644
--- a/test cases/failing/25 badlang/test.json
+++ b/test cases/failing/24 badlang/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/25 badlang/meson.build:3:0: ERROR: Tried to use unknown language \"nonexisting\"."
+      "line": "test cases/failing/24 badlang/meson.build:3:0: ERROR: Tried to use unknown language \"nonexisting\"."
     }
   ]
 }
diff --git a/test cases/failing/26 output subdir/foo.in b/test cases/failing/25 output subdir/foo.in
index 3d1bf19eb..3d1bf19eb 100644
--- a/test cases/failing/26 output subdir/foo.in
+++ b/test cases/failing/25 output subdir/foo.in
diff --git a/test cases/failing/26 output subdir/meson.build b/test cases/failing/25 output subdir/meson.build
index c4bd80666..c4bd80666 100644
--- a/test cases/failing/26 output subdir/meson.build
+++ b/test cases/failing/25 output subdir/meson.build
diff --git a/test cases/failing/26 output subdir/subdir/dummy.txt b/test cases/failing/25 output subdir/subdir/dummy.txt
index 7e907f106..7e907f106 100644
--- a/test cases/failing/26 output subdir/subdir/dummy.txt
+++ b/test cases/failing/25 output subdir/subdir/dummy.txt
diff --git a/test cases/failing/26 output subdir/test.json b/test cases/failing/25 output subdir/test.json
index df0972605..63e0e944c 100644
--- a/test cases/failing/26 output subdir/test.json
+++ b/test cases/failing/25 output subdir/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/26 output subdir/meson.build:3:0: ERROR: configure_file keyword argument \"output\" Output 'subdir/foo' must not contain a path segment."
+      "line": "test cases/failing/25 output subdir/meson.build:3:0: ERROR: configure_file keyword argument \"output\" Output 'subdir/foo' must not contain a path segment."
     }
   ]
 }
diff --git a/test cases/failing/27 noprog use/meson.build b/test cases/failing/26 noprog use/meson.build
index af31ecee4..af31ecee4 100644
--- a/test cases/failing/27 noprog use/meson.build
+++ b/test cases/failing/26 noprog use/meson.build
diff --git a/test cases/failing/27 noprog use/test.json b/test cases/failing/26 noprog use/test.json
index b84562e2b..9c6cec41d 100644
--- a/test cases/failing/27 noprog use/test.json
+++ b/test cases/failing/26 noprog use/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/27 noprog use/meson.build:5:0: ERROR: Tried to use not-found external program in \"command\""
+      "line": "test cases/failing/26 noprog use/meson.build:5:0: ERROR: Tried to use not-found external program in \"command\""
     }
   ]
 }
diff --git a/test cases/failing/28 no crossprop/meson.build b/test cases/failing/27 no crossprop/meson.build
index 915207792..915207792 100644
--- a/test cases/failing/28 no crossprop/meson.build
+++ b/test cases/failing/27 no crossprop/meson.build
diff --git a/test cases/failing/28 no crossprop/test.json b/test cases/failing/27 no crossprop/test.json
index 78be0b718..1182c4f13 100644
--- a/test cases/failing/28 no crossprop/test.json
+++ b/test cases/failing/27 no crossprop/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/28 no crossprop/meson.build:3:14: ERROR: Unknown property for host machine: nonexisting"
+      "line": "test cases/failing/27 no crossprop/meson.build:3:14: ERROR: Unknown property for host machine: nonexisting"
     }
   ]
 }
diff --git a/test cases/failing/29 nested ternary/meson.build b/test cases/failing/28 nested ternary/meson.build
index 76364cea6..76364cea6 100644
--- a/test cases/failing/29 nested ternary/meson.build
+++ b/test cases/failing/28 nested ternary/meson.build
diff --git a/test cases/failing/29 nested ternary/test.json b/test cases/failing/28 nested ternary/test.json
index ba0501372..5efeca02c 100644
--- a/test cases/failing/29 nested ternary/test.json
+++ b/test cases/failing/28 nested ternary/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/29 nested ternary/meson.build:3:12: ERROR: Nested ternary operators are not allowed."
+      "line": "test cases/failing/28 nested ternary/meson.build:3:12: ERROR: Nested ternary operators are not allowed."
     }
   ]
 }
diff --git a/test cases/failing/30 invalid man extension/foo.a1 b/test cases/failing/29 invalid man extension/foo.a1
index e69de29bb..e69de29bb 100644
--- a/test cases/failing/30 invalid man extension/foo.a1
+++ b/test cases/failing/29 invalid man extension/foo.a1
diff --git a/test cases/failing/30 invalid man extension/meson.build b/test cases/failing/29 invalid man extension/meson.build
index b3694d5a0..b3694d5a0 100644
--- a/test cases/failing/30 invalid man extension/meson.build
+++ b/test cases/failing/29 invalid man extension/meson.build
diff --git a/test cases/failing/30 invalid man extension/test.json b/test cases/failing/29 invalid man extension/test.json
index 6ab6843d3..2ff03f17a 100644
--- a/test cases/failing/30 invalid man extension/test.json
+++ b/test cases/failing/29 invalid man extension/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/30 invalid man extension/meson.build:2:5: ERROR: Man file must have a file extension of a number between 1 and 9"
+      "line": "test cases/failing/29 invalid man extension/meson.build:2:5: ERROR: Man file must have a file extension of a number between 1 and 9"
     }
   ]
 }
diff --git a/test cases/failing/31 no man extension/foo b/test cases/failing/30 no man extension/foo
index e69de29bb..e69de29bb 100644
--- a/test cases/failing/31 no man extension/foo
+++ b/test cases/failing/30 no man extension/foo
diff --git a/test cases/failing/31 no man extension/meson.build b/test cases/failing/30 no man extension/meson.build
index 33fdd3e52..33fdd3e52 100644
--- a/test cases/failing/31 no man extension/meson.build
+++ b/test cases/failing/30 no man extension/meson.build
diff --git a/test cases/failing/31 no man extension/test.json b/test cases/failing/30 no man extension/test.json
index 3082f4885..8239f01eb 100644
--- a/test cases/failing/31 no man extension/test.json
+++ b/test cases/failing/30 no man extension/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/31 no man extension/meson.build:2:5: ERROR: Man file must have a file extension of a number between 1 and 9"
+      "line": "test cases/failing/30 no man extension/meson.build:2:5: ERROR: Man file must have a file extension of a number between 1 and 9"
     }
   ]
 }
diff --git a/test cases/failing/32 exe static shared/meson.build b/test cases/failing/31 exe static shared/meson.build
index 2ae512583..2ae512583 100644
--- a/test cases/failing/32 exe static shared/meson.build
+++ b/test cases/failing/31 exe static shared/meson.build
diff --git a/test cases/failing/32 exe static shared/prog.c b/test cases/failing/31 exe static shared/prog.c
index 26603b694..26603b694 100644
--- a/test cases/failing/32 exe static shared/prog.c
+++ b/test cases/failing/31 exe static shared/prog.c
diff --git a/test cases/failing/32 exe static shared/shlib2.c b/test cases/failing/31 exe static shared/shlib2.c
index 5b68843dc..5b68843dc 100644
--- a/test cases/failing/32 exe static shared/shlib2.c
+++ b/test cases/failing/31 exe static shared/shlib2.c
diff --git a/test cases/failing/32 exe static shared/stat.c b/test cases/failing/31 exe static shared/stat.c
index 56ec66c67..56ec66c67 100644
--- a/test cases/failing/32 exe static shared/stat.c
+++ b/test cases/failing/31 exe static shared/stat.c
diff --git a/test cases/failing/32 exe static shared/test.json b/test cases/failing/31 exe static shared/test.json
index 0b859e32a..cb9efa673 100644
--- a/test cases/failing/32 exe static shared/test.json
+++ b/test cases/failing/31 exe static shared/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/32 exe static shared/meson.build:9:9: ERROR: Can't link non-PIC static library 'stat' into shared library 'shr2'. Use the 'pic' option to static_library to build with PIC."
+      "line": "test cases/failing/31 exe static shared/meson.build:9:9: ERROR: Can't link non-PIC static library 'stat' into shared library 'shr2'. Use the 'pic' option to static_library to build with PIC."
     }
   ]
 }
diff --git a/test cases/failing/33 non-root subproject/meson.build b/test cases/failing/32 non-root subproject/meson.build
index 65b1d23d1..65b1d23d1 100644
--- a/test cases/failing/33 non-root subproject/meson.build
+++ b/test cases/failing/32 non-root subproject/meson.build
diff --git a/test cases/failing/33 non-root subproject/some/meson.build b/test cases/failing/32 non-root subproject/some/meson.build
index d82f45123..d82f45123 100644
--- a/test cases/failing/33 non-root subproject/some/meson.build
+++ b/test cases/failing/32 non-root subproject/some/meson.build
diff --git a/test cases/failing/33 non-root subproject/test.json b/test cases/failing/32 non-root subproject/test.json
index d379a4334..6f6d4ee4d 100644
--- a/test cases/failing/33 non-root subproject/test.json
+++ b/test cases/failing/32 non-root subproject/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/33 non-root subproject/some/meson.build:1:0: ERROR: Attempted to resolve subproject without subprojects directory present."
+      "line": "test cases/failing/32 non-root subproject/some/meson.build:1:0: ERROR: Attempted to resolve subproject without subprojects directory present."
     }
   ]
 }
diff --git a/test cases/failing/34 dependency not-required then required/meson.build b/test cases/failing/33 dependency not-required then required/meson.build
index 54f5a5857..54f5a5857 100644
--- a/test cases/failing/34 dependency not-required then required/meson.build
+++ b/test cases/failing/33 dependency not-required then required/meson.build
diff --git a/test cases/failing/34 dependency not-required then required/test.json b/test cases/failing/33 dependency not-required then required/test.json
index 7dd851956..7dd851956 100644
--- a/test cases/failing/34 dependency not-required then required/test.json
+++ b/test cases/failing/33 dependency not-required then required/test.json
diff --git a/test cases/failing/35 project argument after target/exe.c b/test cases/failing/34 project argument after target/exe.c
index 11b7fad8e..11b7fad8e 100644
--- a/test cases/failing/35 project argument after target/exe.c
+++ b/test cases/failing/34 project argument after target/exe.c
diff --git a/test cases/failing/35 project argument after target/meson.build b/test cases/failing/34 project argument after target/meson.build
index 5402c67fc..5402c67fc 100644
--- a/test cases/failing/35 project argument after target/meson.build
+++ b/test cases/failing/34 project argument after target/meson.build
diff --git a/test cases/failing/35 project argument after target/test.json b/test cases/failing/34 project argument after target/test.json
index f5efd9bd8..7a41b7d83 100644
--- a/test cases/failing/35 project argument after target/test.json
+++ b/test cases/failing/34 project argument after target/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/35 project argument after target/meson.build:7:0: ERROR: Tried to use 'add_project_arguments' after a build target has been declared."
+      "line": "test cases/failing/34 project argument after target/meson.build:7:0: ERROR: Tried to use 'add_project_arguments' after a build target has been declared."
     }
   ]
 }
diff --git a/test cases/failing/36 pkgconfig dependency impossible conditions/meson.build b/test cases/failing/35 pkgconfig dependency impossible conditions/meson.build
index 874b58177..874b58177 100644
--- a/test cases/failing/36 pkgconfig dependency impossible conditions/meson.build
+++ b/test cases/failing/35 pkgconfig dependency impossible conditions/meson.build
diff --git a/test cases/failing/36 pkgconfig dependency impossible conditions/test.json b/test cases/failing/35 pkgconfig dependency impossible conditions/test.json
index 6deddbe3a..74b9731f9 100644
--- a/test cases/failing/36 pkgconfig dependency impossible conditions/test.json
+++ b/test cases/failing/35 pkgconfig dependency impossible conditions/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/36 pkgconfig dependency impossible conditions/meson.build:7:0: ERROR: Dependency 'zlib' is required but not found."
+      "line": "test cases/failing/35 pkgconfig dependency impossible conditions/meson.build:7:0: ERROR: Dependency 'zlib' is required but not found."
     }
   ]
 }
diff --git a/test cases/failing/37 has function external dependency/meson.build b/test cases/failing/36 has function external dependency/meson.build
index 45a3bc246..45a3bc246 100644
--- a/test cases/failing/37 has function external dependency/meson.build
+++ b/test cases/failing/36 has function external dependency/meson.build
diff --git a/test cases/failing/37 has function external dependency/mylib.c b/test cases/failing/36 has function external dependency/mylib.c
index d9fbd342b..d9fbd342b 100644
--- a/test cases/failing/37 has function external dependency/mylib.c
+++ b/test cases/failing/36 has function external dependency/mylib.c
diff --git a/test cases/failing/37 has function external dependency/test.json b/test cases/failing/36 has function external dependency/test.json
index 81d6f918c..705cf453b 100644
--- a/test cases/failing/37 has function external dependency/test.json
+++ b/test cases/failing/36 has function external dependency/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/37 has function external dependency/meson.build:8:3: ERROR: Dependencies must be external dependencies"
+      "line": "test cases/failing/36 has function external dependency/meson.build:8:3: ERROR: Dependencies must be external dependencies"
     }
   ]
 }
diff --git a/test cases/failing/38 prefix absolute/meson.build b/test cases/failing/37 prefix absolute/meson.build
index 6d0114be2..6d0114be2 100644
--- a/test cases/failing/38 prefix absolute/meson.build
+++ b/test cases/failing/37 prefix absolute/meson.build
diff --git a/test cases/failing/38 prefix absolute/test.json b/test cases/failing/37 prefix absolute/test.json
index 859906cb7..c1f8271ab 100644
--- a/test cases/failing/38 prefix absolute/test.json
+++ b/test cases/failing/37 prefix absolute/test.json
@@ -5,7 +5,7 @@
   "stdout": [
     {
       "comment": "literal 'some/path/notabs' appears in output, irrespective of os.path.sep, as that's the prefix",
-      "line": "test cases/failing/38 prefix absolute/meson.build:1:0: ERROR: prefix value 'some/path/notabs' must be an absolute path"
+      "line": "test cases/failing/37 prefix absolute/meson.build:1:0: ERROR: prefix value 'some/path/notabs' must be an absolute path"
     }
   ]
 }
diff --git a/test cases/failing/39 kwarg assign/dummy.c b/test cases/failing/38 kwarg assign/dummy.c
index 16fcdd9f4..16fcdd9f4 100644
--- a/test cases/failing/39 kwarg assign/dummy.c
+++ b/test cases/failing/38 kwarg assign/dummy.c
diff --git a/test cases/failing/39 kwarg assign/meson.build b/test cases/failing/38 kwarg assign/meson.build
index 7d4252100..7d4252100 100644
--- a/test cases/failing/39 kwarg assign/meson.build
+++ b/test cases/failing/38 kwarg assign/meson.build
diff --git a/test cases/failing/39 kwarg assign/prog.c b/test cases/failing/38 kwarg assign/prog.c
index 11b7fad8e..11b7fad8e 100644
--- a/test cases/failing/39 kwarg assign/prog.c
+++ b/test cases/failing/38 kwarg assign/prog.c
diff --git a/test cases/failing/39 kwarg assign/test.json b/test cases/failing/38 kwarg assign/test.json
index e12f2dcbc..daf2550cc 100644
--- a/test cases/failing/39 kwarg assign/test.json
+++ b/test cases/failing/38 kwarg assign/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/39 kwarg assign/meson.build:3:30: ERROR: Tried to assign values inside an argument list."
+      "line": "test cases/failing/38 kwarg assign/meson.build:3:30: ERROR: Tried to assign values inside an argument list."
     }
   ]
 }
diff --git a/test cases/failing/40 custom target plainname many inputs/1.txt b/test cases/failing/39 custom target plainname many inputs/1.txt
index d00491fd7..d00491fd7 100644
--- a/test cases/failing/40 custom target plainname many inputs/1.txt
+++ b/test cases/failing/39 custom target plainname many inputs/1.txt
diff --git a/test cases/failing/40 custom target plainname many inputs/2.txt b/test cases/failing/39 custom target plainname many inputs/2.txt
index 0cfbf0888..0cfbf0888 100644
--- a/test cases/failing/40 custom target plainname many inputs/2.txt
+++ b/test cases/failing/39 custom target plainname many inputs/2.txt
diff --git a/test cases/failing/40 custom target plainname many inputs/catfiles.py b/test cases/failing/39 custom target plainname many inputs/catfiles.py
index 1c53e24e7..1c53e24e7 100644
--- a/test cases/failing/40 custom target plainname many inputs/catfiles.py
+++ b/test cases/failing/39 custom target plainname many inputs/catfiles.py
diff --git a/test cases/failing/40 custom target plainname many inputs/meson.build b/test cases/failing/39 custom target plainname many inputs/meson.build
index 8513bf800..8513bf800 100644
--- a/test cases/failing/40 custom target plainname many inputs/meson.build
+++ b/test cases/failing/39 custom target plainname many inputs/meson.build
diff --git a/test cases/failing/40 custom target plainname many inputs/test.json b/test cases/failing/39 custom target plainname many inputs/test.json
index f5c3abfa0..e3f4c1b7d 100644
--- a/test cases/failing/40 custom target plainname many inputs/test.json
+++ b/test cases/failing/39 custom target plainname many inputs/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/40 custom target plainname many inputs/meson.build:5:0: ERROR: custom_target: output cannot contain \"@PLAINNAME@\" or \"@BASENAME@\" when there is more than one input (we can't know which to use)"
+      "line": "test cases/failing/39 custom target plainname many inputs/meson.build:5:0: ERROR: custom_target: output cannot contain \"@PLAINNAME@\" or \"@BASENAME@\" when there is more than one input (we can't know which to use)"
     }
   ]
 }
diff --git a/test cases/failing/41 custom target outputs not matching install_dirs/generator.py b/test cases/failing/40 custom target outputs not matching install_dirs/generator.py
index 4ac61795b..4ac61795b 100755
--- a/test cases/failing/41 custom target outputs not matching install_dirs/generator.py
+++ b/test cases/failing/40 custom target outputs not matching install_dirs/generator.py
diff --git a/test cases/failing/41 custom target outputs not matching install_dirs/meson.build b/test cases/failing/40 custom target outputs not matching install_dirs/meson.build
index ed99dba23..ed99dba23 100644
--- a/test cases/failing/41 custom target outputs not matching install_dirs/meson.build
+++ b/test cases/failing/40 custom target outputs not matching install_dirs/meson.build
diff --git a/test cases/failing/41 custom target outputs not matching install_dirs/test.json b/test cases/failing/40 custom target outputs not matching install_dirs/test.json
index f9e2ba781..f9e2ba781 100644
--- a/test cases/failing/41 custom target outputs not matching install_dirs/test.json
+++ b/test cases/failing/40 custom target outputs not matching install_dirs/test.json
diff --git a/test cases/failing/42 project name colon/meson.build b/test cases/failing/41 project name colon/meson.build
index 53e947ef2..53e947ef2 100644
--- a/test cases/failing/42 project name colon/meson.build
+++ b/test cases/failing/41 project name colon/meson.build
diff --git a/test cases/failing/42 project name colon/test.json b/test cases/failing/41 project name colon/test.json
index c3b880e65..8c8e28436 100644
--- a/test cases/failing/42 project name colon/test.json
+++ b/test cases/failing/41 project name colon/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/42 project name colon/meson.build:1:0: ERROR: Project name 'name with :' must not contain ':'"
+      "line": "test cases/failing/41 project name colon/meson.build:1:0: ERROR: Project name 'name with :' must not contain ':'"
     }
   ]
 }
diff --git a/test cases/failing/43 abs subdir/bob/meson.build b/test cases/failing/42 abs subdir/bob/meson.build
index 7bbf4b284..7bbf4b284 100644
--- a/test cases/failing/43 abs subdir/bob/meson.build
+++ b/test cases/failing/42 abs subdir/bob/meson.build
diff --git a/test cases/failing/43 abs subdir/meson.build b/test cases/failing/42 abs subdir/meson.build
index a8534d0e1..a8534d0e1 100644
--- a/test cases/failing/43 abs subdir/meson.build
+++ b/test cases/failing/42 abs subdir/meson.build
diff --git a/test cases/failing/43 abs subdir/test.json b/test cases/failing/42 abs subdir/test.json
index 201ed44d0..5b99c2470 100644
--- a/test cases/failing/43 abs subdir/test.json
+++ b/test cases/failing/42 abs subdir/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/43 abs subdir/meson.build:5:0: ERROR: Subdir argument must be a relative path."
+      "line": "test cases/failing/42 abs subdir/meson.build:5:0: ERROR: Subdir argument must be a relative path."
     }
   ]
 }
diff --git a/test cases/failing/44 abspath to srcdir/meson.build b/test cases/failing/43 abspath to srcdir/meson.build
index 78c612420..78c612420 100644
--- a/test cases/failing/44 abspath to srcdir/meson.build
+++ b/test cases/failing/43 abspath to srcdir/meson.build
diff --git a/test cases/failing/44 abspath to srcdir/test.json b/test cases/failing/43 abspath to srcdir/test.json
index c64ecfbd6..af9588d2b 100644
--- a/test cases/failing/44 abspath to srcdir/test.json
+++ b/test cases/failing/43 abspath to srcdir/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/44 abspath to srcdir/meson.build:3:0: ERROR: Tried to form an absolute path to a dir in the source tree."
+      "line": "test cases/failing/43 abspath to srcdir/meson.build:3:0: ERROR: Tried to form an absolute path to a dir in the source tree."
     }
   ]
 }
diff --git a/test cases/failing/45 pkgconfig variables reserved/meson.build b/test cases/failing/44 pkgconfig variables reserved/meson.build
index 82ae995d4..82ae995d4 100644
--- a/test cases/failing/45 pkgconfig variables reserved/meson.build
+++ b/test cases/failing/44 pkgconfig variables reserved/meson.build
diff --git a/test cases/failing/45 pkgconfig variables reserved/simple.c b/test cases/failing/44 pkgconfig variables reserved/simple.c
index e8a6d8330..e8a6d8330 100644
--- a/test cases/failing/45 pkgconfig variables reserved/simple.c
+++ b/test cases/failing/44 pkgconfig variables reserved/simple.c
diff --git a/test cases/failing/45 pkgconfig variables reserved/simple.h b/test cases/failing/44 pkgconfig variables reserved/simple.h
index bb52e6d72..bb52e6d72 100644
--- a/test cases/failing/45 pkgconfig variables reserved/simple.h
+++ b/test cases/failing/44 pkgconfig variables reserved/simple.h
diff --git a/test cases/failing/45 pkgconfig variables reserved/test.json b/test cases/failing/44 pkgconfig variables reserved/test.json
index 853eb822b..66ded591b 100644
--- a/test cases/failing/45 pkgconfig variables reserved/test.json
+++ b/test cases/failing/44 pkgconfig variables reserved/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/45 pkgconfig variables reserved/meson.build:8:5: ERROR: Variable \"prefix\" is reserved"
+      "line": "test cases/failing/44 pkgconfig variables reserved/meson.build:8:5: ERROR: Variable \"prefix\" is reserved"
     }
   ]
 }
diff --git a/test cases/failing/46 pkgconfig variables zero length/meson.build b/test cases/failing/45 pkgconfig variables zero length/meson.build
index 65d33445c..65d33445c 100644
--- a/test cases/failing/46 pkgconfig variables zero length/meson.build
+++ b/test cases/failing/45 pkgconfig variables zero length/meson.build
diff --git a/test cases/failing/46 pkgconfig variables zero length/simple.c b/test cases/failing/45 pkgconfig variables zero length/simple.c
index e8a6d8330..e8a6d8330 100644
--- a/test cases/failing/46 pkgconfig variables zero length/simple.c
+++ b/test cases/failing/45 pkgconfig variables zero length/simple.c
diff --git a/test cases/failing/46 pkgconfig variables zero length/simple.h b/test cases/failing/45 pkgconfig variables zero length/simple.h
index bb52e6d72..bb52e6d72 100644
--- a/test cases/failing/46 pkgconfig variables zero length/simple.h
+++ b/test cases/failing/45 pkgconfig variables zero length/simple.h
diff --git a/test cases/failing/46 pkgconfig variables zero length/test.json b/test cases/failing/45 pkgconfig variables zero length/test.json
index b1740650d..899b9edf7 100644
--- a/test cases/failing/46 pkgconfig variables zero length/test.json
+++ b/test cases/failing/45 pkgconfig variables zero length/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/46 pkgconfig variables zero length/meson.build:8:5: ERROR: pkgconfig.generate keyword argument \"variables\" empty variable name"
+      "line": "test cases/failing/45 pkgconfig variables zero length/meson.build:8:5: ERROR: pkgconfig.generate keyword argument \"variables\" empty variable name"
     }
   ]
 }
diff --git a/test cases/failing/47 pkgconfig variables not key value/meson.build b/test cases/failing/46 pkgconfig variables not key value/meson.build
index 02fa7376f..02fa7376f 100644
--- a/test cases/failing/47 pkgconfig variables not key value/meson.build
+++ b/test cases/failing/46 pkgconfig variables not key value/meson.build
diff --git a/test cases/failing/47 pkgconfig variables not key value/simple.c b/test cases/failing/46 pkgconfig variables not key value/simple.c
index e8a6d8330..e8a6d8330 100644
--- a/test cases/failing/47 pkgconfig variables not key value/simple.c
+++ b/test cases/failing/46 pkgconfig variables not key value/simple.c
diff --git a/test cases/failing/47 pkgconfig variables not key value/simple.h b/test cases/failing/46 pkgconfig variables not key value/simple.h
index bb52e6d72..bb52e6d72 100644
--- a/test cases/failing/47 pkgconfig variables not key value/simple.h
+++ b/test cases/failing/46 pkgconfig variables not key value/simple.h
diff --git a/test cases/failing/47 pkgconfig variables not key value/test.json b/test cases/failing/46 pkgconfig variables not key value/test.json
index 11cd374f9..5729d1eb3 100644
--- a/test cases/failing/47 pkgconfig variables not key value/test.json
+++ b/test cases/failing/46 pkgconfig variables not key value/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/47 pkgconfig variables not key value/meson.build:8:5: ERROR: pkgconfig.generate keyword argument \"variables\" variable 'this_should_be_key_value' must have a value separated by equals sign."
+      "line": "test cases/failing/46 pkgconfig variables not key value/meson.build:8:5: ERROR: pkgconfig.generate keyword argument \"variables\" variable 'this_should_be_key_value' must have a value separated by equals sign."
     }
   ]
 }
diff --git a/test cases/failing/48 executable comparison/meson.build b/test cases/failing/47 executable comparison/meson.build
index 041bcf3d3..041bcf3d3 100644
--- a/test cases/failing/48 executable comparison/meson.build
+++ b/test cases/failing/47 executable comparison/meson.build
diff --git a/test cases/failing/48 executable comparison/prog.c b/test cases/failing/47 executable comparison/prog.c
index 0314ff17b..0314ff17b 100644
--- a/test cases/failing/48 executable comparison/prog.c
+++ b/test cases/failing/47 executable comparison/prog.c
diff --git a/test cases/failing/48 executable comparison/test.json b/test cases/failing/47 executable comparison/test.json
index db6dac3e3..f365477b6 100644
--- a/test cases/failing/48 executable comparison/test.json
+++ b/test cases/failing/47 executable comparison/test.json
@@ -2,7 +2,7 @@
   "stdout": [
     {
       "match": "re",
-      "line": "test cases/failing/48 executable comparison/meson.build:6:14: ERROR: Object <ExecutableHolder prog1@exe: prog1(.exe)?> of type Executable does not support the `<` operator."
+      "line": "test cases/failing/47 executable comparison/meson.build:6:14: ERROR: Object <ExecutableHolder prog1@exe: prog1(.exe)?> of type Executable does not support the `<` operator."
     }
   ]
 }
diff --git a/test cases/failing/49 inconsistent comparison/meson.build b/test cases/failing/48 inconsistent comparison/meson.build
index 237a157dc..237a157dc 100644
--- a/test cases/failing/49 inconsistent comparison/meson.build
+++ b/test cases/failing/48 inconsistent comparison/meson.build
diff --git a/test cases/failing/49 inconsistent comparison/test.json b/test cases/failing/48 inconsistent comparison/test.json
index 4440a86d2..42157a5ea 100644
--- a/test cases/failing/49 inconsistent comparison/test.json
+++ b/test cases/failing/48 inconsistent comparison/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/49 inconsistent comparison/meson.build:5:12: ERROR: Object <[ArrayHolder] holds [list]: []> of type array does not support the `<` operator."
+      "line": "test cases/failing/48 inconsistent comparison/meson.build:5:12: ERROR: Object <[ArrayHolder] holds [list]: []> of type array does not support the `<` operator."
     }
   ]
 }
diff --git a/test cases/failing/50 slashname/meson.build b/test cases/failing/49 slashname/meson.build
index 29fe1fceb..29fe1fceb 100644
--- a/test cases/failing/50 slashname/meson.build
+++ b/test cases/failing/49 slashname/meson.build
diff --git a/test cases/failing/50 slashname/sub/meson.build b/test cases/failing/49 slashname/sub/meson.build
index 3baacf601..3baacf601 100644
--- a/test cases/failing/50 slashname/sub/meson.build
+++ b/test cases/failing/49 slashname/sub/meson.build
diff --git a/test cases/failing/50 slashname/sub/prog.c b/test cases/failing/49 slashname/sub/prog.c
index 722de0abe..722de0abe 100644
--- a/test cases/failing/50 slashname/sub/prog.c
+++ b/test cases/failing/49 slashname/sub/prog.c
diff --git a/test cases/failing/50 slashname/test.json b/test cases/failing/49 slashname/test.json
index 44b566c2b..e07d1631b 100644
--- a/test cases/failing/50 slashname/test.json
+++ b/test cases/failing/49 slashname/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/50 slashname/meson.build:9:0: ERROR: Target \"sub/prog\" has a path segment pointing to directory \"sub\". This is an error."
+      "line": "test cases/failing/49 slashname/meson.build:9:0: ERROR: Target \"sub/prog\" has a path segment pointing to directory \"sub\". This is an error."
     }
   ]
 }
diff --git a/test cases/failing/51 reserved meson prefix/meson-foo/meson.build b/test cases/failing/50 reserved meson prefix/meson-foo/meson.build
index e69de29bb..e69de29bb 100644
--- a/test cases/failing/51 reserved meson prefix/meson-foo/meson.build
+++ b/test cases/failing/50 reserved meson prefix/meson-foo/meson.build
diff --git a/test cases/failing/51 reserved meson prefix/meson.build b/test cases/failing/50 reserved meson prefix/meson.build
index 1339035ad..1339035ad 100644
--- a/test cases/failing/51 reserved meson prefix/meson.build
+++ b/test cases/failing/50 reserved meson prefix/meson.build
diff --git a/test cases/failing/51 reserved meson prefix/test.json b/test cases/failing/50 reserved meson prefix/test.json
index 9eb1fa452..512a4454a 100644
--- a/test cases/failing/51 reserved meson prefix/test.json
+++ b/test cases/failing/50 reserved meson prefix/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/51 reserved meson prefix/meson.build:3:0: ERROR: The \"meson-\" prefix is reserved and cannot be used for top-level subdir()."
+      "line": "test cases/failing/50 reserved meson prefix/meson.build:3:0: ERROR: The \"meson-\" prefix is reserved and cannot be used for top-level subdir()."
     }
   ]
 }
diff --git a/test cases/failing/52 or on new line/meson.build b/test cases/failing/51 or on new line/meson.build
index b0bd08efa..b0bd08efa 100644
--- a/test cases/failing/52 or on new line/meson.build
+++ b/test cases/failing/51 or on new line/meson.build
diff --git a/test cases/failing/52 or on new line/meson_options.txt b/test cases/failing/51 or on new line/meson_options.txt
index 3302cf4ec..3302cf4ec 100644
--- a/test cases/failing/52 or on new line/meson_options.txt
+++ b/test cases/failing/51 or on new line/meson_options.txt
diff --git a/test cases/failing/52 or on new line/test.json b/test cases/failing/51 or on new line/test.json
index 49a7255b0..c05d1a8ce 100644
--- a/test cases/failing/52 or on new line/test.json
+++ b/test cases/failing/51 or on new line/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/52 or on new line/meson.build:4:8: ERROR: Invalid or clause."
+      "line": "test cases/failing/51 or on new line/meson.build:4:8: ERROR: Invalid or clause."
     }
   ]
 }
diff --git a/test cases/failing/53 link with executable/meson.build b/test cases/failing/52 link with executable/meson.build
index 186b3e595..186b3e595 100644
--- a/test cases/failing/53 link with executable/meson.build
+++ b/test cases/failing/52 link with executable/meson.build
diff --git a/test cases/failing/53 link with executable/module.c b/test cases/failing/52 link with executable/module.c
index dc0124a24..dc0124a24 100644
--- a/test cases/failing/53 link with executable/module.c
+++ b/test cases/failing/52 link with executable/module.c
diff --git a/test cases/failing/53 link with executable/prog.c b/test cases/failing/52 link with executable/prog.c
index f3836d7ba..f3836d7ba 100644
--- a/test cases/failing/53 link with executable/prog.c
+++ b/test cases/failing/52 link with executable/prog.c
diff --git a/test cases/failing/53 link with executable/test.json b/test cases/failing/52 link with executable/test.json
index 8c25e07bd..ba9c34549 100644
--- a/test cases/failing/53 link with executable/test.json
+++ b/test cases/failing/52 link with executable/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/53 link with executable/meson.build:4:4: ERROR: Link target 'prog' is not linkable."
+      "line": "test cases/failing/52 link with executable/meson.build:4:4: ERROR: Link target 'prog' is not linkable."
     }
   ]
 }
diff --git a/test cases/failing/54 assign custom target index/meson.build b/test cases/failing/53 assign custom target index/meson.build
index 7f2a820b8..7f2a820b8 100644
--- a/test cases/failing/54 assign custom target index/meson.build
+++ b/test cases/failing/53 assign custom target index/meson.build
diff --git a/test cases/failing/54 assign custom target index/test.json b/test cases/failing/53 assign custom target index/test.json
index 15287d6da..e9990a20f 100644
--- a/test cases/failing/54 assign custom target index/test.json
+++ b/test cases/failing/53 assign custom target index/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/54 assign custom target index/meson.build:24:0: ERROR: Assignment target must be an id."
+      "line": "test cases/failing/53 assign custom target index/meson.build:24:0: ERROR: Assignment target must be an id."
     }
   ]
 }
diff --git a/test cases/failing/55 getoption prefix/meson.build b/test cases/failing/54 getoption prefix/meson.build
index 8f85cff2a..8f85cff2a 100644
--- a/test cases/failing/55 getoption prefix/meson.build
+++ b/test cases/failing/54 getoption prefix/meson.build
diff --git a/test cases/failing/55 getoption prefix/subprojects/abc/meson.build b/test cases/failing/54 getoption prefix/subprojects/abc/meson.build
index aa9c3df0f..aa9c3df0f 100644
--- a/test cases/failing/55 getoption prefix/subprojects/abc/meson.build
+++ b/test cases/failing/54 getoption prefix/subprojects/abc/meson.build
diff --git a/test cases/failing/55 getoption prefix/subprojects/abc/meson_options.txt b/test cases/failing/54 getoption prefix/subprojects/abc/meson_options.txt
index 89e624e24..89e624e24 100644
--- a/test cases/failing/55 getoption prefix/subprojects/abc/meson_options.txt
+++ b/test cases/failing/54 getoption prefix/subprojects/abc/meson_options.txt
diff --git a/test cases/failing/55 getoption prefix/test.json b/test cases/failing/54 getoption prefix/test.json
index 9f3a93656..d2ba2f609 100644
--- a/test cases/failing/55 getoption prefix/test.json
+++ b/test cases/failing/54 getoption prefix/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/55 getoption prefix/meson.build:5:0: ERROR: Having a colon in option name is forbidden, projects are not allowed to directly access options of other subprojects."
+      "line": "test cases/failing/54 getoption prefix/meson.build:5:0: ERROR: Having a colon in option name is forbidden, projects are not allowed to directly access options of other subprojects."
     }
   ]
 }
diff --git a/test cases/failing/56 bad option argument/meson.build b/test cases/failing/55 bad option argument/meson.build
index 5219cfb96..5219cfb96 100644
--- a/test cases/failing/56 bad option argument/meson.build
+++ b/test cases/failing/55 bad option argument/meson.build
diff --git a/test cases/failing/56 bad option argument/meson_options.txt b/test cases/failing/55 bad option argument/meson_options.txt
index 0e0372b89..0e0372b89 100644
--- a/test cases/failing/56 bad option argument/meson_options.txt
+++ b/test cases/failing/55 bad option argument/meson_options.txt
diff --git a/test cases/failing/56 bad option argument/test.json b/test cases/failing/55 bad option argument/test.json
index c7957cdc4..0bfc4b9dc 100644
--- a/test cases/failing/56 bad option argument/test.json
+++ b/test cases/failing/55 bad option argument/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/56 bad option argument/meson_options.txt:1:0: ERROR: string option got unknown keyword arguments \"value_\""
+      "line": "test cases/failing/55 bad option argument/meson_options.txt:1:0: ERROR: string option got unknown keyword arguments \"value_\""
     }
   ]
 }
diff --git a/test cases/failing/57 subproj filegrab/meson.build b/test cases/failing/56 subproj filegrab/meson.build
index b5c484cac..b5c484cac 100644
--- a/test cases/failing/57 subproj filegrab/meson.build
+++ b/test cases/failing/56 subproj filegrab/meson.build
diff --git a/test cases/failing/57 subproj filegrab/prog.c b/test cases/failing/56 subproj filegrab/prog.c
index 0314ff17b..0314ff17b 100644
--- a/test cases/failing/57 subproj filegrab/prog.c
+++ b/test cases/failing/56 subproj filegrab/prog.c
diff --git a/test cases/failing/57 subproj filegrab/subprojects/a/meson.build b/test cases/failing/56 subproj filegrab/subprojects/a/meson.build
index 80b988804..80b988804 100644
--- a/test cases/failing/57 subproj filegrab/subprojects/a/meson.build
+++ b/test cases/failing/56 subproj filegrab/subprojects/a/meson.build
diff --git a/test cases/failing/57 subproj filegrab/test.json b/test cases/failing/56 subproj filegrab/test.json
index 8b0b27f67..cdd102955 100644
--- a/test cases/failing/57 subproj filegrab/test.json
+++ b/test cases/failing/56 subproj filegrab/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/57 subproj filegrab/subprojects/a/meson.build:3:0: ERROR: Sandbox violation: Tried to grab file prog.c outside current (sub)project."
+      "line": "test cases/failing/56 subproj filegrab/subprojects/a/meson.build:3:0: ERROR: Sandbox violation: Tried to grab file prog.c outside current (sub)project."
     }
   ]
 }
diff --git a/test cases/failing/58 grab subproj/meson.build b/test cases/failing/57 grab subproj/meson.build
index 30fc69093..30fc69093 100644
--- a/test cases/failing/58 grab subproj/meson.build
+++ b/test cases/failing/57 grab subproj/meson.build
diff --git a/test cases/failing/58 grab subproj/subprojects/foo/meson.build b/test cases/failing/57 grab subproj/subprojects/foo/meson.build
index b346f6d9a..b346f6d9a 100644
--- a/test cases/failing/58 grab subproj/subprojects/foo/meson.build
+++ b/test cases/failing/57 grab subproj/subprojects/foo/meson.build
diff --git a/test cases/failing/58 grab subproj/subprojects/foo/sub.c b/test cases/failing/57 grab subproj/subprojects/foo/sub.c
index a94b1f5ad..a94b1f5ad 100644
--- a/test cases/failing/58 grab subproj/subprojects/foo/sub.c
+++ b/test cases/failing/57 grab subproj/subprojects/foo/sub.c
diff --git a/test cases/failing/58 grab subproj/test.json b/test cases/failing/57 grab subproj/test.json
index bdb0fdfc4..1915efd46 100644
--- a/test cases/failing/58 grab subproj/test.json
+++ b/test cases/failing/57 grab subproj/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/58 grab subproj/meson.build:7:0: ERROR: Sandbox violation: Tried to grab file sub.c from a nested subproject."
+      "line": "test cases/failing/57 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/59 grab sibling/meson.build b/test cases/failing/58 grab sibling/meson.build
index 5ddc295e9..5ddc295e9 100644
--- a/test cases/failing/59 grab sibling/meson.build
+++ b/test cases/failing/58 grab sibling/meson.build
diff --git a/test cases/failing/59 grab sibling/subprojects/a/meson.build b/test cases/failing/58 grab sibling/subprojects/a/meson.build
index 6dd9f61fc..6dd9f61fc 100644
--- a/test cases/failing/59 grab sibling/subprojects/a/meson.build
+++ b/test cases/failing/58 grab sibling/subprojects/a/meson.build
diff --git a/test cases/failing/59 grab sibling/subprojects/b/meson.build b/test cases/failing/58 grab sibling/subprojects/b/meson.build
index 57f261a24..57f261a24 100644
--- a/test cases/failing/59 grab sibling/subprojects/b/meson.build
+++ b/test cases/failing/58 grab sibling/subprojects/b/meson.build
diff --git a/test cases/failing/59 grab sibling/subprojects/b/sneaky.c b/test cases/failing/58 grab sibling/subprojects/b/sneaky.c
index 46718c6cc..46718c6cc 100644
--- a/test cases/failing/59 grab sibling/subprojects/b/sneaky.c
+++ b/test cases/failing/58 grab sibling/subprojects/b/sneaky.c
diff --git a/test cases/failing/59 grab sibling/test.json b/test cases/failing/58 grab sibling/test.json
index ec17e7e05..cbf8b2ddc 100644
--- a/test cases/failing/59 grab sibling/test.json
+++ b/test cases/failing/58 grab sibling/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/59 grab sibling/subprojects/a/meson.build:3:0: ERROR: Sandbox violation: Tried to grab file sneaky.c outside current (sub)project."
+      "line": "test cases/failing/58 grab sibling/subprojects/a/meson.build:3:0: ERROR: Sandbox violation: Tried to grab file sneaky.c outside current (sub)project."
     }
   ]
 }
diff --git a/test cases/failing/60 string as link target/meson.build b/test cases/failing/59 string as link target/meson.build
index cb83fff6a..cb83fff6a 100644
--- a/test cases/failing/60 string as link target/meson.build
+++ b/test cases/failing/59 string as link target/meson.build
diff --git a/test cases/failing/60 string as link target/prog.c b/test cases/failing/59 string as link target/prog.c
index 0314ff17b..0314ff17b 100644
--- a/test cases/failing/60 string as link target/prog.c
+++ b/test cases/failing/59 string as link target/prog.c
diff --git a/test cases/failing/60 string as link target/test.json b/test cases/failing/59 string as link target/test.json
index a97b124ea..ddc639980 100644
--- a/test cases/failing/60 string as link target/test.json
+++ b/test cases/failing/59 string as link target/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/60 string as link target/meson.build:2:0: ERROR: '' is not a target."
+      "line": "test cases/failing/59 string as link target/meson.build:2:0: ERROR: '' is not a target."
     }
   ]
 }
diff --git a/test cases/failing/61 dependency not-found and required/meson.build b/test cases/failing/60 dependency not-found and required/meson.build
index 1ce574738..1ce574738 100644
--- a/test cases/failing/61 dependency not-found and required/meson.build
+++ b/test cases/failing/60 dependency not-found and required/meson.build
diff --git a/test cases/failing/61 dependency not-found and required/test.json b/test cases/failing/60 dependency not-found and required/test.json
index f7a6c9f21..c104a6ad7 100644
--- a/test cases/failing/61 dependency not-found and required/test.json
+++ b/test cases/failing/60 dependency not-found and required/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/61 dependency not-found and required/meson.build:2:6: ERROR: Dependency is required but has no candidates."
+      "line": "test cases/failing/60 dependency not-found and required/meson.build:2:6: ERROR: Dependency is required but has no candidates."
     }
   ]
 }
diff --git a/test cases/failing/62 subproj different versions/main.c b/test cases/failing/61 subproj different versions/main.c
index 8793c623a..8793c623a 100644
--- a/test cases/failing/62 subproj different versions/main.c
+++ b/test cases/failing/61 subproj different versions/main.c
diff --git a/test cases/failing/62 subproj different versions/meson.build b/test cases/failing/61 subproj different versions/meson.build
index e964e423e..e964e423e 100644
--- a/test cases/failing/62 subproj different versions/meson.build
+++ b/test cases/failing/61 subproj different versions/meson.build
diff --git a/test cases/failing/62 subproj different versions/subprojects/a/a.c b/test cases/failing/61 subproj different versions/subprojects/a/a.c
index cd41a6588..cd41a6588 100644
--- a/test cases/failing/62 subproj different versions/subprojects/a/a.c
+++ b/test cases/failing/61 subproj different versions/subprojects/a/a.c
diff --git a/test cases/failing/62 subproj different versions/subprojects/a/a.h b/test cases/failing/61 subproj different versions/subprojects/a/a.h
index 8f1d49eda..8f1d49eda 100644
--- a/test cases/failing/62 subproj different versions/subprojects/a/a.h
+++ b/test cases/failing/61 subproj different versions/subprojects/a/a.h
diff --git a/test cases/failing/62 subproj different versions/subprojects/a/meson.build b/test cases/failing/61 subproj different versions/subprojects/a/meson.build
index e84182a07..e84182a07 100644
--- a/test cases/failing/62 subproj different versions/subprojects/a/meson.build
+++ b/test cases/failing/61 subproj different versions/subprojects/a/meson.build
diff --git a/test cases/failing/62 subproj different versions/subprojects/b/b.c b/test cases/failing/61 subproj different versions/subprojects/b/b.c
index f85f8c3f8..f85f8c3f8 100644
--- a/test cases/failing/62 subproj different versions/subprojects/b/b.c
+++ b/test cases/failing/61 subproj different versions/subprojects/b/b.c
diff --git a/test cases/failing/62 subproj different versions/subprojects/b/b.h b/test cases/failing/61 subproj different versions/subprojects/b/b.h
index eced786a0..eced786a0 100644
--- a/test cases/failing/62 subproj different versions/subprojects/b/b.h
+++ b/test cases/failing/61 subproj different versions/subprojects/b/b.h
diff --git a/test cases/failing/62 subproj different versions/subprojects/b/meson.build b/test cases/failing/61 subproj different versions/subprojects/b/meson.build
index 0398340e6..0398340e6 100644
--- a/test cases/failing/62 subproj different versions/subprojects/b/meson.build
+++ b/test cases/failing/61 subproj different versions/subprojects/b/meson.build
diff --git a/test cases/failing/62 subproj different versions/subprojects/c/c.h b/test cases/failing/61 subproj different versions/subprojects/c/c.h
index 2b15f607c..2b15f607c 100644
--- a/test cases/failing/62 subproj different versions/subprojects/c/c.h
+++ b/test cases/failing/61 subproj different versions/subprojects/c/c.h
diff --git a/test cases/failing/62 subproj different versions/subprojects/c/meson.build b/test cases/failing/61 subproj different versions/subprojects/c/meson.build
index 7184933b2..7184933b2 100644
--- a/test cases/failing/62 subproj different versions/subprojects/c/meson.build
+++ b/test cases/failing/61 subproj different versions/subprojects/c/meson.build
diff --git a/test cases/failing/62 subproj different versions/test.json b/test cases/failing/61 subproj different versions/test.json
index 705ff51f1..b395baa8e 100644
--- a/test cases/failing/62 subproj different versions/test.json
+++ b/test cases/failing/61 subproj different versions/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/62 subproj different versions/subprojects/b/meson.build:3:8: ERROR: Dependency 'c' is required but not found."
+      "line": "test cases/failing/61 subproj different versions/subprojects/b/meson.build:3:8: ERROR: Dependency 'c' is required but not found."
     }
   ]
 }
diff --git a/test cases/failing/63 wrong boost module/meson.build b/test cases/failing/62 wrong boost module/meson.build
index 937e58749..937e58749 100644
--- a/test cases/failing/63 wrong boost module/meson.build
+++ b/test cases/failing/62 wrong boost module/meson.build
diff --git a/test cases/failing/63 wrong boost module/test.json b/test cases/failing/62 wrong boost module/test.json
index ec3c1b083..75ef82b7e 100644
--- a/test cases/failing/63 wrong boost module/test.json
+++ b/test cases/failing/62 wrong boost module/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/63 wrong boost module/meson.build:9:10: ERROR: Dependency \"boost\" not found, tried system"
+      "line": "test cases/failing/62 wrong boost module/meson.build:9:10: ERROR: Dependency \"boost\" not found, tried system"
     }
   ]
 }
diff --git a/test cases/failing/64 install_data rename bad size/file1.txt b/test cases/failing/63 install_data rename bad size/file1.txt
index e69de29bb..e69de29bb 100644
--- a/test cases/failing/64 install_data rename bad size/file1.txt
+++ b/test cases/failing/63 install_data rename bad size/file1.txt
diff --git a/test cases/failing/64 install_data rename bad size/file2.txt b/test cases/failing/63 install_data rename bad size/file2.txt
index e69de29bb..e69de29bb 100644
--- a/test cases/failing/64 install_data rename bad size/file2.txt
+++ b/test cases/failing/63 install_data rename bad size/file2.txt
diff --git a/test cases/failing/64 install_data rename bad size/meson.build b/test cases/failing/63 install_data rename bad size/meson.build
index 849bb9aec..849bb9aec 100644
--- a/test cases/failing/64 install_data rename bad size/meson.build
+++ b/test cases/failing/63 install_data rename bad size/meson.build
diff --git a/test cases/failing/64 install_data rename bad size/test.json b/test cases/failing/63 install_data rename bad size/test.json
index 5ed47480a..28988af02 100644
--- a/test cases/failing/64 install_data rename bad size/test.json
+++ b/test cases/failing/63 install_data rename bad size/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/64 install_data rename bad size/meson.build:3:0: ERROR: \"rename\" and \"sources\" argument lists must be the same length if \"rename\" is given. Rename has 1 elements and sources has 2."
+      "line": "test cases/failing/63 install_data rename bad size/meson.build:3:0: ERROR: \"rename\" and \"sources\" argument lists must be the same length if \"rename\" is given. Rename has 1 elements and sources has 2."
     }
   ]
 }
diff --git a/test cases/failing/65 skip only subdir/meson.build b/test cases/failing/64 skip only subdir/meson.build
index 4832bd49c..4832bd49c 100644
--- a/test cases/failing/65 skip only subdir/meson.build
+++ b/test cases/failing/64 skip only subdir/meson.build
diff --git a/test cases/failing/65 skip only subdir/subdir/meson.build b/test cases/failing/64 skip only subdir/subdir/meson.build
index 1ba447b22..1ba447b22 100644
--- a/test cases/failing/65 skip only subdir/subdir/meson.build
+++ b/test cases/failing/64 skip only subdir/subdir/meson.build
diff --git a/test cases/failing/65 skip only subdir/test.json b/test cases/failing/64 skip only subdir/test.json
index 2747566dc..54fa369aa 100644
--- a/test cases/failing/65 skip only subdir/test.json
+++ b/test cases/failing/64 skip only subdir/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/65 skip only subdir/meson.build:8:0: ERROR: File main.cpp does not exist."
+      "line": "test cases/failing/64 skip only subdir/meson.build:8:0: ERROR: File main.cpp does not exist."
     }
   ]
 }
diff --git a/test cases/failing/66 dual override/meson.build b/test cases/failing/65 dual override/meson.build
index 999b8bc14..999b8bc14 100644
--- a/test cases/failing/66 dual override/meson.build
+++ b/test cases/failing/65 dual override/meson.build
diff --git a/test cases/failing/66 dual override/overrides.py b/test cases/failing/65 dual override/overrides.py
index 49e9b7ad6..49e9b7ad6 100644
--- a/test cases/failing/66 dual override/overrides.py
+++ b/test cases/failing/65 dual override/overrides.py
diff --git a/test cases/failing/66 dual override/test.json b/test cases/failing/65 dual override/test.json
index b8c26510d..6daa014bc 100644
--- a/test cases/failing/66 dual override/test.json
+++ b/test cases/failing/65 dual override/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/66 dual override/meson.build:5:6: ERROR: Tried to override executable \"override\" which has already been overridden."
+      "line": "test cases/failing/65 dual override/meson.build:5:6: ERROR: Tried to override executable \"override\" which has already been overridden."
     }
   ]
 }
diff --git a/test cases/failing/67 override used/meson.build b/test cases/failing/66 override used/meson.build
index 582fc1b05..582fc1b05 100644
--- a/test cases/failing/67 override used/meson.build
+++ b/test cases/failing/66 override used/meson.build
diff --git a/test cases/failing/67 override used/other.py b/test cases/failing/66 override used/other.py
index f62ba960d..f62ba960d 100755
--- a/test cases/failing/67 override used/other.py
+++ b/test cases/failing/66 override used/other.py
diff --git a/test cases/failing/67 override used/something.py b/test cases/failing/66 override used/something.py
index 64c9454c3..64c9454c3 100755
--- a/test cases/failing/67 override used/something.py
+++ b/test cases/failing/66 override used/something.py
diff --git a/test cases/failing/67 override used/test.json b/test cases/failing/66 override used/test.json
index 90d8b4b8d..c73e4a479 100644
--- a/test cases/failing/67 override used/test.json
+++ b/test cases/failing/66 override used/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/67 override used/meson.build:5:6: ERROR: Tried to override finding of executable \"something.py\" which has already been found."
+      "line": "test cases/failing/66 override used/meson.build:5:6: ERROR: Tried to override finding of executable \"something.py\" which has already been found."
     }
   ]
 }
diff --git a/test cases/failing/68 run_command unclean exit/meson.build b/test cases/failing/67 run_command unclean exit/meson.build
index f6bf895a8..f6bf895a8 100644
--- a/test cases/failing/68 run_command unclean exit/meson.build
+++ b/test cases/failing/67 run_command unclean exit/meson.build
diff --git a/test cases/failing/68 run_command unclean exit/returncode.py b/test cases/failing/67 run_command unclean exit/returncode.py
index 84dbc5df6..84dbc5df6 100755
--- a/test cases/failing/68 run_command unclean exit/returncode.py
+++ b/test cases/failing/67 run_command unclean exit/returncode.py
diff --git a/test cases/failing/68 run_command unclean exit/test.json b/test cases/failing/67 run_command unclean exit/test.json
index cef67e515..957884992 100644
--- a/test cases/failing/68 run_command unclean exit/test.json
+++ b/test cases/failing/67 run_command unclean exit/test.json
@@ -2,7 +2,7 @@
   "stdout": [
     {
       "match": "re",
-      "line": "test cases/failing/68 run_command unclean exit/meson\\.build:4:0: ERROR: Command `.*['\"].*[\\\\/]test cases[\\\\/]failing[\\\\/]68 run_command unclean exit[\\\\/]\\.[\\\\/]returncode\\.py['\"] 1` failed with status 1\\."
+      "line": "test cases/failing/67 run_command unclean exit/meson\\.build:4:0: ERROR: Command `.*['\"].*[\\\\/]test cases[\\\\/]failing[\\\\/]67 run_command unclean exit[\\\\/]\\.[\\\\/]returncode\\.py['\"] 1` failed with status 1\\."
     }
   ]
 }
diff --git a/test cases/failing/69 int literal leading zero/meson.build b/test cases/failing/68 int literal leading zero/meson.build
index 87c776f49..87c776f49 100644
--- a/test cases/failing/69 int literal leading zero/meson.build
+++ b/test cases/failing/68 int literal leading zero/meson.build
diff --git a/test cases/failing/69 int literal leading zero/test.json b/test cases/failing/68 int literal leading zero/test.json
index 200b569b2..c98217ad0 100644
--- a/test cases/failing/69 int literal leading zero/test.json
+++ b/test cases/failing/68 int literal leading zero/test.json
@@ -2,7 +2,7 @@
   "stdout": [
     {
       "comment": "this error message is not very informative",
-      "line": "test cases/failing/69 int literal leading zero/meson.build:5:13: ERROR: Expecting eof got number."
+      "line": "test cases/failing/68 int literal leading zero/meson.build:5:13: ERROR: Expecting eof got number."
     }
   ]
 }
diff --git a/test cases/failing/70 configuration immutable/input b/test cases/failing/69 configuration immutable/input
index e69de29bb..e69de29bb 100644
--- a/test cases/failing/70 configuration immutable/input
+++ b/test cases/failing/69 configuration immutable/input
diff --git a/test cases/failing/70 configuration immutable/meson.build b/test cases/failing/69 configuration immutable/meson.build
index b6cac4126..b6cac4126 100644
--- a/test cases/failing/70 configuration immutable/meson.build
+++ b/test cases/failing/69 configuration immutable/meson.build
diff --git a/test cases/failing/70 configuration immutable/test.json b/test cases/failing/69 configuration immutable/test.json
index fc735fa38..94f0428c9 100644
--- a/test cases/failing/70 configuration immutable/test.json
+++ b/test cases/failing/69 configuration immutable/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/70 configuration immutable/meson.build:12:16: ERROR: Can not set values on configuration object that has been used."
+      "line": "test cases/failing/69 configuration immutable/meson.build:12:16: ERROR: Can not set values on configuration object that has been used."
     }
   ]
 }
diff --git a/test cases/failing/71 link with shared module on osx/meson.build b/test cases/failing/70 link with shared module on osx/meson.build
index bf18b3626..bf18b3626 100644
--- a/test cases/failing/71 link with shared module on osx/meson.build
+++ b/test cases/failing/70 link with shared module on osx/meson.build
diff --git a/test cases/failing/71 link with shared module on osx/module.c b/test cases/failing/70 link with shared module on osx/module.c
index 81b0d5af0..81b0d5af0 100644
--- a/test cases/failing/71 link with shared module on osx/module.c
+++ b/test cases/failing/70 link with shared module on osx/module.c
diff --git a/test cases/failing/71 link with shared module on osx/prog.c b/test cases/failing/70 link with shared module on osx/prog.c
index 8164d8da1..8164d8da1 100644
--- a/test cases/failing/71 link with shared module on osx/prog.c
+++ b/test cases/failing/70 link with shared module on osx/prog.c
diff --git a/test cases/failing/71 link with shared module on osx/test.json b/test cases/failing/70 link with shared module on osx/test.json
index 206d4297b..430edba48 100644
--- a/test cases/failing/71 link with shared module on osx/test.json
+++ b/test cases/failing/70 link with shared module on osx/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/71 link with shared module on osx/meson.build:8:4: ERROR: target prog links against shared module mymodule. This is not permitted on OSX"
+      "line": "test cases/failing/70 link with shared module on osx/meson.build:8:4: ERROR: target prog links against shared module mymodule. This is not permitted on OSX"
     }
   ]
 }
diff --git a/test cases/failing/72 non-ascii in ascii encoded configure file/config9.h.in b/test cases/failing/71 non-ascii in ascii encoded configure file/config9.h.in
index 323bec64a..323bec64a 100644
--- a/test cases/failing/72 non-ascii in ascii encoded configure file/config9.h.in
+++ b/test cases/failing/71 non-ascii in ascii encoded configure file/config9.h.in
diff --git a/test cases/failing/72 non-ascii in ascii encoded configure file/meson.build b/test cases/failing/71 non-ascii in ascii encoded configure file/meson.build
index eadb627cd..eadb627cd 100644
--- a/test cases/failing/72 non-ascii in ascii encoded configure file/meson.build
+++ b/test cases/failing/71 non-ascii in ascii encoded configure file/meson.build
diff --git a/test cases/failing/72 non-ascii in ascii encoded configure file/test.json b/test cases/failing/71 non-ascii in ascii encoded configure file/test.json
index 1dc0b913a..8f993c9c6 100644
--- a/test cases/failing/72 non-ascii in ascii encoded configure file/test.json
+++ b/test cases/failing/71 non-ascii in ascii encoded configure file/test.json
@@ -2,7 +2,7 @@
   "stdout": [
     {
       "match": "re",
-      "line": "test cases/failing/72 non-ascii in ascii encoded configure file/meson\\.build:5:0: ERROR: Could not write output file .*[\\\\/]config9\\.h: 'ascii' codec can't encode character '\\\\u0434' in position 17: ordinal not in range\\(128\\)"
+      "line": "test cases/failing/71 non-ascii in ascii encoded configure file/meson\\.build:5:0: ERROR: Could not write output file .*[\\\\/]config9\\.h: 'ascii' codec can't encode character '\\\\u0434' in position 17: ordinal not in range\\(128\\)"
     }
   ]
 }
diff --git a/test cases/failing/73 subproj dependency not-found and required/meson.build b/test cases/failing/72 subproj dependency not-found and required/meson.build
index c5a296104..c5a296104 100644
--- a/test cases/failing/73 subproj dependency not-found and required/meson.build
+++ b/test cases/failing/72 subproj dependency not-found and required/meson.build
diff --git a/test cases/failing/73 subproj dependency not-found and required/test.json b/test cases/failing/72 subproj dependency not-found and required/test.json
index e79e28429..015893b79 100644
--- a/test cases/failing/73 subproj dependency not-found and required/test.json
+++ b/test cases/failing/72 subproj dependency not-found and required/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/73 subproj dependency not-found and required/meson.build:2:10: ERROR: Attempted to resolve subproject without subprojects directory present."
+      "line": "test cases/failing/72 subproj dependency not-found and required/meson.build:2:10: ERROR: Attempted to resolve subproject without subprojects directory present."
     }
   ]
 }
diff --git a/test cases/failing/74 unfound run/meson.build b/test cases/failing/73 unfound run/meson.build
index 3f37e9a06..3f37e9a06 100644
--- a/test cases/failing/74 unfound run/meson.build
+++ b/test cases/failing/73 unfound run/meson.build
diff --git a/test cases/failing/74 unfound run/test.json b/test cases/failing/73 unfound run/test.json
index 8d31785f7..00e708c6b 100644
--- a/test cases/failing/74 unfound run/test.json
+++ b/test cases/failing/73 unfound run/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/74 unfound run/meson.build:4:0: ERROR: Tried to use non-existing executable 'nonexisting_prog'"
+      "line": "test cases/failing/73 unfound run/meson.build:4:0: ERROR: Tried to use non-existing executable 'nonexisting_prog'"
     }
   ]
 }
diff --git a/test cases/failing/75 framework dependency with version/meson.build b/test cases/failing/74 framework dependency with version/meson.build
index ee315ebcb..ee315ebcb 100644
--- a/test cases/failing/75 framework dependency with version/meson.build
+++ b/test cases/failing/74 framework dependency with version/meson.build
diff --git a/test cases/failing/75 framework dependency with version/test.json b/test cases/failing/74 framework dependency with version/test.json
index 8a01356b2..5673758b2 100644
--- a/test cases/failing/75 framework dependency with version/test.json
+++ b/test cases/failing/74 framework dependency with version/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/75 framework dependency with version/meson.build:8:6: ERROR: Dependency lookup for appleframeworks with method 'framework' failed: Unknown version, but need ['>0']."
+      "line": "test cases/failing/74 framework dependency with version/meson.build:8:6: ERROR: Dependency lookup for appleframeworks with method 'framework' failed: Unknown version, but need ['>0']."
     }
   ]
 }
diff --git a/test cases/failing/76 override exe config/foo.c b/test cases/failing/75 override exe config/foo.c
index 03b2213bb..03b2213bb 100644
--- a/test cases/failing/76 override exe config/foo.c
+++ b/test cases/failing/75 override exe config/foo.c
diff --git a/test cases/failing/76 override exe config/meson.build b/test cases/failing/75 override exe config/meson.build
index a5d09249c..a5d09249c 100644
--- a/test cases/failing/76 override exe config/meson.build
+++ b/test cases/failing/75 override exe config/meson.build
diff --git a/test cases/failing/76 override exe config/test.json b/test cases/failing/75 override exe config/test.json
index 23b9055ea..2260dcc2c 100644
--- a/test cases/failing/76 override exe config/test.json
+++ b/test cases/failing/75 override exe config/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/76 override exe config/meson.build:6:0: ERROR: Program 'bar' was overridden with the compiled executable 'foo' and therefore cannot be used during configuration"
+      "line": "test cases/failing/75 override exe config/meson.build:6:0: ERROR: Program 'bar' was overridden with the compiled executable 'foo' and therefore cannot be used during configuration"
     }
   ]
 }
diff --git a/test cases/failing/77 gl dependency with version/meson.build b/test cases/failing/76 gl dependency with version/meson.build
index 012709302..012709302 100644
--- a/test cases/failing/77 gl dependency with version/meson.build
+++ b/test cases/failing/76 gl dependency with version/meson.build
diff --git a/test cases/failing/77 gl dependency with version/test.json b/test cases/failing/76 gl dependency with version/test.json
index 83665cbfb..3fd6f45de 100644
--- a/test cases/failing/77 gl dependency with version/test.json
+++ b/test cases/failing/76 gl dependency with version/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/77 gl dependency with version/meson.build:9:6: ERROR: Dependency lookup for gl with method 'system' failed: Unknown version, but need ['>0']."
+      "line": "test cases/failing/76 gl dependency with version/meson.build:9:6: ERROR: Dependency lookup for gl with method 'system' failed: Unknown version, but need ['>0']."
     }
   ]
 }
diff --git a/test cases/failing/78 threads dependency with version/meson.build b/test cases/failing/77 threads dependency with version/meson.build
index 6023faeb6..6023faeb6 100644
--- a/test cases/failing/78 threads dependency with version/meson.build
+++ b/test cases/failing/77 threads dependency with version/meson.build
diff --git a/test cases/failing/78 threads dependency with version/test.json b/test cases/failing/77 threads dependency with version/test.json
index ec02c2bfd..270f7ad3a 100644
--- a/test cases/failing/78 threads dependency with version/test.json
+++ b/test cases/failing/77 threads dependency with version/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/78 threads dependency with version/meson.build:3:6: ERROR: Dependency lookup for threads with method 'system' failed: Unknown version, but need ['>0']."
+      "line": "test cases/failing/77 threads dependency with version/meson.build:3:6: ERROR: Dependency lookup for threads with method 'system' failed: Unknown version, but need ['>0']."
     }
   ]
 }
diff --git a/test cases/failing/79 gtest dependency with version/meson.build b/test cases/failing/78 gtest dependency with version/meson.build
index efbffe1e7..efbffe1e7 100644
--- a/test cases/failing/79 gtest dependency with version/meson.build
+++ b/test cases/failing/78 gtest dependency with version/meson.build
diff --git a/test cases/failing/79 gtest dependency with version/test.json b/test cases/failing/78 gtest dependency with version/test.json
index a32a3c207..48789c64e 100644
--- a/test cases/failing/79 gtest dependency with version/test.json
+++ b/test cases/failing/78 gtest dependency with version/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/79 gtest dependency with version/meson.build:8:6: ERROR: Dependency 'gtest' is required but not found."
+      "line": "test cases/failing/78 gtest dependency with version/meson.build:8:6: ERROR: Dependency 'gtest' is required but not found."
     }
   ]
 }
diff --git a/test cases/failing/80 dub library/meson.build b/test cases/failing/79 dub library/meson.build
index 306d5b3e5..306d5b3e5 100644
--- a/test cases/failing/80 dub library/meson.build
+++ b/test cases/failing/79 dub library/meson.build
diff --git a/test cases/failing/80 dub library/test.json b/test cases/failing/79 dub library/test.json
index d3c7d4264..9f59604a4 100644
--- a/test cases/failing/80 dub library/test.json
+++ b/test cases/failing/79 dub library/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/80 dub library/meson.build:11:0: ERROR: Dependency \"dubtestproject\" not found"
+      "line": "test cases/failing/79 dub library/meson.build:11:0: ERROR: Dependency \"dubtestproject\" not found"
     }
   ]
 }
diff --git a/test cases/failing/81 dub executable/meson.build b/test cases/failing/80 dub executable/meson.build
index 9a134ea21..9a134ea21 100644
--- a/test cases/failing/81 dub executable/meson.build
+++ b/test cases/failing/80 dub executable/meson.build
diff --git a/test cases/failing/81 dub executable/test.json b/test cases/failing/80 dub executable/test.json
index 8aefa1706..edb74f62c 100644
--- a/test cases/failing/81 dub executable/test.json
+++ b/test cases/failing/80 dub executable/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/81 dub executable/meson.build:11:0: ERROR: Dependency \"dubtestproject:test1\" not found"
+      "line": "test cases/failing/80 dub executable/meson.build:11:0: ERROR: Dependency \"dubtestproject:test1\" not found"
     }
   ]
 }
diff --git a/test cases/failing/82 dub compiler/meson.build b/test cases/failing/81 dub compiler/meson.build
index 36f1849e5..36f1849e5 100644
--- a/test cases/failing/82 dub compiler/meson.build
+++ b/test cases/failing/81 dub compiler/meson.build
diff --git a/test cases/failing/82 dub compiler/test.json b/test cases/failing/81 dub compiler/test.json
index 89d1882d9..d82984d5d 100644
--- a/test cases/failing/82 dub compiler/test.json
+++ b/test cases/failing/81 dub compiler/test.json
@@ -13,7 +13,7 @@
   },
   "stdout": [
     {
-      "line": "test cases/failing/82 dub compiler/meson.build:17:0: ERROR: Dependency \"dubtestproject:test2\" not found"
+      "line": "test cases/failing/81 dub compiler/meson.build:17:0: ERROR: Dependency \"dubtestproject:test2\" not found"
     }
   ]
 }
diff --git a/test cases/failing/83 subproj not-found dep/meson.build b/test cases/failing/82 subproj not-found dep/meson.build
index 2b17df17e..2b17df17e 100644
--- a/test cases/failing/83 subproj not-found dep/meson.build
+++ b/test cases/failing/82 subproj not-found dep/meson.build
diff --git a/test cases/failing/83 subproj not-found dep/subprojects/somesubproj/meson.build b/test cases/failing/82 subproj not-found dep/subprojects/somesubproj/meson.build
index 5f451f401..5f451f401 100644
--- a/test cases/failing/83 subproj not-found dep/subprojects/somesubproj/meson.build
+++ b/test cases/failing/82 subproj not-found dep/subprojects/somesubproj/meson.build
diff --git a/test cases/failing/83 subproj not-found dep/test.json b/test cases/failing/82 subproj not-found dep/test.json
index 5da4fb9a3..e551ac7b3 100644
--- a/test cases/failing/83 subproj not-found dep/test.json
+++ b/test cases/failing/82 subproj not-found dep/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/83 subproj not-found dep/meson.build:2:10: ERROR: Dependency '(anonymous)' is required but not found."
+      "line": "test cases/failing/82 subproj not-found dep/meson.build:2:10: ERROR: Dependency '(anonymous)' is required but not found."
     }
   ]
 }
diff --git a/test cases/failing/84 invalid configure file/input b/test cases/failing/83 invalid configure file/input
index e69de29bb..e69de29bb 100644
--- a/test cases/failing/84 invalid configure file/input
+++ b/test cases/failing/83 invalid configure file/input
diff --git a/test cases/failing/84 invalid configure file/meson.build b/test cases/failing/83 invalid configure file/meson.build
index 08eca2bd0..08eca2bd0 100644
--- a/test cases/failing/84 invalid configure file/meson.build
+++ b/test cases/failing/83 invalid configure file/meson.build
diff --git a/test cases/failing/84 invalid configure file/test.json b/test cases/failing/83 invalid configure file/test.json
index 2b7a7457b..7982d1702 100644
--- a/test cases/failing/84 invalid configure file/test.json
+++ b/test cases/failing/83 invalid configure file/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/84 invalid configure file/meson.build:3:0: ERROR: \"install_dir\" must be specified when \"install\" in a configure_file is true"
+      "line": "test cases/failing/83 invalid configure file/meson.build:3:0: ERROR: \"install_dir\" must be specified when \"install\" in a configure_file is true"
     }
   ]
 }
diff --git a/test cases/failing/85 kwarg dupe/meson.build b/test cases/failing/84 kwarg dupe/meson.build
index 06821a278..06821a278 100644
--- a/test cases/failing/85 kwarg dupe/meson.build
+++ b/test cases/failing/84 kwarg dupe/meson.build
diff --git a/test cases/failing/85 kwarg dupe/prog.c b/test cases/failing/84 kwarg dupe/prog.c
index 5f3fbe6a2..5f3fbe6a2 100644
--- a/test cases/failing/85 kwarg dupe/prog.c
+++ b/test cases/failing/84 kwarg dupe/prog.c
diff --git a/test cases/failing/85 kwarg dupe/test.json b/test cases/failing/84 kwarg dupe/test.json
index 99719ad4c..c568d6b6e 100644
--- a/test cases/failing/85 kwarg dupe/test.json
+++ b/test cases/failing/84 kwarg dupe/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/85 kwarg dupe/meson.build:6:2: ERROR: Entry \"install\" defined both as a keyword argument and in a \"kwarg\" entry."
+      "line": "test cases/failing/84 kwarg dupe/meson.build:6:2: ERROR: Entry \"install\" defined both as a keyword argument and in a \"kwarg\" entry."
     }
   ]
 }
diff --git a/test cases/failing/86 missing pch file/meson.build b/test cases/failing/85 missing pch file/meson.build
index a67b79877..a67b79877 100644
--- a/test cases/failing/86 missing pch file/meson.build
+++ b/test cases/failing/85 missing pch file/meson.build
diff --git a/test cases/failing/86 missing pch file/prog.c b/test cases/failing/85 missing pch file/prog.c
index 11b7fad8e..11b7fad8e 100644
--- a/test cases/failing/86 missing pch file/prog.c
+++ b/test cases/failing/85 missing pch file/prog.c
diff --git a/test cases/failing/86 missing pch file/test.json b/test cases/failing/85 missing pch file/test.json
index cb269b706..05fb7ac6a 100644
--- a/test cases/failing/86 missing pch file/test.json
+++ b/test cases/failing/85 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/86 missing pch file/meson.build:2:6: ERROR: The following PCH files do not exist: pch/prog.h, pch/prog_pch.c"
+      "line": "test cases/failing/85 missing pch file/meson.build:2:6: ERROR: The following PCH files do not exist: pch/prog.h, pch/prog_pch.c"
     }
   ]
 }
diff --git a/test cases/failing/87 pch source different folder/include/pch.h b/test cases/failing/86 pch source different folder/include/pch.h
index e69de29bb..e69de29bb 100644
--- a/test cases/failing/87 pch source different folder/include/pch.h
+++ b/test cases/failing/86 pch source different folder/include/pch.h
diff --git a/test cases/failing/87 pch source different folder/meson.build b/test cases/failing/86 pch source different folder/meson.build
index d32071772..d32071772 100644
--- a/test cases/failing/87 pch source different folder/meson.build
+++ b/test cases/failing/86 pch source different folder/meson.build
diff --git a/test cases/failing/87 pch source different folder/prog.c b/test cases/failing/86 pch source different folder/prog.c
index 3fb1295e4..3fb1295e4 100644
--- a/test cases/failing/87 pch source different folder/prog.c
+++ b/test cases/failing/86 pch source different folder/prog.c
diff --git a/test cases/failing/87 pch source different folder/src/pch.c b/test cases/failing/86 pch source different folder/src/pch.c
index e69de29bb..e69de29bb 100644
--- a/test cases/failing/87 pch source different folder/src/pch.c
+++ b/test cases/failing/86 pch source different folder/src/pch.c
diff --git a/test cases/failing/87 pch source different folder/test.json b/test cases/failing/86 pch source different folder/test.json
index fd18d6866..05b6b7824 100644
--- a/test cases/failing/87 pch source different folder/test.json
+++ b/test cases/failing/86 pch source different folder/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/87 pch source different folder/meson.build:4:6: ERROR: executable keyword argument \"c_pch\" PCH files must be stored in the same folder."
+      "line": "test cases/failing/86 pch source different folder/meson.build:4:6: ERROR: executable keyword argument \"c_pch\" PCH files must be stored in the same folder."
     }
   ]
 }
diff --git a/test cases/failing/88 unknown config tool/meson.build b/test cases/failing/87 unknown config tool/meson.build
index 536976e35..536976e35 100644
--- a/test cases/failing/88 unknown config tool/meson.build
+++ b/test cases/failing/87 unknown config tool/meson.build
diff --git a/test cases/failing/88 unknown config tool/test.json b/test cases/failing/87 unknown config tool/test.json
index 5a53b26f0..025a5a495 100644
--- a/test cases/failing/88 unknown config tool/test.json
+++ b/test cases/failing/87 unknown config tool/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/88 unknown config tool/meson.build:2:0: ERROR: Dependency \"no-such-config-tool\" not found"
+      "line": "test cases/failing/87 unknown config tool/meson.build:2:0: ERROR: Dependency \"no-such-config-tool\" not found"
     }
   ]
 }
diff --git a/test cases/failing/89 custom target install data/Info.plist.cpp b/test cases/failing/88 custom target install data/Info.plist.cpp
index 9ca2fcbaf..9ca2fcbaf 100644
--- a/test cases/failing/89 custom target install data/Info.plist.cpp
+++ b/test cases/failing/88 custom target install data/Info.plist.cpp
diff --git a/test cases/failing/89 custom target install data/meson.build b/test cases/failing/88 custom target install data/meson.build
index 00d348cc0..00d348cc0 100644
--- a/test cases/failing/89 custom target install data/meson.build
+++ b/test cases/failing/88 custom target install data/meson.build
diff --git a/test cases/failing/89 custom target install data/preproc.py b/test cases/failing/88 custom target install data/preproc.py
index e6eba4c6a..e6eba4c6a 100644
--- a/test cases/failing/89 custom target install data/preproc.py
+++ b/test cases/failing/88 custom target install data/preproc.py
diff --git a/test cases/failing/89 custom target install data/test.json b/test cases/failing/88 custom target install data/test.json
index 3364a6a6c..fe34ebabc 100644
--- a/test cases/failing/89 custom target install data/test.json
+++ b/test cases/failing/88 custom target install data/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/89 custom target install data/meson.build:11:0: ERROR: install_data argument 1 was of type \"CustomTarget\" but should have been one of: \"str\", \"File\""
+      "line": "test cases/failing/88 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/90 add dict non string key/meson.build b/test cases/failing/89 add dict non string key/meson.build
index c81a3f764..c81a3f764 100644
--- a/test cases/failing/90 add dict non string key/meson.build
+++ b/test cases/failing/89 add dict non string key/meson.build
diff --git a/test cases/failing/90 add dict non string key/test.json b/test cases/failing/89 add dict non string key/test.json
index 822e09f54..ba841f40d 100644
--- a/test cases/failing/90 add dict non string key/test.json
+++ b/test cases/failing/89 add dict non string key/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/90 add dict non string key/meson.build:9:9: ERROR: Key must be a string"
+      "line": "test cases/failing/89 add dict non string key/meson.build:9:9: ERROR: Key must be a string"
     }
   ]
 }
diff --git a/test cases/failing/91 add dict duplicate keys/meson.build b/test cases/failing/90 add dict duplicate keys/meson.build
index 7a9b523b0..7a9b523b0 100644
--- a/test cases/failing/91 add dict duplicate keys/meson.build
+++ b/test cases/failing/90 add dict duplicate keys/meson.build
diff --git a/test cases/failing/91 add dict duplicate keys/test.json b/test cases/failing/90 add dict duplicate keys/test.json
index b6941e75f..a81691335 100644
--- a/test cases/failing/91 add dict duplicate keys/test.json
+++ b/test cases/failing/90 add dict duplicate keys/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/91 add dict duplicate keys/meson.build:9:27: ERROR: Duplicate dictionary key: myKey"
+      "line": "test cases/failing/90 add dict duplicate keys/meson.build:9:27: ERROR: Duplicate dictionary key: myKey"
     }
   ]
 }
diff --git a/test cases/failing/92 no host get_external_property/meson.build b/test cases/failing/91 no host get_external_property/meson.build
index c9567549f..c9567549f 100644
--- a/test cases/failing/92 no host get_external_property/meson.build
+++ b/test cases/failing/91 no host get_external_property/meson.build
diff --git a/test cases/failing/92 no host get_external_property/test.json b/test cases/failing/91 no host get_external_property/test.json
index 0f7a803ff..64f4681ae 100644
--- a/test cases/failing/92 no host get_external_property/test.json
+++ b/test cases/failing/91 no host get_external_property/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/92 no host get_external_property/meson.build:3:14: ERROR: Unknown property for host machine: nonexisting"
+      "line": "test cases/failing/91 no host get_external_property/meson.build:3:14: ERROR: Unknown property for host machine: nonexisting"
     }
   ]
 }
diff --git a/test cases/failing/93 no native compiler/main.c b/test cases/failing/92 no native compiler/main.c
index 9b6bdc2ec..9b6bdc2ec 100644
--- a/test cases/failing/93 no native compiler/main.c
+++ b/test cases/failing/92 no native compiler/main.c
diff --git a/test cases/failing/93 no native compiler/meson.build b/test cases/failing/92 no native compiler/meson.build
index f0126ac15..f0126ac15 100644
--- a/test cases/failing/93 no native compiler/meson.build
+++ b/test cases/failing/92 no native compiler/meson.build
diff --git a/test cases/failing/93 no native compiler/test.json b/test cases/failing/92 no native compiler/test.json
index adf99f1a2..38a83599e 100644
--- a/test cases/failing/93 no native compiler/test.json
+++ b/test cases/failing/92 no native compiler/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/93 no native compiler/meson.build:12:0: ERROR: No host machine compiler for \"main.c\""
+      "line": "test cases/failing/92 no native compiler/meson.build:12:0: ERROR: No host machine compiler for \"main.c\""
     }
   ]
 }
diff --git a/test cases/failing/94 subdir parse error/meson.build b/test cases/failing/93 subdir parse error/meson.build
index a744396ca..a744396ca 100644
--- a/test cases/failing/94 subdir parse error/meson.build
+++ b/test cases/failing/93 subdir parse error/meson.build
diff --git a/test cases/failing/94 subdir parse error/subdir/meson.build b/test cases/failing/93 subdir parse error/subdir/meson.build
index 3ac5ef938..3ac5ef938 100644
--- a/test cases/failing/94 subdir parse error/subdir/meson.build
+++ b/test cases/failing/93 subdir parse error/subdir/meson.build
diff --git a/test cases/failing/94 subdir parse error/test.json b/test cases/failing/93 subdir parse error/test.json
index 0bf82c1e2..fa565da9a 100644
--- a/test cases/failing/94 subdir parse error/test.json
+++ b/test cases/failing/93 subdir parse error/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/94 subdir parse error/subdir/meson.build:1:0: ERROR: Plusassignment target must be an id."
+      "line": "test cases/failing/93 subdir parse error/subdir/meson.build:1:0: ERROR: Plusassignment target must be an id."
     }
   ]
 }
diff --git a/test cases/failing/95 invalid option file/meson.build b/test cases/failing/94 invalid option file/meson.build
index b0347c33f..b0347c33f 100644
--- a/test cases/failing/95 invalid option file/meson.build
+++ b/test cases/failing/94 invalid option file/meson.build
diff --git a/test cases/failing/95 invalid option file/meson_options.txt b/test cases/failing/94 invalid option file/meson_options.txt
index eef843b53..eef843b53 100644
--- a/test cases/failing/95 invalid option file/meson_options.txt
+++ b/test cases/failing/94 invalid option file/meson_options.txt
diff --git a/test cases/failing/95 invalid option file/test.json b/test cases/failing/94 invalid option file/test.json
index debb4a144..6e0470811 100644
--- a/test cases/failing/95 invalid option file/test.json
+++ b/test cases/failing/94 invalid option file/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/95 invalid option file/meson_options.txt:1:0: ERROR: lexer: unrecognized token \"'\""
+      "line": "test cases/failing/94 invalid option file/meson_options.txt:1:0: ERROR: lexer: unrecognized token \"'\""
     }
   ]
 }
diff --git a/test cases/failing/96 no lang/main.c b/test cases/failing/95 no lang/main.c
index 9b6bdc2ec..9b6bdc2ec 100644
--- a/test cases/failing/96 no lang/main.c
+++ b/test cases/failing/95 no lang/main.c
diff --git a/test cases/failing/96 no lang/meson.build b/test cases/failing/95 no lang/meson.build
index 85c5db8e5..85c5db8e5 100644
--- a/test cases/failing/96 no lang/meson.build
+++ b/test cases/failing/95 no lang/meson.build
diff --git a/test cases/failing/96 no lang/test.json b/test cases/failing/95 no lang/test.json
index ab4ca5cdf..1e5ea2d6c 100644
--- a/test cases/failing/96 no lang/test.json
+++ b/test cases/failing/95 no lang/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/96 no lang/meson.build:2:0: ERROR: No host machine compiler for 'main.c'"
+      "line": "test cases/failing/95 no lang/meson.build:2:0: ERROR: No host machine compiler for 'main.c'"
     }
   ]
 }
diff --git a/test cases/failing/97 no glib-compile-resources/meson.build b/test cases/failing/96 no glib-compile-resources/meson.build
index aae0569da..aae0569da 100644
--- a/test cases/failing/97 no glib-compile-resources/meson.build
+++ b/test cases/failing/96 no glib-compile-resources/meson.build
diff --git a/test cases/failing/97 no glib-compile-resources/test.json b/test cases/failing/96 no glib-compile-resources/test.json
index f3d92ddfb..682b2c2da 100644
--- a/test cases/failing/97 no glib-compile-resources/test.json
+++ b/test cases/failing/96 no glib-compile-resources/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/97 no glib-compile-resources/meson.build:8:12: ERROR: Program 'glib-compile-resources' not found or not executable"
+      "line": "test cases/failing/96 no glib-compile-resources/meson.build:8:12: ERROR: Program 'glib-compile-resources' not found or not executable"
     }
   ]
 }
diff --git a/test cases/failing/97 no glib-compile-resources/trivial.gresource.xml b/test cases/failing/96 no glib-compile-resources/trivial.gresource.xml
index 1447b984d..1447b984d 100644
--- a/test cases/failing/97 no glib-compile-resources/trivial.gresource.xml
+++ b/test cases/failing/96 no glib-compile-resources/trivial.gresource.xml
diff --git a/test cases/failing/98 number in combo/meson.build b/test cases/failing/97 number in combo/meson.build
index 1a647df1a..1a647df1a 100644
--- a/test cases/failing/98 number in combo/meson.build
+++ b/test cases/failing/97 number in combo/meson.build
diff --git a/test cases/failing/98 number in combo/nativefile.ini b/test cases/failing/97 number in combo/nativefile.ini
index 55f10fc20..55f10fc20 100644
--- a/test cases/failing/98 number in combo/nativefile.ini
+++ b/test cases/failing/97 number in combo/nativefile.ini
diff --git a/test cases/failing/98 number in combo/test.json b/test cases/failing/97 number in combo/test.json
index c1c948480..195f59287 100644
--- a/test cases/failing/98 number in combo/test.json
+++ b/test cases/failing/97 number in combo/test.json
@@ -1,5 +1,5 @@
 {
   "stdout": [
-    { "line": "test cases/failing/98 number in combo/meson.build:1:0: ERROR: Value \"1\" (of type \"number\") for option \"optimization\" is not one of the choices. Possible choices are (as string): \"plain\", \"0\", \"g\", \"1\", \"2\", \"3\", \"s\"." }
+    { "line": "test cases/failing/97 number in combo/meson.build:1:0: ERROR: Value \"1\" (of type \"number\") for option \"optimization\" is not one of the choices. Possible choices are (as string): \"plain\", \"0\", \"g\", \"1\", \"2\", \"3\", \"s\"." }
   ]
 }
diff --git a/test cases/failing/99 bool in combo/meson.build b/test cases/failing/98 bool in combo/meson.build
index c5efd67ea..c5efd67ea 100644
--- a/test cases/failing/99 bool in combo/meson.build
+++ b/test cases/failing/98 bool in combo/meson.build
diff --git a/test cases/failing/99 bool in combo/meson_options.txt b/test cases/failing/98 bool in combo/meson_options.txt
index 0c8f5de00..0c8f5de00 100644
--- a/test cases/failing/99 bool in combo/meson_options.txt
+++ b/test cases/failing/98 bool in combo/meson_options.txt
diff --git a/test cases/failing/99 bool in combo/nativefile.ini b/test cases/failing/98 bool in combo/nativefile.ini
index b423957cf..b423957cf 100644
--- a/test cases/failing/99 bool in combo/nativefile.ini
+++ b/test cases/failing/98 bool in combo/nativefile.ini
diff --git a/test cases/failing/99 bool in combo/test.json b/test cases/failing/98 bool in combo/test.json
index b3effc767..f3df2bd8e 100644
--- a/test cases/failing/99 bool in combo/test.json
+++ b/test cases/failing/98 bool in combo/test.json
@@ -1,5 +1,5 @@
 {
   "stdout": [
-    { "line": "test cases/failing/99 bool in combo/meson.build:1:0: ERROR: Value \"True\" (of type \"boolean\") for option \"opt\" is not one of the choices. Possible choices are (as string): \"true\", \"false\"." }
+    { "line": "test cases/failing/98 bool in combo/meson.build:1:0: ERROR: Value \"True\" (of type \"boolean\") for option \"opt\" is not one of the choices. Possible choices are (as string): \"true\", \"false\"." }
   ]
 }
diff --git a/test cases/failing/100 compiler no lang/meson.build b/test cases/failing/99 compiler no lang/meson.build
index 366bbdd5d..366bbdd5d 100644
--- a/test cases/failing/100 compiler no lang/meson.build
+++ b/test cases/failing/99 compiler no lang/meson.build
diff --git a/test cases/failing/99 compiler no lang/test.json b/test cases/failing/99 compiler no lang/test.json
new file mode 100644
index 000000000..9b531ddba
--- /dev/null
+++ b/test cases/failing/99 compiler no lang/test.json
@@ -0,0 +1,7 @@
+{
+  "stdout": [
+    {
+      "line": "test cases/failing/99 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/rewrite/8 tricky dataflow/addSrc.json b/test cases/rewrite/9 tricky dataflow/addSrc.json
index 17e42926f..17e42926f 100644
--- a/test cases/rewrite/8 tricky dataflow/addSrc.json
+++ b/test cases/rewrite/9 tricky dataflow/addSrc.json
diff --git a/test cases/rewrite/8 tricky dataflow/info.json b/test cases/rewrite/9 tricky dataflow/info.json
index 8d4ac553a..8d4ac553a 100644
--- a/test cases/rewrite/8 tricky dataflow/info.json
+++ b/test cases/rewrite/9 tricky dataflow/info.json
diff --git a/test cases/rewrite/8 tricky dataflow/meson.build b/test cases/rewrite/9 tricky dataflow/meson.build
index 0431739ce..0431739ce 100644
--- a/test cases/rewrite/8 tricky dataflow/meson.build
+++ b/test cases/rewrite/9 tricky dataflow/meson.build
diff --git a/test cases/rust/28 self-contained/lib.rs b/test cases/rust/29 self-contained/lib.rs
index f8a8bf201..f8a8bf201 100644
--- a/test cases/rust/28 self-contained/lib.rs
+++ b/test cases/rust/29 self-contained/lib.rs
diff --git a/test cases/rust/28 self-contained/main.c b/test cases/rust/29 self-contained/main.c
index 11bedf5ae..11bedf5ae 100644
--- a/test cases/rust/28 self-contained/main.c
+++ b/test cases/rust/29 self-contained/main.c
diff --git a/test cases/rust/28 self-contained/meson.build b/test cases/rust/29 self-contained/meson.build
index 25de68f25..25de68f25 100644
--- a/test cases/rust/28 self-contained/meson.build
+++ b/test cases/rust/29 self-contained/meson.build
diff --git a/test cases/rust/28 self-contained/test.json b/test cases/rust/29 self-contained/test.json
index fccefd6f1..fccefd6f1 100644
--- a/test cases/rust/28 self-contained/test.json
+++ b/test cases/rust/29 self-contained/test.json
diff --git a/test cases/rust/29 rlib link subdir/cdep/f.c b/test cases/rust/30 rlib link subdir/cdep/f.c
index d64ff8ca2..d64ff8ca2 100644
--- a/test cases/rust/29 rlib link subdir/cdep/f.c
+++ b/test cases/rust/30 rlib link subdir/cdep/f.c
diff --git a/test cases/rust/29 rlib link subdir/cdep/meson.build b/test cases/rust/30 rlib link subdir/cdep/meson.build
index b7fd7e28b..b7fd7e28b 100644
--- a/test cases/rust/29 rlib link subdir/cdep/meson.build
+++ b/test cases/rust/30 rlib link subdir/cdep/meson.build
diff --git a/test cases/rust/29 rlib link subdir/f-sys.rs b/test cases/rust/30 rlib link subdir/f-sys.rs
index 88971208d..88971208d 100644
--- a/test cases/rust/29 rlib link subdir/f-sys.rs
+++ b/test cases/rust/30 rlib link subdir/f-sys.rs
diff --git a/test cases/rust/29 rlib link subdir/main.rs b/test cases/rust/30 rlib link subdir/main.rs
index 8ae3c3255..8ae3c3255 100644
--- a/test cases/rust/29 rlib link subdir/main.rs
+++ b/test cases/rust/30 rlib link subdir/main.rs
diff --git a/test cases/rust/29 rlib link subdir/meson.build b/test cases/rust/30 rlib link subdir/meson.build
index 89acff26f..89acff26f 100644
--- a/test cases/rust/29 rlib link subdir/meson.build
+++ b/test cases/rust/30 rlib link subdir/meson.build
diff --git a/test cases/rust/30 both machines/lib.rs b/test cases/rust/31 both machines/lib.rs
index 432593368..432593368 100644
--- a/test cases/rust/30 both machines/lib.rs
+++ b/test cases/rust/31 both machines/lib.rs
diff --git a/test cases/rust/30 both machines/meson.build b/test cases/rust/31 both machines/meson.build
index 511518a7b..511518a7b 100644
--- a/test cases/rust/30 both machines/meson.build
+++ b/test cases/rust/31 both machines/meson.build
diff --git a/test cases/rust/30 both machines/test.rs b/test cases/rust/31 both machines/test.rs
index c9679d452..c9679d452 100644
--- a/test cases/rust/30 both machines/test.rs
+++ b/test cases/rust/31 both machines/test.rs
diff --git a/test cases/rust/30 cargo workspace/meson.build b/test cases/rust/32 cargo workspace/meson.build
index 4d69fdfc0..4d69fdfc0 100644
--- a/test cases/rust/30 cargo workspace/meson.build
+++ b/test cases/rust/32 cargo workspace/meson.build
diff --git a/test cases/rust/30 cargo workspace/subprojects/foo.wrap b/test cases/rust/32 cargo workspace/subprojects/foo.wrap
index 3d21ca79a..3d21ca79a 100644
--- a/test cases/rust/30 cargo workspace/subprojects/foo.wrap
+++ b/test cases/rust/32 cargo workspace/subprojects/foo.wrap
diff --git a/test cases/rust/30 cargo workspace/subprojects/foo/Cargo.toml b/test cases/rust/32 cargo workspace/subprojects/foo/Cargo.toml
index 52f28d821..52f28d821 100644
--- a/test cases/rust/30 cargo workspace/subprojects/foo/Cargo.toml
+++ b/test cases/rust/32 cargo workspace/subprojects/foo/Cargo.toml
diff --git a/test cases/rust/30 cargo workspace/subprojects/foo/src/foo/Cargo.toml b/test cases/rust/32 cargo workspace/subprojects/foo/src/foo/Cargo.toml
index 52b39e9b2..52b39e9b2 100644
--- a/test cases/rust/30 cargo workspace/subprojects/foo/src/foo/Cargo.toml
+++ b/test cases/rust/32 cargo workspace/subprojects/foo/src/foo/Cargo.toml
diff --git a/test cases/rust/30 cargo workspace/subprojects/foo/src/foo/src/lib.rs b/test cases/rust/32 cargo workspace/subprojects/foo/src/foo/src/lib.rs
index 65803daa7..65803daa7 100644
--- a/test cases/rust/30 cargo workspace/subprojects/foo/src/foo/src/lib.rs
+++ b/test cases/rust/32 cargo workspace/subprojects/foo/src/foo/src/lib.rs
diff --git a/test cases/rust/30 cargo workspace/subprojects/foo/src/lib.rs b/test cases/rust/32 cargo workspace/subprojects/foo/src/lib.rs
index c3773818c..c3773818c 100644
--- a/test cases/rust/30 cargo workspace/subprojects/foo/src/lib.rs
+++ b/test cases/rust/32 cargo workspace/subprojects/foo/src/lib.rs
diff --git a/test cases/rust/30 cargo workspace/subprojects/foo/src/member1/Cargo.toml b/test cases/rust/32 cargo workspace/subprojects/foo/src/member1/Cargo.toml
index 2c521377a..2c521377a 100644
--- a/test cases/rust/30 cargo workspace/subprojects/foo/src/member1/Cargo.toml
+++ b/test cases/rust/32 cargo workspace/subprojects/foo/src/member1/Cargo.toml
diff --git a/test cases/rust/30 cargo workspace/subprojects/foo/src/member1/src/lib.rs b/test cases/rust/32 cargo workspace/subprojects/foo/src/member1/src/lib.rs
index d4778ce62..d4778ce62 100644
--- a/test cases/rust/30 cargo workspace/subprojects/foo/src/member1/src/lib.rs
+++ b/test cases/rust/32 cargo workspace/subprojects/foo/src/member1/src/lib.rs
diff --git a/test cases/rust/30 cargo workspace/subprojects/foo/subprojects/member2-1-rs.wrap b/test cases/rust/32 cargo workspace/subprojects/foo/subprojects/member2-1-rs.wrap
index 57ae2faa6..57ae2faa6 100644
--- a/test cases/rust/30 cargo workspace/subprojects/foo/subprojects/member2-1-rs.wrap
+++ b/test cases/rust/32 cargo workspace/subprojects/foo/subprojects/member2-1-rs.wrap
diff --git a/test cases/rust/30 cargo workspace/subprojects/foo/subprojects/member2-1.0/Cargo.toml b/test cases/rust/32 cargo workspace/subprojects/foo/subprojects/member2-1.0/Cargo.toml
index 059120a1e..059120a1e 100644
--- a/test cases/rust/30 cargo workspace/subprojects/foo/subprojects/member2-1.0/Cargo.toml
+++ b/test cases/rust/32 cargo workspace/subprojects/foo/subprojects/member2-1.0/Cargo.toml
diff --git a/test cases/rust/30 cargo workspace/subprojects/foo/subprojects/member2-1.0/src/lib.rs b/test cases/rust/32 cargo workspace/subprojects/foo/subprojects/member2-1.0/src/lib.rs
index 75703a957..75703a957 100644
--- a/test cases/rust/30 cargo workspace/subprojects/foo/subprojects/member2-1.0/src/lib.rs
+++ b/test cases/rust/32 cargo workspace/subprojects/foo/subprojects/member2-1.0/src/lib.rs
diff --git a/test cases/rust/30 cargo workspace/subprojects/member2.wrap b/test cases/rust/32 cargo workspace/subprojects/member2.wrap
index 3d43da646..3d43da646 100644
--- a/test cases/rust/30 cargo workspace/subprojects/member2.wrap
+++ b/test cases/rust/32 cargo workspace/subprojects/member2.wrap
diff --git a/test cases/rust/30 cargo workspace/test_foo_1.c b/test cases/rust/32 cargo workspace/test_foo_1.c
index d5f12a6ee..d5f12a6ee 100644
--- a/test cases/rust/30 cargo workspace/test_foo_1.c
+++ b/test cases/rust/32 cargo workspace/test_foo_1.c
diff --git a/test cases/rust/30 cargo workspace/test_foo_1.rs b/test cases/rust/32 cargo workspace/test_foo_1.rs
index 7d1ebb757..7d1ebb757 100644
--- a/test cases/rust/30 cargo workspace/test_foo_1.rs
+++ b/test cases/rust/32 cargo workspace/test_foo_1.rs
diff --git a/test cases/rust/31 cargo multiple versions/meson.build b/test cases/rust/33 cargo multiple versions/meson.build
index dd11508ae..dd11508ae 100644
--- a/test cases/rust/31 cargo multiple versions/meson.build
+++ b/test cases/rust/33 cargo multiple versions/meson.build
diff --git a/test cases/rust/31 cargo multiple versions/subprojects/foo-1-rs.wrap b/test cases/rust/33 cargo multiple versions/subprojects/foo-1-rs.wrap
index 5133599d2..5133599d2 100644
--- a/test cases/rust/31 cargo multiple versions/subprojects/foo-1-rs.wrap
+++ b/test cases/rust/33 cargo multiple versions/subprojects/foo-1-rs.wrap
diff --git a/test cases/rust/31 cargo multiple versions/subprojects/foo-1-rs/Cargo.toml b/test cases/rust/33 cargo multiple versions/subprojects/foo-1-rs/Cargo.toml
index 41de66978..41de66978 100644
--- a/test cases/rust/31 cargo multiple versions/subprojects/foo-1-rs/Cargo.toml
+++ b/test cases/rust/33 cargo multiple versions/subprojects/foo-1-rs/Cargo.toml
diff --git a/test cases/rust/31 cargo multiple versions/subprojects/foo-1-rs/lib.rs b/test cases/rust/33 cargo multiple versions/subprojects/foo-1-rs/lib.rs
index f3662d5cc..f3662d5cc 100644
--- a/test cases/rust/31 cargo multiple versions/subprojects/foo-1-rs/lib.rs
+++ b/test cases/rust/33 cargo multiple versions/subprojects/foo-1-rs/lib.rs
diff --git a/test cases/rust/31 cargo multiple versions/subprojects/foo-2-rs.wrap b/test cases/rust/33 cargo multiple versions/subprojects/foo-2-rs.wrap
index 5133599d2..5133599d2 100644
--- a/test cases/rust/31 cargo multiple versions/subprojects/foo-2-rs.wrap
+++ b/test cases/rust/33 cargo multiple versions/subprojects/foo-2-rs.wrap
diff --git a/test cases/rust/31 cargo multiple versions/subprojects/foo-2-rs/Cargo.toml b/test cases/rust/33 cargo multiple versions/subprojects/foo-2-rs/Cargo.toml
index ce55217e4..ce55217e4 100644
--- a/test cases/rust/31 cargo multiple versions/subprojects/foo-2-rs/Cargo.toml
+++ b/test cases/rust/33 cargo multiple versions/subprojects/foo-2-rs/Cargo.toml
diff --git a/test cases/rust/31 cargo multiple versions/subprojects/foo-2-rs/lib.rs b/test cases/rust/33 cargo multiple versions/subprojects/foo-2-rs/lib.rs
index afbf386e0..afbf386e0 100644
--- a/test cases/rust/31 cargo multiple versions/subprojects/foo-2-rs/lib.rs
+++ b/test cases/rust/33 cargo multiple versions/subprojects/foo-2-rs/lib.rs
diff --git a/test cases/rust/31 cargo multiple versions/subprojects/main.wrap b/test cases/rust/33 cargo multiple versions/subprojects/main.wrap
index 5133599d2..5133599d2 100644
--- a/test cases/rust/31 cargo multiple versions/subprojects/main.wrap
+++ b/test cases/rust/33 cargo multiple versions/subprojects/main.wrap
diff --git a/test cases/rust/31 cargo multiple versions/subprojects/main/Cargo.toml b/test cases/rust/33 cargo multiple versions/subprojects/main/Cargo.toml
index 0401a5958..0401a5958 100644
--- a/test cases/rust/31 cargo multiple versions/subprojects/main/Cargo.toml
+++ b/test cases/rust/33 cargo multiple versions/subprojects/main/Cargo.toml
diff --git a/test cases/rust/31 cargo multiple versions/subprojects/main/lib.rs b/test cases/rust/33 cargo multiple versions/subprojects/main/lib.rs
index 5029a27e5..5029a27e5 100644
--- a/test cases/rust/31 cargo multiple versions/subprojects/main/lib.rs
+++ b/test cases/rust/33 cargo multiple versions/subprojects/main/lib.rs
diff --git a/test cases/unit/125 python extension/foo.c b/test cases/unit/126 python extension/foo.c
index e1a0dfb7b..e1a0dfb7b 100644
--- a/test cases/unit/125 python extension/foo.c
+++ b/test cases/unit/126 python extension/foo.c
diff --git a/test cases/unit/125 python extension/meson.build b/test cases/unit/126 python extension/meson.build
index 8cebceab7..8cebceab7 100644
--- a/test cases/unit/125 python extension/meson.build
+++ b/test cases/unit/126 python extension/meson.build
diff --git a/test cases/unit/126 pkgsubproj/meson.build b/test cases/unit/127 pkgsubproj/meson.build
index b4cf89fa0..b4cf89fa0 100644
--- a/test cases/unit/126 pkgsubproj/meson.build
+++ b/test cases/unit/127 pkgsubproj/meson.build
diff --git a/test cases/unit/126 pkgsubproj/subprojects/sub/meson.build b/test cases/unit/127 pkgsubproj/subprojects/sub/meson.build
index 99622b681..99622b681 100644
--- a/test cases/unit/126 pkgsubproj/subprojects/sub/meson.build
+++ b/test cases/unit/127 pkgsubproj/subprojects/sub/meson.build
diff --git a/test cases/unit/127 test slice/meson.build b/test cases/unit/128 test slice/meson.build
index a41c2f62d..a41c2f62d 100644
--- a/test cases/unit/127 test slice/meson.build
+++ b/test cases/unit/128 test slice/meson.build
diff --git a/test cases/unit/127 test slice/test.py b/test cases/unit/128 test slice/test.py
index e69de29bb..e69de29bb 100644
--- a/test cases/unit/127 test slice/test.py
+++ b/test cases/unit/128 test slice/test.py
diff --git a/test cases/unit/128 sanitizers/meson.build b/test cases/unit/129 sanitizers/meson.build
index b42fb35d4..b42fb35d4 100644
--- a/test cases/unit/128 sanitizers/meson.build
+++ b/test cases/unit/129 sanitizers/meson.build
diff --git a/test cases/unit/129 long opt vs D/meson.build b/test cases/unit/130 long opt vs D/meson.build
index e05d88d20..e05d88d20 100644
--- a/test cases/unit/129 long opt vs D/meson.build
+++ b/test cases/unit/130 long opt vs D/meson.build
diff --git a/test cases/unit/129 long opt vs D/meson_options.txt b/test cases/unit/130 long opt vs D/meson_options.txt
index 255bf1576..255bf1576 100644
--- a/test cases/unit/129 long opt vs D/meson_options.txt
+++ b/test cases/unit/130 long opt vs D/meson_options.txt
diff --git a/test cases/unit/130 vala internal glib/lib.vala b/test cases/unit/131 vala internal glib/lib.vala
index e62e63234..e62e63234 100644
--- a/test cases/unit/130 vala internal glib/lib.vala
+++ b/test cases/unit/131 vala internal glib/lib.vala
diff --git a/test cases/unit/130 vala internal glib/meson.build b/test cases/unit/131 vala internal glib/meson.build
index 947908200..947908200 100644
--- a/test cases/unit/130 vala internal glib/meson.build
+++ b/test cases/unit/131 vala internal glib/meson.build
diff --git a/test cases/unit/130 vala internal glib/meson.options b/test cases/unit/131 vala internal glib/meson.options
index f8a1ecee3..f8a1ecee3 100644
--- a/test cases/unit/130 vala internal glib/meson.options
+++ b/test cases/unit/131 vala internal glib/meson.options
diff --git a/test cases/unit/131 custom target index test/meson.build b/test cases/unit/132 custom target index test/meson.build
index adbbb4df4..adbbb4df4 100644
--- a/test cases/unit/131 custom target index test/meson.build
+++ b/test cases/unit/132 custom target index test/meson.build