Condense test directory names for next release.

186 files changed, 77 insertions, 77 deletions

diff --git a/run_unittests.py b/run_unittests.py
index e8f453d..29edf6a 100755
--- a/run_unittests.py
+++ b/run_unittests.py
@@ -2756,7 +2756,7 @@ class AllPlatformTests(BasePlatformTests):
         self.run_tests()
 
     def test_implicit_forcefallback(self):
-        testdir = os.path.join(self.unit_test_dir, '95 implicit force fallback')
+        testdir = os.path.join(self.unit_test_dir, '96 implicit force fallback')
         with self.assertRaises(subprocess.CalledProcessError) as cm:
             self.init(testdir)
         self.init(testdir, extra_args=['--wrap-mode=forcefallback'])
@@ -4016,9 +4016,9 @@ class AllPlatformTests(BasePlatformTests):
         for (t, f) in [
             ('10 out of bounds', 'meson.build'),
             ('18 wrong plusassign', 'meson.build'),
-            ('61 bad option argument', 'meson_options.txt'),
-            ('102 subdir parse error', os.path.join('subdir', 'meson.build')),
-            ('103 invalid option file', 'meson_options.txt'),
+            ('60 bad option argument', 'meson_options.txt'),
+            ('98 subdir parse error', os.path.join('subdir', 'meson.build')),
+            ('99 invalid option file', 'meson_options.txt'),
         ]:
             tdir = os.path.join(self.src_root, 'test cases', 'failing', t)
 
diff --git a/test cases/common/241 dependency native host == build/meson.build b/test cases/common/240 dependency native host == build/meson.build
index bdcd93c..bdcd93c 100644
--- a/test cases/common/241 dependency native host == build/meson.build
+++ b/test cases/common/240 dependency native host == build/meson.build
diff --git a/test cases/common/241 dependency native host == build/test.json b/test cases/common/240 dependency native host == build/test.json
index 5e2a715..5e2a715 100644
--- a/test cases/common/241 dependency native host == build/test.json
+++ b/test cases/common/240 dependency native host == build/test.json
diff --git a/test cases/common/242 set and get variable/meson.build b/test cases/common/241 set and get variable/meson.build
index 4ecdb35..4ecdb35 100644
--- a/test cases/common/242 set and get variable/meson.build
+++ b/test cases/common/241 set and get variable/meson.build
diff --git a/test cases/common/242 set and get variable/test1.txt b/test cases/common/241 set and get variable/test1.txt
index e69de29..e69de29 100644
--- a/test cases/common/242 set and get variable/test1.txt
+++ b/test cases/common/241 set and get variable/test1.txt
diff --git a/test cases/common/242 set and get variable/test2.txt b/test cases/common/241 set and get variable/test2.txt
index e69de29..e69de29 100644
--- a/test cases/common/242 set and get variable/test2.txt
+++ b/test cases/common/241 set and get variable/test2.txt
diff --git a/test cases/common/243 custom target feed/data_source.txt b/test cases/common/242 custom target feed/data_source.txt
index 0c23cc0..0c23cc0 100644
--- a/test cases/common/243 custom target feed/data_source.txt
+++ b/test cases/common/242 custom target feed/data_source.txt
diff --git a/test cases/common/243 custom target feed/meson.build b/test cases/common/242 custom target feed/meson.build
index 1cda37d..1cda37d 100644
--- a/test cases/common/243 custom target feed/meson.build
+++ b/test cases/common/242 custom target feed/meson.build
diff --git a/test cases/common/243 custom target feed/my_compiler.py b/test cases/common/242 custom target feed/my_compiler.py
index 97d4208..97d4208 100755
--- a/test cases/common/243 custom target feed/my_compiler.py
+++ b/test cases/common/242 custom target feed/my_compiler.py
diff --git a/test cases/common/243 custom target feed/test.json b/test cases/common/242 custom target feed/test.json
index ba66b02..ba66b02 100644
--- a/test cases/common/243 custom target feed/test.json
+++ b/test cases/common/242 custom target feed/test.json
diff --git a/test cases/failing/101 no native compiler/main.c b/test cases/failing/100 no lang/main.c
index 9b6bdc2..9b6bdc2 100644
--- a/test cases/failing/101 no native compiler/main.c
+++ b/test cases/failing/100 no lang/main.c
diff --git a/test cases/failing/104 no lang/meson.build b/test cases/failing/100 no lang/meson.build
index 85c5db8..85c5db8 100644
--- a/test cases/failing/104 no lang/meson.build
+++ b/test cases/failing/100 no lang/meson.build
diff --git a/test cases/failing/104 no lang/test.json b/test cases/failing/100 no lang/test.json
index 62999be..58dc1ac 100644
--- a/test cases/failing/104 no lang/test.json
+++ b/test cases/failing/100 no lang/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/104 no lang/meson.build:2:0: ERROR: No host machine compiler for \"main.c\""
+      "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/105 no glib-compile-resources/meson.build b/test cases/failing/101 no glib-compile-resources/meson.build
index aae0569..aae0569 100644
--- a/test cases/failing/105 no glib-compile-resources/meson.build
+++ b/test cases/failing/101 no glib-compile-resources/meson.build
diff --git a/test cases/failing/105 no glib-compile-resources/test.json b/test cases/failing/101 no glib-compile-resources/test.json
index 4bc7d90..d81b0c0 100644
--- a/test cases/failing/105 no glib-compile-resources/test.json
+++ b/test cases/failing/101 no glib-compile-resources/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/105 no glib-compile-resources/meson.build:8:0: ERROR: Program 'glib-compile-resources' not found"
+      "line": "test cases/failing/101 no glib-compile-resources/meson.build:8:0: ERROR: Program 'glib-compile-resources' not found"
     }
   ]
 }
diff --git a/test cases/failing/105 no glib-compile-resources/trivial.gresource.xml b/test cases/failing/101 no glib-compile-resources/trivial.gresource.xml
index 1447b98..1447b98 100644
--- a/test cases/failing/105 no glib-compile-resources/trivial.gresource.xml
+++ b/test cases/failing/101 no glib-compile-resources/trivial.gresource.xml
diff --git a/test cases/failing/101 no native compiler/test.json b/test cases/failing/101 no native compiler/test.json
deleted file mode 100644
index c7b5d1c..0000000
--- a/test cases/failing/101 no native compiler/test.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "stdout": [
-    {
-      "line": "test cases/failing/101 no native compiler/meson.build:12:0: ERROR: No host machine compiler for \"main.c\""
-    }
-  ]
-}
diff --git a/test cases/failing/107 number in combo/meson.build b/test cases/failing/102 number in combo/meson.build
index 1a647df..1a647df 100644
--- a/test cases/failing/107 number in combo/meson.build
+++ b/test cases/failing/102 number in combo/meson.build
diff --git a/test cases/failing/107 number in combo/nativefile.ini b/test cases/failing/102 number in combo/nativefile.ini
index 55f10fc..55f10fc 100644
--- a/test cases/failing/107 number in combo/nativefile.ini
+++ b/test cases/failing/102 number in combo/nativefile.ini
diff --git a/test cases/failing/107 number in combo/test.json b/test cases/failing/102 number in combo/test.json
index f5aeb4e..8e70a60 100644
--- a/test cases/failing/107 number in combo/test.json
+++ b/test cases/failing/102 number in combo/test.json
@@ -1,5 +1,5 @@
 {
   "stdout": [
-    { "line": "test cases/failing/107 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/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\"." }
   ]
 }
diff --git a/test cases/failing/102 subdir parse error/test.json b/test cases/failing/102 subdir parse error/test.json
deleted file mode 100644
index 06fd4d3..0000000
--- a/test cases/failing/102 subdir parse error/test.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "stdout": [
-    {
-      "line": "test cases/failing/102 subdir parse error/subdir/meson.build:1:0: ERROR: Plusassignment target must be an id."
-    }
-  ]
-}
diff --git a/test cases/failing/108 bool in combo/meson.build b/test cases/failing/103 bool in combo/meson.build
index c5efd67..c5efd67 100644
--- a/test cases/failing/108 bool in combo/meson.build
+++ b/test cases/failing/103 bool in combo/meson.build
diff --git a/test cases/failing/108 bool in combo/meson_options.txt b/test cases/failing/103 bool in combo/meson_options.txt
index 0c8f5de..0c8f5de 100644
--- a/test cases/failing/108 bool in combo/meson_options.txt
+++ b/test cases/failing/103 bool in combo/meson_options.txt
diff --git a/test cases/failing/108 bool in combo/nativefile.ini b/test cases/failing/103 bool in combo/nativefile.ini
index b423957..b423957 100644
--- a/test cases/failing/108 bool in combo/nativefile.ini
+++ b/test cases/failing/103 bool in combo/nativefile.ini
diff --git a/test cases/failing/108 bool in combo/test.json b/test cases/failing/103 bool in combo/test.json
index 729ad3d..48d4cc3 100644
--- a/test cases/failing/108 bool in combo/test.json
+++ b/test cases/failing/103 bool in combo/test.json
@@ -1,5 +1,5 @@
 {
   "stdout": [
-    { "line": "test cases/failing/108 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/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\"." }
   ]
 }
