Condense test directory names.dircondense64

261 files changed, 86 insertions, 86 deletions

diff --git a/test cases/failing/101 no glib-compile-resources/meson.build b/test cases/failing/100 no glib-compile-resources/meson.build
index aae0569..aae0569 100644
--- a/test cases/failing/101 no glib-compile-resources/meson.build
+++ b/test cases/failing/100 no glib-compile-resources/meson.build
diff --git a/test cases/failing/101 no glib-compile-resources/test.json b/test cases/failing/100 no glib-compile-resources/test.json
index 7f0c02c..ad9ba29 100644
--- a/test cases/failing/101 no glib-compile-resources/test.json
+++ b/test cases/failing/100 no glib-compile-resources/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/101 no glib-compile-resources/meson.build:8:0: ERROR: Program 'glib-compile-resources' not found or not executable"
+      "line": "test cases/failing/100 no glib-compile-resources/meson.build:8:0: ERROR: Program 'glib-compile-resources' not found or not executable"
     }
   ]
 }
diff --git a/test cases/failing/101 no glib-compile-resources/trivial.gresource.xml b/test cases/failing/100 no glib-compile-resources/trivial.gresource.xml
index 1447b98..1447b98 100644
--- a/test cases/failing/101 no glib-compile-resources/trivial.gresource.xml
+++ b/test cases/failing/100 no glib-compile-resources/trivial.gresource.xml
diff --git a/test cases/failing/100 no lang/test.json b/test cases/failing/100 no lang/test.json
deleted file mode 100644
index a74adaf..0000000
--- a/test cases/failing/100 no lang/test.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "stdout": [
-    {
-      "line": "test cases/failing/100 no lang/meson.build:2:0: ERROR: No host machine compiler for 'main.c'"
-    }
-  ]
-}
diff --git a/test cases/failing/102 number in combo/meson.build b/test cases/failing/101 number in combo/meson.build
index 1a647df..1a647df 100644
--- a/test cases/failing/102 number in combo/meson.build
+++ b/test cases/failing/101 number in combo/meson.build
diff --git a/test cases/failing/102 number in combo/nativefile.ini b/test cases/failing/101 number in combo/nativefile.ini
index 55f10fc..55f10fc 100644
--- a/test cases/failing/102 number in combo/nativefile.ini
+++ b/test cases/failing/101 number in combo/nativefile.ini
diff --git a/test cases/failing/102 number in combo/test.json b/test cases/failing/101 number in combo/test.json
index 8e70a60..5d37df1 100644
--- a/test cases/failing/102 number in combo/test.json
+++ b/test cases/failing/101 number in combo/test.json
@@ -1,5 +1,5 @@
 {
   "stdout": [
-    { "line": "test cases/failing/102 number in combo/meson.build:1:0: ERROR: Value \"1\" (of type \"number\") for combo option \"Optimization level\" is not one of the choices. Possible choices are (as string): \"0\", \"g\", \"1\", \"2\", \"3\", \"s\"." }
+    { "line": "test cases/failing/101 number in combo/meson.build:1:0: ERROR: Value \"1\" (of type \"number\") for combo option \"Optimization level\" is not one of the choices. Possible choices are (as string): \"0\", \"g\", \"1\", \"2\", \"3\", \"s\"." }
   ]
 }
diff --git a/test cases/failing/103 bool in combo/meson.build b/test cases/failing/102 bool in combo/meson.build
index c5efd67..c5efd67 100644
--- a/test cases/failing/103 bool in combo/meson.build
+++ b/test cases/failing/102 bool in combo/meson.build
diff --git a/test cases/failing/103 bool in combo/meson_options.txt b/test cases/failing/102 bool in combo/meson_options.txt
index 0c8f5de..0c8f5de 100644
--- a/test cases/failing/103 bool in combo/meson_options.txt
+++ b/test cases/failing/102 bool in combo/meson_options.txt
diff --git a/test cases/failing/103 bool in combo/nativefile.ini b/test cases/failing/102 bool in combo/nativefile.ini
index b423957..b423957 100644
--- a/test cases/failing/103 bool in combo/nativefile.ini
+++ b/test cases/failing/102 bool in combo/nativefile.ini
diff --git a/test cases/failing/103 bool in combo/test.json b/test cases/failing/102 bool in combo/test.json
index 48d4cc3..c0041af 100644
--- a/test cases/failing/103 bool in combo/test.json
+++ b/test cases/failing/102 bool in combo/test.json
@@ -1,5 +1,5 @@
 {
   "stdout": [
-    { "line": "test cases/failing/103 bool in combo/meson.build:1:0: ERROR: Value \"True\" (of type \"boolean\") for combo option \"opt\" is not one of the choices. Possible choices are (as string): \"true\", \"false\"." }
+    { "line": "test cases/failing/102 bool in combo/meson.build:1:0: ERROR: Value \"True\" (of type \"boolean\") for combo option \"opt\" is not one of the choices. Possible choices are (as string): \"true\", \"false\"." }
   ]
 }
diff --git a/test cases/failing/104 compiler no lang/meson.build b/test cases/failing/103 compiler no lang/meson.build
index 366bbdd..366bbdd 100644
--- a/test cases/failing/104 compiler no lang/meson.build
+++ b/test cases/failing/103 compiler no lang/meson.build
diff --git a/test cases/failing/104 compiler no lang/test.json b/test cases/failing/103 compiler no lang/test.json
index d8cc96e..123dcb9 100644
--- a/test cases/failing/104 compiler no lang/test.json
+++ b/test cases/failing/103 compiler no lang/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/104 compiler no lang/meson.build:2:6: ERROR: Tried to access compiler for language \"c\", not specified for host machine."
+      "line": "test cases/failing/103 compiler no lang/meson.build:2:6: ERROR: Tried to access compiler for language \"c\", not specified for host machine."
     }
   ]
 }
diff --git a/test cases/failing/105 no fallback/meson.build b/test cases/failing/104 no fallback/meson.build
index 0101bb8..0101bb8 100644
--- a/test cases/failing/105 no fallback/meson.build
+++ b/test cases/failing/104 no fallback/meson.build
diff --git a/test cases/failing/105 no fallback/subprojects/foob/meson.build b/test cases/failing/104 no fallback/subprojects/foob/meson.build
index b2c4814..b2c4814 100644
--- a/test cases/failing/105 no fallback/subprojects/foob/meson.build
+++ b/test cases/failing/104 no fallback/subprojects/foob/meson.build
diff --git a/test cases/failing/105 no fallback/test.json b/test cases/failing/104 no fallback/test.json
index e034061..e034061 100644
--- a/test cases/failing/105 no fallback/test.json
+++ b/test cases/failing/104 no fallback/test.json
diff --git a/test cases/failing/106 feature require/meson.build b/test cases/failing/105 feature require/meson.build
index d976ae8..d976ae8 100644
--- a/test cases/failing/106 feature require/meson.build
+++ b/test cases/failing/105 feature require/meson.build
diff --git a/test cases/failing/106 feature require/meson_options.txt b/test cases/failing/105 feature require/meson_options.txt
index 5910a87..5910a87 100644
--- a/test cases/failing/106 feature require/meson_options.txt
+++ b/test cases/failing/105 feature require/meson_options.txt
diff --git a/test cases/failing/106 feature require/test.json b/test cases/failing/105 feature require/test.json
index 7c4640d..7c4640d 100644
--- a/test cases/failing/106 feature require/test.json
+++ b/test cases/failing/105 feature require/test.json
diff --git a/test cases/failing/107 feature require.bis/meson.build b/test cases/failing/106 feature require.bis/meson.build
index 08c099c..08c099c 100644
--- a/test cases/failing/107 feature require.bis/meson.build
+++ b/test cases/failing/106 feature require.bis/meson.build
diff --git a/test cases/failing/107 feature require.bis/meson_options.txt b/test cases/failing/106 feature require.bis/meson_options.txt
index 5910a87..5910a87 100644
--- a/test cases/failing/107 feature require.bis/meson_options.txt
+++ b/test cases/failing/106 feature require.bis/meson_options.txt
diff --git a/test cases/failing/107 feature require.bis/test.json b/test cases/failing/106 feature require.bis/test.json
index 2583990..2583990 100644
--- a/test cases/failing/107 feature require.bis/test.json
+++ b/test cases/failing/106 feature require.bis/test.json
diff --git a/test cases/failing/108 no build get_external_property/meson.build b/test cases/failing/107 no build get_external_property/meson.build
index 8a4215c..8a4215c 100644
--- a/test cases/failing/108 no build get_external_property/meson.build
+++ b/test cases/failing/107 no build get_external_property/meson.build
diff --git a/test cases/failing/108 no build get_external_property/test.json b/test cases/failing/107 no build get_external_property/test.json
index d2827f4..b95427e 100644
--- a/test cases/failing/108 no build get_external_property/test.json
+++ b/test cases/failing/107 no build get_external_property/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/108 no build get_external_property/meson.build:3:0: ERROR: Unknown property for build machine: nonexisting"
+      "line": "test cases/failing/107 no build get_external_property/meson.build:3:0: ERROR: Unknown property for build machine: nonexisting"
     }
   ]
 }
diff --git a/test cases/failing/109 enter subdir twice/meson.build b/test cases/failing/108 enter subdir twice/meson.build
index 9343233..9343233 100644
--- a/test cases/failing/109 enter subdir twice/meson.build
+++ b/test cases/failing/108 enter subdir twice/meson.build
diff --git a/test cases/failing/109 enter subdir twice/sub/meson.build b/test cases/failing/108 enter subdir twice/sub/meson.build
index d036a3f..d036a3f 100644
--- a/test cases/failing/109 enter subdir twice/sub/meson.build
+++ b/test cases/failing/108 enter subdir twice/sub/meson.build
diff --git a/test cases/failing/109 enter subdir twice/test.json b/test cases/failing/108 enter subdir twice/test.json
index f7a526c..0a8e127 100644
--- a/test cases/failing/109 enter subdir twice/test.json
+++ b/test cases/failing/108 enter subdir twice/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/109 enter subdir twice/meson.build:3:0: ERROR: Tried to enter directory \"sub\", which has already been visited."
+      "line": "test cases/failing/108 enter subdir twice/meson.build:3:0: ERROR: Tried to enter directory \"sub\", which has already been visited."
     }
   ]
 }
diff --git a/test cases/failing/111 invalid fstring/109 invalid fstring/meson.build b/test cases/failing/109 invalid fstring/109 invalid fstring/meson.build
index dd22f56..dd22f56 100644
--- a/test cases/failing/111 invalid fstring/109 invalid fstring/meson.build
+++ b/test cases/failing/109 invalid fstring/109 invalid fstring/meson.build
diff --git a/test cases/failing/111 invalid fstring/109 invalid fstring/test.json b/test cases/failing/109 invalid fstring/109 invalid fstring/test.json
index 71d8f59..71d8f59 100644
--- a/test cases/failing/111 invalid fstring/109 invalid fstring/test.json
+++ b/test cases/failing/109 invalid fstring/109 invalid fstring/test.json
diff --git a/test cases/failing/111 invalid fstring/meson.build b/test cases/failing/109 invalid fstring/meson.build
index 973df30..973df30 100644
--- a/test cases/failing/111 invalid fstring/meson.build
+++ b/test cases/failing/109 invalid fstring/meson.build
diff --git a/test cases/failing/111 invalid fstring/test.json b/test cases/failing/109 invalid fstring/test.json
index 89ec40c..a095d62 100644
--- a/test cases/failing/111 invalid fstring/test.json
+++ b/test cases/failing/109 invalid fstring/test.json
@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "line": "test cases/failing/111 invalid fstring/meson.build:3:0: ERROR: Identifier \"foo\" does not name a variable."
+            "line": "test cases/failing/109 invalid fstring/meson.build:3:0: ERROR: Identifier \"foo\" does not name a variable."
         }
     ]
 }
diff --git a/test cases/failing/112 compiler argument checking/meson.build b/test cases/failing/110 compiler argument checking/meson.build
index bb1f447..bb1f447 100644
--- a/test cases/failing/112 compiler argument checking/meson.build
+++ b/test cases/failing/110 compiler argument checking/meson.build
diff --git a/test cases/failing/112 compiler argument checking/test.json b/test cases/failing/110 compiler argument checking/test.json
index f4728db..3de6acb 100644
--- a/test cases/failing/112 compiler argument checking/test.json
+++ b/test cases/failing/110 compiler argument checking/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-        "line": "test cases/failing/112 compiler argument checking/meson.build:4:0: ERROR: Compiler for C does not support \"-meson-goober-arg-for-testing\""
+        "line": "test cases/failing/110 compiler argument checking/meson.build:4:0: ERROR: Compiler for C does not support \"-meson-goober-arg-for-testing\""
     }
   ]
 }