diff --git a/test cases/failing/103 invalid option file/test.json b/test cases/failing/103 invalid option file/test.json
deleted file mode 100644
index 20dbec3..0000000
--- a/test cases/failing/103 invalid option file/test.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "stdout": [
-    {
-      "line": "test cases/failing/103 invalid option file/meson_options.txt:1:0: ERROR: lexer"
-    }
-  ]
-}
diff --git a/test cases/failing/109 compiler no lang/meson.build b/test cases/failing/104 compiler no lang/meson.build
index 366bbdd..366bbdd 100644
--- a/test cases/failing/109 compiler no lang/meson.build
+++ b/test cases/failing/104 compiler no lang/meson.build
diff --git a/test cases/failing/109 compiler no lang/test.json b/test cases/failing/104 compiler no lang/test.json
index c613d5d..d8cc96e 100644
--- a/test cases/failing/109 compiler no lang/test.json
+++ b/test cases/failing/104 compiler no lang/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/109 compiler no lang/meson.build:2:6: ERROR: Tried to access compiler for language \"c\", not specified for host machine."
+      "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."
     }
   ]
 }
diff --git a/test cases/failing/110 no fallback/meson.build b/test cases/failing/105 no fallback/meson.build
index 0101bb8..0101bb8 100644
--- a/test cases/failing/110 no fallback/meson.build
+++ b/test cases/failing/105 no fallback/meson.build
diff --git a/test cases/failing/110 no fallback/subprojects/foob/meson.build b/test cases/failing/105 no fallback/subprojects/foob/meson.build
index b2c4814..b2c4814 100644
--- a/test cases/failing/110 no fallback/subprojects/foob/meson.build
+++ b/test cases/failing/105 no fallback/subprojects/foob/meson.build
diff --git a/test cases/failing/110 no fallback/test.json b/test cases/failing/105 no fallback/test.json
index e034061..e034061 100644
--- a/test cases/failing/110 no fallback/test.json
+++ b/test cases/failing/105 no fallback/test.json
diff --git a/test cases/failing/111 feature require/meson.build b/test cases/failing/106 feature require/meson.build
index d976ae8..d976ae8 100644
--- a/test cases/failing/111 feature require/meson.build
+++ b/test cases/failing/106 feature require/meson.build
diff --git a/test cases/failing/111 feature require/meson_options.txt b/test cases/failing/106 feature require/meson_options.txt
index d6f2ce6..d6f2ce6 100644
--- a/test cases/failing/111 feature require/meson_options.txt
+++ b/test cases/failing/106 feature require/meson_options.txt
diff --git a/test cases/failing/111 feature require/test.json b/test cases/failing/106 feature require/test.json
index 7c4640d..7c4640d 100644
--- a/test cases/failing/111 feature require/test.json
+++ b/test cases/failing/106 feature require/test.json
diff --git a/test cases/failing/111 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/111 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/111 no build get_external_property/test.json b/test cases/failing/107 no build get_external_property/test.json
index 8b004be..b95427e 100644
--- a/test cases/failing/111 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/111 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/112 enter subdir twice/meson.build b/test cases/failing/108 enter subdir twice/meson.build
index 9343233..9343233 100644
--- a/test cases/failing/112 enter subdir twice/meson.build
+++ b/test cases/failing/108 enter subdir twice/meson.build
diff --git a/test cases/failing/112 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/112 enter subdir twice/sub/meson.build
+++ b/test cases/failing/108 enter subdir twice/sub/meson.build
diff --git a/test cases/failing/112 enter subdir twice/test.json b/test cases/failing/108 enter subdir twice/test.json
index 9443b2f..0a8e127 100644
--- a/test cases/failing/112 enter subdir twice/test.json
+++ b/test cases/failing/108 enter subdir twice/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/112 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/113 invalid fstring/meson.build b/test cases/failing/109 invalid fstring/meson.build
index dd22f56..dd22f56 100644
--- a/test cases/failing/113 invalid fstring/meson.build
+++ b/test cases/failing/109 invalid fstring/meson.build
diff --git a/test cases/failing/113 invalid fstring/test.json b/test cases/failing/109 invalid fstring/test.json
index 17442fd..71d8f59 100644
--- a/test cases/failing/113 invalid fstring/test.json
+++ b/test cases/failing/109 invalid fstring/test.json
@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "line": "test cases/failing/113 invalid fstring/meson.build:4:0: ERROR: Identifier \"dict\" does not name a formattable variable (has to be an integer, a string, a floating point number or a boolean)."
+            "line": "test cases/failing/109 invalid fstring/meson.build:4:0: ERROR: Identifier \"dict\" does not name a formattable variable (has to be an integer, a string, a floating point number or a boolean)."
         }
     ]
 }
diff --git a/test cases/failing/114 invalid fstring/meson.build b/test cases/failing/110 invalid fstring/meson.build
index 973df30..973df30 100644
--- a/test cases/failing/114 invalid fstring/meson.build
+++ b/test cases/failing/110 invalid fstring/meson.build
diff --git a/test cases/failing/114 invalid fstring/test.json b/test cases/failing/110 invalid fstring/test.json
index 8ce34b0..bfd0e2d 100644
--- a/test cases/failing/114 invalid fstring/test.json
+++ b/test cases/failing/110 invalid fstring/test.json
@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "line": "test cases/failing/114 invalid fstring/meson.build:3:0: ERROR: Identifier \"foo\" does not name a variable."
+            "line": "test cases/failing/110 invalid fstring/meson.build:3:0: ERROR: Identifier \"foo\" does not name a variable."
         }
     ]
 }
diff --git a/test cases/failing/115 compiler argument checking/meson.build b/test cases/failing/111 compiler argument checking/meson.build
index bb1f447..bb1f447 100644
--- a/test cases/failing/115 compiler argument checking/meson.build
+++ b/test cases/failing/111 compiler argument checking/meson.build
diff --git a/test cases/failing/115 compiler argument checking/test.json b/test cases/failing/111 compiler argument checking/test.json
index 93f9476..f41f2d2 100644
--- a/test cases/failing/115 compiler argument checking/test.json
+++ b/test cases/failing/111 compiler argument checking/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-        "line": "test cases/failing/115 compiler argument checking/meson.build:4:0: ERROR: Compiler for C does not support \"-meson-goober-arg-for-testing\""
+        "line": "test cases/failing/111 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/115 empty fallback/meson.build b/test cases/failing/112 empty fallback/meson.build
index f4eb5fe..f4eb5fe 100644
--- a/test cases/failing/115 empty fallback/meson.build
+++ b/test cases/failing/112 empty fallback/meson.build
diff --git a/test cases/failing/115 empty fallback/subprojects/foo/meson.build b/test cases/failing/112 empty fallback/subprojects/foo/meson.build
index c9e134b..c9e134b 100644
--- a/test cases/failing/115 empty fallback/subprojects/foo/meson.build
+++ b/test cases/failing/112 empty fallback/subprojects/foo/meson.build
diff --git a/test cases/failing/115 empty fallback/test.json b/test cases/failing/112 empty fallback/test.json
index dcfde45..89520ef 100644
--- a/test cases/failing/115 empty fallback/test.json
+++ b/test cases/failing/112 empty fallback/test.json
@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "line": "test cases/failing/115 empty fallback/meson.build:6:0: ERROR: Dependency \"foo\" not found, tried pkgconfig and cmake"
+            "line": "test cases/failing/112 empty fallback/meson.build:6:0: ERROR: Dependency \"foo\" not found, tried pkgconfig and cmake"
         }
     ]
 }