diff --git a/test cases/failing/113 empty fallback/meson.build b/test cases/failing/111 empty fallback/meson.build
index f4eb5fe..f4eb5fe 100644
--- a/test cases/failing/113 empty fallback/meson.build
+++ b/test cases/failing/111 empty fallback/meson.build
diff --git a/test cases/failing/113 empty fallback/subprojects/foo/meson.build b/test cases/failing/111 empty fallback/subprojects/foo/meson.build
index c9e134b..c9e134b 100644
--- a/test cases/failing/113 empty fallback/subprojects/foo/meson.build
+++ b/test cases/failing/111 empty fallback/subprojects/foo/meson.build
diff --git a/test cases/failing/113 empty fallback/test.json b/test cases/failing/111 empty fallback/test.json
index c8ed212..02db40b 100644
--- a/test cases/failing/113 empty fallback/test.json
+++ b/test cases/failing/111 empty fallback/test.json
@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "line": "test cases/failing/113 empty fallback/meson.build:6:0: ERROR: Dependency \"foo\" not found, tried pkgconfig and cmake"
+            "line": "test cases/failing/111 empty fallback/meson.build:6:0: ERROR: Dependency \"foo\" not found, tried pkgconfig and cmake"
         }
     ]
 }
diff --git a/test cases/failing/114 cmake executable dependency/meson.build b/test cases/failing/112 cmake executable dependency/meson.build
index bfb03ef..bfb03ef 100644
--- a/test cases/failing/114 cmake executable dependency/meson.build
+++ b/test cases/failing/112 cmake executable dependency/meson.build
diff --git a/test cases/failing/114 cmake executable dependency/subprojects/cmlib/CMakeLists.txt b/test cases/failing/112 cmake executable dependency/subprojects/cmlib/CMakeLists.txt
index 0067879..0067879 100644
--- a/test cases/failing/114 cmake executable dependency/subprojects/cmlib/CMakeLists.txt
+++ b/test cases/failing/112 cmake executable dependency/subprojects/cmlib/CMakeLists.txt
diff --git a/test cases/failing/100 no lang/main.c b/test cases/failing/112 cmake executable dependency/subprojects/cmlib/main.c
index 9b6bdc2..9b6bdc2 100644
--- a/test cases/failing/100 no lang/main.c
+++ b/test cases/failing/112 cmake executable dependency/subprojects/cmlib/main.c
diff --git a/test cases/failing/114 cmake executable dependency/test.json b/test cases/failing/112 cmake executable dependency/test.json
index 951f2e7..c1ccf6c 100644
--- a/test cases/failing/114 cmake executable dependency/test.json
+++ b/test cases/failing/112 cmake executable dependency/test.json
@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "line": "test cases/failing/114 cmake executable dependency/meson.build:9:0: ERROR: main is an executable and does not support the dependency() method. Use target() instead."
+            "line": "test cases/failing/112 cmake executable dependency/meson.build:9:0: ERROR: main is an executable and does not support the dependency() method. Use target() instead."
         }
     ],
     "tools": {
diff --git a/test cases/failing/115 allow_fallback with fallback/meson.build b/test cases/failing/113 allow_fallback with fallback/meson.build
index 2874e42..2874e42 100644
--- a/test cases/failing/115 allow_fallback with fallback/meson.build
+++ b/test cases/failing/113 allow_fallback with fallback/meson.build
diff --git a/test cases/failing/115 allow_fallback with fallback/test.json b/test cases/failing/113 allow_fallback with fallback/test.json
index 6bdcc51..58ed475 100644
--- a/test cases/failing/115 allow_fallback with fallback/test.json
+++ b/test cases/failing/113 allow_fallback with fallback/test.json
@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "line": "test cases/failing/115 allow_fallback with fallback/meson.build:3:0: ERROR: \"fallback\" and \"allow_fallback\" arguments are mutually exclusive"
+            "line": "test cases/failing/113 allow_fallback with fallback/meson.build:3:0: ERROR: \"fallback\" and \"allow_fallback\" arguments are mutually exclusive"
         }
     ]
 }
diff --git a/test cases/failing/116 nonsensical bindgen/meson.build b/test cases/failing/114 nonsensical bindgen/meson.build
index 6995f67..6995f67 100644
--- a/test cases/failing/116 nonsensical bindgen/meson.build
+++ b/test cases/failing/114 nonsensical bindgen/meson.build
diff --git a/test cases/failing/116 nonsensical bindgen/src/header.h b/test cases/failing/114 nonsensical bindgen/src/header.h
index 750621f..750621f 100644
--- a/test cases/failing/116 nonsensical bindgen/src/header.h
+++ b/test cases/failing/114 nonsensical bindgen/src/header.h
diff --git a/test cases/failing/116 nonsensical bindgen/src/source.c b/test cases/failing/114 nonsensical bindgen/src/source.c
index d652d28..d652d28 100644
--- a/test cases/failing/116 nonsensical bindgen/src/source.c
+++ b/test cases/failing/114 nonsensical bindgen/src/source.c
diff --git a/test cases/failing/116 nonsensical bindgen/test.json b/test cases/failing/114 nonsensical bindgen/test.json
index b0a38e8..bc85311 100644
--- a/test cases/failing/116 nonsensical bindgen/test.json
+++ b/test cases/failing/114 nonsensical bindgen/test.json
@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "line": "test cases/failing/116 nonsensical bindgen/meson.build:17:24: ERROR: bindgen source file must be a C header, not an object or build target"
+            "line": "test cases/failing/114 nonsensical bindgen/meson.build:17:24: ERROR: bindgen source file must be a C header, not an object or build target"
         }
     ]
 }
diff --git a/test cases/failing/117 run_target in test/meson.build b/test cases/failing/115 run_target in test/meson.build
index db7cb30..db7cb30 100644
--- a/test cases/failing/117 run_target in test/meson.build
+++ b/test cases/failing/115 run_target in test/meson.build
diff --git a/test cases/failing/117 run_target in test/test.json b/test cases/failing/115 run_target in test/test.json
index ad24367..fce0c47 100644
--- a/test cases/failing/117 run_target in test/test.json
+++ b/test cases/failing/115 run_target in test/test.json
@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "line": "test cases/failing/117 run_target in test/meson.build:4:0: ERROR: test keyword argument 'args' was of type array[RunTarget] but should have been array[str | File | BuildTarget | CustomTarget | CustomTargetIndex]"
+            "line": "test cases/failing/115 run_target in test/meson.build:4:0: ERROR: test keyword argument 'args' was of type array[RunTarget] but should have been array[str | File | BuildTarget | CustomTarget | CustomTargetIndex]"
         }
     ]
 }
diff --git a/test cases/failing/117 run_target in test/trivial.c b/test cases/failing/115 run_target in test/trivial.c
index 96612d4..96612d4 100644
--- a/test cases/failing/117 run_target in test/trivial.c
+++ b/test cases/failing/115 run_target in test/trivial.c
diff --git a/test cases/failing/118 run_target in add_install_script/meson.build b/test cases/failing/116 run_target in add_install_script/meson.build
index 9d37a39..9d37a39 100644
--- a/test cases/failing/118 run_target in add_install_script/meson.build
+++ b/test cases/failing/116 run_target in add_install_script/meson.build
diff --git a/test cases/failing/118 run_target in add_install_script/test.json b/test cases/failing/116 run_target in add_install_script/test.json
index a09b1a3..621d510 100644
--- a/test cases/failing/118 run_target in add_install_script/test.json
+++ b/test cases/failing/116 run_target in add_install_script/test.json
@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "line": "test cases/failing/118 run_target in add_install_script/meson.build:4:6: ERROR: meson.add_install_script argument 2 was of type \"RunTarget\" but should have been one of: \"str\", \"File\", \"BuildTarget\", \"CustomTarget\", \"CustomTargetIndex\", \"ExternalProgram\""
+            "line": "test cases/failing/116 run_target in add_install_script/meson.build:4:6: ERROR: meson.add_install_script argument 2 was of type \"RunTarget\" but should have been one of: \"str\", \"File\", \"BuildTarget\", \"CustomTarget\", \"CustomTargetIndex\", \"ExternalProgram\""
         }
     ]
 }
diff --git a/test cases/failing/118 run_target in add_install_script/trivial.c b/test cases/failing/116 run_target in add_install_script/trivial.c
index 1b14571..1b14571 100644
--- a/test cases/failing/118 run_target in add_install_script/trivial.c
+++ b/test cases/failing/116 run_target in add_install_script/trivial.c
diff --git a/test cases/failing/119 pathsep in install_symlink/meson.build b/test cases/failing/117 pathsep in install_symlink/meson.build
index cce82c2..cce82c2 100644
--- a/test cases/failing/119 pathsep in install_symlink/meson.build
+++ b/test cases/failing/117 pathsep in install_symlink/meson.build
diff --git a/test cases/failing/119 pathsep in install_symlink/test.json b/test cases/failing/117 pathsep in install_symlink/test.json
index 9df546a..aa35619 100644
--- a/test cases/failing/119 pathsep in install_symlink/test.json
+++ b/test cases/failing/117 pathsep in install_symlink/test.json
@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "line": "test cases/failing/119 pathsep in install_symlink/meson.build:3:0: ERROR: Link name is \"foo/bar\", but link names cannot contain path separators. The dir part should be in install_dir."
+            "line": "test cases/failing/117 pathsep in install_symlink/meson.build:3:0: ERROR: Link name is \"foo/bar\", but link names cannot contain path separators. The dir part should be in install_dir."
         }
     ]
 }
diff --git a/test cases/failing/120 subproject version conflict/meson.build b/test cases/failing/118 subproject version conflict/meson.build
index ffbcc13..ffbcc13 100644
--- a/test cases/failing/120 subproject version conflict/meson.build
+++ b/test cases/failing/118 subproject version conflict/meson.build
diff --git a/test cases/failing/120 subproject version conflict/subprojects/A/meson.build b/test cases/failing/118 subproject version conflict/subprojects/A/meson.build
index 7da4df0..7da4df0 100644
--- a/test cases/failing/120 subproject version conflict/subprojects/A/meson.build
+++ b/test cases/failing/118 subproject version conflict/subprojects/A/meson.build
diff --git a/test cases/failing/120 subproject version conflict/subprojects/B/meson.build b/test cases/failing/118 subproject version conflict/subprojects/B/meson.build
index 0ead934..0ead934 100644
--- a/test cases/failing/120 subproject version conflict/subprojects/B/meson.build
+++ b/test cases/failing/118 subproject version conflict/subprojects/B/meson.build
diff --git a/test cases/failing/120 subproject version conflict/test.json b/test cases/failing/118 subproject version conflict/test.json
index 7807d68..a31511c 100644
--- a/test cases/failing/120 subproject version conflict/test.json
+++ b/test cases/failing/118 subproject version conflict/test.json
@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "line": "test cases/failing/120 subproject version conflict/meson.build:4:0: ERROR: Subproject B version is 100 but ['1'] required."
+            "line": "test cases/failing/118 subproject version conflict/meson.build:4:0: ERROR: Subproject B version is 100 but ['1'] required."
         }
     ]
 }
diff --git a/test cases/failing/121 structured source empty string/main.rs b/test cases/failing/119 structured source empty string/main.rs
index e69de29..e69de29 100644
--- a/test cases/failing/121 structured source empty string/main.rs
+++ b/test cases/failing/119 structured source empty string/main.rs
diff --git a/test cases/failing/121 structured source empty string/meson.build b/test cases/failing/119 structured source empty string/meson.build
index 0715991..0715991 100644
--- a/test cases/failing/121 structured source empty string/meson.build
+++ b/test cases/failing/119 structured source empty string/meson.build
diff --git a/test cases/failing/121 structured source empty string/test.json b/test cases/failing/119 structured source empty string/test.json
index feb2af9..3d41fc2 100644
--- a/test cases/failing/121 structured source empty string/test.json
+++ b/test cases/failing/119 structured source empty string/test.json
@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "line": "test cases/failing/121 structured source empty string/meson.build:7:0: ERROR: structured_sources: keys to dictionary argument may not be an empty string."
+            "line": "test cases/failing/119 structured source empty string/meson.build:7:0: ERROR: structured_sources: keys to dictionary argument may not be an empty string."
         }
     ]
 }
diff --git a/test cases/failing/122 structured_sources conflicts/main.rs b/test cases/failing/120 structured_sources conflicts/main.rs
index e69de29..e69de29 100644
--- a/test cases/failing/122 structured_sources conflicts/main.rs
+++ b/test cases/failing/120 structured_sources conflicts/main.rs
diff --git a/test cases/failing/122 structured_sources conflicts/meson.build b/test cases/failing/120 structured_sources conflicts/meson.build
index 561ad86..561ad86 100644
--- a/test cases/failing/122 structured_sources conflicts/meson.build
+++ b/test cases/failing/120 structured_sources conflicts/meson.build
diff --git a/test cases/failing/122 structured_sources conflicts/test.json b/test cases/failing/120 structured_sources conflicts/test.json
index 4833f86..2f3d1ef 100644
--- a/test cases/failing/122 structured_sources conflicts/test.json
+++ b/test cases/failing/120 structured_sources conflicts/test.json
@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "line": "test cases/failing/122 structured_sources conflicts/meson.build:7:0: ERROR: Conflicting sources in structured sources: main.rs"
+            "line": "test cases/failing/120 structured_sources conflicts/meson.build:7:0: ERROR: Conflicting sources in structured sources: main.rs"
         }
     ]
 }
diff --git a/test cases/failing/123 missing compiler/meson.build b/test cases/failing/121 missing compiler/meson.build
index 19bdd0c..19bdd0c 100644
--- a/test cases/failing/123 missing compiler/meson.build
+++ b/test cases/failing/121 missing compiler/meson.build
diff --git a/test cases/failing/123 missing compiler/subprojects/sub/main.c b/test cases/failing/121 missing compiler/subprojects/sub/main.c
index 44e82e2..44e82e2 100644
--- a/test cases/failing/123 missing compiler/subprojects/sub/main.c
+++ b/test cases/failing/121 missing compiler/subprojects/sub/main.c
diff --git a/test cases/failing/123 missing compiler/subprojects/sub/meson.build b/test cases/failing/121 missing compiler/subprojects/sub/meson.build
index b60850c..b60850c 100644
--- a/test cases/failing/123 missing compiler/subprojects/sub/meson.build
+++ b/test cases/failing/121 missing compiler/subprojects/sub/meson.build
diff --git a/test cases/failing/123 missing compiler/test.json b/test cases/failing/121 missing compiler/test.json
index 915df16..442e331 100644
--- a/test cases/failing/123 missing compiler/test.json
+++ b/test cases/failing/121 missing compiler/test.json
@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "line": "test cases/failing/123 missing compiler/subprojects/sub/meson.build:4:0: ERROR: No host machine compiler for 'subprojects/sub/main.c'"
+            "line": "test cases/failing/121 missing compiler/subprojects/sub/meson.build:4:0: ERROR: No host machine compiler for 'subprojects/sub/main.c'"
         }
     ]
 }
diff --git a/test cases/failing/39 prefix absolute/meson.build b/test cases/failing/38 prefix absolute/meson.build
index e2863e7..e2863e7 100644
--- a/test cases/failing/39 prefix absolute/meson.build
+++ b/test cases/failing/38 prefix absolute/meson.build
diff --git a/test cases/failing/39 prefix absolute/test.json b/test cases/failing/38 prefix absolute/test.json
index 2770243..859906c 100644
--- a/test cases/failing/39 prefix absolute/test.json
+++ b/test cases/failing/38 prefix absolute/test.json
@@ -5,7 +5,7 @@
   "stdout": [
     {
       "comment": "literal 'some/path/notabs' appears in output, irrespective of os.path.sep, as that's the prefix",
-      "line": "test cases/failing/39 prefix absolute/meson.build:1:0: ERROR: prefix value 'some/path/notabs' must be an absolute path"
+      "line": "test cases/failing/38 prefix absolute/meson.build:1:0: ERROR: prefix value 'some/path/notabs' must be an absolute path"
     }
   ]
 }
diff --git a/test cases/failing/40 kwarg assign/dummy.c b/test cases/failing/39 kwarg assign/dummy.c
index 16fcdd9..16fcdd9 100644
--- a/test cases/failing/40 kwarg assign/dummy.c
+++ b/test cases/failing/39 kwarg assign/dummy.c
diff --git a/test cases/failing/40 kwarg assign/meson.build b/test cases/failing/39 kwarg assign/meson.build
index 7d42521..7d42521 100644
--- a/test cases/failing/40 kwarg assign/meson.build
+++ b/test cases/failing/39 kwarg assign/meson.build
diff --git a/test cases/failing/40 kwarg assign/prog.c b/test cases/failing/39 kwarg assign/prog.c
index 11b7fad..11b7fad 100644
--- a/test cases/failing/40 kwarg assign/prog.c
+++ b/test cases/failing/39 kwarg assign/prog.c
diff --git a/test cases/failing/40 kwarg assign/test.json b/test cases/failing/39 kwarg assign/test.json
index 671eb3f..8fd9d0f 100644
--- a/test cases/failing/40 kwarg assign/test.json
+++ b/test cases/failing/39 kwarg assign/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/40 kwarg assign/meson.build:3:0: ERROR: Tried to assign values inside an argument list."
+      "line": "test cases/failing/39 kwarg assign/meson.build:3:0: ERROR: Tried to assign values inside an argument list."
     }
   ]
 }
diff --git a/test cases/failing/41 custom target plainname many inputs/1.txt b/test cases/failing/40 custom target plainname many inputs/1.txt
index d00491f..d00491f 100644
--- a/test cases/failing/41 custom target plainname many inputs/1.txt
+++ b/test cases/failing/40 custom target plainname many inputs/1.txt
diff --git a/test cases/failing/41 custom target plainname many inputs/2.txt b/test cases/failing/40 custom target plainname many inputs/2.txt
index 0cfbf08..0cfbf08 100644
--- a/test cases/failing/41 custom target plainname many inputs/2.txt
+++ b/test cases/failing/40 custom target plainname many inputs/2.txt
diff --git a/test cases/failing/41 custom target plainname many inputs/catfiles.py b/test cases/failing/40 custom target plainname many inputs/catfiles.py
index 1c53e24..1c53e24 100644
--- a/test cases/failing/41 custom target plainname many inputs/catfiles.py
+++ b/test cases/failing/40 custom target plainname many inputs/catfiles.py
diff --git a/test cases/failing/41 custom target plainname many inputs/meson.build b/test cases/failing/40 custom target plainname many inputs/meson.build
index 1bcfc06..1bcfc06 100644
--- a/test cases/failing/41 custom target plainname many inputs/meson.build
+++ b/test cases/failing/40 custom target plainname many inputs/meson.build
diff --git a/test cases/failing/41 custom target plainname many inputs/test.json b/test cases/failing/40 custom target plainname many inputs/test.json
index 66a56f6..05f4d49 100644
--- a/test cases/failing/41 custom target plainname many inputs/test.json
+++ b/test cases/failing/40 custom target plainname many inputs/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/41 custom target plainname many inputs/meson.build:5:0: ERROR: custom_target: output cannot containe \"@PLAINNAME@\" or \"@BASENAME@\" when there is more than one input (we can't know which to use)"
+      "line": "test cases/failing/40 custom target plainname many inputs/meson.build:5:0: ERROR: custom_target: output cannot containe \"@PLAINNAME@\" or \"@BASENAME@\" when there is more than one input (we can't know which to use)"
     }
   ]
 }
diff --git a/test cases/failing/42 custom target outputs not matching install_dirs/generator.py b/test cases/failing/41 custom target outputs not matching install_dirs/generator.py
index 4ac6179..4ac6179 100755
--- a/test cases/failing/42 custom target outputs not matching install_dirs/generator.py
+++ b/test cases/failing/41 custom target outputs not matching install_dirs/generator.py
diff --git a/test cases/failing/42 custom target outputs not matching install_dirs/meson.build b/test cases/failing/41 custom target outputs not matching install_dirs/meson.build
index 765e237..765e237 100644
--- a/test cases/failing/42 custom target outputs not matching install_dirs/meson.build
+++ b/test cases/failing/41 custom target outputs not matching install_dirs/meson.build
diff --git a/test cases/failing/42 custom target outputs not matching install_dirs/test.json b/test cases/failing/41 custom target outputs not matching install_dirs/test.json
index f9e2ba7..f9e2ba7 100644
--- a/test cases/failing/42 custom target outputs not matching install_dirs/test.json
+++ b/test cases/failing/41 custom target outputs not matching install_dirs/test.json
diff --git a/test cases/failing/43 project name colon/meson.build b/test cases/failing/42 project name colon/meson.build
index 53e947e..53e947e 100644
--- a/test cases/failing/43 project name colon/meson.build
+++ b/test cases/failing/42 project name colon/meson.build
diff --git a/test cases/failing/43 project name colon/test.json b/test cases/failing/42 project name colon/test.json
index 7a55574..c3b880e 100644
--- a/test cases/failing/43 project name colon/test.json
+++ b/test cases/failing/42 project name colon/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/43 project name colon/meson.build:1:0: ERROR: Project name 'name with :' must not contain ':'"
+      "line": "test cases/failing/42 project name colon/meson.build:1:0: ERROR: Project name 'name with :' must not contain ':'"
     }
   ]
 }
diff --git a/test cases/failing/44 abs subdir/bob/meson.build b/test cases/failing/43 abs subdir/bob/meson.build
index 7bbf4b2..7bbf4b2 100644
--- a/test cases/failing/44 abs subdir/bob/meson.build
+++ b/test cases/failing/43 abs subdir/bob/meson.build
diff --git a/test cases/failing/44 abs subdir/meson.build b/test cases/failing/43 abs subdir/meson.build
index 5425245..5425245 100644
--- a/test cases/failing/44 abs subdir/meson.build
+++ b/test cases/failing/43 abs subdir/meson.build
diff --git a/test cases/failing/44 abs subdir/test.json b/test cases/failing/43 abs subdir/test.json
index 0aa56f6..201ed44 100644
--- a/test cases/failing/44 abs subdir/test.json
+++ b/test cases/failing/43 abs subdir/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/44 abs subdir/meson.build:5:0: ERROR: Subdir argument must be a relative path."
+      "line": "test cases/failing/43 abs subdir/meson.build:5:0: ERROR: Subdir argument must be a relative path."
     }
   ]
 }
diff --git a/test cases/failing/45 abspath to srcdir/meson.build b/test cases/failing/44 abspath to srcdir/meson.build
index 964a19b..964a19b 100644
--- a/test cases/failing/45 abspath to srcdir/meson.build
+++ b/test cases/failing/44 abspath to srcdir/meson.build
diff --git a/test cases/failing/45 abspath to srcdir/test.json b/test cases/failing/44 abspath to srcdir/test.json
index 177bac1..2cc2980 100644
--- a/test cases/failing/45 abspath to srcdir/test.json
+++ b/test cases/failing/44 abspath to srcdir/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/45 abspath to srcdir/meson.build:3:0: ERROR: Tried to form an absolute path to a source dir."
+      "line": "test cases/failing/44 abspath to srcdir/meson.build:3:0: ERROR: Tried to form an absolute path to a source dir."
     }
   ]
 }
diff --git a/test cases/failing/46 pkgconfig variables reserved/meson.build b/test cases/failing/45 pkgconfig variables reserved/meson.build
index 82ae995..82ae995 100644
--- a/test cases/failing/46 pkgconfig variables reserved/meson.build
+++ b/test cases/failing/45 pkgconfig variables reserved/meson.build
diff --git a/test cases/failing/46 pkgconfig variables reserved/simple.c b/test cases/failing/45 pkgconfig variables reserved/simple.c
index e8a6d83..e8a6d83 100644
--- a/test cases/failing/46 pkgconfig variables reserved/simple.c
+++ b/test cases/failing/45 pkgconfig variables reserved/simple.c
diff --git a/test cases/failing/46 pkgconfig variables reserved/simple.h b/test cases/failing/45 pkgconfig variables reserved/simple.h
index bb52e6d..bb52e6d 100644
--- a/test cases/failing/46 pkgconfig variables reserved/simple.h
+++ b/test cases/failing/45 pkgconfig variables reserved/simple.h
diff --git a/test cases/failing/46 pkgconfig variables reserved/test.json b/test cases/failing/45 pkgconfig variables reserved/test.json
index b92ee17..853eb82 100644
--- a/test cases/failing/46 pkgconfig variables reserved/test.json
+++ b/test cases/failing/45 pkgconfig variables reserved/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/46 pkgconfig variables reserved/meson.build:8:5: ERROR: Variable \"prefix\" is reserved"
+      "line": "test cases/failing/45 pkgconfig variables reserved/meson.build:8:5: ERROR: Variable \"prefix\" is reserved"
     }
   ]
 }
diff --git a/test cases/failing/47 pkgconfig variables zero length/meson.build b/test cases/failing/46 pkgconfig variables zero length/meson.build
index 65d3344..65d3344 100644
--- a/test cases/failing/47 pkgconfig variables zero length/meson.build
+++ b/test cases/failing/46 pkgconfig variables zero length/meson.build
diff --git a/test cases/failing/47 pkgconfig variables zero length/simple.c b/test cases/failing/46 pkgconfig variables zero length/simple.c
index e8a6d83..e8a6d83 100644
--- a/test cases/failing/47 pkgconfig variables zero length/simple.c
+++ b/test cases/failing/46 pkgconfig variables zero length/simple.c
diff --git a/test cases/failing/47 pkgconfig variables zero length/simple.h b/test cases/failing/46 pkgconfig variables zero length/simple.h
index bb52e6d..bb52e6d 100644
--- a/test cases/failing/47 pkgconfig variables zero length/simple.h
+++ b/test cases/failing/46 pkgconfig variables zero length/simple.h
diff --git a/test cases/failing/47 pkgconfig variables zero length/test.json b/test cases/failing/46 pkgconfig variables zero length/test.json
index 39ffde4..ae8ba2b 100644
--- a/test cases/failing/47 pkgconfig variables zero length/test.json
+++ b/test cases/failing/46 pkgconfig variables zero length/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/47 pkgconfig variables zero length/meson.build:8:5: ERROR: Empty variable name or value"
+      "line": "test cases/failing/46 pkgconfig variables zero length/meson.build:8:5: ERROR: Empty variable name or value"
     }
   ]
 }