diff --git a/test cases/failing/116 cmake executable dependency/meson.build b/test cases/failing/113 cmake executable dependency/meson.build
index bfb03ef..bfb03ef 100644
--- a/test cases/failing/116 cmake executable dependency/meson.build
+++ b/test cases/failing/113 cmake executable dependency/meson.build
diff --git a/test cases/failing/116 cmake executable dependency/subprojects/cmlib/CMakeLists.txt b/test cases/failing/113 cmake executable dependency/subprojects/cmlib/CMakeLists.txt
index 0067879..0067879 100644
--- a/test cases/failing/116 cmake executable dependency/subprojects/cmlib/CMakeLists.txt
+++ b/test cases/failing/113 cmake executable dependency/subprojects/cmlib/CMakeLists.txt
diff --git a/test cases/failing/104 no lang/main.c b/test cases/failing/113 cmake executable dependency/subprojects/cmlib/main.c
index 9b6bdc2..9b6bdc2 100644
--- a/test cases/failing/104 no lang/main.c
+++ b/test cases/failing/113 cmake executable dependency/subprojects/cmlib/main.c
diff --git a/test cases/failing/116 cmake executable dependency/test.json b/test cases/failing/113 cmake executable dependency/test.json
index d11cfa7..1cb4a0f 100644
--- a/test cases/failing/116 cmake executable dependency/test.json
+++ b/test cases/failing/113 cmake executable dependency/test.json
@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "line": "test cases/failing/116 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/113 cmake executable dependency/meson.build:9:0: ERROR: main is an executable and does not support the dependency() method. Use target() instead."
         }
     ]
 }
diff --git a/test cases/failing/58 link with executable/meson.build b/test cases/failing/57 link with executable/meson.build
index 186b3e5..186b3e5 100644
--- a/test cases/failing/58 link with executable/meson.build
+++ b/test cases/failing/57 link with executable/meson.build
diff --git a/test cases/failing/58 link with executable/module.c b/test cases/failing/57 link with executable/module.c
index dc0124a..dc0124a 100644
--- a/test cases/failing/58 link with executable/module.c
+++ b/test cases/failing/57 link with executable/module.c
diff --git a/test cases/failing/58 link with executable/prog.c b/test cases/failing/57 link with executable/prog.c
index f3836d7..f3836d7 100644
--- a/test cases/failing/58 link with executable/prog.c
+++ b/test cases/failing/57 link with executable/prog.c
diff --git a/test cases/failing/58 link with executable/test.json b/test cases/failing/57 link with executable/test.json
index d3975c1..c835a90 100644
--- a/test cases/failing/58 link with executable/test.json
+++ b/test cases/failing/57 link with executable/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/58 link with executable/meson.build:4:0: ERROR: Link target 'prog' is not linkable."
+      "line": "test cases/failing/57 link with executable/meson.build:4:0: ERROR: Link target 'prog' is not linkable."
     }
   ]
 }
diff --git a/test cases/failing/59 assign custom target index/meson.build b/test cases/failing/58 assign custom target index/meson.build
index 7f2a820..7f2a820 100644
--- a/test cases/failing/59 assign custom target index/meson.build
+++ b/test cases/failing/58 assign custom target index/meson.build
diff --git a/test cases/failing/59 assign custom target index/test.json b/test cases/failing/58 assign custom target index/test.json
index 07ecb91..b5aa326 100644
--- a/test cases/failing/59 assign custom target index/test.json
+++ b/test cases/failing/58 assign custom target index/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/59 assign custom target index/meson.build:24:0: ERROR: Assignment target must be an id."
+      "line": "test cases/failing/58 assign custom target index/meson.build:24:0: ERROR: Assignment target must be an id."
     }
   ]
 }
diff --git a/test cases/failing/60 getoption prefix/meson.build b/test cases/failing/59 getoption prefix/meson.build
index 8f85cff..8f85cff 100644
--- a/test cases/failing/60 getoption prefix/meson.build
+++ b/test cases/failing/59 getoption prefix/meson.build
diff --git a/test cases/failing/60 getoption prefix/subprojects/abc/meson.build b/test cases/failing/59 getoption prefix/subprojects/abc/meson.build
index aa9c3df..aa9c3df 100644
--- a/test cases/failing/60 getoption prefix/subprojects/abc/meson.build
+++ b/test cases/failing/59 getoption prefix/subprojects/abc/meson.build
diff --git a/test cases/failing/60 getoption prefix/subprojects/abc/meson_options.txt b/test cases/failing/59 getoption prefix/subprojects/abc/meson_options.txt
index 89e624e..89e624e 100644
--- a/test cases/failing/60 getoption prefix/subprojects/abc/meson_options.txt
+++ b/test cases/failing/59 getoption prefix/subprojects/abc/meson_options.txt
diff --git a/test cases/failing/60 getoption prefix/test.json b/test cases/failing/59 getoption prefix/test.json
index 03bf419..4485e04 100644
--- a/test cases/failing/60 getoption prefix/test.json
+++ b/test cases/failing/59 getoption prefix/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/60 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/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."
     }
   ]
 }
diff --git a/test cases/failing/61 bad option argument/meson.build b/test cases/failing/60 bad option argument/meson.build
index 5219cfb..5219cfb 100644
--- a/test cases/failing/61 bad option argument/meson.build
+++ b/test cases/failing/60 bad option argument/meson.build
diff --git a/test cases/failing/61 bad option argument/meson_options.txt b/test cases/failing/60 bad option argument/meson_options.txt
index de1fff6..de1fff6 100644
--- a/test cases/failing/61 bad option argument/meson_options.txt
+++ b/test cases/failing/60 bad option argument/meson_options.txt
diff --git a/test cases/failing/61 bad option argument/test.json b/test cases/failing/60 bad option argument/test.json
index 4002005..a2b2748 100644
--- a/test cases/failing/61 bad option argument/test.json
+++ b/test cases/failing/60 bad option argument/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/61 bad option argument/meson_options.txt:1:0: ERROR: Invalid kwargs for option \"name\": \"vaule\""
+      "line": "test cases/failing/60 bad option argument/meson_options.txt:1:0: ERROR: Invalid kwargs for option \"name\": \"vaule\""
     }
   ]
 }
diff --git a/test cases/failing/62 subproj filegrab/meson.build b/test cases/failing/61 subproj filegrab/meson.build
index f38d6c7..f38d6c7 100644
--- a/test cases/failing/62 subproj filegrab/meson.build
+++ b/test cases/failing/61 subproj filegrab/meson.build
diff --git a/test cases/failing/62 subproj filegrab/prog.c b/test cases/failing/61 subproj filegrab/prog.c
index 0314ff1..0314ff1 100644
--- a/test cases/failing/62 subproj filegrab/prog.c
+++ b/test cases/failing/61 subproj filegrab/prog.c
diff --git a/test cases/failing/62 subproj filegrab/subprojects/a/meson.build b/test cases/failing/61 subproj filegrab/subprojects/a/meson.build
index 80b9888..80b9888 100644
--- a/test cases/failing/62 subproj filegrab/subprojects/a/meson.build
+++ b/test cases/failing/61 subproj filegrab/subprojects/a/meson.build
diff --git a/test cases/failing/62 subproj filegrab/test.json b/test cases/failing/61 subproj filegrab/test.json
index 282cb73..600e0d5 100644
--- a/test cases/failing/62 subproj filegrab/test.json
+++ b/test cases/failing/61 subproj filegrab/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/62 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/61 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/63 grab subproj/meson.build b/test cases/failing/62 grab subproj/meson.build
index 30fc690..30fc690 100644
--- a/test cases/failing/63 grab subproj/meson.build
+++ b/test cases/failing/62 grab subproj/meson.build
diff --git a/test cases/failing/63 grab subproj/subprojects/foo/meson.build b/test cases/failing/62 grab subproj/subprojects/foo/meson.build
index b346f6d..b346f6d 100644
--- a/test cases/failing/63 grab subproj/subprojects/foo/meson.build
+++ b/test cases/failing/62 grab subproj/subprojects/foo/meson.build
diff --git a/test cases/failing/63 grab subproj/subprojects/foo/sub.c b/test cases/failing/62 grab subproj/subprojects/foo/sub.c
index a94b1f5..a94b1f5 100644
--- a/test cases/failing/63 grab subproj/subprojects/foo/sub.c
+++ b/test cases/failing/62 grab subproj/subprojects/foo/sub.c
diff --git a/test cases/failing/63 grab subproj/test.json b/test cases/failing/62 grab subproj/test.json
index 37ebb35..1503ad7 100644
--- a/test cases/failing/63 grab subproj/test.json
+++ b/test cases/failing/62 grab subproj/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/63 grab subproj/meson.build:7:0: ERROR: Sandbox violation: Tried to grab file sub.c from a nested subproject."
+      "line": "test cases/failing/62 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/64 grab sibling/meson.build b/test cases/failing/63 grab sibling/meson.build
index 60b926a..60b926a 100644
--- a/test cases/failing/64 grab sibling/meson.build
+++ b/test cases/failing/63 grab sibling/meson.build
diff --git a/test cases/failing/64 grab sibling/subprojects/a/meson.build b/test cases/failing/63 grab sibling/subprojects/a/meson.build
index 6dd9f61..6dd9f61 100644
--- a/test cases/failing/64 grab sibling/subprojects/a/meson.build
+++ b/test cases/failing/63 grab sibling/subprojects/a/meson.build
diff --git a/test cases/failing/64 grab sibling/subprojects/b/meson.build b/test cases/failing/63 grab sibling/subprojects/b/meson.build
index 7c70fe5..7c70fe5 100644
--- a/test cases/failing/64 grab sibling/subprojects/b/meson.build
+++ b/test cases/failing/63 grab sibling/subprojects/b/meson.build
diff --git a/test cases/failing/64 grab sibling/subprojects/b/sneaky.c b/test cases/failing/63 grab sibling/subprojects/b/sneaky.c
index 46718c6..46718c6 100644
--- a/test cases/failing/64 grab sibling/subprojects/b/sneaky.c
+++ b/test cases/failing/63 grab sibling/subprojects/b/sneaky.c
diff --git a/test cases/failing/64 grab sibling/test.json b/test cases/failing/63 grab sibling/test.json
index bd609ec..91715c7 100644
--- a/test cases/failing/64 grab sibling/test.json
+++ b/test cases/failing/63 grab sibling/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/64 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/63 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/65 string as link target/meson.build b/test cases/failing/64 string as link target/meson.build
index cb83fff..cb83fff 100644
--- a/test cases/failing/65 string as link target/meson.build
+++ b/test cases/failing/64 string as link target/meson.build
diff --git a/test cases/failing/65 string as link target/prog.c b/test cases/failing/64 string as link target/prog.c
index 0314ff1..0314ff1 100644
--- a/test cases/failing/65 string as link target/prog.c
+++ b/test cases/failing/64 string as link target/prog.c
diff --git a/test cases/failing/65 string as link target/test.json b/test cases/failing/64 string as link target/test.json
index e212482..b07a2ea 100644
--- a/test cases/failing/65 string as link target/test.json
+++ b/test cases/failing/64 string as link target/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/65 string as link target/meson.build:2:0: ERROR: '' is not a target."
+      "line": "test cases/failing/64 string as link target/meson.build:2:0: ERROR: '' is not a target."
     }
   ]
 }
diff --git a/test cases/failing/66 dependency not-found and required/meson.build b/test cases/failing/65 dependency not-found and required/meson.build
index 1ce5747..1ce5747 100644
--- a/test cases/failing/66 dependency not-found and required/meson.build
+++ b/test cases/failing/65 dependency not-found and required/meson.build
diff --git a/test cases/failing/66 dependency not-found and required/test.json b/test cases/failing/65 dependency not-found and required/test.json
index d9fbc19..ff20969 100644
--- a/test cases/failing/66 dependency not-found and required/test.json
+++ b/test cases/failing/65 dependency not-found and required/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/66 dependency not-found and required/meson.build:2:0: ERROR: Dependency is required but has no candidates."
+      "line": "test cases/failing/65 dependency not-found and required/meson.build:2:0: ERROR: Dependency is required but has no candidates."
     }
   ]
 }
diff --git a/test cases/failing/67 subproj different versions/main.c b/test cases/failing/66 subproj different versions/main.c
index 8793c62..8793c62 100644
--- a/test cases/failing/67 subproj different versions/main.c
+++ b/test cases/failing/66 subproj different versions/main.c
diff --git a/test cases/failing/67 subproj different versions/meson.build b/test cases/failing/66 subproj different versions/meson.build
index e964e42..e964e42 100644
--- a/test cases/failing/67 subproj different versions/meson.build
+++ b/test cases/failing/66 subproj different versions/meson.build
diff --git a/test cases/failing/67 subproj different versions/subprojects/a/a.c b/test cases/failing/66 subproj different versions/subprojects/a/a.c
index cd41a65..cd41a65 100644
--- a/test cases/failing/67 subproj different versions/subprojects/a/a.c
+++ b/test cases/failing/66 subproj different versions/subprojects/a/a.c
diff --git a/test cases/failing/67 subproj different versions/subprojects/a/a.h b/test cases/failing/66 subproj different versions/subprojects/a/a.h
index 8f1d49e..8f1d49e 100644
--- a/test cases/failing/67 subproj different versions/subprojects/a/a.h
+++ b/test cases/failing/66 subproj different versions/subprojects/a/a.h
diff --git a/test cases/failing/67 subproj different versions/subprojects/a/meson.build b/test cases/failing/66 subproj different versions/subprojects/a/meson.build
index e84182a..e84182a 100644
--- a/test cases/failing/67 subproj different versions/subprojects/a/meson.build
+++ b/test cases/failing/66 subproj different versions/subprojects/a/meson.build
diff --git a/test cases/failing/67 subproj different versions/subprojects/b/b.c b/test cases/failing/66 subproj different versions/subprojects/b/b.c
index f85f8c3..f85f8c3 100644
--- a/test cases/failing/67 subproj different versions/subprojects/b/b.c
+++ b/test cases/failing/66 subproj different versions/subprojects/b/b.c
diff --git a/test cases/failing/67 subproj different versions/subprojects/b/b.h b/test cases/failing/66 subproj different versions/subprojects/b/b.h
index eced786..eced786 100644
--- a/test cases/failing/67 subproj different versions/subprojects/b/b.h
+++ b/test cases/failing/66 subproj different versions/subprojects/b/b.h
diff --git a/test cases/failing/67 subproj different versions/subprojects/b/meson.build b/test cases/failing/66 subproj different versions/subprojects/b/meson.build
index 0398340..0398340 100644
--- a/test cases/failing/67 subproj different versions/subprojects/b/meson.build
+++ b/test cases/failing/66 subproj different versions/subprojects/b/meson.build
diff --git a/test cases/failing/67 subproj different versions/subprojects/c/c.h b/test cases/failing/66 subproj different versions/subprojects/c/c.h
index 2b15f60..2b15f60 100644
--- a/test cases/failing/67 subproj different versions/subprojects/c/c.h
+++ b/test cases/failing/66 subproj different versions/subprojects/c/c.h
diff --git a/test cases/failing/67 subproj different versions/subprojects/c/meson.build b/test cases/failing/66 subproj different versions/subprojects/c/meson.build
index 7184933..7184933 100644
--- a/test cases/failing/67 subproj different versions/subprojects/c/meson.build
+++ b/test cases/failing/66 subproj different versions/subprojects/c/meson.build
diff --git a/test cases/failing/67 subproj different versions/test.json b/test cases/failing/66 subproj different versions/test.json
index 3b34c0b..19e7b4a 100644
--- a/test cases/failing/67 subproj different versions/test.json
+++ b/test cases/failing/66 subproj different versions/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/67 subproj different versions/subprojects/b/meson.build:3:0: ERROR: Dependency 'c' is required but not found."
+      "line": "test cases/failing/66 subproj different versions/subprojects/b/meson.build:3:0: ERROR: Dependency 'c' is required but not found."
     }
   ]
 }
diff --git a/test cases/failing/68 wrong boost module/meson.build b/test cases/failing/67 wrong boost module/meson.build
index 937e587..937e587 100644
--- a/test cases/failing/68 wrong boost module/meson.build
+++ b/test cases/failing/67 wrong boost module/meson.build
diff --git a/test cases/failing/68 wrong boost module/test.json b/test cases/failing/67 wrong boost module/test.json
index 9edd452..5f9b21f 100644
--- a/test cases/failing/68 wrong boost module/test.json
+++ b/test cases/failing/67 wrong boost module/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/68 wrong boost module/meson.build:9:0: ERROR: Dependency \"boost\" not found, tried system"
+      "line": "test cases/failing/67 wrong boost module/meson.build:9:0: ERROR: Dependency \"boost\" not found, tried system"
     }
   ]
 }