diff --git a/test cases/failing/48 pkgconfig variables zero length value/meson.build b/test cases/failing/47 pkgconfig variables zero length value/meson.build
index 33977b2..33977b2 100644
--- a/test cases/failing/48 pkgconfig variables zero length value/meson.build
+++ b/test cases/failing/47 pkgconfig variables zero length value/meson.build
diff --git a/test cases/failing/48 pkgconfig variables zero length value/simple.c b/test cases/failing/47 pkgconfig variables zero length value/simple.c
index e8a6d83..e8a6d83 100644
--- a/test cases/failing/48 pkgconfig variables zero length value/simple.c
+++ b/test cases/failing/47 pkgconfig variables zero length value/simple.c
diff --git a/test cases/failing/48 pkgconfig variables zero length value/simple.h b/test cases/failing/47 pkgconfig variables zero length value/simple.h
index bb52e6d..bb52e6d 100644
--- a/test cases/failing/48 pkgconfig variables zero length value/simple.h
+++ b/test cases/failing/47 pkgconfig variables zero length value/simple.h
diff --git a/test cases/failing/48 pkgconfig variables zero length value/test.json b/test cases/failing/47 pkgconfig variables zero length value/test.json
index 8aa1bc5..e963830 100644
--- a/test cases/failing/48 pkgconfig variables zero length value/test.json
+++ b/test cases/failing/47 pkgconfig variables zero length value/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/48 pkgconfig variables zero length value/meson.build:8:5: ERROR: Empty variable name or value"
+      "line": "test cases/failing/47 pkgconfig variables zero length value/meson.build:8:5: ERROR: Empty variable name or value"
     }
   ]
 }
diff --git a/test cases/failing/49 pkgconfig variables not key value/meson.build b/test cases/failing/48 pkgconfig variables not key value/meson.build
index 02fa737..02fa737 100644
--- a/test cases/failing/49 pkgconfig variables not key value/meson.build
+++ b/test cases/failing/48 pkgconfig variables not key value/meson.build
diff --git a/test cases/failing/49 pkgconfig variables not key value/simple.c b/test cases/failing/48 pkgconfig variables not key value/simple.c
index e8a6d83..e8a6d83 100644
--- a/test cases/failing/49 pkgconfig variables not key value/simple.c
+++ b/test cases/failing/48 pkgconfig variables not key value/simple.c
diff --git a/test cases/failing/49 pkgconfig variables not key value/simple.h b/test cases/failing/48 pkgconfig variables not key value/simple.h
index bb52e6d..bb52e6d 100644
--- a/test cases/failing/49 pkgconfig variables not key value/simple.h
+++ b/test cases/failing/48 pkgconfig variables not key value/simple.h
diff --git a/test cases/failing/49 pkgconfig variables not key value/test.json b/test cases/failing/48 pkgconfig variables not key value/test.json
index 082bd79..decbe71 100644
--- a/test cases/failing/49 pkgconfig variables not key value/test.json
+++ b/test cases/failing/48 pkgconfig variables not key value/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/49 pkgconfig variables not key value/meson.build:8:5: ERROR: Variable 'this_should_be_key_value' must have a value separated by equals sign."
+      "line": "test cases/failing/48 pkgconfig variables not key value/meson.build:8:5: ERROR: Variable 'this_should_be_key_value' must have a value separated by equals sign."
     }
   ]
 }
diff --git a/test cases/failing/50 executable comparison/meson.build b/test cases/failing/49 executable comparison/meson.build
index 041bcf3..041bcf3 100644
--- a/test cases/failing/50 executable comparison/meson.build
+++ b/test cases/failing/49 executable comparison/meson.build
diff --git a/test cases/failing/50 executable comparison/prog.c b/test cases/failing/49 executable comparison/prog.c
index 0314ff1..0314ff1 100644
--- a/test cases/failing/50 executable comparison/prog.c
+++ b/test cases/failing/49 executable comparison/prog.c
diff --git a/test cases/failing/50 executable comparison/test.json b/test cases/failing/49 executable comparison/test.json
index 7f6bd3b..a37002e 100644
--- a/test cases/failing/50 executable comparison/test.json
+++ b/test cases/failing/49 executable comparison/test.json
@@ -2,7 +2,7 @@
   "stdout": [
     {
       "match": "re",
-      "line": "test cases/failing/50 executable comparison/meson.build:6:0: ERROR: Object <ExecutableHolder prog1@exe: prog1(.exe)?> of type Executable does not support the `<` operator."
+      "line": "test cases/failing/49 executable comparison/meson.build:6:0: ERROR: Object <ExecutableHolder prog1@exe: prog1(.exe)?> of type Executable does not support the `<` operator."
     }
   ]
 }
diff --git a/test cases/failing/51 inconsistent comparison/meson.build b/test cases/failing/50 inconsistent comparison/meson.build
index 7694c2c..7694c2c 100644
--- a/test cases/failing/51 inconsistent comparison/meson.build
+++ b/test cases/failing/50 inconsistent comparison/meson.build
diff --git a/test cases/failing/51 inconsistent comparison/test.json b/test cases/failing/50 inconsistent comparison/test.json
index bd26554..171bfa6 100644
--- a/test cases/failing/51 inconsistent comparison/test.json
+++ b/test cases/failing/50 inconsistent comparison/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/51 inconsistent comparison/meson.build:5:0: ERROR: Object <[ArrayHolder] holds [list]: []> of type array does not support the `<` operator."
+      "line": "test cases/failing/50 inconsistent comparison/meson.build:5:0: ERROR: Object <[ArrayHolder] holds [list]: []> of type array does not support the `<` operator."
     }
   ]
 }
diff --git a/test cases/failing/52 slashname/meson.build b/test cases/failing/51 slashname/meson.build
index 29fe1fc..29fe1fc 100644
--- a/test cases/failing/52 slashname/meson.build
+++ b/test cases/failing/51 slashname/meson.build
diff --git a/test cases/failing/52 slashname/sub/meson.build b/test cases/failing/51 slashname/sub/meson.build
index 3baacf6..3baacf6 100644
--- a/test cases/failing/52 slashname/sub/meson.build
+++ b/test cases/failing/51 slashname/sub/meson.build
diff --git a/test cases/failing/52 slashname/sub/prog.c b/test cases/failing/51 slashname/sub/prog.c
index 722de0a..722de0a 100644
--- a/test cases/failing/52 slashname/sub/prog.c
+++ b/test cases/failing/51 slashname/sub/prog.c
diff --git a/test cases/failing/52 slashname/test.json b/test cases/failing/51 slashname/test.json
index eb50e1b..39346a9 100644
--- a/test cases/failing/52 slashname/test.json
+++ b/test cases/failing/51 slashname/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/52 slashname/meson.build:9:0: ERROR: Target \"sub/prog\" has a path segment pointing to directory \"sub\". This is an error."
+      "line": "test cases/failing/51 slashname/meson.build:9:0: ERROR: Target \"sub/prog\" has a path segment pointing to directory \"sub\". This is an error."
     }
   ]
 }
diff --git a/test cases/failing/53 reserved meson prefix/meson-foo/meson.build b/test cases/failing/52 reserved meson prefix/meson-foo/meson.build
index e69de29..e69de29 100644
--- a/test cases/failing/53 reserved meson prefix/meson-foo/meson.build
+++ b/test cases/failing/52 reserved meson prefix/meson-foo/meson.build
diff --git a/test cases/failing/53 reserved meson prefix/meson.build b/test cases/failing/52 reserved meson prefix/meson.build
index 1339035..1339035 100644
--- a/test cases/failing/53 reserved meson prefix/meson.build
+++ b/test cases/failing/52 reserved meson prefix/meson.build
diff --git a/test cases/failing/53 reserved meson prefix/test.json b/test cases/failing/52 reserved meson prefix/test.json
index 502d96a..707cd73 100644
--- a/test cases/failing/53 reserved meson prefix/test.json
+++ b/test cases/failing/52 reserved meson prefix/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/53 reserved meson prefix/meson.build:3:0: ERROR: The \"meson-\" prefix is reserved and cannot be used for top-level subdir()."
+      "line": "test cases/failing/52 reserved meson prefix/meson.build:3:0: ERROR: The \"meson-\" prefix is reserved and cannot be used for top-level subdir()."
     }
   ]
 }
diff --git a/test cases/failing/54 wrong shared crate type/foo.rs b/test cases/failing/53 wrong shared crate type/foo.rs
index e69de29..e69de29 100644
--- a/test cases/failing/54 wrong shared crate type/foo.rs
+++ b/test cases/failing/53 wrong shared crate type/foo.rs
diff --git a/test cases/failing/54 wrong shared crate type/meson.build b/test cases/failing/53 wrong shared crate type/meson.build
index 90020fa..90020fa 100644
--- a/test cases/failing/54 wrong shared crate type/meson.build
+++ b/test cases/failing/53 wrong shared crate type/meson.build
diff --git a/test cases/failing/54 wrong shared crate type/test.json b/test cases/failing/53 wrong shared crate type/test.json
index a5b7961..5faaece 100644
--- a/test cases/failing/54 wrong shared crate type/test.json
+++ b/test cases/failing/53 wrong shared crate type/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/54 wrong shared crate type/meson.build:7:0: ERROR: Crate type \"staticlib\" invalid for dynamic libraries; must be \"dylib\", \"cdylib\", or \"proc-macro\""
+      "line": "test cases/failing/53 wrong shared crate type/meson.build:7:0: ERROR: Crate type \"staticlib\" invalid for dynamic libraries; must be \"dylib\", \"cdylib\", or \"proc-macro\""
     }
   ]
 }
diff --git a/test cases/failing/55 wrong static crate type/foo.rs b/test cases/failing/54 wrong static crate type/foo.rs
index e69de29..e69de29 100644
--- a/test cases/failing/55 wrong static crate type/foo.rs
+++ b/test cases/failing/54 wrong static crate type/foo.rs
diff --git a/test cases/failing/55 wrong static crate type/meson.build b/test cases/failing/54 wrong static crate type/meson.build
index 179d7cd..179d7cd 100644
--- a/test cases/failing/55 wrong static crate type/meson.build
+++ b/test cases/failing/54 wrong static crate type/meson.build
diff --git a/test cases/failing/55 wrong static crate type/test.json b/test cases/failing/54 wrong static crate type/test.json
index 7073f7b..83ae5e1 100644
--- a/test cases/failing/55 wrong static crate type/test.json
+++ b/test cases/failing/54 wrong static crate type/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/55 wrong static crate type/meson.build:7:0: ERROR: Crate type \"cdylib\" invalid for static libraries; must be \"rlib\" or \"staticlib\""
+      "line": "test cases/failing/54 wrong static crate type/meson.build:7:0: ERROR: Crate type \"cdylib\" invalid for static libraries; must be \"rlib\" or \"staticlib\""
     }
   ]
 }
diff --git a/test cases/failing/56 or on new line/meson.build b/test cases/failing/55 or on new line/meson.build
index 12f2705..12f2705 100644
--- a/test cases/failing/56 or on new line/meson.build
+++ b/test cases/failing/55 or on new line/meson.build
diff --git a/test cases/failing/56 or on new line/meson_options.txt b/test cases/failing/55 or on new line/meson_options.txt
index 3302cf4..3302cf4 100644
--- a/test cases/failing/56 or on new line/meson_options.txt
+++ b/test cases/failing/55 or on new line/meson_options.txt
diff --git a/test cases/failing/56 or on new line/test.json b/test cases/failing/55 or on new line/test.json
index c55cee6..f1b8a67 100644
--- a/test cases/failing/56 or on new line/test.json
+++ b/test cases/failing/55 or on new line/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/56 or on new line/meson.build:4:8: ERROR: Invalid or clause."
+      "line": "test cases/failing/55 or on new line/meson.build:4:8: ERROR: Invalid or clause."
     }
   ]
 }
diff --git a/test cases/failing/57 link with executable/meson.build b/test cases/failing/56 link with executable/meson.build
index 186b3e5..186b3e5 100644
--- a/test cases/failing/57 link with executable/meson.build
+++ b/test cases/failing/56 link with executable/meson.build
diff --git a/test cases/failing/57 link with executable/module.c b/test cases/failing/56 link with executable/module.c
index dc0124a..dc0124a 100644
--- a/test cases/failing/57 link with executable/module.c
+++ b/test cases/failing/56 link with executable/module.c
diff --git a/test cases/failing/57 link with executable/prog.c b/test cases/failing/56 link with executable/prog.c
index f3836d7..f3836d7 100644
--- a/test cases/failing/57 link with executable/prog.c
+++ b/test cases/failing/56 link with executable/prog.c
diff --git a/test cases/failing/57 link with executable/test.json b/test cases/failing/56 link with executable/test.json
index c835a90..2288783 100644
--- a/test cases/failing/57 link with executable/test.json
+++ b/test cases/failing/56 link with executable/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/57 link with executable/meson.build:4:0: ERROR: Link target 'prog' is not linkable."
+      "line": "test cases/failing/56 link with executable/meson.build:4:0: ERROR: Link target 'prog' is not linkable."
     }
   ]
 }