diff --git a/test cases/failing/69 install_data rename bad size/file1.txt b/test cases/failing/68 install_data rename bad size/file1.txt
index e69de29..e69de29 100644
--- a/test cases/failing/69 install_data rename bad size/file1.txt
+++ b/test cases/failing/68 install_data rename bad size/file1.txt
diff --git a/test cases/failing/69 install_data rename bad size/file2.txt b/test cases/failing/68 install_data rename bad size/file2.txt
index e69de29..e69de29 100644
--- a/test cases/failing/69 install_data rename bad size/file2.txt
+++ b/test cases/failing/68 install_data rename bad size/file2.txt
diff --git a/test cases/failing/69 install_data rename bad size/meson.build b/test cases/failing/68 install_data rename bad size/meson.build
index c7cde08..c7cde08 100644
--- a/test cases/failing/69 install_data rename bad size/meson.build
+++ b/test cases/failing/68 install_data rename bad size/meson.build
diff --git a/test cases/failing/69 install_data rename bad size/test.json b/test cases/failing/68 install_data rename bad size/test.json
index b99688a..a3cbb1b 100644
--- a/test cases/failing/69 install_data rename bad size/test.json
+++ b/test cases/failing/68 install_data rename bad size/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/69 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/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."
     }
   ]
 }
diff --git a/test cases/failing/70 skip only subdir/meson.build b/test cases/failing/69 skip only subdir/meson.build
index 4832bd4..4832bd4 100644
--- a/test cases/failing/70 skip only subdir/meson.build
+++ b/test cases/failing/69 skip only subdir/meson.build
diff --git a/test cases/failing/70 skip only subdir/subdir/meson.build b/test cases/failing/69 skip only subdir/subdir/meson.build
index 1ba447b..1ba447b 100644
--- a/test cases/failing/70 skip only subdir/subdir/meson.build
+++ b/test cases/failing/69 skip only subdir/subdir/meson.build
diff --git a/test cases/failing/70 skip only subdir/test.json b/test cases/failing/69 skip only subdir/test.json
index 3b40b66..134971a 100644
--- a/test cases/failing/70 skip only subdir/test.json
+++ b/test cases/failing/69 skip only subdir/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/70 skip only subdir/meson.build:8:0: ERROR: File main.cpp does not exist."
+      "line": "test cases/failing/69 skip only subdir/meson.build:8:0: ERROR: File main.cpp does not exist."
     }
   ]
 }
diff --git a/test cases/failing/71 dual override/meson.build b/test cases/failing/70 dual override/meson.build
index e5f86ba..e5f86ba 100644
--- a/test cases/failing/71 dual override/meson.build
+++ b/test cases/failing/70 dual override/meson.build
diff --git a/test cases/failing/71 dual override/overrides.py b/test cases/failing/70 dual override/overrides.py
index 49e9b7a..49e9b7a 100644
--- a/test cases/failing/71 dual override/overrides.py
+++ b/test cases/failing/70 dual override/overrides.py
diff --git a/test cases/failing/71 dual override/test.json b/test cases/failing/70 dual override/test.json
index 66409e6..e955dc0 100644
--- a/test cases/failing/71 dual override/test.json
+++ b/test cases/failing/70 dual override/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/71 dual override/meson.build:5:6: ERROR: Tried to override executable \"override\" which has already been overridden."
+      "line": "test cases/failing/70 dual override/meson.build:5:6: ERROR: Tried to override executable \"override\" which has already been overridden."
     }
   ]
 }
diff --git a/test cases/failing/72 override used/meson.build b/test cases/failing/71 override used/meson.build
index 61885bb..61885bb 100644
--- a/test cases/failing/72 override used/meson.build
+++ b/test cases/failing/71 override used/meson.build
diff --git a/test cases/failing/72 override used/other.py b/test cases/failing/71 override used/other.py
index f62ba96..f62ba96 100755
--- a/test cases/failing/72 override used/other.py
+++ b/test cases/failing/71 override used/other.py
diff --git a/test cases/failing/72 override used/something.py b/test cases/failing/71 override used/something.py
index 64c9454..64c9454 100755
--- a/test cases/failing/72 override used/something.py
+++ b/test cases/failing/71 override used/something.py
diff --git a/test cases/failing/72 override used/test.json b/test cases/failing/71 override used/test.json
index 29a58f1..6c734e4 100644
--- a/test cases/failing/72 override used/test.json
+++ b/test cases/failing/71 override used/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/72 override used/meson.build:5:6: ERROR: Tried to override finding of executable \"something.py\" which has already been found."
+      "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."
     }
   ]
 }
diff --git a/test cases/failing/73 run_command unclean exit/meson.build b/test cases/failing/72 run_command unclean exit/meson.build
index 4bc02ae..4bc02ae 100644
--- a/test cases/failing/73 run_command unclean exit/meson.build
+++ b/test cases/failing/72 run_command unclean exit/meson.build
diff --git a/test cases/failing/73 run_command unclean exit/returncode.py b/test cases/failing/72 run_command unclean exit/returncode.py
index 84dbc5d..84dbc5d 100755
--- a/test cases/failing/73 run_command unclean exit/returncode.py
+++ b/test cases/failing/72 run_command unclean exit/returncode.py
diff --git a/test cases/failing/73 run_command unclean exit/test.json b/test cases/failing/72 run_command unclean exit/test.json
index beda187..67a80f4 100644
--- a/test cases/failing/73 run_command unclean exit/test.json
+++ b/test cases/failing/72 run_command unclean exit/test.json
@@ -2,7 +2,7 @@
   "stdout": [
     {
       "match": "re",
-      "line": "test cases/failing/73 run_command unclean exit/meson\\.build:4:0: ERROR: Command \".*[\\\\/]test cases[\\\\/]failing[\\\\/]73 run_command unclean exit[\\\\/]\\.[\\\\/]returncode\\.py 1\" failed with status 1\\."
+      "line": "test cases/failing/72 run_command unclean exit/meson\\.build:4:0: ERROR: Command \".*[\\\\/]test cases[\\\\/]failing[\\\\/]72 run_command unclean exit[\\\\/]\\.[\\\\/]returncode\\.py 1\" failed with status 1\\."
     }
   ]
 }
diff --git a/test cases/failing/74 int literal leading zero/meson.build b/test cases/failing/73 int literal leading zero/meson.build
index 7ad64ae..7ad64ae 100644
--- a/test cases/failing/74 int literal leading zero/meson.build
+++ b/test cases/failing/73 int literal leading zero/meson.build
diff --git a/test cases/failing/74 int literal leading zero/test.json b/test cases/failing/73 int literal leading zero/test.json
index 78a735e..bc41165 100644
--- a/test cases/failing/74 int literal leading zero/test.json
+++ b/test cases/failing/73 int literal leading zero/test.json
@@ -2,7 +2,7 @@
   "stdout": [
     {
       "comment": "this error message is not very informative",
-      "line": "test cases/failing/74 int literal leading zero/meson.build:5:13: ERROR: Expecting eof got number."
+      "line": "test cases/failing/73 int literal leading zero/meson.build:5:13: ERROR: Expecting eof got number."
     }
   ]
 }
diff --git a/test cases/failing/75 configuration immutable/input b/test cases/failing/74 configuration immutable/input
index e69de29..e69de29 100644
--- a/test cases/failing/75 configuration immutable/input
+++ b/test cases/failing/74 configuration immutable/input
diff --git a/test cases/failing/75 configuration immutable/meson.build b/test cases/failing/74 configuration immutable/meson.build
index b6cac41..b6cac41 100644
--- a/test cases/failing/75 configuration immutable/meson.build
+++ b/test cases/failing/74 configuration immutable/meson.build
diff --git a/test cases/failing/75 configuration immutable/test.json b/test cases/failing/74 configuration immutable/test.json
index 3365aae..1dd172a 100644
--- a/test cases/failing/75 configuration immutable/test.json
+++ b/test cases/failing/74 configuration immutable/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/75 configuration immutable/meson.build:12:16: ERROR: Can not set values on configuration object that has been used."
+      "line": "test cases/failing/74 configuration immutable/meson.build:12:16: ERROR: Can not set values on configuration object that has been used."
     }
   ]
 }
diff --git a/test cases/failing/76 link with shared module on osx/meson.build b/test cases/failing/75 link with shared module on osx/meson.build
index bf18b36..bf18b36 100644
--- a/test cases/failing/76 link with shared module on osx/meson.build
+++ b/test cases/failing/75 link with shared module on osx/meson.build
diff --git a/test cases/failing/76 link with shared module on osx/module.c b/test cases/failing/75 link with shared module on osx/module.c
index 81b0d5a..81b0d5a 100644
--- a/test cases/failing/76 link with shared module on osx/module.c
+++ b/test cases/failing/75 link with shared module on osx/module.c
diff --git a/test cases/failing/76 link with shared module on osx/prog.c b/test cases/failing/75 link with shared module on osx/prog.c
index 8164d8d..8164d8d 100644
--- a/test cases/failing/76 link with shared module on osx/prog.c
+++ b/test cases/failing/75 link with shared module on osx/prog.c
diff --git a/test cases/failing/76 link with shared module on osx/test.json b/test cases/failing/75 link with shared module on osx/test.json
index 0a32674..7db17d8 100644
--- a/test cases/failing/76 link with shared module on osx/test.json
+++ b/test cases/failing/75 link with shared module on osx/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/76 link with shared module on osx/meson.build:8:0: ERROR: target links against shared modules. This is not permitted on OSX"
+      "line": "test cases/failing/75 link with shared module on osx/meson.build:8:0: ERROR: target links against shared modules. This is not permitted on OSX"
     }
   ]
 }
diff --git a/test cases/failing/77 non ascii in ascii encoded configure file/config9.h.in b/test cases/failing/76 non ascii in ascii encoded configure file/config9.h.in
index 323bec6..323bec6 100644
--- a/test cases/failing/77 non ascii in ascii encoded configure file/config9.h.in
+++ b/test cases/failing/76 non ascii in ascii encoded configure file/config9.h.in
diff --git a/test cases/failing/77 non ascii in ascii encoded configure file/meson.build b/test cases/failing/76 non ascii in ascii encoded configure file/meson.build
index 846daaf..846daaf 100644
--- a/test cases/failing/77 non ascii in ascii encoded configure file/meson.build
+++ b/test cases/failing/76 non ascii in ascii encoded configure file/meson.build
diff --git a/test cases/failing/77 non ascii in ascii encoded configure file/test.json b/test cases/failing/76 non ascii in ascii encoded configure file/test.json
index e35b95b..44e6377 100644
--- a/test cases/failing/77 non ascii in ascii encoded configure file/test.json
+++ b/test cases/failing/76 non ascii in ascii encoded configure file/test.json
@@ -2,7 +2,7 @@
   "stdout": [
     {
       "match": "re",
-      "line": "test cases/failing/77 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/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\\)"
     }
   ]
 }
diff --git a/test cases/failing/78 subproj dependency not-found and required/meson.build b/test cases/failing/77 subproj dependency not-found and required/meson.build
index c5a2961..c5a2961 100644
--- a/test cases/failing/78 subproj dependency not-found and required/meson.build
+++ b/test cases/failing/77 subproj dependency not-found and required/meson.build
diff --git a/test cases/failing/78 subproj dependency not-found and required/test.json b/test cases/failing/77 subproj dependency not-found and required/test.json
index a89c0eb..5365f34 100644
--- a/test cases/failing/78 subproj dependency not-found and required/test.json
+++ b/test cases/failing/77 subproj dependency not-found and required/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/78 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/77 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/79 unfound run/meson.build b/test cases/failing/78 unfound run/meson.build
index 3f37e9a..3f37e9a 100644
--- a/test cases/failing/79 unfound run/meson.build
+++ b/test cases/failing/78 unfound run/meson.build
diff --git a/test cases/failing/79 unfound run/test.json b/test cases/failing/78 unfound run/test.json
index 6baafc0..0cdcdf2 100644
--- a/test cases/failing/79 unfound run/test.json
+++ b/test cases/failing/78 unfound run/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/79 unfound run/meson.build:4:0: ERROR: Tried to use non-existing executable 'nonexisting_prog'"
+      "line": "test cases/failing/78 unfound run/meson.build:4:0: ERROR: Tried to use non-existing executable 'nonexisting_prog'"
     }
   ]
 }
diff --git a/test cases/failing/80 framework dependency with version/meson.build b/test cases/failing/79 framework dependency with version/meson.build
index b7e04ba..b7e04ba 100644
--- a/test cases/failing/80 framework dependency with version/meson.build
+++ b/test cases/failing/79 framework dependency with version/meson.build
diff --git a/test cases/failing/80 framework dependency with version/test.json b/test cases/failing/79 framework dependency with version/test.json
index 5cbc129..9b0d335 100644
--- a/test cases/failing/80 framework dependency with version/test.json
+++ b/test cases/failing/79 framework dependency with version/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/80 framework dependency with version/meson.build:8:0: ERROR: Unknown version of dependency 'appleframeworks', but need ['>0']."
+      "line": "test cases/failing/79 framework dependency with version/meson.build:8:0: ERROR: Unknown version of dependency 'appleframeworks', but need ['>0']."
     }
   ]
 }
diff --git a/test cases/failing/81 override exe config/foo.c b/test cases/failing/80 override exe config/foo.c
index 03b2213..03b2213 100644
--- a/test cases/failing/81 override exe config/foo.c
+++ b/test cases/failing/80 override exe config/foo.c
diff --git a/test cases/failing/81 override exe config/meson.build b/test cases/failing/80 override exe config/meson.build
index 29a7416..29a7416 100644
--- a/test cases/failing/81 override exe config/meson.build
+++ b/test cases/failing/80 override exe config/meson.build
diff --git a/test cases/failing/81 override exe config/test.json b/test cases/failing/80 override exe config/test.json
index f19785b..36c789e 100644
--- a/test cases/failing/81 override exe config/test.json
+++ b/test cases/failing/80 override exe config/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/81 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/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"
     }
   ]
 }
diff --git a/test cases/failing/82 gl dependency with version/meson.build b/test cases/failing/81 gl dependency with version/meson.build
index 0127093..0127093 100644
--- a/test cases/failing/82 gl dependency with version/meson.build
+++ b/test cases/failing/81 gl dependency with version/meson.build
diff --git a/test cases/failing/82 gl dependency with version/test.json b/test cases/failing/81 gl dependency with version/test.json
index 2c63a2c..86da735 100644
--- a/test cases/failing/82 gl dependency with version/test.json
+++ b/test cases/failing/81 gl dependency with version/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/82 gl dependency with version/meson.build:9:0: ERROR: Unknown version of dependency 'gl', but need ['>0']."
+      "line": "test cases/failing/81 gl dependency with version/meson.build:9:0: ERROR: Unknown version of dependency 'gl', but need ['>0']."
     }
   ]
 }
diff --git a/test cases/failing/83 threads dependency with version/meson.build b/test cases/failing/82 threads dependency with version/meson.build
index 6023fae..6023fae 100644
--- a/test cases/failing/83 threads dependency with version/meson.build
+++ b/test cases/failing/82 threads dependency with version/meson.build
diff --git a/test cases/failing/83 threads dependency with version/test.json b/test cases/failing/82 threads dependency with version/test.json
index b131be4..9b71468 100644
--- a/test cases/failing/83 threads dependency with version/test.json
+++ b/test cases/failing/82 threads dependency with version/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/83 threads dependency with version/meson.build:3:0: ERROR: Unknown version of dependency 'threads', but need ['>0']."
+      "line": "test cases/failing/82 threads dependency with version/meson.build:3:0: ERROR: Unknown version of dependency 'threads', but need ['>0']."
     }
   ]
 }
diff --git a/test cases/failing/84 gtest dependency with version/meson.build b/test cases/failing/83 gtest dependency with version/meson.build
index b43a047..b43a047 100644
--- a/test cases/failing/84 gtest dependency with version/meson.build
+++ b/test cases/failing/83 gtest dependency with version/meson.build
diff --git a/test cases/failing/84 gtest dependency with version/test.json b/test cases/failing/83 gtest dependency with version/test.json
index 6f0b41d..4a44077 100644
--- a/test cases/failing/84 gtest dependency with version/test.json
+++ b/test cases/failing/83 gtest dependency with version/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/84 gtest dependency with version/meson.build:8:0: ERROR: Dependency 'gtest' is required but not found."
+      "line": "test cases/failing/83 gtest dependency with version/meson.build:8:0: ERROR: Dependency 'gtest' is required but not found."
     }
   ]
 }