diff --git a/test cases/failing/58 assign custom target index/meson.build b/test cases/failing/57 assign custom target index/meson.build
index 7f2a820..7f2a820 100644
--- a/test cases/failing/58 assign custom target index/meson.build
+++ b/test cases/failing/57 assign custom target index/meson.build
diff --git a/test cases/failing/58 assign custom target index/test.json b/test cases/failing/57 assign custom target index/test.json
index b5aa326..392137a 100644
--- a/test cases/failing/58 assign custom target index/test.json
+++ b/test cases/failing/57 assign custom target index/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/58 assign custom target index/meson.build:24:0: ERROR: Assignment target must be an id."
+      "line": "test cases/failing/57 assign custom target index/meson.build:24:0: ERROR: Assignment target must be an id."
     }
   ]
 }
diff --git a/test cases/failing/59 getoption prefix/meson.build b/test cases/failing/58 getoption prefix/meson.build
index 8f85cff..8f85cff 100644
--- a/test cases/failing/59 getoption prefix/meson.build
+++ b/test cases/failing/58 getoption prefix/meson.build
diff --git a/test cases/failing/59 getoption prefix/subprojects/abc/meson.build b/test cases/failing/58 getoption prefix/subprojects/abc/meson.build
index aa9c3df..aa9c3df 100644
--- a/test cases/failing/59 getoption prefix/subprojects/abc/meson.build
+++ b/test cases/failing/58 getoption prefix/subprojects/abc/meson.build
diff --git a/test cases/failing/59 getoption prefix/subprojects/abc/meson_options.txt b/test cases/failing/58 getoption prefix/subprojects/abc/meson_options.txt
index 89e624e..89e624e 100644
--- a/test cases/failing/59 getoption prefix/subprojects/abc/meson_options.txt
+++ b/test cases/failing/58 getoption prefix/subprojects/abc/meson_options.txt
diff --git a/test cases/failing/59 getoption prefix/test.json b/test cases/failing/58 getoption prefix/test.json
index 4485e04..630dcd9 100644
--- a/test cases/failing/59 getoption prefix/test.json
+++ b/test cases/failing/58 getoption prefix/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/59 getoption prefix/meson.build:5:0: ERROR: Having a colon in option name is forbidden, projects are not allowed to directly access options of other subprojects."
+      "line": "test cases/failing/58 getoption prefix/meson.build:5:0: ERROR: Having a colon in option name is forbidden, projects are not allowed to directly access options of other subprojects."
     }
   ]
 }
diff --git a/test cases/failing/60 bad option argument/meson.build b/test cases/failing/59 bad option argument/meson.build
index 5219cfb..5219cfb 100644
--- a/test cases/failing/60 bad option argument/meson.build
+++ b/test cases/failing/59 bad option argument/meson.build
diff --git a/test cases/failing/60 bad option argument/meson_options.txt b/test cases/failing/59 bad option argument/meson_options.txt
index de1fff6..de1fff6 100644
--- a/test cases/failing/60 bad option argument/meson_options.txt
+++ b/test cases/failing/59 bad option argument/meson_options.txt
diff --git a/test cases/failing/60 bad option argument/test.json b/test cases/failing/59 bad option argument/test.json
index 38712b6..3c5df1b 100644
--- a/test cases/failing/60 bad option argument/test.json
+++ b/test cases/failing/59 bad option argument/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/60 bad option argument/meson_options.txt:1:0: ERROR: option got unknown keyword arguments \"vaule\""
+      "line": "test cases/failing/59 bad option argument/meson_options.txt:1:0: ERROR: option got unknown keyword arguments \"vaule\""
     }
   ]
 }
diff --git a/test cases/failing/61 subproj filegrab/meson.build b/test cases/failing/60 subproj filegrab/meson.build
index f38d6c7..f38d6c7 100644
--- a/test cases/failing/61 subproj filegrab/meson.build
+++ b/test cases/failing/60 subproj filegrab/meson.build
diff --git a/test cases/failing/61 subproj filegrab/prog.c b/test cases/failing/60 subproj filegrab/prog.c
index 0314ff1..0314ff1 100644
--- a/test cases/failing/61 subproj filegrab/prog.c
+++ b/test cases/failing/60 subproj filegrab/prog.c
diff --git a/test cases/failing/61 subproj filegrab/subprojects/a/meson.build b/test cases/failing/60 subproj filegrab/subprojects/a/meson.build
index 80b9888..80b9888 100644
--- a/test cases/failing/61 subproj filegrab/subprojects/a/meson.build
+++ b/test cases/failing/60 subproj filegrab/subprojects/a/meson.build
diff --git a/test cases/failing/61 subproj filegrab/test.json b/test cases/failing/60 subproj filegrab/test.json
index 600e0d5..04a6dbb 100644
--- a/test cases/failing/61 subproj filegrab/test.json
+++ b/test cases/failing/60 subproj filegrab/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/61 subproj filegrab/subprojects/a/meson.build:3:0: ERROR: Sandbox violation: Tried to grab file prog.c outside current (sub)project."
+      "line": "test cases/failing/60 subproj filegrab/subprojects/a/meson.build:3:0: ERROR: Sandbox violation: Tried to grab file prog.c outside current (sub)project."
     }
   ]
 }
diff --git a/test cases/failing/62 grab subproj/meson.build b/test cases/failing/61 grab subproj/meson.build
index 30fc690..30fc690 100644
--- a/test cases/failing/62 grab subproj/meson.build
+++ b/test cases/failing/61 grab subproj/meson.build
diff --git a/test cases/failing/62 grab subproj/subprojects/foo/meson.build b/test cases/failing/61 grab subproj/subprojects/foo/meson.build
index b346f6d..b346f6d 100644
--- a/test cases/failing/62 grab subproj/subprojects/foo/meson.build
+++ b/test cases/failing/61 grab subproj/subprojects/foo/meson.build
diff --git a/test cases/failing/62 grab subproj/subprojects/foo/sub.c b/test cases/failing/61 grab subproj/subprojects/foo/sub.c
index a94b1f5..a94b1f5 100644
--- a/test cases/failing/62 grab subproj/subprojects/foo/sub.c
+++ b/test cases/failing/61 grab subproj/subprojects/foo/sub.c
diff --git a/test cases/failing/62 grab subproj/test.json b/test cases/failing/61 grab subproj/test.json
index 1503ad7..873ec6c 100644
--- a/test cases/failing/62 grab subproj/test.json
+++ b/test cases/failing/61 grab subproj/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/62 grab subproj/meson.build:7:0: ERROR: Sandbox violation: Tried to grab file sub.c from a nested subproject."
+      "line": "test cases/failing/61 grab subproj/meson.build:7:0: ERROR: Sandbox violation: Tried to grab file sub.c from a nested subproject."
     }
   ]
 }
diff --git a/test cases/failing/63 grab sibling/meson.build b/test cases/failing/62 grab sibling/meson.build
index 60b926a..60b926a 100644
--- a/test cases/failing/63 grab sibling/meson.build
+++ b/test cases/failing/62 grab sibling/meson.build
diff --git a/test cases/failing/63 grab sibling/subprojects/a/meson.build b/test cases/failing/62 grab sibling/subprojects/a/meson.build
index 6dd9f61..6dd9f61 100644
--- a/test cases/failing/63 grab sibling/subprojects/a/meson.build
+++ b/test cases/failing/62 grab sibling/subprojects/a/meson.build
diff --git a/test cases/failing/63 grab sibling/subprojects/b/meson.build b/test cases/failing/62 grab sibling/subprojects/b/meson.build
index 7c70fe5..7c70fe5 100644
--- a/test cases/failing/63 grab sibling/subprojects/b/meson.build
+++ b/test cases/failing/62 grab sibling/subprojects/b/meson.build
diff --git a/test cases/failing/63 grab sibling/subprojects/b/sneaky.c b/test cases/failing/62 grab sibling/subprojects/b/sneaky.c
index 46718c6..46718c6 100644
--- a/test cases/failing/63 grab sibling/subprojects/b/sneaky.c
+++ b/test cases/failing/62 grab sibling/subprojects/b/sneaky.c
diff --git a/test cases/failing/63 grab sibling/test.json b/test cases/failing/62 grab sibling/test.json
index 91715c7..9e7c4bb 100644
--- a/test cases/failing/63 grab sibling/test.json
+++ b/test cases/failing/62 grab sibling/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/63 grab sibling/subprojects/a/meson.build:3:0: ERROR: Sandbox violation: Tried to grab file sneaky.c outside current (sub)project."
+      "line": "test cases/failing/62 grab sibling/subprojects/a/meson.build:3:0: ERROR: Sandbox violation: Tried to grab file sneaky.c outside current (sub)project."
     }
   ]
 }
diff --git a/test cases/failing/64 string as link target/meson.build b/test cases/failing/63 string as link target/meson.build
index cb83fff..cb83fff 100644
--- a/test cases/failing/64 string as link target/meson.build
+++ b/test cases/failing/63 string as link target/meson.build
diff --git a/test cases/failing/64 string as link target/prog.c b/test cases/failing/63 string as link target/prog.c
index 0314ff1..0314ff1 100644
--- a/test cases/failing/64 string as link target/prog.c
+++ b/test cases/failing/63 string as link target/prog.c
diff --git a/test cases/failing/64 string as link target/test.json b/test cases/failing/63 string as link target/test.json
index b07a2ea..a531d64 100644
--- a/test cases/failing/64 string as link target/test.json
+++ b/test cases/failing/63 string as link target/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/64 string as link target/meson.build:2:0: ERROR: '' is not a target."
+      "line": "test cases/failing/63 string as link target/meson.build:2:0: ERROR: '' is not a target."
     }
   ]
 }
diff --git a/test cases/failing/65 dependency not-found and required/meson.build b/test cases/failing/64 dependency not-found and required/meson.build
index 1ce5747..1ce5747 100644
--- a/test cases/failing/65 dependency not-found and required/meson.build
+++ b/test cases/failing/64 dependency not-found and required/meson.build
diff --git a/test cases/failing/65 dependency not-found and required/test.json b/test cases/failing/64 dependency not-found and required/test.json
index ff20969..84d14b4 100644
--- a/test cases/failing/65 dependency not-found and required/test.json
+++ b/test cases/failing/64 dependency not-found and required/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/65 dependency not-found and required/meson.build:2:0: ERROR: Dependency is required but has no candidates."
+      "line": "test cases/failing/64 dependency not-found and required/meson.build:2:0: ERROR: Dependency is required but has no candidates."
     }
   ]
 }
diff --git a/test cases/failing/66 subproj different versions/main.c b/test cases/failing/65 subproj different versions/main.c
index 8793c62..8793c62 100644
--- a/test cases/failing/66 subproj different versions/main.c
+++ b/test cases/failing/65 subproj different versions/main.c
diff --git a/test cases/failing/66 subproj different versions/meson.build b/test cases/failing/65 subproj different versions/meson.build
index e964e42..e964e42 100644
--- a/test cases/failing/66 subproj different versions/meson.build
+++ b/test cases/failing/65 subproj different versions/meson.build
diff --git a/test cases/failing/66 subproj different versions/subprojects/a/a.c b/test cases/failing/65 subproj different versions/subprojects/a/a.c
index cd41a65..cd41a65 100644
--- a/test cases/failing/66 subproj different versions/subprojects/a/a.c
+++ b/test cases/failing/65 subproj different versions/subprojects/a/a.c
diff --git a/test cases/failing/66 subproj different versions/subprojects/a/a.h b/test cases/failing/65 subproj different versions/subprojects/a/a.h
index 8f1d49e..8f1d49e 100644
--- a/test cases/failing/66 subproj different versions/subprojects/a/a.h
+++ b/test cases/failing/65 subproj different versions/subprojects/a/a.h
diff --git a/test cases/failing/66 subproj different versions/subprojects/a/meson.build b/test cases/failing/65 subproj different versions/subprojects/a/meson.build
index e84182a..e84182a 100644
--- a/test cases/failing/66 subproj different versions/subprojects/a/meson.build
+++ b/test cases/failing/65 subproj different versions/subprojects/a/meson.build
diff --git a/test cases/failing/66 subproj different versions/subprojects/b/b.c b/test cases/failing/65 subproj different versions/subprojects/b/b.c
index f85f8c3..f85f8c3 100644
--- a/test cases/failing/66 subproj different versions/subprojects/b/b.c
+++ b/test cases/failing/65 subproj different versions/subprojects/b/b.c
diff --git a/test cases/failing/66 subproj different versions/subprojects/b/b.h b/test cases/failing/65 subproj different versions/subprojects/b/b.h
index eced786..eced786 100644
--- a/test cases/failing/66 subproj different versions/subprojects/b/b.h
+++ b/test cases/failing/65 subproj different versions/subprojects/b/b.h
diff --git a/test cases/failing/66 subproj different versions/subprojects/b/meson.build b/test cases/failing/65 subproj different versions/subprojects/b/meson.build
index 0398340..0398340 100644
--- a/test cases/failing/66 subproj different versions/subprojects/b/meson.build
+++ b/test cases/failing/65 subproj different versions/subprojects/b/meson.build
diff --git a/test cases/failing/66 subproj different versions/subprojects/c/c.h b/test cases/failing/65 subproj different versions/subprojects/c/c.h
index 2b15f60..2b15f60 100644
--- a/test cases/failing/66 subproj different versions/subprojects/c/c.h
+++ b/test cases/failing/65 subproj different versions/subprojects/c/c.h
diff --git a/test cases/failing/66 subproj different versions/subprojects/c/meson.build b/test cases/failing/65 subproj different versions/subprojects/c/meson.build
index 7184933..7184933 100644
--- a/test cases/failing/66 subproj different versions/subprojects/c/meson.build
+++ b/test cases/failing/65 subproj different versions/subprojects/c/meson.build
diff --git a/test cases/failing/66 subproj different versions/test.json b/test cases/failing/65 subproj different versions/test.json
index 19e7b4a..2f9f70d 100644
--- a/test cases/failing/66 subproj different versions/test.json
+++ b/test cases/failing/65 subproj different versions/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/66 subproj different versions/subprojects/b/meson.build:3:0: ERROR: Dependency 'c' is required but not found."
+      "line": "test cases/failing/65 subproj different versions/subprojects/b/meson.build:3:0: ERROR: Dependency 'c' is required but not found."
     }
   ]
 }