diff --git a/test cases/failing/85 dub libray/meson.build b/test cases/failing/84 dub libray/meson.build
index 306d5b3..306d5b3 100644
--- a/test cases/failing/85 dub libray/meson.build
+++ b/test cases/failing/84 dub libray/meson.build
diff --git a/test cases/failing/85 dub libray/test.json b/test cases/failing/84 dub libray/test.json
index a8b3e28..23fe6e5 100644
--- a/test cases/failing/85 dub libray/test.json
+++ b/test cases/failing/84 dub libray/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/85 dub libray/meson.build:11:0: ERROR: Dependency \"dubtestproject\" not found"
+      "line": "test cases/failing/84 dub libray/meson.build:11:0: ERROR: Dependency \"dubtestproject\" not found"
     }
   ]
 }
diff --git a/test cases/failing/86 dub executable/meson.build b/test cases/failing/85 dub executable/meson.build
index 9a134ea..9a134ea 100644
--- a/test cases/failing/86 dub executable/meson.build
+++ b/test cases/failing/85 dub executable/meson.build
diff --git a/test cases/failing/86 dub executable/test.json b/test cases/failing/85 dub executable/test.json
index f9944af..4a8674c 100644
--- a/test cases/failing/86 dub executable/test.json
+++ b/test cases/failing/85 dub executable/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/86 dub executable/meson.build:11:0: ERROR: Dependency \"dubtestproject:test1\" not found"
+      "line": "test cases/failing/85 dub executable/meson.build:11:0: ERROR: Dependency \"dubtestproject:test1\" not found"
     }
   ]
 }
diff --git a/test cases/failing/87 dub compiler/meson.build b/test cases/failing/86 dub compiler/meson.build
index 36f1849..36f1849 100644
--- a/test cases/failing/87 dub compiler/meson.build
+++ b/test cases/failing/86 dub compiler/meson.build
diff --git a/test cases/failing/87 dub compiler/test.json b/test cases/failing/86 dub compiler/test.json
index f28312f..ab6caff 100644
--- a/test cases/failing/87 dub compiler/test.json
+++ b/test cases/failing/86 dub compiler/test.json
@@ -13,7 +13,7 @@
   },
   "stdout": [
     {
-      "line": "test cases/failing/87 dub compiler/meson.build:17:0: ERROR: Dependency \"dubtestproject:test2\" not found"
+      "line": "test cases/failing/86 dub compiler/meson.build:17:0: ERROR: Dependency \"dubtestproject:test2\" not found"
     }
   ]
 }
diff --git a/test cases/failing/88 subproj not-found dep/meson.build b/test cases/failing/87 subproj not-found dep/meson.build
index 2b17df1..2b17df1 100644
--- a/test cases/failing/88 subproj not-found dep/meson.build
+++ b/test cases/failing/87 subproj not-found dep/meson.build
diff --git a/test cases/failing/88 subproj not-found dep/subprojects/somesubproj/meson.build b/test cases/failing/87 subproj not-found dep/subprojects/somesubproj/meson.build
index 5f451f4..5f451f4 100644
--- a/test cases/failing/88 subproj not-found dep/subprojects/somesubproj/meson.build
+++ b/test cases/failing/87 subproj not-found dep/subprojects/somesubproj/meson.build
diff --git a/test cases/failing/88 subproj not-found dep/test.json b/test cases/failing/87 subproj not-found dep/test.json
index 7598bc2..160e9d3 100644
--- a/test cases/failing/88 subproj not-found dep/test.json
+++ b/test cases/failing/87 subproj not-found dep/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/88 subproj not-found dep/meson.build:2:0: ERROR: Dependency '(anonymous)' is required but not found."
+      "line": "test cases/failing/87 subproj not-found dep/meson.build:2:0: ERROR: Dependency '(anonymous)' is required but not found."
     }
   ]
 }
diff --git a/test cases/failing/89 invalid configure file/input b/test cases/failing/88 invalid configure file/input
index e69de29..e69de29 100644
--- a/test cases/failing/89 invalid configure file/input
+++ b/test cases/failing/88 invalid configure file/input
diff --git a/test cases/failing/89 invalid configure file/meson.build b/test cases/failing/88 invalid configure file/meson.build
index 08eca2b..08eca2b 100644
--- a/test cases/failing/89 invalid configure file/meson.build
+++ b/test cases/failing/88 invalid configure file/meson.build
diff --git a/test cases/failing/89 invalid configure file/test.json b/test cases/failing/88 invalid configure file/test.json
index 921ce61..b551f61 100644
--- a/test cases/failing/89 invalid configure file/test.json
+++ b/test cases/failing/88 invalid configure file/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/89 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/88 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/90 kwarg dupe/meson.build b/test cases/failing/89 kwarg dupe/meson.build
index 06821a2..06821a2 100644
--- a/test cases/failing/90 kwarg dupe/meson.build
+++ b/test cases/failing/89 kwarg dupe/meson.build
diff --git a/test cases/failing/90 kwarg dupe/prog.c b/test cases/failing/89 kwarg dupe/prog.c
index 5f3fbe6..5f3fbe6 100644
--- a/test cases/failing/90 kwarg dupe/prog.c
+++ b/test cases/failing/89 kwarg dupe/prog.c
diff --git a/test cases/failing/90 kwarg dupe/test.json b/test cases/failing/89 kwarg dupe/test.json
index a8df75d..ec46600 100644
--- a/test cases/failing/90 kwarg dupe/test.json
+++ b/test cases/failing/89 kwarg dupe/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/90 kwarg dupe/meson.build:5:0: ERROR: Entry \"install\" defined both as a keyword argument and in a \"kwarg\" entry."
+      "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."
     }
   ]
 }
diff --git a/test cases/failing/91 missing pch file/meson.build b/test cases/failing/90 missing pch file/meson.build
index a67b798..a67b798 100644
--- a/test cases/failing/91 missing pch file/meson.build
+++ b/test cases/failing/90 missing pch file/meson.build
diff --git a/test cases/failing/91 missing pch file/prog.c b/test cases/failing/90 missing pch file/prog.c
index 11b7fad..11b7fad 100644
--- a/test cases/failing/91 missing pch file/prog.c
+++ b/test cases/failing/90 missing pch file/prog.c
diff --git a/test cases/failing/91 missing pch file/test.json b/test cases/failing/90 missing pch file/test.json
index 166f627..f55eb47 100644
--- a/test cases/failing/91 missing pch file/test.json
+++ b/test cases/failing/90 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/91 missing pch file/meson.build:2:0: ERROR: File pch/prog.h does not exist."
+      "line": "test cases/failing/90 missing pch file/meson.build:2:0: ERROR: File pch/prog.h does not exist."
     }
   ]
 }
diff --git a/test cases/failing/92 pch source different folder/include/pch.h b/test cases/failing/91 pch source different folder/include/pch.h
index e69de29..e69de29 100644
--- a/test cases/failing/92 pch source different folder/include/pch.h
+++ b/test cases/failing/91 pch source different folder/include/pch.h
diff --git a/test cases/failing/92 pch source different folder/meson.build b/test cases/failing/91 pch source different folder/meson.build
index d320717..d320717 100644
--- a/test cases/failing/92 pch source different folder/meson.build
+++ b/test cases/failing/91 pch source different folder/meson.build
diff --git a/test cases/failing/92 pch source different folder/prog.c b/test cases/failing/91 pch source different folder/prog.c
index 3fb1295..3fb1295 100644
--- a/test cases/failing/92 pch source different folder/prog.c
+++ b/test cases/failing/91 pch source different folder/prog.c
diff --git a/test cases/failing/92 pch source different folder/src/pch.c b/test cases/failing/91 pch source different folder/src/pch.c
index e69de29..e69de29 100644
--- a/test cases/failing/92 pch source different folder/src/pch.c
+++ b/test cases/failing/91 pch source different folder/src/pch.c
diff --git a/test cases/failing/92 pch source different folder/test.json b/test cases/failing/91 pch source different folder/test.json
index d94db50..6309f6c 100644
--- a/test cases/failing/92 pch source different folder/test.json
+++ b/test cases/failing/91 pch source different folder/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/92 pch source different folder/meson.build:4:0: ERROR: PCH files must be stored in the same folder."
+      "line": "test cases/failing/91 pch source different folder/meson.build:4:0: ERROR: PCH files must be stored in the same folder."
     }
   ]
 }