diff --git a/test cases/failing/67 wrong boost module/meson.build b/test cases/failing/66 wrong boost module/meson.build
index 937e587..937e587 100644
--- a/test cases/failing/67 wrong boost module/meson.build
+++ b/test cases/failing/66 wrong boost module/meson.build
diff --git a/test cases/failing/67 wrong boost module/test.json b/test cases/failing/66 wrong boost module/test.json
index 5f9b21f..c65a78c 100644
--- a/test cases/failing/67 wrong boost module/test.json
+++ b/test cases/failing/66 wrong boost module/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/67 wrong boost module/meson.build:9:0: ERROR: Dependency \"boost\" not found, tried system"
+      "line": "test cases/failing/66 wrong boost module/meson.build:9:0: ERROR: Dependency \"boost\" not found, tried system"
     }
   ]
 }
diff --git a/test cases/failing/68 install_data rename bad size/file1.txt b/test cases/failing/67 install_data rename bad size/file1.txt
index e69de29..e69de29 100644
--- a/test cases/failing/68 install_data rename bad size/file1.txt
+++ b/test cases/failing/67 install_data rename bad size/file1.txt
diff --git a/test cases/failing/68 install_data rename bad size/file2.txt b/test cases/failing/67 install_data rename bad size/file2.txt
index e69de29..e69de29 100644
--- a/test cases/failing/68 install_data rename bad size/file2.txt
+++ b/test cases/failing/67 install_data rename bad size/file2.txt
diff --git a/test cases/failing/68 install_data rename bad size/meson.build b/test cases/failing/67 install_data rename bad size/meson.build
index c7cde08..c7cde08 100644
--- a/test cases/failing/68 install_data rename bad size/meson.build
+++ b/test cases/failing/67 install_data rename bad size/meson.build
diff --git a/test cases/failing/68 install_data rename bad size/test.json b/test cases/failing/67 install_data rename bad size/test.json
index a3cbb1b..af1f0d9 100644
--- a/test cases/failing/68 install_data rename bad size/test.json
+++ b/test cases/failing/67 install_data rename bad size/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/68 install_data rename bad size/meson.build:3:0: ERROR: \"rename\" and \"sources\" argument lists must be the same length if \"rename\" is given. Rename has 1 elements and sources has 2."
+      "line": "test cases/failing/67 install_data rename bad size/meson.build:3:0: ERROR: \"rename\" and \"sources\" argument lists must be the same length if \"rename\" is given. Rename has 1 elements and sources has 2."
     }
   ]
 }
diff --git a/test cases/failing/69 skip only subdir/meson.build b/test cases/failing/68 skip only subdir/meson.build
index 4832bd4..4832bd4 100644
--- a/test cases/failing/69 skip only subdir/meson.build
+++ b/test cases/failing/68 skip only subdir/meson.build
diff --git a/test cases/failing/69 skip only subdir/subdir/meson.build b/test cases/failing/68 skip only subdir/subdir/meson.build
index 1ba447b..1ba447b 100644
--- a/test cases/failing/69 skip only subdir/subdir/meson.build
+++ b/test cases/failing/68 skip only subdir/subdir/meson.build
diff --git a/test cases/failing/69 skip only subdir/test.json b/test cases/failing/68 skip only subdir/test.json
index 134971a..4558847 100644
--- a/test cases/failing/69 skip only subdir/test.json
+++ b/test cases/failing/68 skip only subdir/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/69 skip only subdir/meson.build:8:0: ERROR: File main.cpp does not exist."
+      "line": "test cases/failing/68 skip only subdir/meson.build:8:0: ERROR: File main.cpp does not exist."
     }
   ]
 }
diff --git a/test cases/failing/70 dual override/meson.build b/test cases/failing/69 dual override/meson.build
index e5f86ba..e5f86ba 100644
--- a/test cases/failing/70 dual override/meson.build
+++ b/test cases/failing/69 dual override/meson.build
diff --git a/test cases/failing/70 dual override/overrides.py b/test cases/failing/69 dual override/overrides.py
index 49e9b7a..49e9b7a 100644
--- a/test cases/failing/70 dual override/overrides.py
+++ b/test cases/failing/69 dual override/overrides.py
diff --git a/test cases/failing/70 dual override/test.json b/test cases/failing/69 dual override/test.json
index e955dc0..784d6b2 100644
--- a/test cases/failing/70 dual override/test.json
+++ b/test cases/failing/69 dual override/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/70 dual override/meson.build:5:6: ERROR: Tried to override executable \"override\" which has already been overridden."
+      "line": "test cases/failing/69 dual override/meson.build:5:6: ERROR: Tried to override executable \"override\" which has already been overridden."
     }
   ]
 }
diff --git a/test cases/failing/71 override used/meson.build b/test cases/failing/70 override used/meson.build
index 61885bb..61885bb 100644
--- a/test cases/failing/71 override used/meson.build
+++ b/test cases/failing/70 override used/meson.build
diff --git a/test cases/failing/71 override used/other.py b/test cases/failing/70 override used/other.py
index f62ba96..f62ba96 100755
--- a/test cases/failing/71 override used/other.py
+++ b/test cases/failing/70 override used/other.py
diff --git a/test cases/failing/71 override used/something.py b/test cases/failing/70 override used/something.py
index 64c9454..64c9454 100755
--- a/test cases/failing/71 override used/something.py
+++ b/test cases/failing/70 override used/something.py
diff --git a/test cases/failing/71 override used/test.json b/test cases/failing/70 override used/test.json
index 6c734e4..adb60aa 100644
--- a/test cases/failing/71 override used/test.json
+++ b/test cases/failing/70 override used/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/71 override used/meson.build:5:6: ERROR: Tried to override finding of executable \"something.py\" which has already been found."
+      "line": "test cases/failing/70 override used/meson.build:5:6: ERROR: Tried to override finding of executable \"something.py\" which has already been found."
     }
   ]
 }
diff --git a/test cases/failing/72 run_command unclean exit/meson.build b/test cases/failing/71 run_command unclean exit/meson.build
index 4bc02ae..4bc02ae 100644
--- a/test cases/failing/72 run_command unclean exit/meson.build
+++ b/test cases/failing/71 run_command unclean exit/meson.build
diff --git a/test cases/failing/72 run_command unclean exit/returncode.py b/test cases/failing/71 run_command unclean exit/returncode.py
index 84dbc5d..84dbc5d 100755
--- a/test cases/failing/72 run_command unclean exit/returncode.py
+++ b/test cases/failing/71 run_command unclean exit/returncode.py
diff --git a/test cases/failing/72 run_command unclean exit/test.json b/test cases/failing/71 run_command unclean exit/test.json
index 67a80f4..e9bfb94 100644
--- a/test cases/failing/72 run_command unclean exit/test.json
+++ b/test cases/failing/71 run_command unclean exit/test.json
@@ -2,7 +2,7 @@
   "stdout": [
     {
       "match": "re",
-      "line": "test cases/failing/72 run_command unclean exit/meson\\.build:4:0: ERROR: Command \".*[\\\\/]test cases[\\\\/]failing[\\\\/]72 run_command unclean exit[\\\\/]\\.[\\\\/]returncode\\.py 1\" failed with status 1\\."
+      "line": "test cases/failing/71 run_command unclean exit/meson\\.build:4:0: ERROR: Command \".*[\\\\/]test cases[\\\\/]failing[\\\\/]71 run_command unclean exit[\\\\/]\\.[\\\\/]returncode\\.py 1\" failed with status 1\\."
     }
   ]
 }
diff --git a/test cases/failing/73 int literal leading zero/meson.build b/test cases/failing/72 int literal leading zero/meson.build
index 87c776f..87c776f 100644
--- a/test cases/failing/73 int literal leading zero/meson.build
+++ b/test cases/failing/72 int literal leading zero/meson.build
diff --git a/test cases/failing/73 int literal leading zero/test.json b/test cases/failing/72 int literal leading zero/test.json
index bc41165..556e492 100644
--- a/test cases/failing/73 int literal leading zero/test.json
+++ b/test cases/failing/72 int literal leading zero/test.json
@@ -2,7 +2,7 @@
   "stdout": [
     {
       "comment": "this error message is not very informative",
-      "line": "test cases/failing/73 int literal leading zero/meson.build:5:13: ERROR: Expecting eof got number."
+      "line": "test cases/failing/72 int literal leading zero/meson.build:5:13: ERROR: Expecting eof got number."
     }
   ]
 }
diff --git a/test cases/failing/74 configuration immutable/input b/test cases/failing/73 configuration immutable/input
index e69de29..e69de29 100644
--- a/test cases/failing/74 configuration immutable/input
+++ b/test cases/failing/73 configuration immutable/input
diff --git a/test cases/failing/74 configuration immutable/meson.build b/test cases/failing/73 configuration immutable/meson.build
index b6cac41..b6cac41 100644
--- a/test cases/failing/74 configuration immutable/meson.build
+++ b/test cases/failing/73 configuration immutable/meson.build
diff --git a/test cases/failing/74 configuration immutable/test.json b/test cases/failing/73 configuration immutable/test.json
index 1dd172a..32d9427 100644
--- a/test cases/failing/74 configuration immutable/test.json
+++ b/test cases/failing/73 configuration immutable/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/74 configuration immutable/meson.build:12:16: ERROR: Can not set values on configuration object that has been used."
+      "line": "test cases/failing/73 configuration immutable/meson.build:12:16: ERROR: Can not set values on configuration object that has been used."
     }
   ]
 }
diff --git a/test cases/failing/75 link with shared module on osx/meson.build b/test cases/failing/74 link with shared module on osx/meson.build
index bf18b36..bf18b36 100644
--- a/test cases/failing/75 link with shared module on osx/meson.build
+++ b/test cases/failing/74 link with shared module on osx/meson.build
diff --git a/test cases/failing/75 link with shared module on osx/module.c b/test cases/failing/74 link with shared module on osx/module.c
index 81b0d5a..81b0d5a 100644
--- a/test cases/failing/75 link with shared module on osx/module.c
+++ b/test cases/failing/74 link with shared module on osx/module.c
diff --git a/test cases/failing/75 link with shared module on osx/prog.c b/test cases/failing/74 link with shared module on osx/prog.c
index 8164d8d..8164d8d 100644
--- a/test cases/failing/75 link with shared module on osx/prog.c
+++ b/test cases/failing/74 link with shared module on osx/prog.c
diff --git a/test cases/failing/75 link with shared module on osx/test.json b/test cases/failing/74 link with shared module on osx/test.json
index 81ee2ac..9ca1b9d 100644
--- a/test cases/failing/75 link with shared module on osx/test.json
+++ b/test cases/failing/74 link with shared module on osx/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/75 link with shared module on osx/meson.build:8:0: ERROR: target prog links against shared module mymodule. This is not permitted on OSX"
+      "line": "test cases/failing/74 link with shared module on osx/meson.build:8:0: ERROR: target prog links against shared module mymodule. This is not permitted on OSX"
     }
   ]
 }
diff --git a/test cases/failing/76 non ascii in ascii encoded configure file/config9.h.in b/test cases/failing/75 non ascii in ascii encoded configure file/config9.h.in
index 323bec6..323bec6 100644
--- a/test cases/failing/76 non ascii in ascii encoded configure file/config9.h.in
+++ b/test cases/failing/75 non ascii in ascii encoded configure file/config9.h.in
diff --git a/test cases/failing/76 non ascii in ascii encoded configure file/meson.build b/test cases/failing/75 non ascii in ascii encoded configure file/meson.build
index 846daaf..846daaf 100644
--- a/test cases/failing/76 non ascii in ascii encoded configure file/meson.build
+++ b/test cases/failing/75 non ascii in ascii encoded configure file/meson.build
diff --git a/test cases/failing/76 non ascii in ascii encoded configure file/test.json b/test cases/failing/75 non ascii in ascii encoded configure file/test.json
index 44e6377..27cb0ab 100644
--- a/test cases/failing/76 non ascii in ascii encoded configure file/test.json
+++ b/test cases/failing/75 non ascii in ascii encoded configure file/test.json
@@ -2,7 +2,7 @@
   "stdout": [
     {
       "match": "re",
-      "line": "test cases/failing/76 non ascii in ascii encoded configure file/meson\\.build:5:0: ERROR: Could not write output file .*[\\\\/]config9\\.h: 'ascii' codec can't encode character '\\\\u0434' in position 17: ordinal not in range\\(128\\)"
+      "line": "test cases/failing/75 non ascii in ascii encoded configure file/meson\\.build:5:0: ERROR: Could not write output file .*[\\\\/]config9\\.h: 'ascii' codec can't encode character '\\\\u0434' in position 17: ordinal not in range\\(128\\)"
     }
   ]
 }
diff --git a/test cases/failing/77 subproj dependency not-found and required/meson.build b/test cases/failing/76 subproj dependency not-found and required/meson.build
index c5a2961..c5a2961 100644
--- a/test cases/failing/77 subproj dependency not-found and required/meson.build
+++ b/test cases/failing/76 subproj dependency not-found and required/meson.build
diff --git a/test cases/failing/77 subproj dependency not-found and required/test.json b/test cases/failing/76 subproj dependency not-found and required/test.json
index 5365f34..3b98436 100644
--- a/test cases/failing/77 subproj dependency not-found and required/test.json
+++ b/test cases/failing/76 subproj dependency not-found and required/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/77 subproj dependency not-found and required/meson.build:2:0: ERROR: Neither a subproject directory nor a missing.wrap file was found."
+      "line": "test cases/failing/76 subproj dependency not-found and required/meson.build:2:0: ERROR: Neither a subproject directory nor a missing.wrap file was found."
     }
   ]
 }
diff --git a/test cases/failing/78 unfound run/meson.build b/test cases/failing/77 unfound run/meson.build
index 3f37e9a..3f37e9a 100644
--- a/test cases/failing/78 unfound run/meson.build
+++ b/test cases/failing/77 unfound run/meson.build
diff --git a/test cases/failing/78 unfound run/test.json b/test cases/failing/77 unfound run/test.json
index 0cdcdf2..99464bd 100644
--- a/test cases/failing/78 unfound run/test.json
+++ b/test cases/failing/77 unfound run/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/78 unfound run/meson.build:4:0: ERROR: Tried to use non-existing executable 'nonexisting_prog'"
+      "line": "test cases/failing/77 unfound run/meson.build:4:0: ERROR: Tried to use non-existing executable 'nonexisting_prog'"
     }
   ]
 }
diff --git a/test cases/failing/79 framework dependency with version/meson.build b/test cases/failing/78 framework dependency with version/meson.build
index b7e04ba..b7e04ba 100644
--- a/test cases/failing/79 framework dependency with version/meson.build
+++ b/test cases/failing/78 framework dependency with version/meson.build
diff --git a/test cases/failing/79 framework dependency with version/test.json b/test cases/failing/78 framework dependency with version/test.json
index 9b0d335..c9f25a2 100644
--- a/test cases/failing/79 framework dependency with version/test.json
+++ b/test cases/failing/78 framework dependency with version/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/79 framework dependency with version/meson.build:8:0: ERROR: Unknown version of dependency 'appleframeworks', but need ['>0']."
+      "line": "test cases/failing/78 framework dependency with version/meson.build:8:0: ERROR: Unknown version of dependency 'appleframeworks', but need ['>0']."
     }
   ]
 }
diff --git a/test cases/failing/80 override exe config/foo.c b/test cases/failing/79 override exe config/foo.c
index 03b2213..03b2213 100644
--- a/test cases/failing/80 override exe config/foo.c
+++ b/test cases/failing/79 override exe config/foo.c
diff --git a/test cases/failing/80 override exe config/meson.build b/test cases/failing/79 override exe config/meson.build
index a5d0924..a5d0924 100644
--- a/test cases/failing/80 override exe config/meson.build
+++ b/test cases/failing/79 override exe config/meson.build
diff --git a/test cases/failing/80 override exe config/test.json b/test cases/failing/79 override exe config/test.json
index 36c789e..1a671a3 100644
--- a/test cases/failing/80 override exe config/test.json
+++ b/test cases/failing/79 override exe config/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/80 override exe config/meson.build:6:0: ERROR: Program 'bar' was overridden with the compiled executable 'foo' and therefore cannot be used during configuration"
+      "line": "test cases/failing/79 override exe config/meson.build:6:0: ERROR: Program 'bar' was overridden with the compiled executable 'foo' and therefore cannot be used during configuration"
     }
   ]
 }
diff --git a/test cases/failing/81 gl dependency with version/meson.build b/test cases/failing/80 gl dependency with version/meson.build
index 0127093..0127093 100644
--- a/test cases/failing/81 gl dependency with version/meson.build
+++ b/test cases/failing/80 gl dependency with version/meson.build
diff --git a/test cases/failing/81 gl dependency with version/test.json b/test cases/failing/80 gl dependency with version/test.json
index 86da735..cae10da 100644
--- a/test cases/failing/81 gl dependency with version/test.json
+++ b/test cases/failing/80 gl dependency with version/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/81 gl dependency with version/meson.build:9:0: ERROR: Unknown version of dependency 'gl', but need ['>0']."
+      "line": "test cases/failing/80 gl dependency with version/meson.build:9:0: ERROR: Unknown version of dependency 'gl', but need ['>0']."
     }
   ]
 }
diff --git a/test cases/failing/82 threads dependency with version/meson.build b/test cases/failing/81 threads dependency with version/meson.build
index 6023fae..6023fae 100644
--- a/test cases/failing/82 threads dependency with version/meson.build
+++ b/test cases/failing/81 threads dependency with version/meson.build
diff --git a/test cases/failing/82 threads dependency with version/test.json b/test cases/failing/81 threads dependency with version/test.json
index 9b71468..7781b72 100644
--- a/test cases/failing/82 threads dependency with version/test.json
+++ b/test cases/failing/81 threads dependency with version/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/82 threads dependency with version/meson.build:3:0: ERROR: Unknown version of dependency 'threads', but need ['>0']."
+      "line": "test cases/failing/81 threads dependency with version/meson.build:3:0: ERROR: Unknown version of dependency 'threads', but need ['>0']."
     }
   ]
 }
diff --git a/test cases/failing/83 gtest dependency with version/meson.build b/test cases/failing/82 gtest dependency with version/meson.build
index b43a047..b43a047 100644
--- a/test cases/failing/83 gtest dependency with version/meson.build
+++ b/test cases/failing/82 gtest dependency with version/meson.build
diff --git a/test cases/failing/83 gtest dependency with version/test.json b/test cases/failing/82 gtest dependency with version/test.json
index 4a44077..7cf397b 100644
--- a/test cases/failing/83 gtest dependency with version/test.json
+++ b/test cases/failing/82 gtest dependency with version/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/83 gtest dependency with version/meson.build:8:0: ERROR: Dependency 'gtest' is required but not found."
+      "line": "test cases/failing/82 gtest dependency with version/meson.build:8:0: ERROR: Dependency 'gtest' is required but not found."
     }
   ]
 }
diff --git a/test cases/failing/84 dub libray/meson.build b/test cases/failing/83 dub libray/meson.build
index 306d5b3..306d5b3 100644
--- a/test cases/failing/84 dub libray/meson.build
+++ b/test cases/failing/83 dub libray/meson.build
diff --git a/test cases/failing/84 dub libray/test.json b/test cases/failing/83 dub libray/test.json
index 23fe6e5..4dcbbed 100644
--- a/test cases/failing/84 dub libray/test.json
+++ b/test cases/failing/83 dub libray/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/84 dub libray/meson.build:11:0: ERROR: Dependency \"dubtestproject\" not found"
+      "line": "test cases/failing/83 dub libray/meson.build:11:0: ERROR: Dependency \"dubtestproject\" not found"
     }
   ]
 }
diff --git a/test cases/failing/85 dub executable/meson.build b/test cases/failing/84 dub executable/meson.build
index 9a134ea..9a134ea 100644
--- a/test cases/failing/85 dub executable/meson.build
+++ b/test cases/failing/84 dub executable/meson.build
diff --git a/test cases/failing/85 dub executable/test.json b/test cases/failing/84 dub executable/test.json
index 4a8674c..6dfff62 100644
--- a/test cases/failing/85 dub executable/test.json
+++ b/test cases/failing/84 dub executable/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/85 dub executable/meson.build:11:0: ERROR: Dependency \"dubtestproject:test1\" not found"
+      "line": "test cases/failing/84 dub executable/meson.build:11:0: ERROR: Dependency \"dubtestproject:test1\" not found"
     }
   ]
 }
diff --git a/test cases/failing/86 dub compiler/meson.build b/test cases/failing/85 dub compiler/meson.build
index 36f1849..36f1849 100644
--- a/test cases/failing/86 dub compiler/meson.build
+++ b/test cases/failing/85 dub compiler/meson.build
diff --git a/test cases/failing/86 dub compiler/test.json b/test cases/failing/85 dub compiler/test.json
index ab6caff..50ee39b 100644
--- a/test cases/failing/86 dub compiler/test.json
+++ b/test cases/failing/85 dub compiler/test.json
@@ -13,7 +13,7 @@
   },
   "stdout": [
     {
-      "line": "test cases/failing/86 dub compiler/meson.build:17:0: ERROR: Dependency \"dubtestproject:test2\" not found"
+      "line": "test cases/failing/85 dub compiler/meson.build:17:0: ERROR: Dependency \"dubtestproject:test2\" not found"
     }
   ]
 }
diff --git a/test cases/failing/87 subproj not-found dep/meson.build b/test cases/failing/86 subproj not-found dep/meson.build
index 2b17df1..2b17df1 100644
--- a/test cases/failing/87 subproj not-found dep/meson.build
+++ b/test cases/failing/86 subproj not-found dep/meson.build
diff --git a/test cases/failing/87 subproj not-found dep/subprojects/somesubproj/meson.build b/test cases/failing/86 subproj not-found dep/subprojects/somesubproj/meson.build
index 5f451f4..5f451f4 100644
--- a/test cases/failing/87 subproj not-found dep/subprojects/somesubproj/meson.build
+++ b/test cases/failing/86 subproj not-found dep/subprojects/somesubproj/meson.build
diff --git a/test cases/failing/87 subproj not-found dep/test.json b/test cases/failing/86 subproj not-found dep/test.json
index 160e9d3..b662643 100644
--- a/test cases/failing/87 subproj not-found dep/test.json
+++ b/test cases/failing/86 subproj not-found dep/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/87 subproj not-found dep/meson.build:2:0: ERROR: Dependency '(anonymous)' is required but not found."
+      "line": "test cases/failing/86 subproj not-found dep/meson.build:2:0: ERROR: Dependency '(anonymous)' is required but not found."
     }
   ]
 }
diff --git a/test cases/failing/88 invalid configure file/input b/test cases/failing/87 invalid configure file/input
index e69de29..e69de29 100644
--- a/test cases/failing/88 invalid configure file/input
+++ b/test cases/failing/87 invalid configure file/input
diff --git a/test cases/failing/88 invalid configure file/meson.build b/test cases/failing/87 invalid configure file/meson.build
index 08eca2b..08eca2b 100644
--- a/test cases/failing/88 invalid configure file/meson.build
+++ b/test cases/failing/87 invalid configure file/meson.build
diff --git a/test cases/failing/88 invalid configure file/test.json b/test cases/failing/87 invalid configure file/test.json
index b551f61..d8ea73d 100644
--- a/test cases/failing/88 invalid configure file/test.json
+++ b/test cases/failing/87 invalid configure file/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/88 invalid configure file/meson.build:3:0: ERROR: \"install_dir\" must be specified when \"install\" in a configure_file is true"
+      "line": "test cases/failing/87 invalid configure file/meson.build:3:0: ERROR: \"install_dir\" must be specified when \"install\" in a configure_file is true"
     }
   ]
 }