diff --git a/test cases/failing/94 unknown config tool/meson.build b/test cases/failing/92 unknown config tool/meson.build
index 536976e..536976e 100644
--- a/test cases/failing/94 unknown config tool/meson.build
+++ b/test cases/failing/92 unknown config tool/meson.build
diff --git a/test cases/failing/94 unknown config tool/test.json b/test cases/failing/92 unknown config tool/test.json
index a001152..c4484f3 100644
--- a/test cases/failing/94 unknown config tool/test.json
+++ b/test cases/failing/92 unknown config tool/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/94 unknown config tool/meson.build:2:0: ERROR: Dependency \"no-such-config-tool\" not found"
+      "line": "test cases/failing/92 unknown config tool/meson.build:2:0: ERROR: Dependency \"no-such-config-tool\" not found"
     }
   ]
 }
diff --git a/test cases/failing/95 custom target install data/Info.plist.cpp b/test cases/failing/93 custom target install data/Info.plist.cpp
index 9ca2fcb..9ca2fcb 100644
--- a/test cases/failing/95 custom target install data/Info.plist.cpp
+++ b/test cases/failing/93 custom target install data/Info.plist.cpp
diff --git a/test cases/failing/95 custom target install data/meson.build b/test cases/failing/93 custom target install data/meson.build
index 00d348c..00d348c 100644
--- a/test cases/failing/95 custom target install data/meson.build
+++ b/test cases/failing/93 custom target install data/meson.build
diff --git a/test cases/failing/95 custom target install data/preproc.py b/test cases/failing/93 custom target install data/preproc.py
index e6eba4c..e6eba4c 100644
--- a/test cases/failing/95 custom target install data/preproc.py
+++ b/test cases/failing/93 custom target install data/preproc.py
diff --git a/test cases/failing/95 custom target install data/test.json b/test cases/failing/93 custom target install data/test.json
index c8004d6..caeafb1 100644
--- a/test cases/failing/95 custom target install data/test.json
+++ b/test cases/failing/93 custom target install data/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/95 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/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\""
     }
   ]
 }
diff --git a/test cases/failing/96 add dict non string key/meson.build b/test cases/failing/94 add dict non string key/meson.build
index c81a3f7..c81a3f7 100644
--- a/test cases/failing/96 add dict non string key/meson.build
+++ b/test cases/failing/94 add dict non string key/meson.build
diff --git a/test cases/failing/96 add dict non string key/test.json b/test cases/failing/94 add dict non string key/test.json
index 5fd4033..09459dd 100644
--- a/test cases/failing/96 add dict non string key/test.json
+++ b/test cases/failing/94 add dict non string key/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/96 add dict non string key/meson.build:9:0: ERROR: Key must be a string"
+      "line": "test cases/failing/94 add dict non string key/meson.build:9:0: ERROR: Key must be a string"
     }
   ]
 }
diff --git a/test cases/failing/97 add dict duplicate keys/meson.build b/test cases/failing/95 add dict duplicate keys/meson.build
index 7a9b523..7a9b523 100644
--- a/test cases/failing/97 add dict duplicate keys/meson.build
+++ b/test cases/failing/95 add dict duplicate keys/meson.build
diff --git a/test cases/failing/97 add dict duplicate keys/test.json b/test cases/failing/95 add dict duplicate keys/test.json
index 9d01551..ae9a81f 100644
--- a/test cases/failing/97 add dict duplicate keys/test.json
+++ b/test cases/failing/95 add dict duplicate keys/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/97 add dict duplicate keys/meson.build:9:0: ERROR: Duplicate dictionary key: myKey"
+      "line": "test cases/failing/95 add dict duplicate keys/meson.build:9:0: ERROR: Duplicate dictionary key: myKey"
     }
   ]
 }
diff --git a/test cases/failing/99 no host get_external_property/meson.build b/test cases/failing/96 no host get_external_property/meson.build
index c956754..c956754 100644
--- a/test cases/failing/99 no host get_external_property/meson.build
+++ b/test cases/failing/96 no host get_external_property/meson.build
diff --git a/test cases/failing/99 no host get_external_property/test.json b/test cases/failing/96 no host get_external_property/test.json
index 44b5245..3376a0b 100644
--- a/test cases/failing/99 no host get_external_property/test.json
+++ b/test cases/failing/96 no host get_external_property/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/99 no host get_external_property/meson.build:3:0: ERROR: Unknown property for host machine: nonexisting"
+      "line": "test cases/failing/96 no host get_external_property/meson.build:3:0: ERROR: Unknown property for host machine: nonexisting"
     }
   ]
 }
diff --git a/test cases/failing/116 cmake executable dependency/subprojects/cmlib/main.c b/test cases/failing/97 no native compiler/main.c
index 9b6bdc2..9b6bdc2 100644
--- a/test cases/failing/116 cmake executable dependency/subprojects/cmlib/main.c
+++ b/test cases/failing/97 no native compiler/main.c
diff --git a/test cases/failing/101 no native compiler/meson.build b/test cases/failing/97 no native compiler/meson.build
index f0126ac..f0126ac 100644
--- a/test cases/failing/101 no native compiler/meson.build
+++ b/test cases/failing/97 no native compiler/meson.build
diff --git a/test cases/failing/97 no native compiler/test.json b/test cases/failing/97 no native compiler/test.json
new file mode 100644
index 0000000..b79bd3b
--- /dev/null
+++ b/test cases/failing/97 no native compiler/test.json
@@ -0,0 +1,7 @@
+{
+  "stdout": [
+    {
+      "line": "test cases/failing/97 no native compiler/meson.build:12:0: ERROR: No host machine compiler for \"main.c\""
+    }
+  ]
+}
diff --git a/test cases/failing/102 subdir parse error/meson.build b/test cases/failing/98 subdir parse error/meson.build
index ee5bb0c..ee5bb0c 100644
--- a/test cases/failing/102 subdir parse error/meson.build
+++ b/test cases/failing/98 subdir parse error/meson.build
diff --git a/test cases/failing/102 subdir parse error/subdir/meson.build b/test cases/failing/98 subdir parse error/subdir/meson.build
index 3ac5ef9..3ac5ef9 100644
--- a/test cases/failing/102 subdir parse error/subdir/meson.build
+++ b/test cases/failing/98 subdir parse error/subdir/meson.build
diff --git a/test cases/failing/98 subdir parse error/test.json b/test cases/failing/98 subdir parse error/test.json
new file mode 100644
index 0000000..8e04799
--- /dev/null
+++ b/test cases/failing/98 subdir parse error/test.json
@@ -0,0 +1,7 @@
+{
+  "stdout": [
+    {
+      "line": "test cases/failing/98 subdir parse error/subdir/meson.build:1:0: ERROR: Plusassignment target must be an id."
+    }
+  ]
+}
diff --git a/test cases/failing/103 invalid option file/meson.build b/test cases/failing/99 invalid option file/meson.build
index b0347c3..b0347c3 100644
--- a/test cases/failing/103 invalid option file/meson.build
+++ b/test cases/failing/99 invalid option file/meson.build
diff --git a/test cases/failing/103 invalid option file/meson_options.txt b/test cases/failing/99 invalid option file/meson_options.txt
index eef843b..eef843b 100644
--- a/test cases/failing/103 invalid option file/meson_options.txt
+++ b/test cases/failing/99 invalid option file/meson_options.txt
diff --git a/test cases/failing/99 invalid option file/test.json b/test cases/failing/99 invalid option file/test.json
new file mode 100644
index 0000000..ebfddd8
--- /dev/null
+++ b/test cases/failing/99 invalid option file/test.json
@@ -0,0 +1,7 @@
+{
+  "stdout": [
+    {
+      "line": "test cases/failing/99 invalid option file/meson_options.txt:1:0: ERROR: lexer"
+    }
+  ]
+}
diff --git a/test cases/unit/95 implicit force fallback/meson.build b/test cases/unit/96 implicit force fallback/meson.build
index 623a338..623a338 100644
--- a/test cases/unit/95 implicit force fallback/meson.build
+++ b/test cases/unit/96 implicit force fallback/meson.build
diff --git a/test cases/unit/95 implicit force fallback/subprojects/something/meson.build b/test cases/unit/96 implicit force fallback/subprojects/something/meson.build
index 89a4727..89a4727 100644
--- a/test cases/unit/95 implicit force fallback/subprojects/something/meson.build
+++ b/test cases/unit/96 implicit force fallback/subprojects/something/meson.build