diff --git a/test cases/failing/89 kwarg dupe/meson.build b/test cases/failing/88 kwarg dupe/meson.build
index 06821a2..06821a2 100644
--- a/test cases/failing/89 kwarg dupe/meson.build
+++ b/test cases/failing/88 kwarg dupe/meson.build
diff --git a/test cases/failing/89 kwarg dupe/prog.c b/test cases/failing/88 kwarg dupe/prog.c
index 5f3fbe6..5f3fbe6 100644
--- a/test cases/failing/89 kwarg dupe/prog.c
+++ b/test cases/failing/88 kwarg dupe/prog.c
diff --git a/test cases/failing/89 kwarg dupe/test.json b/test cases/failing/88 kwarg dupe/test.json
index ec46600..cfd68eb 100644
--- a/test cases/failing/89 kwarg dupe/test.json
+++ b/test cases/failing/88 kwarg dupe/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/89 kwarg dupe/meson.build:5:0: ERROR: Entry \"install\" defined both as a keyword argument and in a \"kwarg\" entry."
+      "line": "test cases/failing/88 kwarg dupe/meson.build:5:0: ERROR: Entry \"install\" defined both as a keyword argument and in a \"kwarg\" entry."
     }
   ]
 }
diff --git a/test cases/failing/90 missing pch file/meson.build b/test cases/failing/89 missing pch file/meson.build
index a67b798..a67b798 100644
--- a/test cases/failing/90 missing pch file/meson.build
+++ b/test cases/failing/89 missing pch file/meson.build
diff --git a/test cases/failing/90 missing pch file/prog.c b/test cases/failing/89 missing pch file/prog.c
index 11b7fad..11b7fad 100644
--- a/test cases/failing/90 missing pch file/prog.c
+++ b/test cases/failing/89 missing pch file/prog.c
diff --git a/test cases/failing/90 missing pch file/test.json b/test cases/failing/89 missing pch file/test.json
index f55eb47..638d2e7 100644
--- a/test cases/failing/90 missing pch file/test.json
+++ b/test cases/failing/89 missing pch file/test.json
@@ -2,7 +2,7 @@
   "stdout": [
     {
       "comment": "literal 'pch/prog.h' from meson.build appears in output, irrespective of os.path.sep",
-      "line": "test cases/failing/90 missing pch file/meson.build:2:0: ERROR: File pch/prog.h does not exist."
+      "line": "test cases/failing/89 missing pch file/meson.build:2:0: ERROR: File pch/prog.h does not exist."
     }
   ]
 }
diff --git a/test cases/failing/91 pch source different folder/include/pch.h b/test cases/failing/90 pch source different folder/include/pch.h
index e69de29..e69de29 100644
--- a/test cases/failing/91 pch source different folder/include/pch.h
+++ b/test cases/failing/90 pch source different folder/include/pch.h
diff --git a/test cases/failing/91 pch source different folder/meson.build b/test cases/failing/90 pch source different folder/meson.build
index d320717..d320717 100644
--- a/test cases/failing/91 pch source different folder/meson.build
+++ b/test cases/failing/90 pch source different folder/meson.build
diff --git a/test cases/failing/91 pch source different folder/prog.c b/test cases/failing/90 pch source different folder/prog.c
index 3fb1295..3fb1295 100644
--- a/test cases/failing/91 pch source different folder/prog.c
+++ b/test cases/failing/90 pch source different folder/prog.c
diff --git a/test cases/failing/91 pch source different folder/src/pch.c b/test cases/failing/90 pch source different folder/src/pch.c
index e69de29..e69de29 100644
--- a/test cases/failing/91 pch source different folder/src/pch.c
+++ b/test cases/failing/90 pch source different folder/src/pch.c
diff --git a/test cases/failing/91 pch source different folder/test.json b/test cases/failing/90 pch source different folder/test.json
index 6309f6c..cbbac3d 100644
--- a/test cases/failing/91 pch source different folder/test.json
+++ b/test cases/failing/90 pch source different folder/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/91 pch source different folder/meson.build:4:0: ERROR: PCH files must be stored in the same folder."
+      "line": "test cases/failing/90 pch source different folder/meson.build:4:0: ERROR: PCH files must be stored in the same folder."
     }
   ]
 }
diff --git a/test cases/failing/92 unknown config tool/meson.build b/test cases/failing/91 unknown config tool/meson.build
index 536976e..536976e 100644
--- a/test cases/failing/92 unknown config tool/meson.build
+++ b/test cases/failing/91 unknown config tool/meson.build
diff --git a/test cases/failing/92 unknown config tool/test.json b/test cases/failing/91 unknown config tool/test.json
index c4484f3..e225167 100644
--- a/test cases/failing/92 unknown config tool/test.json
+++ b/test cases/failing/91 unknown config tool/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/92 unknown config tool/meson.build:2:0: ERROR: Dependency \"no-such-config-tool\" not found"
+      "line": "test cases/failing/91 unknown config tool/meson.build:2:0: ERROR: Dependency \"no-such-config-tool\" not found"
     }
   ]
 }
diff --git a/test cases/failing/93 custom target install data/Info.plist.cpp b/test cases/failing/92 custom target install data/Info.plist.cpp
index 9ca2fcb..9ca2fcb 100644
--- a/test cases/failing/93 custom target install data/Info.plist.cpp
+++ b/test cases/failing/92 custom target install data/Info.plist.cpp
diff --git a/test cases/failing/93 custom target install data/meson.build b/test cases/failing/92 custom target install data/meson.build
index 00d348c..00d348c 100644
--- a/test cases/failing/93 custom target install data/meson.build
+++ b/test cases/failing/92 custom target install data/meson.build
diff --git a/test cases/failing/93 custom target install data/preproc.py b/test cases/failing/92 custom target install data/preproc.py
index e6eba4c..e6eba4c 100644
--- a/test cases/failing/93 custom target install data/preproc.py
+++ b/test cases/failing/92 custom target install data/preproc.py
diff --git a/test cases/failing/93 custom target install data/test.json b/test cases/failing/92 custom target install data/test.json
index caeafb1..46ab013 100644
--- a/test cases/failing/93 custom target install data/test.json
+++ b/test cases/failing/92 custom target install data/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/93 custom target install data/meson.build:11:0: ERROR: install_data argument 1 was of type \"CustomTarget\" but should have been one of: \"str\", \"File\""
+      "line": "test cases/failing/92 custom target install data/meson.build:11:0: ERROR: install_data argument 1 was of type \"CustomTarget\" but should have been one of: \"str\", \"File\""
     }
   ]
 }
diff --git a/test cases/failing/94 add dict non string key/meson.build b/test cases/failing/93 add dict non string key/meson.build
index c81a3f7..c81a3f7 100644
--- a/test cases/failing/94 add dict non string key/meson.build
+++ b/test cases/failing/93 add dict non string key/meson.build
diff --git a/test cases/failing/94 add dict non string key/test.json b/test cases/failing/93 add dict non string key/test.json
index 09459dd..3ef2dde 100644
--- a/test cases/failing/94 add dict non string key/test.json
+++ b/test cases/failing/93 add dict non string key/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/94 add dict non string key/meson.build:9:0: ERROR: Key must be a string"
+      "line": "test cases/failing/93 add dict non string key/meson.build:9:0: ERROR: Key must be a string"
     }
   ]
 }
diff --git a/test cases/failing/95 add dict duplicate keys/meson.build b/test cases/failing/94 add dict duplicate keys/meson.build
index 7a9b523..7a9b523 100644
--- a/test cases/failing/95 add dict duplicate keys/meson.build
+++ b/test cases/failing/94 add dict duplicate keys/meson.build
diff --git a/test cases/failing/95 add dict duplicate keys/test.json b/test cases/failing/94 add dict duplicate keys/test.json
index ae9a81f..5b2d7d6 100644
--- a/test cases/failing/95 add dict duplicate keys/test.json
+++ b/test cases/failing/94 add dict duplicate keys/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/95 add dict duplicate keys/meson.build:9:0: ERROR: Duplicate dictionary key: myKey"
+      "line": "test cases/failing/94 add dict duplicate keys/meson.build:9:0: ERROR: Duplicate dictionary key: myKey"
     }
   ]
 }
diff --git a/test cases/failing/96 no host get_external_property/meson.build b/test cases/failing/95 no host get_external_property/meson.build
index c956754..c956754 100644
--- a/test cases/failing/96 no host get_external_property/meson.build
+++ b/test cases/failing/95 no host get_external_property/meson.build
diff --git a/test cases/failing/96 no host get_external_property/test.json b/test cases/failing/95 no host get_external_property/test.json
index 3376a0b..0ef6dd2 100644
--- a/test cases/failing/96 no host get_external_property/test.json
+++ b/test cases/failing/95 no host get_external_property/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/96 no host get_external_property/meson.build:3:0: ERROR: Unknown property for host machine: nonexisting"
+      "line": "test cases/failing/95 no host get_external_property/meson.build:3:0: ERROR: Unknown property for host machine: nonexisting"
     }
   ]
 }
diff --git a/test cases/failing/114 cmake executable dependency/subprojects/cmlib/main.c b/test cases/failing/96 no native compiler/main.c
index 9b6bdc2..9b6bdc2 100644
--- a/test cases/failing/114 cmake executable dependency/subprojects/cmlib/main.c
+++ b/test cases/failing/96 no native compiler/main.c
diff --git a/test cases/failing/97 no native compiler/meson.build b/test cases/failing/96 no native compiler/meson.build
index f0126ac..f0126ac 100644
--- a/test cases/failing/97 no native compiler/meson.build
+++ b/test cases/failing/96 no native compiler/meson.build
diff --git a/test cases/failing/97 no native compiler/test.json b/test cases/failing/96 no native compiler/test.json
index b79bd3b..0107727 100644
--- a/test cases/failing/97 no native compiler/test.json
+++ b/test cases/failing/96 no native compiler/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/97 no native compiler/meson.build:12:0: ERROR: No host machine compiler for \"main.c\""
+      "line": "test cases/failing/96 no native compiler/meson.build:12:0: ERROR: No host machine compiler for \"main.c\""
     }
   ]
 }
diff --git a/test cases/failing/98 subdir parse error/meson.build b/test cases/failing/97 subdir parse error/meson.build
index ee5bb0c..ee5bb0c 100644
--- a/test cases/failing/98 subdir parse error/meson.build
+++ b/test cases/failing/97 subdir parse error/meson.build
diff --git a/test cases/failing/98 subdir parse error/subdir/meson.build b/test cases/failing/97 subdir parse error/subdir/meson.build
index 3ac5ef9..3ac5ef9 100644
--- a/test cases/failing/98 subdir parse error/subdir/meson.build
+++ b/test cases/failing/97 subdir parse error/subdir/meson.build
diff --git a/test cases/failing/98 subdir parse error/test.json b/test cases/failing/97 subdir parse error/test.json
index 8e04799..414789e 100644
--- a/test cases/failing/98 subdir parse error/test.json
+++ b/test cases/failing/97 subdir parse error/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/98 subdir parse error/subdir/meson.build:1:0: ERROR: Plusassignment target must be an id."
+      "line": "test cases/failing/97 subdir parse error/subdir/meson.build:1:0: ERROR: Plusassignment target must be an id."
     }
   ]
 }
diff --git a/test cases/failing/99 invalid option file/meson.build b/test cases/failing/98 invalid option file/meson.build
index b0347c3..b0347c3 100644
--- a/test cases/failing/99 invalid option file/meson.build
+++ b/test cases/failing/98 invalid option file/meson.build
diff --git a/test cases/failing/99 invalid option file/meson_options.txt b/test cases/failing/98 invalid option file/meson_options.txt
index eef843b..eef843b 100644
--- a/test cases/failing/99 invalid option file/meson_options.txt
+++ b/test cases/failing/98 invalid option file/meson_options.txt
diff --git a/test cases/failing/99 invalid option file/test.json b/test cases/failing/98 invalid option file/test.json
index ebfddd8..6ab5393 100644
--- a/test cases/failing/99 invalid option file/test.json
+++ b/test cases/failing/98 invalid option file/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/99 invalid option file/meson_options.txt:1:0: ERROR: lexer"
+      "line": "test cases/failing/98 invalid option file/meson_options.txt:1:0: ERROR: lexer"
     }
   ]
 }
diff --git a/test cases/failing/97 no native compiler/main.c b/test cases/failing/99 no lang/main.c
index 9b6bdc2..9b6bdc2 100644
--- a/test cases/failing/97 no native compiler/main.c
+++ b/test cases/failing/99 no lang/main.c
diff --git a/test cases/failing/100 no lang/meson.build b/test cases/failing/99 no lang/meson.build
index 85c5db8..85c5db8 100644
--- a/test cases/failing/100 no lang/meson.build
+++ b/test cases/failing/99 no lang/meson.build
diff --git a/test cases/failing/99 no lang/test.json b/test cases/failing/99 no lang/test.json
new file mode 100644
index 0000000..48c6dd7
--- /dev/null
+++ b/test cases/failing/99 no lang/test.json
@@ -0,0 +1,7 @@
+{
+  "stdout": [
+    {
+      "line": "test cases/failing/99 no lang/meson.build:2:0: ERROR: No host machine compiler for 'main.c'"
+    }
+  ]
+}