From ac1d0aea582b225869732f53108754af2ccde7e1 Mon Sep 17 00:00:00 2001
From: Jussi Pakkanen <jpakkane@gmail.com>
Date: Sun, 3 Mar 2024 22:05:33 +0200
Subject: [PATCH] Condense test dirs for rc2.

---
 test cases/failing/100 bool in combo/test.json              | 5 -----
 .../meson.build                                             | 0
 .../test.json                                               | 2 +-
 .../{102 no fallback => 101 no fallback}/meson.build        | 0
 .../subprojects/foob/meson.build                            | 0
 .../failing/{102 no fallback => 101 no fallback}/test.json  | 0
 .../meson.build                                             | 0
 .../meson_options.txt                                       | 0
 .../{103 feature require => 102 feature require}/test.json  | 0
 .../meson.build                                             | 0
 .../meson_options.txt                                       | 0
 .../test.json                                               | 0
 .../meson.build                                             | 0
 .../test.json                                               | 2 +-
 .../meson.build                                             | 0
 .../sub/meson.build                                         | 0
 .../test.json                                               | 2 +-
 .../109 invalid fstring/meson.build                         | 0
 .../109 invalid fstring/test.json                           | 0
 .../meson.build                                             | 0
 .../{107 invalid fstring => 106 invalid fstring}/test.json  | 2 +-
 .../meson.build                                             | 0
 .../test.json                                               | 2 +-
 .../{109 empty fallback => 108 empty fallback}/meson.build  | 0
 .../subprojects/foo/meson.build                             | 0
 .../{109 empty fallback => 108 empty fallback}/test.json    | 2 +-
 .../meson.build                                             | 0
 .../subprojects/cmlib/CMakeLists.txt                        | 0
 .../subprojects/cmlib/main.c                                | 0
 .../test.json                                               | 2 +-
 .../meson.build                                             | 0
 .../test.json                                               | 2 +-
 .../meson.build                                             | 0
 .../src/header.h                                            | 0
 .../src/source.c                                            | 0
 .../test.json                                               | 2 +-
 .../meson.build                                             | 0
 .../test.json                                               | 2 +-
 .../trivial.c                                               | 0
 .../meson.build                                             | 0
 .../test.json                                               | 2 +-
 .../trivial.c                                               | 0
 .../meson.build                                             | 0
 .../test.json                                               | 2 +-
 .../meson.build                                             | 0
 .../subprojects/A/meson.build                               | 0
 .../subprojects/B/meson.build                               | 0
 .../test.json                                               | 2 +-
 .../main.rs                                                 | 0
 .../meson.build                                             | 0
 .../test.json                                               | 2 +-
 .../main.rs                                                 | 0
 .../meson.build                                             | 0
 .../test.json                                               | 2 +-
 .../meson.build                                             | 0
 .../subprojects/sub/main.c                                  | 0
 .../subprojects/sub/meson.build                             | 0
 .../test.json                                               | 2 +-
 .../meson.build                                             | 0
 .../subprojects/cmlib/CMakeLists.txt                        | 0
 .../test.json                                               | 2 +-
 .../meson.build                                             | 0
 .../test.json                                               | 2 +-
 .../meson.build                                             | 0
 .../meson_options.txt                                       | 0
 .../subprojects/subproj1/file.txt                           | 0
 .../subprojects/subproj1/meson.build                        | 0
 .../subprojects/subproj1/nested/meson.build                 | 0
 .../subprojects/subproj2/file.txt                           | 0
 .../subprojects/subproj2/meson.build                        | 0
 .../subprojects/subproj2/nested/meson.build                 | 0
 .../subprojects/subproj3/file.txt                           | 0
 .../subprojects/subproj3/meson.build                        | 0
 .../test.json                                               | 2 +-
 .../inc/lib.h                                               | 0
 .../lib.c                                                   | 0
 .../meson.build                                             | 0
 .../subprojects/a/meson.build                               | 0
 .../subprojects/a/prog.c                                    | 0
 .../test.json                                               | 2 +-
 .../inc/lib.h                                               | 0
 .../lib.c                                                   | 0
 .../meson.build                                             | 0
 .../test.json                                               | 2 +-
 .../meson.build                                             | 0
 .../src1.c                                                  | 0
 .../src2.c                                                  | 0
 .../test.json                                               | 2 +-
 .../main.c                                                  | 0
 .../meson.build                                             | 0
 .../subprojects/sub/meson.build                             | 0
 .../test.json                                               | 2 +-
 .../exe.c                                                   | 0
 .../lib.in                                                  | 0
 .../meson.build                                             | 0
 .../test.json                                               | 0
 .../{128 invalid ast => 127 invalid ast}/meson.build        | 0
 .../failing/{128 invalid ast => 127 invalid ast}/test.json  | 2 +-
 .../meson.build                                             | 0
 .../test.json                                               | 2 +-
 .../{130 utf8 with bom => 129 utf8 with bom}/meson.build    | 0
 .../{130 utf8 with bom => 129 utf8 with bom}/test.json      | 2 +-
 .../meson.build                                             | 0
 .../subdir/meson.build                                      | 0
 .../test.json                                               | 2 +-
 .../meson.build                                             | 0
 .../meson.options                                           | 0
 .../test.json                                               | 2 +-
 .../meson.build                                             | 0
 .../simple.c                                                | 0
 .../simple.h                                                | 0
 .../test.json                                               | 2 +-
 .../meson.build                                             | 0
 .../prog.c                                                  | 0
 .../test.json                                               | 2 +-
 .../meson.build                                             | 0
 .../test.json                                               | 2 +-
 .../failing/{51 slashname => 50 slashname}/meson.build      | 0
 .../failing/{51 slashname => 50 slashname}/sub/meson.build  | 0
 .../failing/{51 slashname => 50 slashname}/sub/prog.c       | 0
 test cases/failing/{51 slashname => 50 slashname}/test.json | 2 +-
 .../meson-foo/meson.build                                   | 0
 .../meson.build                                             | 0
 .../test.json                                               | 2 +-
 .../{53 or on new line => 52 or on new line}/meson.build    | 0
 .../meson_options.txt                                       | 0
 .../{53 or on new line => 52 or on new line}/test.json      | 2 +-
 .../meson.build                                             | 0
 .../module.c                                                | 0
 .../prog.c                                                  | 0
 .../test.json                                               | 2 +-
 .../meson.build                                             | 0
 .../test.json                                               | 2 +-
 .../meson.build                                             | 0
 .../subprojects/abc/meson.build                             | 0
 .../subprojects/abc/meson_options.txt                       | 0
 .../{56 getoption prefix => 55 getoption prefix}/test.json  | 2 +-
 .../meson.build                                             | 0
 .../meson_options.txt                                       | 0
 .../test.json                                               | 2 +-
 .../meson.build                                             | 0
 .../{58 subproj filegrab => 57 subproj filegrab}/prog.c     | 0
 .../subprojects/a/meson.build                               | 0
 .../{58 subproj filegrab => 57 subproj filegrab}/test.json  | 2 +-
 .../{59 grab subproj => 58 grab subproj}/meson.build        | 0
 .../subprojects/foo/meson.build                             | 0
 .../subprojects/foo/sub.c                                   | 0
 .../failing/{59 grab subproj => 58 grab subproj}/test.json  | 2 +-
 .../{60 grab sibling => 59 grab sibling}/meson.build        | 0
 .../subprojects/a/meson.build                               | 0
 .../subprojects/b/meson.build                               | 0
 .../subprojects/b/sneaky.c                                  | 0
 .../failing/{60 grab sibling => 59 grab sibling}/test.json  | 2 +-
 .../meson.build                                             | 0
 .../prog.c                                                  | 0
 .../test.json                                               | 2 +-
 .../meson.build                                             | 0
 .../test.json                                               | 2 +-
 .../main.c                                                  | 0
 .../meson.build                                             | 0
 .../subprojects/a/a.c                                       | 0
 .../subprojects/a/a.h                                       | 0
 .../subprojects/a/meson.build                               | 0
 .../subprojects/b/b.c                                       | 0
 .../subprojects/b/b.h                                       | 0
 .../subprojects/b/meson.build                               | 0
 .../subprojects/c/c.h                                       | 0
 .../subprojects/c/meson.build                               | 0
 .../test.json                                               | 2 +-
 .../meson.build                                             | 0
 .../test.json                                               | 2 +-
 .../file1.txt                                               | 0
 .../file2.txt                                               | 0
 .../meson.build                                             | 0
 .../test.json                                               | 2 +-
 .../meson.build                                             | 0
 .../subdir/meson.build                                      | 0
 .../{66 skip only subdir => 65 skip only subdir}/test.json  | 2 +-
 .../{67 dual override => 66 dual override}/meson.build      | 0
 .../{67 dual override => 66 dual override}/overrides.py     | 0
 .../{67 dual override => 66 dual override}/test.json        | 2 +-
 .../{68 override used => 67 override used}/meson.build      | 0
 .../failing/{68 override used => 67 override used}/other.py | 0
 .../{68 override used => 67 override used}/something.py     | 0
 .../{68 override used => 67 override used}/test.json        | 2 +-
 .../meson.build                                             | 0
 .../returncode.py                                           | 0
 .../test.json                                               | 2 +-
 .../meson.build                                             | 0
 .../test.json                                               | 2 +-
 .../input                                                   | 0
 .../meson.build                                             | 0
 .../test.json                                               | 2 +-
 .../meson.build                                             | 0
 .../module.c                                                | 0
 .../prog.c                                                  | 0
 .../test.json                                               | 2 +-
 .../config9.h.in                                            | 0
 .../meson.build                                             | 0
 .../test.json                                               | 2 +-
 .../meson.build                                             | 0
 .../test.json                                               | 2 +-
 .../failing/{75 unfound run => 74 unfound run}/meson.build  | 0
 .../failing/{75 unfound run => 74 unfound run}/test.json    | 2 +-
 .../meson.build                                             | 0
 .../test.json                                               | 2 +-
 .../foo.c                                                   | 0
 .../meson.build                                             | 0
 .../test.json                                               | 2 +-
 .../meson.build                                             | 0
 .../test.json                                               | 2 +-
 .../meson.build                                             | 0
 .../test.json                                               | 2 +-
 .../meson.build                                             | 0
 .../test.json                                               | 2 +-
 .../failing/{81 dub library => 80 dub library}/meson.build  | 0
 .../failing/{81 dub library => 80 dub library}/test.json    | 2 +-
 .../{82 dub executable => 81 dub executable}/meson.build    | 0
 .../{82 dub executable => 81 dub executable}/test.json      | 2 +-
 .../{83 dub compiler => 82 dub compiler}/meson.build        | 0
 .../failing/{83 dub compiler => 82 dub compiler}/test.json  | 2 +-
 .../meson.build                                             | 0
 .../subprojects/somesubproj/meson.build                     | 0
 .../test.json                                               | 2 +-
 .../input                                                   | 0
 .../meson.build                                             | 0
 .../test.json                                               | 2 +-
 .../failing/{86 kwarg dupe => 85 kwarg dupe}/meson.build    | 0
 test cases/failing/{86 kwarg dupe => 85 kwarg dupe}/prog.c  | 0
 .../failing/{86 kwarg dupe => 85 kwarg dupe}/test.json      | 2 +-
 .../meson.build                                             | 0
 .../{87 missing pch file => 86 missing pch file}/prog.c     | 0
 .../{87 missing pch file => 86 missing pch file}/test.json  | 2 +-
 .../include/pch.h                                           | 0
 .../meson.build                                             | 0
 .../prog.c                                                  | 0
 .../src/pch.c                                               | 0
 .../test.json                                               | 2 +-
 .../meson.build                                             | 0
 .../test.json                                               | 2 +-
 .../Info.plist.cpp                                          | 0
 .../meson.build                                             | 0
 .../preproc.py                                              | 0
 .../test.json                                               | 2 +-
 .../meson.build                                             | 0
 .../test.json                                               | 2 +-
 .../meson.build                                             | 0
 .../test.json                                               | 2 +-
 .../meson.build                                             | 0
 .../test.json                                               | 2 +-
 .../{94 no native compiler => 93 no native compiler}/main.c | 0
 .../meson.build                                             | 0
 .../test.json                                               | 2 +-
 .../meson.build                                             | 0
 .../subdir/meson.build                                      | 0
 .../test.json                                               | 2 +-
 .../meson.build                                             | 0
 .../meson_options.txt                                       | 0
 .../test.json                                               | 2 +-
 test cases/failing/{97 no lang => 96 no lang}/main.c        | 0
 test cases/failing/{97 no lang => 96 no lang}/meson.build   | 0
 test cases/failing/{97 no lang => 96 no lang}/test.json     | 2 +-
 .../meson.build                                             | 0
 .../test.json                                               | 2 +-
 .../trivial.gresource.xml                                   | 0
 .../{99 number in combo => 98 number in combo}/meson.build  | 0
 .../nativefile.ini                                          | 0
 .../{99 number in combo => 98 number in combo}/test.json    | 2 +-
 .../{100 bool in combo => 99 bool in combo}/meson.build     | 0
 .../meson_options.txt                                       | 0
 .../{100 bool in combo => 99 bool in combo}/nativefile.ini  | 0
 test cases/failing/99 bool in combo/test.json               | 5 +++++
 unittests/allplatformstests.py                              | 6 +++---
 273 files changed, 88 insertions(+), 88 deletions(-)
 delete mode 100644 test cases/failing/100 bool in combo/test.json
 rename test cases/failing/{101 compiler no lang => 100 compiler no lang}/meson.build (100%)
 rename test cases/failing/{101 compiler no lang => 100 compiler no lang}/test.json (66%)
 rename test cases/failing/{102 no fallback => 101 no fallback}/meson.build (100%)
 rename test cases/failing/{102 no fallback => 101 no fallback}/subprojects/foob/meson.build (100%)
 rename test cases/failing/{102 no fallback => 101 no fallback}/test.json (100%)
 rename test cases/failing/{103 feature require => 102 feature require}/meson.build (100%)
 rename test cases/failing/{103 feature require => 102 feature require}/meson_options.txt (100%)
 rename test cases/failing/{103 feature require => 102 feature require}/test.json (100%)
 rename test cases/failing/{104 feature require.bis => 103 feature require.bis}/meson.build (100%)
 rename test cases/failing/{104 feature require.bis => 103 feature require.bis}/meson_options.txt (100%)
 rename test cases/failing/{104 feature require.bis => 103 feature require.bis}/test.json (100%)
 rename test cases/failing/{105 no build get_external_property => 104 no build get_external_property}/meson.build (100%)
 rename test cases/failing/{105 no build get_external_property => 104 no build get_external_property}/test.json (63%)
 rename test cases/failing/{106 enter subdir twice => 105 enter subdir twice}/meson.build (100%)
 rename test cases/failing/{106 enter subdir twice => 105 enter subdir twice}/sub/meson.build (100%)
 rename test cases/failing/{106 enter subdir twice => 105 enter subdir twice}/test.json (64%)
 rename test cases/failing/{107 invalid fstring => 106 invalid fstring}/109 invalid fstring/meson.build (100%)
 rename test cases/failing/{107 invalid fstring => 106 invalid fstring}/109 invalid fstring/test.json (100%)
 rename test cases/failing/{107 invalid fstring => 106 invalid fstring}/meson.build (100%)
 rename test cases/failing/{107 invalid fstring => 106 invalid fstring}/test.json (63%)
 rename test cases/failing/{108 compiler argument checking => 107 compiler argument checking}/meson.build (100%)
 rename test cases/failing/{108 compiler argument checking => 107 compiler argument checking}/test.json (66%)
 rename test cases/failing/{109 empty fallback => 108 empty fallback}/meson.build (100%)
 rename test cases/failing/{109 empty fallback => 108 empty fallback}/subprojects/foo/meson.build (100%)
 rename test cases/failing/{109 empty fallback => 108 empty fallback}/test.json (65%)
 rename test cases/failing/{110 cmake executable dependency => 109 cmake executable dependency}/meson.build (100%)
 rename test cases/failing/{110 cmake executable dependency => 109 cmake executable dependency}/subprojects/cmlib/CMakeLists.txt (100%)
 rename test cases/failing/{110 cmake executable dependency => 109 cmake executable dependency}/subprojects/cmlib/main.c (100%)
 rename test cases/failing/{110 cmake executable dependency => 109 cmake executable dependency}/test.json (77%)
 rename test cases/failing/{111 allow_fallback with fallback => 110 allow_fallback with fallback}/meson.build (100%)
 rename test cases/failing/{111 allow_fallback with fallback => 110 allow_fallback with fallback}/test.json (70%)
 rename test cases/failing/{112 nonsensical bindgen => 111 nonsensical bindgen}/meson.build (100%)
 rename test cases/failing/{112 nonsensical bindgen => 111 nonsensical bindgen}/src/header.h (100%)
 rename test cases/failing/{112 nonsensical bindgen => 111 nonsensical bindgen}/src/source.c (100%)
 rename test cases/failing/{112 nonsensical bindgen => 111 nonsensical bindgen}/test.json (69%)
 rename test cases/failing/{113 run_target in test => 112 run_target in test}/meson.build (100%)
 rename test cases/failing/{113 run_target in test => 112 run_target in test}/test.json (77%)
 rename test cases/failing/{113 run_target in test => 112 run_target in test}/trivial.c (100%)
 rename test cases/failing/{114 run_target in add_install_script => 113 run_target in add_install_script}/meson.build (100%)
 rename test cases/failing/{114 run_target in add_install_script => 113 run_target in add_install_script}/test.json (81%)
 rename test cases/failing/{114 run_target in add_install_script => 113 run_target in add_install_script}/trivial.c (100%)
 rename test cases/failing/{115 pathsep in install_symlink => 114 pathsep in install_symlink}/meson.build (100%)
 rename test cases/failing/{115 pathsep in install_symlink => 114 pathsep in install_symlink}/test.json (74%)
 rename test cases/failing/{116 subproject version conflict => 115 subproject version conflict}/meson.build (100%)
 rename test cases/failing/{116 subproject version conflict => 115 subproject version conflict}/subprojects/A/meson.build (100%)
 rename test cases/failing/{116 subproject version conflict => 115 subproject version conflict}/subprojects/B/meson.build (100%)
 rename test cases/failing/{116 subproject version conflict => 115 subproject version conflict}/test.json (66%)
 rename test cases/failing/{117 structured source empty string => 116 structured source empty string}/main.rs (100%)
 rename test cases/failing/{117 structured source empty string => 116 structured source empty string}/meson.build (100%)
 rename test cases/failing/{117 structured source empty string => 116 structured source empty string}/test.json (71%)
 rename test cases/failing/{118 structured_sources conflicts => 117 structured_sources conflicts}/main.rs (100%)
 rename test cases/failing/{118 structured_sources conflicts => 117 structured_sources conflicts}/meson.build (100%)
 rename test cases/failing/{118 structured_sources conflicts => 117 structured_sources conflicts}/test.json (67%)
 rename test cases/failing/{119 missing compiler => 118 missing compiler}/meson.build (100%)
 rename test cases/failing/{119 missing compiler => 118 missing compiler}/subprojects/sub/main.c (100%)
 rename test cases/failing/{119 missing compiler => 118 missing compiler}/subprojects/sub/meson.build (100%)
 rename test cases/failing/{119 missing compiler => 118 missing compiler}/test.json (68%)
 rename test cases/failing/{120 cmake subproject error => 119 cmake subproject error}/meson.build (100%)
 rename test cases/failing/{120 cmake subproject error => 119 cmake subproject error}/subprojects/cmlib/CMakeLists.txt (100%)
 rename test cases/failing/{120 cmake subproject error => 119 cmake subproject error}/test.json (74%)
 rename test cases/failing/{121 pkgconfig not relocatable outside prefix => 120 pkgconfig not relocatable outside prefix}/meson.build (100%)
 rename test cases/failing/{121 pkgconfig not relocatable outside prefix => 120 pkgconfig not relocatable outside prefix}/test.json (78%)
 rename test cases/failing/{122 subproject sandbox violation => 121 subproject sandbox violation}/meson.build (100%)
 rename test cases/failing/{122 subproject sandbox violation => 121 subproject sandbox violation}/meson_options.txt (100%)
 rename test cases/failing/{122 subproject sandbox violation => 121 subproject sandbox violation}/subprojects/subproj1/file.txt (100%)
 rename test cases/failing/{122 subproject sandbox violation => 121 subproject sandbox violation}/subprojects/subproj1/meson.build (100%)
 rename test cases/failing/{122 subproject sandbox violation => 121 subproject sandbox violation}/subprojects/subproj1/nested/meson.build (100%)
 rename test cases/failing/{122 subproject sandbox violation => 121 subproject sandbox violation}/subprojects/subproj2/file.txt (100%)
 rename test cases/failing/{122 subproject sandbox violation => 121 subproject sandbox violation}/subprojects/subproj2/meson.build (100%)
 rename test cases/failing/{122 subproject sandbox violation => 121 subproject sandbox violation}/subprojects/subproj2/nested/meson.build (100%)
 rename test cases/failing/{122 subproject sandbox violation => 121 subproject sandbox violation}/subprojects/subproj3/file.txt (100%)
 rename test cases/failing/{122 subproject sandbox violation => 121 subproject sandbox violation}/subprojects/subproj3/meson.build (100%)
 rename test cases/failing/{122 subproject sandbox violation => 121 subproject sandbox violation}/test.json (82%)
 rename test cases/failing/{123 override and add_project_dependency => 122 override and add_project_dependency}/inc/lib.h (100%)
 rename test cases/failing/{123 override and add_project_dependency => 122 override and add_project_dependency}/lib.c (100%)
 rename test cases/failing/{123 override and add_project_dependency => 122 override and add_project_dependency}/meson.build (100%)
 rename test cases/failing/{123 override and add_project_dependency => 122 override and add_project_dependency}/subprojects/a/meson.build (100%)
 rename test cases/failing/{123 override and add_project_dependency => 122 override and add_project_dependency}/subprojects/a/prog.c (100%)
 rename test cases/failing/{123 override and add_project_dependency => 122 override and add_project_dependency}/test.json (66%)
 rename test cases/failing/{124 targets before add_project_dependency => 123 targets before add_project_dependency}/inc/lib.h (100%)
 rename test cases/failing/{124 targets before add_project_dependency => 123 targets before add_project_dependency}/lib.c (100%)
 rename test cases/failing/{124 targets before add_project_dependency => 123 targets before add_project_dependency}/meson.build (100%)
 rename test cases/failing/{124 targets before add_project_dependency => 123 targets before add_project_dependency}/test.json (70%)
 rename test cases/failing/{125 extract from unity => 124 extract from unity}/meson.build (100%)
 rename test cases/failing/{125 extract from unity => 124 extract from unity}/src1.c (100%)
 rename test cases/failing/{125 extract from unity => 124 extract from unity}/src2.c (100%)
 rename test cases/failing/{125 extract from unity => 124 extract from unity}/test.json (73%)
 rename test cases/failing/{126 subproject object as a dependency => 125 subproject object as a dependency}/main.c (100%)
 rename test cases/failing/{126 subproject object as a dependency => 125 subproject object as a dependency}/meson.build (100%)
 rename test cases/failing/{126 subproject object as a dependency => 125 subproject object as a dependency}/subprojects/sub/meson.build (100%)
 rename test cases/failing/{126 subproject object as a dependency => 125 subproject object as a dependency}/test.json (64%)
 rename test cases/failing/{127 generator host binary => 126 generator host binary}/exe.c (100%)
 rename test cases/failing/{127 generator host binary => 126 generator host binary}/lib.in (100%)
 rename test cases/failing/{127 generator host binary => 126 generator host binary}/meson.build (100%)
 rename test cases/failing/{127 generator host binary => 126 generator host binary}/test.json (100%)
 rename test cases/failing/{128 invalid ast => 127 invalid ast}/meson.build (100%)
 rename test cases/failing/{128 invalid ast => 127 invalid ast}/test.json (67%)
 rename test cases/failing/{129 invalid project function => 128 invalid project function}/meson.build (100%)
 rename test cases/failing/{129 invalid project function => 128 invalid project function}/test.json (69%)
 rename test cases/failing/{130 utf8 with bom => 129 utf8 with bom}/meson.build (100%)
 rename test cases/failing/{130 utf8 with bom => 129 utf8 with bom}/test.json (62%)
 rename test cases/failing/{131 utf8 with bom subdir => 130 utf8 with bom subdir}/meson.build (100%)
 rename test cases/failing/{131 utf8 with bom subdir => 130 utf8 with bom subdir}/subdir/meson.build (100%)
 rename test cases/failing/{131 utf8 with bom subdir => 130 utf8 with bom subdir}/test.json (65%)
 rename test cases/failing/{132 utf8 with bom options => 131 utf8 with bom options}/meson.build (100%)
 rename test cases/failing/{132 utf8 with bom options => 131 utf8 with bom options}/meson.options (100%)
 rename test cases/failing/{132 utf8 with bom options => 131 utf8 with bom options}/test.json (64%)
 rename test cases/failing/{48 pkgconfig variables not key value => 47 pkgconfig variables not key value}/meson.build (100%)
 rename test cases/failing/{48 pkgconfig variables not key value => 47 pkgconfig variables not key value}/simple.c (100%)
 rename test cases/failing/{48 pkgconfig variables not key value => 47 pkgconfig variables not key value}/simple.h (100%)
 rename test cases/failing/{48 pkgconfig variables not key value => 47 pkgconfig variables not key value}/test.json (75%)
 rename test cases/failing/{49 executable comparison => 48 executable comparison}/meson.build (100%)
 rename test cases/failing/{49 executable comparison => 48 executable comparison}/prog.c (100%)
 rename test cases/failing/{49 executable comparison => 48 executable comparison}/test.json (73%)
 rename test cases/failing/{50 inconsistent comparison => 49 inconsistent comparison}/meson.build (100%)
 rename test cases/failing/{50 inconsistent comparison => 49 inconsistent comparison}/test.json (69%)
 rename test cases/failing/{51 slashname => 50 slashname}/meson.build (100%)
 rename test cases/failing/{51 slashname => 50 slashname}/sub/meson.build (100%)
 rename test cases/failing/{51 slashname => 50 slashname}/sub/prog.c (100%)
 rename test cases/failing/{51 slashname => 50 slashname}/test.json (67%)
 rename test cases/failing/{52 reserved meson prefix => 51 reserved meson prefix}/meson-foo/meson.build (100%)
 rename test cases/failing/{52 reserved meson prefix => 51 reserved meson prefix}/meson.build (100%)
 rename test cases/failing/{52 reserved meson prefix => 51 reserved meson prefix}/test.json (67%)
 rename test cases/failing/{53 or on new line => 52 or on new line}/meson.build (100%)
 rename test cases/failing/{53 or on new line => 52 or on new line}/meson_options.txt (100%)
 rename test cases/failing/{53 or on new line => 52 or on new line}/test.json (50%)
 rename test cases/failing/{54 link with executable => 53 link with executable}/meson.build (100%)
 rename test cases/failing/{54 link with executable => 53 link with executable}/module.c (100%)
 rename test cases/failing/{54 link with executable => 53 link with executable}/prog.c (100%)
 rename test cases/failing/{54 link with executable => 53 link with executable}/test.json (58%)
 rename test cases/failing/{55 assign custom target index => 54 assign custom target index}/meson.build (100%)
 rename test cases/failing/{55 assign custom target index => 54 assign custom target index}/test.json (59%)
 rename test cases/failing/{56 getoption prefix => 55 getoption prefix}/meson.build (100%)
 rename test cases/failing/{56 getoption prefix => 55 getoption prefix}/subprojects/abc/meson.build (100%)
 rename test cases/failing/{56 getoption prefix => 55 getoption prefix}/subprojects/abc/meson_options.txt (100%)
 rename test cases/failing/{56 getoption prefix => 55 getoption prefix}/test.json (72%)
 rename test cases/failing/{57 bad option argument => 56 bad option argument}/meson.build (100%)
 rename test cases/failing/{57 bad option argument => 56 bad option argument}/meson_options.txt (100%)
 rename test cases/failing/{57 bad option argument => 56 bad option argument}/test.json (63%)
 rename test cases/failing/{58 subproj filegrab => 57 subproj filegrab}/meson.build (100%)
 rename test cases/failing/{58 subproj filegrab => 57 subproj filegrab}/prog.c (100%)
 rename test cases/failing/{58 subproj filegrab => 57 subproj filegrab}/subprojects/a/meson.build (100%)
 rename test cases/failing/{58 subproj filegrab => 57 subproj filegrab}/test.json (68%)
 rename test cases/failing/{59 grab subproj => 58 grab subproj}/meson.build (100%)
 rename test cases/failing/{59 grab subproj => 58 grab subproj}/subprojects/foo/meson.build (100%)
 rename test cases/failing/{59 grab subproj => 58 grab subproj}/subprojects/foo/sub.c (100%)
 rename test cases/failing/{59 grab subproj => 58 grab subproj}/test.json (64%)
 rename test cases/failing/{60 grab sibling => 59 grab sibling}/meson.build (100%)
 rename test cases/failing/{60 grab sibling => 59 grab sibling}/subprojects/a/meson.build (100%)
 rename test cases/failing/{60 grab sibling => 59 grab sibling}/subprojects/b/meson.build (100%)
 rename test cases/failing/{60 grab sibling => 59 grab sibling}/subprojects/b/sneaky.c (100%)
 rename test cases/failing/{60 grab sibling => 59 grab sibling}/test.json (68%)
 rename test cases/failing/{61 string as link target => 60 string as link target}/meson.build (100%)
 rename test cases/failing/{61 string as link target => 60 string as link target}/prog.c (100%)
 rename test cases/failing/{61 string as link target => 60 string as link target}/test.json (53%)
 rename test cases/failing/{62 dependency not-found and required => 61 dependency not-found and required}/meson.build (100%)
 rename test cases/failing/{62 dependency not-found and required => 61 dependency not-found and required}/test.json (63%)
 rename test cases/failing/{63 subproj different versions => 62 subproj different versions}/main.c (100%)
 rename test cases/failing/{63 subproj different versions => 62 subproj different versions}/meson.build (100%)
 rename test cases/failing/{63 subproj different versions => 62 subproj different versions}/subprojects/a/a.c (100%)
 rename test cases/failing/{63 subproj different versions => 62 subproj different versions}/subprojects/a/a.h (100%)
 rename test cases/failing/{63 subproj different versions => 62 subproj different versions}/subprojects/a/meson.build (100%)
 rename test cases/failing/{63 subproj different versions => 62 subproj different versions}/subprojects/b/b.c (100%)
 rename test cases/failing/{63 subproj different versions => 62 subproj different versions}/subprojects/b/b.h (100%)
 rename test cases/failing/{63 subproj different versions => 62 subproj different versions}/subprojects/b/meson.build (100%)
 rename test cases/failing/{63 subproj different versions => 62 subproj different versions}/subprojects/c/c.h (100%)
 rename test cases/failing/{63 subproj different versions => 62 subproj different versions}/subprojects/c/meson.build (100%)
 rename test cases/failing/{63 subproj different versions => 62 subproj different versions}/test.json (64%)
 rename test cases/failing/{64 wrong boost module => 63 wrong boost module}/meson.build (100%)
 rename test cases/failing/{64 wrong boost module => 63 wrong boost module}/test.json (60%)
 rename test cases/failing/{65 install_data rename bad size => 64 install_data rename bad size}/file1.txt (100%)
 rename test cases/failing/{65 install_data rename bad size => 64 install_data rename bad size}/file2.txt (100%)
 rename test cases/failing/{65 install_data rename bad size => 64 install_data rename bad size}/meson.build (100%)
 rename test cases/failing/{65 install_data rename bad size => 64 install_data rename bad size}/test.json (75%)
 rename test cases/failing/{66 skip only subdir => 65 skip only subdir}/meson.build (100%)
 rename test cases/failing/{66 skip only subdir => 65 skip only subdir}/subdir/meson.build (100%)
 rename test cases/failing/{66 skip only subdir => 65 skip only subdir}/test.json (55%)
 rename test cases/failing/{67 dual override => 66 dual override}/meson.build (100%)
 rename test cases/failing/{67 dual override => 66 dual override}/overrides.py (100%)
 rename test cases/failing/{67 dual override => 66 dual override}/test.json (65%)
 rename test cases/failing/{68 override used => 67 override used}/meson.build (100%)
 rename test cases/failing/{68 override used => 67 override used}/other.py (100%)
 rename test cases/failing/{68 override used => 67 override used}/something.py (100%)
 rename test cases/failing/{68 override used => 67 override used}/test.json (67%)
 rename test cases/failing/{69 run_command unclean exit => 68 run_command unclean exit}/meson.build (100%)
 rename test cases/failing/{69 run_command unclean exit => 68 run_command unclean exit}/returncode.py (100%)
 rename test cases/failing/{69 run_command unclean exit => 68 run_command unclean exit}/test.json (56%)
 rename test cases/failing/{70 int literal leading zero => 69 int literal leading zero}/meson.build (100%)
 rename test cases/failing/{70 int literal leading zero => 69 int literal leading zero}/test.json (69%)
 rename test cases/failing/{71 configuration immutable => 70 configuration immutable}/input (100%)
 rename test cases/failing/{71 configuration immutable => 70 configuration immutable}/meson.build (100%)
 rename test cases/failing/{71 configuration immutable => 70 configuration immutable}/test.json (65%)
 rename test cases/failing/{72 link with shared module on osx => 71 link with shared module on osx}/meson.build (100%)
 rename test cases/failing/{72 link with shared module on osx => 71 link with shared module on osx}/module.c (100%)
 rename test cases/failing/{72 link with shared module on osx => 71 link with shared module on osx}/prog.c (100%)
 rename test cases/failing/{72 link with shared module on osx => 71 link with shared module on osx}/test.json (68%)
 rename test cases/failing/{73 non-ascii in ascii encoded configure file => 72 non-ascii in ascii encoded configure file}/config9.h.in (100%)
 rename test cases/failing/{73 non-ascii in ascii encoded configure file => 72 non-ascii in ascii encoded configure file}/meson.build (100%)
 rename test cases/failing/{73 non-ascii in ascii encoded configure file => 72 non-ascii in ascii encoded configure file}/test.json (79%)
 rename test cases/failing/{74 subproj dependency not-found and required => 73 subproj dependency not-found and required}/meson.build (100%)
 rename test cases/failing/{74 subproj dependency not-found and required => 73 subproj dependency not-found and required}/test.json (68%)
 rename test cases/failing/{75 unfound run => 74 unfound run}/meson.build (100%)
 rename test cases/failing/{75 unfound run => 74 unfound run}/test.json (60%)
 rename test cases/failing/{76 framework dependency with version => 75 framework dependency with version}/meson.build (100%)
 rename test cases/failing/{76 framework dependency with version => 75 framework dependency with version}/test.json (72%)
 rename test cases/failing/{77 override exe config => 76 override exe config}/foo.c (100%)
 rename test cases/failing/{77 override exe config => 76 override exe config}/meson.build (100%)
 rename test cases/failing/{77 override exe config => 76 override exe config}/test.json (72%)
 rename test cases/failing/{78 gl dependency with version => 77 gl dependency with version}/meson.build (100%)
 rename test cases/failing/{78 gl dependency with version => 77 gl dependency with version}/test.json (69%)
 rename test cases/failing/{79 threads dependency with version => 78 threads dependency with version}/meson.build (100%)
 rename test cases/failing/{79 threads dependency with version => 78 threads dependency with version}/test.json (71%)
 rename test cases/failing/{80 gtest dependency with version => 79 gtest dependency with version}/meson.build (100%)
 rename test cases/failing/{80 gtest dependency with version => 79 gtest dependency with version}/test.json (62%)
 rename test cases/failing/{81 dub library => 80 dub library}/meson.build (100%)
 rename test cases/failing/{81 dub library => 80 dub library}/test.json (57%)
 rename test cases/failing/{82 dub executable => 81 dub executable}/meson.build (100%)
 rename test cases/failing/{82 dub executable => 81 dub executable}/test.json (59%)
 rename test cases/failing/{83 dub compiler => 82 dub compiler}/meson.build (100%)
 rename test cases/failing/{83 dub compiler => 82 dub compiler}/test.json (81%)
 rename test cases/failing/{84 subproj not-found dep => 83 subproj not-found dep}/meson.build (100%)
 rename test cases/failing/{84 subproj not-found dep => 83 subproj not-found dep}/subprojects/somesubproj/meson.build (100%)
 rename test cases/failing/{84 subproj not-found dep => 83 subproj not-found dep}/test.json (62%)
 rename test cases/failing/{85 invalid configure file => 84 invalid configure file}/input (100%)
 rename test cases/failing/{85 invalid configure file => 84 invalid configure file}/meson.build (100%)
 rename test cases/failing/{85 invalid configure file => 84 invalid configure file}/test.json (67%)
 rename test cases/failing/{86 kwarg dupe => 85 kwarg dupe}/meson.build (100%)
 rename test cases/failing/{86 kwarg dupe => 85 kwarg dupe}/prog.c (100%)
 rename test cases/failing/{86 kwarg dupe => 85 kwarg dupe}/test.json (65%)
 rename test cases/failing/{87 missing pch file => 86 missing pch file}/meson.build (100%)
 rename test cases/failing/{87 missing pch file => 86 missing pch file}/prog.c (100%)
 rename test cases/failing/{87 missing pch file => 86 missing pch file}/test.json (74%)
 rename test cases/failing/{88 pch source different folder => 87 pch source different folder}/include/pch.h (100%)
 rename test cases/failing/{88 pch source different folder => 87 pch source different folder}/meson.build (100%)
 rename test cases/failing/{88 pch source different folder => 87 pch source different folder}/prog.c (100%)
 rename test cases/failing/{88 pch source different folder => 87 pch source different folder}/src/pch.c (100%)
 rename test cases/failing/{88 pch source different folder => 87 pch source different folder}/test.json (62%)
 rename test cases/failing/{89 unknown config tool => 88 unknown config tool}/meson.build (100%)
 rename test cases/failing/{89 unknown config tool => 88 unknown config tool}/test.json (60%)
 rename test cases/failing/{90 custom target install data => 89 custom target install data}/Info.plist.cpp (100%)
 rename test cases/failing/{90 custom target install data => 89 custom target install data}/meson.build (100%)
 rename test cases/failing/{90 custom target install data => 89 custom target install data}/preproc.py (100%)
 rename test cases/failing/{90 custom target install data => 89 custom target install data}/test.json (71%)
 rename test cases/failing/{91 add dict non string key => 90 add dict non string key}/meson.build (100%)
 rename test cases/failing/{91 add dict non string key => 90 add dict non string key}/test.json (54%)
 rename test cases/failing/{92 add dict duplicate keys => 91 add dict duplicate keys}/meson.build (100%)
 rename test cases/failing/{92 add dict duplicate keys => 91 add dict duplicate keys}/test.json (58%)
 rename test cases/failing/{93 no host get_external_property => 92 no host get_external_property}/meson.build (100%)
 rename test cases/failing/{93 no host get_external_property => 92 no host get_external_property}/test.json (63%)
 rename test cases/failing/{94 no native compiler => 93 no native compiler}/main.c (100%)
 rename test cases/failing/{94 no native compiler => 93 no native compiler}/meson.build (100%)
 rename test cases/failing/{94 no native compiler => 93 no native compiler}/test.json (58%)
 rename test cases/failing/{95 subdir parse error => 94 subdir parse error}/meson.build (100%)
 rename test cases/failing/{95 subdir parse error => 94 subdir parse error}/subdir/meson.build (100%)
 rename test cases/failing/{95 subdir parse error => 94 subdir parse error}/test.json (59%)
 rename test cases/failing/{96 invalid option file => 95 invalid option file}/meson.build (100%)
 rename test cases/failing/{96 invalid option file => 95 invalid option file}/meson_options.txt (100%)
 rename test cases/failing/{96 invalid option file => 95 invalid option file}/test.json (50%)
 rename test cases/failing/{97 no lang => 96 no lang}/main.c (100%)
 rename test cases/failing/{97 no lang => 96 no lang}/meson.build (100%)
 rename test cases/failing/{97 no lang => 96 no lang}/test.json (54%)
 rename test cases/failing/{98 no glib-compile-resources => 97 no glib-compile-resources}/meson.build (100%)
 rename test cases/failing/{98 no glib-compile-resources => 97 no glib-compile-resources}/test.json (65%)
 rename test cases/failing/{98 no glib-compile-resources => 97 no glib-compile-resources}/trivial.gresource.xml (100%)
 rename test cases/failing/{99 number in combo => 98 number in combo}/meson.build (100%)
 rename test cases/failing/{99 number in combo => 98 number in combo}/nativefile.ini (100%)
 rename test cases/failing/{99 number in combo => 98 number in combo}/test.json (77%)
 rename test cases/failing/{100 bool in combo => 99 bool in combo}/meson.build (100%)
 rename test cases/failing/{100 bool in combo => 99 bool in combo}/meson_options.txt (100%)
 rename test cases/failing/{100 bool in combo => 99 bool in combo}/nativefile.ini (100%)
 create mode 100644 test cases/failing/99 bool in combo/test.json

diff --git a/test cases/failing/100 bool in combo/test.json b/test cases/failing/100 bool in combo/test.json
deleted file mode 100644
index 357d7a875..000000000
--- a/test cases/failing/100 bool in combo/test.json	
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "stdout": [
-    { "line": "test cases/failing/100 bool in combo/meson.build:1:0: ERROR: Value \"True\" (of type \"boolean\") for combo option \"opt\" is not one of the choices. Possible choices are (as string): \"true\", \"false\"." }
-  ]
-}
diff --git a/test cases/failing/101 compiler no lang/meson.build b/test cases/failing/100 compiler no lang/meson.build
similarity index 100%
rename from test cases/failing/101 compiler no lang/meson.build
rename to test cases/failing/100 compiler no lang/meson.build
diff --git a/test cases/failing/101 compiler no lang/test.json b/test cases/failing/100 compiler no lang/test.json
similarity index 66%
rename from test cases/failing/101 compiler no lang/test.json
rename to test cases/failing/100 compiler no lang/test.json
index 364efa9e8..935d79d1c 100644
--- a/test cases/failing/101 compiler no lang/test.json	
+++ b/test cases/failing/100 compiler no lang/test.json	
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/101 compiler no lang/meson.build:2:6: ERROR: Tried to access compiler for language \"c\", not specified for host machine."
+      "line": "test cases/failing/100 compiler no lang/meson.build:2:6: ERROR: Tried to access compiler for language \"c\", not specified for host machine."
     }
   ]
 }
diff --git a/test cases/failing/102 no fallback/meson.build b/test cases/failing/101 no fallback/meson.build
similarity index 100%
rename from test cases/failing/102 no fallback/meson.build
rename to test cases/failing/101 no fallback/meson.build
diff --git a/test cases/failing/102 no fallback/subprojects/foob/meson.build b/test cases/failing/101 no fallback/subprojects/foob/meson.build
similarity index 100%
rename from test cases/failing/102 no fallback/subprojects/foob/meson.build
rename to test cases/failing/101 no fallback/subprojects/foob/meson.build
diff --git a/test cases/failing/102 no fallback/test.json b/test cases/failing/101 no fallback/test.json
similarity index 100%
rename from test cases/failing/102 no fallback/test.json
rename to test cases/failing/101 no fallback/test.json
diff --git a/test cases/failing/103 feature require/meson.build b/test cases/failing/102 feature require/meson.build
similarity index 100%
rename from test cases/failing/103 feature require/meson.build
rename to test cases/failing/102 feature require/meson.build
diff --git a/test cases/failing/103 feature require/meson_options.txt b/test cases/failing/102 feature require/meson_options.txt
similarity index 100%
rename from test cases/failing/103 feature require/meson_options.txt
rename to test cases/failing/102 feature require/meson_options.txt
diff --git a/test cases/failing/103 feature require/test.json b/test cases/failing/102 feature require/test.json
similarity index 100%
rename from test cases/failing/103 feature require/test.json
rename to test cases/failing/102 feature require/test.json
diff --git a/test cases/failing/104 feature require.bis/meson.build b/test cases/failing/103 feature require.bis/meson.build
similarity index 100%
rename from test cases/failing/104 feature require.bis/meson.build
rename to test cases/failing/103 feature require.bis/meson.build
diff --git a/test cases/failing/104 feature require.bis/meson_options.txt b/test cases/failing/103 feature require.bis/meson_options.txt
similarity index 100%
rename from test cases/failing/104 feature require.bis/meson_options.txt
rename to test cases/failing/103 feature require.bis/meson_options.txt
diff --git a/test cases/failing/104 feature require.bis/test.json b/test cases/failing/103 feature require.bis/test.json
similarity index 100%
rename from test cases/failing/104 feature require.bis/test.json
rename to test cases/failing/103 feature require.bis/test.json
diff --git a/test cases/failing/105 no build get_external_property/meson.build b/test cases/failing/104 no build get_external_property/meson.build
similarity index 100%
rename from test cases/failing/105 no build get_external_property/meson.build
rename to test cases/failing/104 no build get_external_property/meson.build
diff --git a/test cases/failing/105 no build get_external_property/test.json b/test cases/failing/104 no build get_external_property/test.json
similarity index 63%
rename from test cases/failing/105 no build get_external_property/test.json
rename to test cases/failing/104 no build get_external_property/test.json
index e8b282c6f..5792213b0 100644
--- a/test cases/failing/105 no build get_external_property/test.json	
+++ b/test cases/failing/104 no build get_external_property/test.json	
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/105 no build get_external_property/meson.build:3:14: ERROR: Unknown property for build machine: nonexisting"
+      "line": "test cases/failing/104 no build get_external_property/meson.build:3:14: ERROR: Unknown property for build machine: nonexisting"
     }
   ]
 }
diff --git a/test cases/failing/106 enter subdir twice/meson.build b/test cases/failing/105 enter subdir twice/meson.build
similarity index 100%
rename from test cases/failing/106 enter subdir twice/meson.build
rename to test cases/failing/105 enter subdir twice/meson.build
diff --git a/test cases/failing/106 enter subdir twice/sub/meson.build b/test cases/failing/105 enter subdir twice/sub/meson.build
similarity index 100%
rename from test cases/failing/106 enter subdir twice/sub/meson.build
rename to test cases/failing/105 enter subdir twice/sub/meson.build
diff --git a/test cases/failing/106 enter subdir twice/test.json b/test cases/failing/105 enter subdir twice/test.json
similarity index 64%
rename from test cases/failing/106 enter subdir twice/test.json
rename to test cases/failing/105 enter subdir twice/test.json
index 9a8b11d06..80e8c101a 100644
--- a/test cases/failing/106 enter subdir twice/test.json	
+++ b/test cases/failing/105 enter subdir twice/test.json	
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/106 enter subdir twice/meson.build:3:0: ERROR: Tried to enter directory \"sub\", which has already been visited."
+      "line": "test cases/failing/105 enter subdir twice/meson.build:3:0: ERROR: Tried to enter directory \"sub\", which has already been visited."
     }
   ]
 }
diff --git a/test cases/failing/107 invalid fstring/109 invalid fstring/meson.build b/test cases/failing/106 invalid fstring/109 invalid fstring/meson.build
similarity index 100%
rename from test cases/failing/107 invalid fstring/109 invalid fstring/meson.build
rename to test cases/failing/106 invalid fstring/109 invalid fstring/meson.build
diff --git a/test cases/failing/107 invalid fstring/109 invalid fstring/test.json b/test cases/failing/106 invalid fstring/109 invalid fstring/test.json
similarity index 100%
rename from test cases/failing/107 invalid fstring/109 invalid fstring/test.json
rename to test cases/failing/106 invalid fstring/109 invalid fstring/test.json
diff --git a/test cases/failing/107 invalid fstring/meson.build b/test cases/failing/106 invalid fstring/meson.build
similarity index 100%
rename from test cases/failing/107 invalid fstring/meson.build
rename to test cases/failing/106 invalid fstring/meson.build
diff --git a/test cases/failing/107 invalid fstring/test.json b/test cases/failing/106 invalid fstring/test.json
similarity index 63%
rename from test cases/failing/107 invalid fstring/test.json
rename to test cases/failing/106 invalid fstring/test.json
index ccd82b574..8d5342885 100644
--- a/test cases/failing/107 invalid fstring/test.json	
+++ b/test cases/failing/106 invalid fstring/test.json	
@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "line": "test cases/failing/107 invalid fstring/meson.build:3:4: ERROR: Identifier \"foo\" does not name a variable."
+            "line": "test cases/failing/106 invalid fstring/meson.build:3:4: ERROR: Identifier \"foo\" does not name a variable."
         }
     ]
 }
diff --git a/test cases/failing/108 compiler argument checking/meson.build b/test cases/failing/107 compiler argument checking/meson.build
similarity index 100%
rename from test cases/failing/108 compiler argument checking/meson.build
rename to test cases/failing/107 compiler argument checking/meson.build
diff --git a/test cases/failing/108 compiler argument checking/test.json b/test cases/failing/107 compiler argument checking/test.json
similarity index 66%
rename from test cases/failing/108 compiler argument checking/test.json
rename to test cases/failing/107 compiler argument checking/test.json
index e9e27af57..a1576aa69 100644
--- a/test cases/failing/108 compiler argument checking/test.json	
+++ b/test cases/failing/107 compiler argument checking/test.json	
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-        "line": "test cases/failing/108 compiler argument checking/meson.build:4:25: ERROR: Compiler for C does not support \"-meson-goober-arg-for-testing\""
+        "line": "test cases/failing/107 compiler argument checking/meson.build:4:25: ERROR: Compiler for C does not support \"-meson-goober-arg-for-testing\""
     }
   ]
 }
diff --git a/test cases/failing/109 empty fallback/meson.build b/test cases/failing/108 empty fallback/meson.build
similarity index 100%
rename from test cases/failing/109 empty fallback/meson.build
rename to test cases/failing/108 empty fallback/meson.build
diff --git a/test cases/failing/109 empty fallback/subprojects/foo/meson.build b/test cases/failing/108 empty fallback/subprojects/foo/meson.build
similarity index 100%
rename from test cases/failing/109 empty fallback/subprojects/foo/meson.build
rename to test cases/failing/108 empty fallback/subprojects/foo/meson.build
diff --git a/test cases/failing/109 empty fallback/test.json b/test cases/failing/108 empty fallback/test.json
similarity index 65%
rename from test cases/failing/109 empty fallback/test.json
rename to test cases/failing/108 empty fallback/test.json
index 46a4ec514..c63188231 100644
--- a/test cases/failing/109 empty fallback/test.json	
+++ b/test cases/failing/108 empty fallback/test.json	
@@ -2,7 +2,7 @@
     "stdout": [
         {
             "match": "re",
-            "line": "test cases/failing/109 empty fallback/meson.build:6:0: ERROR: Dependency \"foo\" not found.*"
+            "line": "test cases/failing/108 empty fallback/meson.build:6:0: ERROR: Dependency \"foo\" not found.*"
         }
     ]
 }
diff --git a/test cases/failing/110 cmake executable dependency/meson.build b/test cases/failing/109 cmake executable dependency/meson.build
similarity index 100%
rename from test cases/failing/110 cmake executable dependency/meson.build
rename to test cases/failing/109 cmake executable dependency/meson.build
diff --git a/test cases/failing/110 cmake executable dependency/subprojects/cmlib/CMakeLists.txt b/test cases/failing/109 cmake executable dependency/subprojects/cmlib/CMakeLists.txt
similarity index 100%
rename from test cases/failing/110 cmake executable dependency/subprojects/cmlib/CMakeLists.txt
rename to test cases/failing/109 cmake executable dependency/subprojects/cmlib/CMakeLists.txt
diff --git a/test cases/failing/110 cmake executable dependency/subprojects/cmlib/main.c b/test cases/failing/109 cmake executable dependency/subprojects/cmlib/main.c
similarity index 100%
rename from test cases/failing/110 cmake executable dependency/subprojects/cmlib/main.c
rename to test cases/failing/109 cmake executable dependency/subprojects/cmlib/main.c
diff --git a/test cases/failing/110 cmake executable dependency/test.json b/test cases/failing/109 cmake executable dependency/test.json
similarity index 77%
rename from test cases/failing/110 cmake executable dependency/test.json
rename to test cases/failing/109 cmake executable dependency/test.json
index 80d01fe0d..f7c477555 100644
--- a/test cases/failing/110 cmake executable dependency/test.json	
+++ b/test cases/failing/109 cmake executable dependency/test.json	
@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "line": "test cases/failing/110 cmake executable dependency/meson.build:9:14: ERROR: main is an executable and does not support the dependency() method. Use target() instead."
+            "line": "test cases/failing/109 cmake executable dependency/meson.build:9:14: ERROR: main is an executable and does not support the dependency() method. Use target() instead."
         }
     ],
     "tools": {
diff --git a/test cases/failing/111 allow_fallback with fallback/meson.build b/test cases/failing/110 allow_fallback with fallback/meson.build
similarity index 100%
rename from test cases/failing/111 allow_fallback with fallback/meson.build
rename to test cases/failing/110 allow_fallback with fallback/meson.build
diff --git a/test cases/failing/111 allow_fallback with fallback/test.json b/test cases/failing/110 allow_fallback with fallback/test.json
similarity index 70%
rename from test cases/failing/111 allow_fallback with fallback/test.json
rename to test cases/failing/110 allow_fallback with fallback/test.json
index 92aa19af3..b558eccae 100644
--- a/test cases/failing/111 allow_fallback with fallback/test.json	
+++ b/test cases/failing/110 allow_fallback with fallback/test.json	
@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "line": "test cases/failing/111 allow_fallback with fallback/meson.build:3:0: ERROR: \"fallback\" and \"allow_fallback\" arguments are mutually exclusive"
+            "line": "test cases/failing/110 allow_fallback with fallback/meson.build:3:0: ERROR: \"fallback\" and \"allow_fallback\" arguments are mutually exclusive"
         }
     ]
 }
diff --git a/test cases/failing/112 nonsensical bindgen/meson.build b/test cases/failing/111 nonsensical bindgen/meson.build
similarity index 100%
rename from test cases/failing/112 nonsensical bindgen/meson.build
rename to test cases/failing/111 nonsensical bindgen/meson.build
diff --git a/test cases/failing/112 nonsensical bindgen/src/header.h b/test cases/failing/111 nonsensical bindgen/src/header.h
similarity index 100%
rename from test cases/failing/112 nonsensical bindgen/src/header.h
rename to test cases/failing/111 nonsensical bindgen/src/header.h
diff --git a/test cases/failing/112 nonsensical bindgen/src/source.c b/test cases/failing/111 nonsensical bindgen/src/source.c
similarity index 100%
rename from test cases/failing/112 nonsensical bindgen/src/source.c
rename to test cases/failing/111 nonsensical bindgen/src/source.c
diff --git a/test cases/failing/112 nonsensical bindgen/test.json b/test cases/failing/111 nonsensical bindgen/test.json
similarity index 69%
rename from test cases/failing/112 nonsensical bindgen/test.json
rename to test cases/failing/111 nonsensical bindgen/test.json
index a2b4b7196..f2dc92c89 100644
--- a/test cases/failing/112 nonsensical bindgen/test.json	
+++ b/test cases/failing/111 nonsensical bindgen/test.json	
@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "line": "test cases/failing/112 nonsensical bindgen/meson.build:17:24: ERROR: bindgen source file must be a C header, not an object or build target"
+            "line": "test cases/failing/111 nonsensical bindgen/meson.build:17:24: ERROR: bindgen source file must be a C header, not an object or build target"
         }
     ]
 }
diff --git a/test cases/failing/113 run_target in test/meson.build b/test cases/failing/112 run_target in test/meson.build
similarity index 100%
rename from test cases/failing/113 run_target in test/meson.build
rename to test cases/failing/112 run_target in test/meson.build
diff --git a/test cases/failing/113 run_target in test/test.json b/test cases/failing/112 run_target in test/test.json
similarity index 77%
rename from test cases/failing/113 run_target in test/test.json
rename to test cases/failing/112 run_target in test/test.json
index 0e1ded4ea..100db9482 100644
--- a/test cases/failing/113 run_target in test/test.json	
+++ b/test cases/failing/112 run_target in test/test.json	
@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "line": "test cases/failing/113 run_target in test/meson.build:7:0: ERROR: test keyword argument 'args' was of type array[RunTarget] but should have been array[str | File | BuildTarget | CustomTarget | CustomTargetIndex]"
+            "line": "test cases/failing/112 run_target in test/meson.build:7:0: ERROR: test keyword argument 'args' was of type array[RunTarget] but should have been array[str | File | BuildTarget | CustomTarget | CustomTargetIndex]"
         }
     ]
 }
diff --git a/test cases/failing/113 run_target in test/trivial.c b/test cases/failing/112 run_target in test/trivial.c
similarity index 100%
rename from test cases/failing/113 run_target in test/trivial.c
rename to test cases/failing/112 run_target in test/trivial.c
diff --git a/test cases/failing/114 run_target in add_install_script/meson.build b/test cases/failing/113 run_target in add_install_script/meson.build
similarity index 100%
rename from test cases/failing/114 run_target in add_install_script/meson.build
rename to test cases/failing/113 run_target in add_install_script/meson.build
diff --git a/test cases/failing/114 run_target in add_install_script/test.json b/test cases/failing/113 run_target in add_install_script/test.json
similarity index 81%
rename from test cases/failing/114 run_target in add_install_script/test.json
rename to test cases/failing/113 run_target in add_install_script/test.json
index 0b28f9b15..c9ed33ecf 100644
--- a/test cases/failing/114 run_target in add_install_script/test.json	
+++ b/test cases/failing/113 run_target in add_install_script/test.json	
@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "line": "test cases/failing/114 run_target in add_install_script/meson.build:7:6: ERROR: meson.add_install_script argument 2 was of type \"RunTarget\" but should have been one of: \"str\", \"File\", \"BuildTarget\", \"CustomTarget\", \"CustomTargetIndex\", \"ExternalProgram\""
+            "line": "test cases/failing/113 run_target in add_install_script/meson.build:7:6: ERROR: meson.add_install_script argument 2 was of type \"RunTarget\" but should have been one of: \"str\", \"File\", \"BuildTarget\", \"CustomTarget\", \"CustomTargetIndex\", \"ExternalProgram\""
         }
     ]
 }
diff --git a/test cases/failing/114 run_target in add_install_script/trivial.c b/test cases/failing/113 run_target in add_install_script/trivial.c
similarity index 100%
rename from test cases/failing/114 run_target in add_install_script/trivial.c
rename to test cases/failing/113 run_target in add_install_script/trivial.c
diff --git a/test cases/failing/115 pathsep in install_symlink/meson.build b/test cases/failing/114 pathsep in install_symlink/meson.build
similarity index 100%
rename from test cases/failing/115 pathsep in install_symlink/meson.build
rename to test cases/failing/114 pathsep in install_symlink/meson.build
diff --git a/test cases/failing/115 pathsep in install_symlink/test.json b/test cases/failing/114 pathsep in install_symlink/test.json
similarity index 74%
rename from test cases/failing/115 pathsep in install_symlink/test.json
rename to test cases/failing/114 pathsep in install_symlink/test.json
index fee661f4e..bca4e0e1d 100644
--- a/test cases/failing/115 pathsep in install_symlink/test.json	
+++ b/test cases/failing/114 pathsep in install_symlink/test.json	
@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "line": "test cases/failing/115 pathsep in install_symlink/meson.build:3:0: ERROR: Link name is \"foo/bar\", but link names cannot contain path separators. The dir part should be in install_dir."
+            "line": "test cases/failing/114 pathsep in install_symlink/meson.build:3:0: ERROR: Link name is \"foo/bar\", but link names cannot contain path separators. The dir part should be in install_dir."
         }
     ]
 }
diff --git a/test cases/failing/116 subproject version conflict/meson.build b/test cases/failing/115 subproject version conflict/meson.build
similarity index 100%
rename from test cases/failing/116 subproject version conflict/meson.build
rename to test cases/failing/115 subproject version conflict/meson.build
diff --git a/test cases/failing/116 subproject version conflict/subprojects/A/meson.build b/test cases/failing/115 subproject version conflict/subprojects/A/meson.build
similarity index 100%
rename from test cases/failing/116 subproject version conflict/subprojects/A/meson.build
rename to test cases/failing/115 subproject version conflict/subprojects/A/meson.build
diff --git a/test cases/failing/116 subproject version conflict/subprojects/B/meson.build b/test cases/failing/115 subproject version conflict/subprojects/B/meson.build
similarity index 100%
rename from test cases/failing/116 subproject version conflict/subprojects/B/meson.build
rename to test cases/failing/115 subproject version conflict/subprojects/B/meson.build
diff --git a/test cases/failing/116 subproject version conflict/test.json b/test cases/failing/115 subproject version conflict/test.json
similarity index 66%
rename from test cases/failing/116 subproject version conflict/test.json
rename to test cases/failing/115 subproject version conflict/test.json
index c82774496..23c7eb5e9 100644
--- a/test cases/failing/116 subproject version conflict/test.json	
+++ b/test cases/failing/115 subproject version conflict/test.json	
@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "line": "test cases/failing/116 subproject version conflict/meson.build:4:8: ERROR: Subproject B version is 100 but ['1'] required."
+            "line": "test cases/failing/115 subproject version conflict/meson.build:4:8: ERROR: Subproject B version is 100 but ['1'] required."
         }
     ]
 }
diff --git a/test cases/failing/117 structured source empty string/main.rs b/test cases/failing/116 structured source empty string/main.rs
similarity index 100%
rename from test cases/failing/117 structured source empty string/main.rs
rename to test cases/failing/116 structured source empty string/main.rs
diff --git a/test cases/failing/117 structured source empty string/meson.build b/test cases/failing/116 structured source empty string/meson.build
similarity index 100%
rename from test cases/failing/117 structured source empty string/meson.build
rename to test cases/failing/116 structured source empty string/meson.build
diff --git a/test cases/failing/117 structured source empty string/test.json b/test cases/failing/116 structured source empty string/test.json
similarity index 71%
rename from test cases/failing/117 structured source empty string/test.json
rename to test cases/failing/116 structured source empty string/test.json
index 7c90b0325..00efbe39a 100644
--- a/test cases/failing/117 structured source empty string/test.json	
+++ b/test cases/failing/116 structured source empty string/test.json	
@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "line": "test cases/failing/117 structured source empty string/meson.build:9:2: ERROR: structured_sources: keys to dictionary argument may not be an empty string."
+            "line": "test cases/failing/116 structured source empty string/meson.build:9:2: ERROR: structured_sources: keys to dictionary argument may not be an empty string."
         }
     ]
 }
diff --git a/test cases/failing/118 structured_sources conflicts/main.rs b/test cases/failing/117 structured_sources conflicts/main.rs
similarity index 100%
rename from test cases/failing/118 structured_sources conflicts/main.rs
rename to test cases/failing/117 structured_sources conflicts/main.rs
diff --git a/test cases/failing/118 structured_sources conflicts/meson.build b/test cases/failing/117 structured_sources conflicts/meson.build
similarity index 100%
rename from test cases/failing/118 structured_sources conflicts/meson.build
rename to test cases/failing/117 structured_sources conflicts/meson.build
diff --git a/test cases/failing/118 structured_sources conflicts/test.json b/test cases/failing/117 structured_sources conflicts/test.json
similarity index 67%
rename from test cases/failing/118 structured_sources conflicts/test.json
rename to test cases/failing/117 structured_sources conflicts/test.json
index 55b122890..a7201b5f3 100644
--- a/test cases/failing/118 structured_sources conflicts/test.json	
+++ b/test cases/failing/117 structured_sources conflicts/test.json	
@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "line": "test cases/failing/118 structured_sources conflicts/meson.build:7:0: ERROR: Conflicting sources in structured sources: main.rs"
+            "line": "test cases/failing/117 structured_sources conflicts/meson.build:7:0: ERROR: Conflicting sources in structured sources: main.rs"
         }
     ]
 }
diff --git a/test cases/failing/119 missing compiler/meson.build b/test cases/failing/118 missing compiler/meson.build
similarity index 100%
rename from test cases/failing/119 missing compiler/meson.build
rename to test cases/failing/118 missing compiler/meson.build
diff --git a/test cases/failing/119 missing compiler/subprojects/sub/main.c b/test cases/failing/118 missing compiler/subprojects/sub/main.c
similarity index 100%
rename from test cases/failing/119 missing compiler/subprojects/sub/main.c
rename to test cases/failing/118 missing compiler/subprojects/sub/main.c
diff --git a/test cases/failing/119 missing compiler/subprojects/sub/meson.build b/test cases/failing/118 missing compiler/subprojects/sub/meson.build
similarity index 100%
rename from test cases/failing/119 missing compiler/subprojects/sub/meson.build
rename to test cases/failing/118 missing compiler/subprojects/sub/meson.build
diff --git a/test cases/failing/119 missing compiler/test.json b/test cases/failing/118 missing compiler/test.json
similarity index 68%
rename from test cases/failing/119 missing compiler/test.json
rename to test cases/failing/118 missing compiler/test.json
index c5f3fb1ca..a2494e4bc 100644
--- a/test cases/failing/119 missing compiler/test.json	
+++ b/test cases/failing/118 missing compiler/test.json	
@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "line": "test cases/failing/119 missing compiler/subprojects/sub/meson.build:4:0: ERROR: No host machine compiler for 'subprojects/sub/main.c'"
+            "line": "test cases/failing/118 missing compiler/subprojects/sub/meson.build:4:0: ERROR: No host machine compiler for 'subprojects/sub/main.c'"
         }
     ]
 }
diff --git a/test cases/failing/120 cmake subproject error/meson.build b/test cases/failing/119 cmake subproject error/meson.build
similarity index 100%
rename from test cases/failing/120 cmake subproject error/meson.build
rename to test cases/failing/119 cmake subproject error/meson.build
diff --git a/test cases/failing/120 cmake subproject error/subprojects/cmlib/CMakeLists.txt b/test cases/failing/119 cmake subproject error/subprojects/cmlib/CMakeLists.txt
similarity index 100%
rename from test cases/failing/120 cmake subproject error/subprojects/cmlib/CMakeLists.txt
rename to test cases/failing/119 cmake subproject error/subprojects/cmlib/CMakeLists.txt
diff --git a/test cases/failing/120 cmake subproject error/test.json b/test cases/failing/119 cmake subproject error/test.json
similarity index 74%
rename from test cases/failing/120 cmake subproject error/test.json
rename to test cases/failing/119 cmake subproject error/test.json
index d88e708bf..625e45175 100644
--- a/test cases/failing/120 cmake subproject error/test.json	
+++ b/test cases/failing/119 cmake subproject error/test.json	
@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "line": "test cases/failing/120 cmake subproject error/meson.build:8:14: ERROR: Failed to configure the CMake subproject: Fancy error message"
+            "line": "test cases/failing/119 cmake subproject error/meson.build:8:14: ERROR: Failed to configure the CMake subproject: Fancy error message"
         }
     ],
     "tools": {
diff --git a/test cases/failing/121 pkgconfig not relocatable outside prefix/meson.build b/test cases/failing/120 pkgconfig not relocatable outside prefix/meson.build
similarity index 100%
rename from test cases/failing/121 pkgconfig not relocatable outside prefix/meson.build
rename to test cases/failing/120 pkgconfig not relocatable outside prefix/meson.build
diff --git a/test cases/failing/121 pkgconfig not relocatable outside prefix/test.json b/test cases/failing/120 pkgconfig not relocatable outside prefix/test.json
similarity index 78%
rename from test cases/failing/121 pkgconfig not relocatable outside prefix/test.json
rename to test cases/failing/120 pkgconfig not relocatable outside prefix/test.json
index c0dfb87e2..32c6e0931 100644
--- a/test cases/failing/121 pkgconfig not relocatable outside prefix/test.json	
+++ b/test cases/failing/120 pkgconfig not relocatable outside prefix/test.json	
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/121 pkgconfig not relocatable outside prefix/meson\\.build:17:5: ERROR: Pkgconfig prefix cannot be outside of the prefix when pkgconfig\\.relocatable=true. Pkgconfig prefix is (C:)?/opt/lib/pkgconfig.",
+      "line": "test cases/failing/120 pkgconfig not relocatable outside prefix/meson\\.build:17:5: ERROR: Pkgconfig prefix cannot be outside of the prefix when pkgconfig\\.relocatable=true. Pkgconfig prefix is (C:)?/opt/lib/pkgconfig.",
       "match": "re"
     }
   ]
diff --git a/test cases/failing/122 subproject sandbox violation/meson.build b/test cases/failing/121 subproject sandbox violation/meson.build
similarity index 100%
rename from test cases/failing/122 subproject sandbox violation/meson.build
rename to test cases/failing/121 subproject sandbox violation/meson.build
diff --git a/test cases/failing/122 subproject sandbox violation/meson_options.txt b/test cases/failing/121 subproject sandbox violation/meson_options.txt
similarity index 100%
rename from test cases/failing/122 subproject sandbox violation/meson_options.txt
rename to test cases/failing/121 subproject sandbox violation/meson_options.txt
diff --git a/test cases/failing/122 subproject sandbox violation/subprojects/subproj1/file.txt b/test cases/failing/121 subproject sandbox violation/subprojects/subproj1/file.txt
similarity index 100%
rename from test cases/failing/122 subproject sandbox violation/subprojects/subproj1/file.txt
rename to test cases/failing/121 subproject sandbox violation/subprojects/subproj1/file.txt
diff --git a/test cases/failing/122 subproject sandbox violation/subprojects/subproj1/meson.build b/test cases/failing/121 subproject sandbox violation/subprojects/subproj1/meson.build
similarity index 100%
rename from test cases/failing/122 subproject sandbox violation/subprojects/subproj1/meson.build
rename to test cases/failing/121 subproject sandbox violation/subprojects/subproj1/meson.build
diff --git a/test cases/failing/122 subproject sandbox violation/subprojects/subproj1/nested/meson.build b/test cases/failing/121 subproject sandbox violation/subprojects/subproj1/nested/meson.build
similarity index 100%
rename from test cases/failing/122 subproject sandbox violation/subprojects/subproj1/nested/meson.build
rename to test cases/failing/121 subproject sandbox violation/subprojects/subproj1/nested/meson.build
diff --git a/test cases/failing/122 subproject sandbox violation/subprojects/subproj2/file.txt b/test cases/failing/121 subproject sandbox violation/subprojects/subproj2/file.txt
similarity index 100%
rename from test cases/failing/122 subproject sandbox violation/subprojects/subproj2/file.txt
rename to test cases/failing/121 subproject sandbox violation/subprojects/subproj2/file.txt
diff --git a/test cases/failing/122 subproject sandbox violation/subprojects/subproj2/meson.build b/test cases/failing/121 subproject sandbox violation/subprojects/subproj2/meson.build
similarity index 100%
rename from test cases/failing/122 subproject sandbox violation/subprojects/subproj2/meson.build
rename to test cases/failing/121 subproject sandbox violation/subprojects/subproj2/meson.build
diff --git a/test cases/failing/122 subproject sandbox violation/subprojects/subproj2/nested/meson.build b/test cases/failing/121 subproject sandbox violation/subprojects/subproj2/nested/meson.build
similarity index 100%
rename from test cases/failing/122 subproject sandbox violation/subprojects/subproj2/nested/meson.build
rename to test cases/failing/121 subproject sandbox violation/subprojects/subproj2/nested/meson.build
diff --git a/test cases/failing/122 subproject sandbox violation/subprojects/subproj3/file.txt b/test cases/failing/121 subproject sandbox violation/subprojects/subproj3/file.txt
similarity index 100%
rename from test cases/failing/122 subproject sandbox violation/subprojects/subproj3/file.txt
rename to test cases/failing/121 subproject sandbox violation/subprojects/subproj3/file.txt
diff --git a/test cases/failing/122 subproject sandbox violation/subprojects/subproj3/meson.build b/test cases/failing/121 subproject sandbox violation/subprojects/subproj3/meson.build
similarity index 100%
rename from test cases/failing/122 subproject sandbox violation/subprojects/subproj3/meson.build
rename to test cases/failing/121 subproject sandbox violation/subprojects/subproj3/meson.build
diff --git a/test cases/failing/122 subproject sandbox violation/test.json b/test cases/failing/121 subproject sandbox violation/test.json
similarity index 82%
rename from test cases/failing/122 subproject sandbox violation/test.json
rename to test cases/failing/121 subproject sandbox violation/test.json
index 4bd402884..d8c28d702 100644
--- a/test cases/failing/122 subproject sandbox violation/test.json	
+++ b/test cases/failing/121 subproject sandbox violation/test.json	
@@ -10,7 +10,7 @@
   },
   "stdout": [
     {
-      "line": "test cases/failing/122 subproject sandbox violation/meson.build:24:0: ERROR: Sandbox violation: Tried to grab file file.txt from a nested subproject."
+      "line": "test cases/failing/121 subproject sandbox violation/meson.build:24:0: ERROR: Sandbox violation: Tried to grab file file.txt from a nested subproject."
     }
   ]
 }
diff --git a/test cases/failing/123 override and add_project_dependency/inc/lib.h b/test cases/failing/122 override and add_project_dependency/inc/lib.h
similarity index 100%
rename from test cases/failing/123 override and add_project_dependency/inc/lib.h
rename to test cases/failing/122 override and add_project_dependency/inc/lib.h
diff --git a/test cases/failing/123 override and add_project_dependency/lib.c b/test cases/failing/122 override and add_project_dependency/lib.c
similarity index 100%
rename from test cases/failing/123 override and add_project_dependency/lib.c
rename to test cases/failing/122 override and add_project_dependency/lib.c
diff --git a/test cases/failing/123 override and add_project_dependency/meson.build b/test cases/failing/122 override and add_project_dependency/meson.build
similarity index 100%
rename from test cases/failing/123 override and add_project_dependency/meson.build
rename to test cases/failing/122 override and add_project_dependency/meson.build
diff --git a/test cases/failing/123 override and add_project_dependency/subprojects/a/meson.build b/test cases/failing/122 override and add_project_dependency/subprojects/a/meson.build
similarity index 100%
rename from test cases/failing/123 override and add_project_dependency/subprojects/a/meson.build
rename to test cases/failing/122 override and add_project_dependency/subprojects/a/meson.build
diff --git a/test cases/failing/123 override and add_project_dependency/subprojects/a/prog.c b/test cases/failing/122 override and add_project_dependency/subprojects/a/prog.c
similarity index 100%
rename from test cases/failing/123 override and add_project_dependency/subprojects/a/prog.c
rename to test cases/failing/122 override and add_project_dependency/subprojects/a/prog.c
diff --git a/test cases/failing/123 override and add_project_dependency/test.json b/test cases/failing/122 override and add_project_dependency/test.json
similarity index 66%
rename from test cases/failing/123 override and add_project_dependency/test.json
rename to test cases/failing/122 override and add_project_dependency/test.json
index e0a4433cb..08eb0c6b4 100644
--- a/test cases/failing/123 override and add_project_dependency/test.json	
+++ b/test cases/failing/122 override and add_project_dependency/test.json	
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/123 override and add_project_dependency/subprojects/a/meson.build:6:0: ERROR: Dependencies must be external dependencies"
+      "line": "test cases/failing/122 override and add_project_dependency/subprojects/a/meson.build:6:0: ERROR: Dependencies must be external dependencies"
     }
   ]
 }
diff --git a/test cases/failing/124 targets before add_project_dependency/inc/lib.h b/test cases/failing/123 targets before add_project_dependency/inc/lib.h
similarity index 100%
rename from test cases/failing/124 targets before add_project_dependency/inc/lib.h
rename to test cases/failing/123 targets before add_project_dependency/inc/lib.h
diff --git a/test cases/failing/124 targets before add_project_dependency/lib.c b/test cases/failing/123 targets before add_project_dependency/lib.c
similarity index 100%
rename from test cases/failing/124 targets before add_project_dependency/lib.c
rename to test cases/failing/123 targets before add_project_dependency/lib.c
diff --git a/test cases/failing/124 targets before add_project_dependency/meson.build b/test cases/failing/123 targets before add_project_dependency/meson.build
similarity index 100%
rename from test cases/failing/124 targets before add_project_dependency/meson.build
rename to test cases/failing/123 targets before add_project_dependency/meson.build
diff --git a/test cases/failing/124 targets before add_project_dependency/test.json b/test cases/failing/123 targets before add_project_dependency/test.json
similarity index 70%
rename from test cases/failing/124 targets before add_project_dependency/test.json
rename to test cases/failing/123 targets before add_project_dependency/test.json
index d856ba4fd..4a21eec55 100644
--- a/test cases/failing/124 targets before add_project_dependency/test.json	
+++ b/test cases/failing/123 targets before add_project_dependency/test.json	
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/124 targets before add_project_dependency/meson.build:5:0: ERROR: Tried to use 'add_project_dependencies' after a build target has been declared."
+      "line": "test cases/failing/123 targets before add_project_dependency/meson.build:5:0: ERROR: Tried to use 'add_project_dependencies' after a build target has been declared."
     }
   ]
 }
diff --git a/test cases/failing/125 extract from unity/meson.build b/test cases/failing/124 extract from unity/meson.build
similarity index 100%
rename from test cases/failing/125 extract from unity/meson.build
rename to test cases/failing/124 extract from unity/meson.build
diff --git a/test cases/failing/125 extract from unity/src1.c b/test cases/failing/124 extract from unity/src1.c
similarity index 100%
rename from test cases/failing/125 extract from unity/src1.c
rename to test cases/failing/124 extract from unity/src1.c
diff --git a/test cases/failing/125 extract from unity/src2.c b/test cases/failing/124 extract from unity/src2.c
similarity index 100%
rename from test cases/failing/125 extract from unity/src2.c
rename to test cases/failing/124 extract from unity/src2.c
diff --git a/test cases/failing/125 extract from unity/test.json b/test cases/failing/124 extract from unity/test.json
similarity index 73%
rename from test cases/failing/125 extract from unity/test.json
rename to test cases/failing/124 extract from unity/test.json
index 2f6468d36..ef76d2f4f 100644
--- a/test cases/failing/125 extract from unity/test.json	
+++ b/test cases/failing/124 extract from unity/test.json	
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/125 extract from unity/meson.build:4:37: ERROR: Single object files cannot be extracted in Unity builds. You can only extract all the object files for each compiler at once."
+      "line": "test cases/failing/124 extract from unity/meson.build:4:37: ERROR: Single object files cannot be extracted in Unity builds. You can only extract all the object files for each compiler at once."
     }
   ]
 }
diff --git a/test cases/failing/126 subproject object as a dependency/main.c b/test cases/failing/125 subproject object as a dependency/main.c
similarity index 100%
rename from test cases/failing/126 subproject object as a dependency/main.c
rename to test cases/failing/125 subproject object as a dependency/main.c
diff --git a/test cases/failing/126 subproject object as a dependency/meson.build b/test cases/failing/125 subproject object as a dependency/meson.build
similarity index 100%
rename from test cases/failing/126 subproject object as a dependency/meson.build
rename to test cases/failing/125 subproject object as a dependency/meson.build
diff --git a/test cases/failing/126 subproject object as a dependency/subprojects/sub/meson.build b/test cases/failing/125 subproject object as a dependency/subprojects/sub/meson.build
similarity index 100%
rename from test cases/failing/126 subproject object as a dependency/subprojects/sub/meson.build
rename to test cases/failing/125 subproject object as a dependency/subprojects/sub/meson.build
diff --git a/test cases/failing/126 subproject object as a dependency/test.json b/test cases/failing/125 subproject object as a dependency/test.json
similarity index 64%
rename from test cases/failing/126 subproject object as a dependency/test.json
rename to test cases/failing/125 subproject object as a dependency/test.json
index 4bf7f5b8b..0cb257151 100644
--- a/test cases/failing/126 subproject object as a dependency/test.json	
+++ b/test cases/failing/125 subproject object as a dependency/test.json	
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/126 subproject object as a dependency/meson.build:3:0: ERROR: Tried to use subproject object as a dependency."
+      "line": "test cases/failing/125 subproject object as a dependency/meson.build:3:0: ERROR: Tried to use subproject object as a dependency."
     }
   ]
 }
diff --git a/test cases/failing/127 generator host binary/exe.c b/test cases/failing/126 generator host binary/exe.c
similarity index 100%
rename from test cases/failing/127 generator host binary/exe.c
rename to test cases/failing/126 generator host binary/exe.c
diff --git a/test cases/failing/127 generator host binary/lib.in b/test cases/failing/126 generator host binary/lib.in
similarity index 100%
rename from test cases/failing/127 generator host binary/lib.in
rename to test cases/failing/126 generator host binary/lib.in
diff --git a/test cases/failing/127 generator host binary/meson.build b/test cases/failing/126 generator host binary/meson.build
similarity index 100%
rename from test cases/failing/127 generator host binary/meson.build
rename to test cases/failing/126 generator host binary/meson.build
diff --git a/test cases/failing/127 generator host binary/test.json b/test cases/failing/126 generator host binary/test.json
similarity index 100%
rename from test cases/failing/127 generator host binary/test.json
rename to test cases/failing/126 generator host binary/test.json
diff --git a/test cases/failing/128 invalid ast/meson.build b/test cases/failing/127 invalid ast/meson.build
similarity index 100%
rename from test cases/failing/128 invalid ast/meson.build
rename to test cases/failing/127 invalid ast/meson.build
diff --git a/test cases/failing/128 invalid ast/test.json b/test cases/failing/127 invalid ast/test.json
similarity index 67%
rename from test cases/failing/128 invalid ast/test.json
rename to test cases/failing/127 invalid ast/test.json
index e5c3873dc..db7bfe821 100644
--- a/test cases/failing/128 invalid ast/test.json	
+++ b/test cases/failing/127 invalid ast/test.json	
@@ -2,7 +2,7 @@
   "stdout": [
     {
       "match": "re",
-      "line": "test cases/failing/128 invalid ast/meson.build:1:44: ERROR: Meson version is [0-9.]+(\\.rc[0-9]+)? but project requires 0.1.0"
+      "line": "test cases/failing/127 invalid ast/meson.build:1:44: ERROR: Meson version is [0-9.]+(\\.rc[0-9]+)? but project requires 0.1.0"
     }
   ]
 }
diff --git a/test cases/failing/129 invalid project function/meson.build b/test cases/failing/128 invalid project function/meson.build
similarity index 100%
rename from test cases/failing/129 invalid project function/meson.build
rename to test cases/failing/128 invalid project function/meson.build
diff --git a/test cases/failing/129 invalid project function/test.json b/test cases/failing/128 invalid project function/test.json
similarity index 69%
rename from test cases/failing/129 invalid project function/test.json
rename to test cases/failing/128 invalid project function/test.json
index b28266cb1..17c1ac652 100644
--- a/test cases/failing/129 invalid project function/test.json	
+++ b/test cases/failing/128 invalid project function/test.json	
@@ -2,7 +2,7 @@
   "stdout": [
     {
       "match": "re",
-      "line": "test cases/failing/129 invalid project function/meson.build:1:67: ERROR: Meson version is [0-9.]+(\\.rc[0-9]+)? but project requires 0.1.0"
+      "line": "test cases/failing/128 invalid project function/meson.build:1:67: ERROR: Meson version is [0-9.]+(\\.rc[0-9]+)? but project requires 0.1.0"
     }
   ]
 }
diff --git a/test cases/failing/130 utf8 with bom/meson.build b/test cases/failing/129 utf8 with bom/meson.build
similarity index 100%
rename from test cases/failing/130 utf8 with bom/meson.build
rename to test cases/failing/129 utf8 with bom/meson.build
diff --git a/test cases/failing/130 utf8 with bom/test.json b/test cases/failing/129 utf8 with bom/test.json
similarity index 62%
rename from test cases/failing/130 utf8 with bom/test.json
rename to test cases/failing/129 utf8 with bom/test.json
index 2292bebe3..ec2df13bb 100644
--- a/test cases/failing/130 utf8 with bom/test.json	
+++ b/test cases/failing/129 utf8 with bom/test.json	
@@ -1,7 +1,7 @@
 {
     "stdout": [
       {
-        "line": "test cases/failing/130 utf8 with bom/meson.build:0:0: ERROR: Builder file must be encoded in UTF-8 (with no BOM)"
+        "line": "test cases/failing/129 utf8 with bom/meson.build:0:0: ERROR: Builder file must be encoded in UTF-8 (with no BOM)"
       }
     ]
   }
diff --git a/test cases/failing/131 utf8 with bom subdir/meson.build b/test cases/failing/130 utf8 with bom subdir/meson.build
similarity index 100%
rename from test cases/failing/131 utf8 with bom subdir/meson.build
rename to test cases/failing/130 utf8 with bom subdir/meson.build
diff --git a/test cases/failing/131 utf8 with bom subdir/subdir/meson.build b/test cases/failing/130 utf8 with bom subdir/subdir/meson.build
similarity index 100%
rename from test cases/failing/131 utf8 with bom subdir/subdir/meson.build
rename to test cases/failing/130 utf8 with bom subdir/subdir/meson.build
diff --git a/test cases/failing/131 utf8 with bom subdir/test.json b/test cases/failing/130 utf8 with bom subdir/test.json
similarity index 65%
rename from test cases/failing/131 utf8 with bom subdir/test.json
rename to test cases/failing/130 utf8 with bom subdir/test.json
index 72cc5152d..bbaea1b30 100644
--- a/test cases/failing/131 utf8 with bom subdir/test.json	
+++ b/test cases/failing/130 utf8 with bom subdir/test.json	
@@ -1,7 +1,7 @@
 {
     "stdout": [
       {
-        "line": "test cases/failing/131 utf8 with bom subdir/subdir/meson.build:0:0: ERROR: Builder file must be encoded in UTF-8 (with no BOM)"
+        "line": "test cases/failing/130 utf8 with bom subdir/subdir/meson.build:0:0: ERROR: Builder file must be encoded in UTF-8 (with no BOM)"
       }
     ]
   }
diff --git a/test cases/failing/132 utf8 with bom options/meson.build b/test cases/failing/131 utf8 with bom options/meson.build
similarity index 100%
rename from test cases/failing/132 utf8 with bom options/meson.build
rename to test cases/failing/131 utf8 with bom options/meson.build
diff --git a/test cases/failing/132 utf8 with bom options/meson.options b/test cases/failing/131 utf8 with bom options/meson.options
similarity index 100%
rename from test cases/failing/132 utf8 with bom options/meson.options
rename to test cases/failing/131 utf8 with bom options/meson.options
diff --git a/test cases/failing/132 utf8 with bom options/test.json b/test cases/failing/131 utf8 with bom options/test.json
similarity index 64%
rename from test cases/failing/132 utf8 with bom options/test.json
rename to test cases/failing/131 utf8 with bom options/test.json
index c09f48e6a..e6391c57d 100644
--- a/test cases/failing/132 utf8 with bom options/test.json	
+++ b/test cases/failing/131 utf8 with bom options/test.json	
@@ -1,7 +1,7 @@
 {
     "stdout": [
       {
-        "line": "test cases/failing/132 utf8 with bom options/meson.options:0:0: ERROR: Builder file must be encoded in UTF-8 (with no BOM)"
+        "line": "test cases/failing/131 utf8 with bom options/meson.options:0:0: ERROR: Builder file must be encoded in UTF-8 (with no BOM)"
       }
     ]
   }
diff --git a/test cases/failing/48 pkgconfig variables not key value/meson.build b/test cases/failing/47 pkgconfig variables not key value/meson.build
similarity index 100%
rename from test cases/failing/48 pkgconfig variables not key value/meson.build
rename to test cases/failing/47 pkgconfig variables not key value/meson.build
diff --git a/test cases/failing/48 pkgconfig variables not key value/simple.c b/test cases/failing/47 pkgconfig variables not key value/simple.c
similarity index 100%
rename from test cases/failing/48 pkgconfig variables not key value/simple.c
rename to test cases/failing/47 pkgconfig variables not key value/simple.c
diff --git a/test cases/failing/48 pkgconfig variables not key value/simple.h b/test cases/failing/47 pkgconfig variables not key value/simple.h
similarity index 100%
rename from test cases/failing/48 pkgconfig variables not key value/simple.h
rename to test cases/failing/47 pkgconfig variables not key value/simple.h
diff --git a/test cases/failing/48 pkgconfig variables not key value/test.json b/test cases/failing/47 pkgconfig variables not key value/test.json
similarity index 75%
rename from test cases/failing/48 pkgconfig variables not key value/test.json
rename to test cases/failing/47 pkgconfig variables not key value/test.json
index 96422a923..11cd374f9 100644
--- a/test cases/failing/48 pkgconfig variables not key value/test.json	
+++ b/test cases/failing/47 pkgconfig variables not key value/test.json	
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/48 pkgconfig variables not key value/meson.build:8:5: ERROR: pkgconfig.generate keyword argument \"variables\" variable 'this_should_be_key_value' must have a value separated by equals sign."
+      "line": "test cases/failing/47 pkgconfig variables not key value/meson.build:8:5: ERROR: pkgconfig.generate keyword argument \"variables\" variable 'this_should_be_key_value' must have a value separated by equals sign."
     }
   ]
 }
diff --git a/test cases/failing/49 executable comparison/meson.build b/test cases/failing/48 executable comparison/meson.build
similarity index 100%
rename from test cases/failing/49 executable comparison/meson.build
rename to test cases/failing/48 executable comparison/meson.build
diff --git a/test cases/failing/49 executable comparison/prog.c b/test cases/failing/48 executable comparison/prog.c
similarity index 100%
rename from test cases/failing/49 executable comparison/prog.c
rename to test cases/failing/48 executable comparison/prog.c
diff --git a/test cases/failing/49 executable comparison/test.json b/test cases/failing/48 executable comparison/test.json
similarity index 73%
rename from test cases/failing/49 executable comparison/test.json
rename to test cases/failing/48 executable comparison/test.json
index 76c310b38..db6dac3e3 100644
--- a/test cases/failing/49 executable comparison/test.json	
+++ b/test cases/failing/48 executable comparison/test.json	
@@ -2,7 +2,7 @@
   "stdout": [
     {
       "match": "re",
-      "line": "test cases/failing/49 executable comparison/meson.build:6:14: ERROR: Object <ExecutableHolder prog1@exe: prog1(.exe)?> of type Executable does not support the `<` operator."
+      "line": "test cases/failing/48 executable comparison/meson.build:6:14: ERROR: Object <ExecutableHolder prog1@exe: prog1(.exe)?> of type Executable does not support the `<` operator."
     }
   ]
 }
diff --git a/test cases/failing/50 inconsistent comparison/meson.build b/test cases/failing/49 inconsistent comparison/meson.build
similarity index 100%
rename from test cases/failing/50 inconsistent comparison/meson.build
rename to test cases/failing/49 inconsistent comparison/meson.build
diff --git a/test cases/failing/50 inconsistent comparison/test.json b/test cases/failing/49 inconsistent comparison/test.json
similarity index 69%
rename from test cases/failing/50 inconsistent comparison/test.json
rename to test cases/failing/49 inconsistent comparison/test.json
index fa71eeff4..4440a86d2 100644
--- a/test cases/failing/50 inconsistent comparison/test.json	
+++ b/test cases/failing/49 inconsistent comparison/test.json	
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/50 inconsistent comparison/meson.build:5:12: ERROR: Object <[ArrayHolder] holds [list]: []> of type array does not support the `<` operator."
+      "line": "test cases/failing/49 inconsistent comparison/meson.build:5:12: ERROR: Object <[ArrayHolder] holds [list]: []> of type array does not support the `<` operator."
     }
   ]
 }
diff --git a/test cases/failing/51 slashname/meson.build b/test cases/failing/50 slashname/meson.build
similarity index 100%
rename from test cases/failing/51 slashname/meson.build
rename to test cases/failing/50 slashname/meson.build
diff --git a/test cases/failing/51 slashname/sub/meson.build b/test cases/failing/50 slashname/sub/meson.build
similarity index 100%
rename from test cases/failing/51 slashname/sub/meson.build
rename to test cases/failing/50 slashname/sub/meson.build
diff --git a/test cases/failing/51 slashname/sub/prog.c b/test cases/failing/50 slashname/sub/prog.c
similarity index 100%
rename from test cases/failing/51 slashname/sub/prog.c
rename to test cases/failing/50 slashname/sub/prog.c
diff --git a/test cases/failing/51 slashname/test.json b/test cases/failing/50 slashname/test.json
similarity index 67%
rename from test cases/failing/51 slashname/test.json
rename to test cases/failing/50 slashname/test.json
index 39346a955..44b566c2b 100644
--- a/test cases/failing/51 slashname/test.json	
+++ b/test cases/failing/50 slashname/test.json	
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "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."
+      "line": "test cases/failing/50 slashname/meson.build:9:0: ERROR: Target \"sub/prog\" has a path segment pointing to directory \"sub\". This is an error."
     }
   ]
 }
diff --git a/test cases/failing/52 reserved meson prefix/meson-foo/meson.build b/test cases/failing/51 reserved meson prefix/meson-foo/meson.build
similarity index 100%
rename from test cases/failing/52 reserved meson prefix/meson-foo/meson.build
rename to test cases/failing/51 reserved meson prefix/meson-foo/meson.build
diff --git a/test cases/failing/52 reserved meson prefix/meson.build b/test cases/failing/51 reserved meson prefix/meson.build
similarity index 100%
rename from test cases/failing/52 reserved meson prefix/meson.build
rename to test cases/failing/51 reserved meson prefix/meson.build
diff --git a/test cases/failing/52 reserved meson prefix/test.json b/test cases/failing/51 reserved meson prefix/test.json
similarity index 67%
rename from test cases/failing/52 reserved meson prefix/test.json
rename to test cases/failing/51 reserved meson prefix/test.json
index 707cd73a5..9eb1fa452 100644
--- a/test cases/failing/52 reserved meson prefix/test.json	
+++ b/test cases/failing/51 reserved meson prefix/test.json	
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "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()."
+      "line": "test cases/failing/51 reserved meson prefix/meson.build:3:0: ERROR: The \"meson-\" prefix is reserved and cannot be used for top-level subdir()."
     }
   ]
 }
diff --git a/test cases/failing/53 or on new line/meson.build b/test cases/failing/52 or on new line/meson.build
similarity index 100%
rename from test cases/failing/53 or on new line/meson.build
rename to test cases/failing/52 or on new line/meson.build
diff --git a/test cases/failing/53 or on new line/meson_options.txt b/test cases/failing/52 or on new line/meson_options.txt
similarity index 100%
rename from test cases/failing/53 or on new line/meson_options.txt
rename to test cases/failing/52 or on new line/meson_options.txt
diff --git a/test cases/failing/53 or on new line/test.json b/test cases/failing/52 or on new line/test.json
similarity index 50%
rename from test cases/failing/53 or on new line/test.json
rename to test cases/failing/52 or on new line/test.json
index 339002555..49a7255b0 100644
--- a/test cases/failing/53 or on new line/test.json	
+++ b/test cases/failing/52 or on new line/test.json	
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/53 or on new line/meson.build:4:8: ERROR: Invalid or clause."
+      "line": "test cases/failing/52 or on new line/meson.build:4:8: ERROR: Invalid or clause."
     }
   ]
 }
diff --git a/test cases/failing/54 link with executable/meson.build b/test cases/failing/53 link with executable/meson.build
similarity index 100%
rename from test cases/failing/54 link with executable/meson.build
rename to test cases/failing/53 link with executable/meson.build
diff --git a/test cases/failing/54 link with executable/module.c b/test cases/failing/53 link with executable/module.c
similarity index 100%
rename from test cases/failing/54 link with executable/module.c
rename to test cases/failing/53 link with executable/module.c
diff --git a/test cases/failing/54 link with executable/prog.c b/test cases/failing/53 link with executable/prog.c
similarity index 100%
rename from test cases/failing/54 link with executable/prog.c
rename to test cases/failing/53 link with executable/prog.c
diff --git a/test cases/failing/54 link with executable/test.json b/test cases/failing/53 link with executable/test.json
similarity index 58%
rename from test cases/failing/54 link with executable/test.json
rename to test cases/failing/53 link with executable/test.json
index 2b51bdd5a..8c25e07bd 100644
--- a/test cases/failing/54 link with executable/test.json	
+++ b/test cases/failing/53 link with executable/test.json	
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/54 link with executable/meson.build:4:4: ERROR: Link target 'prog' is not linkable."
+      "line": "test cases/failing/53 link with executable/meson.build:4:4: ERROR: Link target 'prog' is not linkable."
     }
   ]
 }
diff --git a/test cases/failing/55 assign custom target index/meson.build b/test cases/failing/54 assign custom target index/meson.build
similarity index 100%
rename from test cases/failing/55 assign custom target index/meson.build
rename to test cases/failing/54 assign custom target index/meson.build
diff --git a/test cases/failing/55 assign custom target index/test.json b/test cases/failing/54 assign custom target index/test.json
similarity index 59%
rename from test cases/failing/55 assign custom target index/test.json
rename to test cases/failing/54 assign custom target index/test.json
index 39983fb67..15287d6da 100644
--- a/test cases/failing/55 assign custom target index/test.json	
+++ b/test cases/failing/54 assign custom target index/test.json	
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/55 assign custom target index/meson.build:24:0: ERROR: Assignment target must be an id."
+      "line": "test cases/failing/54 assign custom target index/meson.build:24:0: ERROR: Assignment target must be an id."
     }
   ]
 }
diff --git a/test cases/failing/56 getoption prefix/meson.build b/test cases/failing/55 getoption prefix/meson.build
similarity index 100%
rename from test cases/failing/56 getoption prefix/meson.build
rename to test cases/failing/55 getoption prefix/meson.build
diff --git a/test cases/failing/56 getoption prefix/subprojects/abc/meson.build b/test cases/failing/55 getoption prefix/subprojects/abc/meson.build
similarity index 100%
rename from test cases/failing/56 getoption prefix/subprojects/abc/meson.build
rename to test cases/failing/55 getoption prefix/subprojects/abc/meson.build
diff --git a/test cases/failing/56 getoption prefix/subprojects/abc/meson_options.txt b/test cases/failing/55 getoption prefix/subprojects/abc/meson_options.txt
similarity index 100%
rename from test cases/failing/56 getoption prefix/subprojects/abc/meson_options.txt
rename to test cases/failing/55 getoption prefix/subprojects/abc/meson_options.txt
diff --git a/test cases/failing/56 getoption prefix/test.json b/test cases/failing/55 getoption prefix/test.json
similarity index 72%
rename from test cases/failing/56 getoption prefix/test.json
rename to test cases/failing/55 getoption prefix/test.json
index c52dffc71..9f3a93656 100644
--- a/test cases/failing/56 getoption prefix/test.json	
+++ b/test cases/failing/55 getoption prefix/test.json	
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/56 getoption prefix/meson.build:5:0: ERROR: Having a colon in option name is forbidden, projects are not allowed to directly access options of other subprojects."
+      "line": "test cases/failing/55 getoption prefix/meson.build:5:0: ERROR: Having a colon in option name is forbidden, projects are not allowed to directly access options of other subprojects."
     }
   ]
 }
diff --git a/test cases/failing/57 bad option argument/meson.build b/test cases/failing/56 bad option argument/meson.build
similarity index 100%
rename from test cases/failing/57 bad option argument/meson.build
rename to test cases/failing/56 bad option argument/meson.build
diff --git a/test cases/failing/57 bad option argument/meson_options.txt b/test cases/failing/56 bad option argument/meson_options.txt
similarity index 100%
rename from test cases/failing/57 bad option argument/meson_options.txt
rename to test cases/failing/56 bad option argument/meson_options.txt
diff --git a/test cases/failing/57 bad option argument/test.json b/test cases/failing/56 bad option argument/test.json
similarity index 63%
rename from test cases/failing/57 bad option argument/test.json
rename to test cases/failing/56 bad option argument/test.json
index 622acdffc..c7957cdc4 100644
--- a/test cases/failing/57 bad option argument/test.json	
+++ b/test cases/failing/56 bad option argument/test.json	
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/57 bad option argument/meson_options.txt:1:0: ERROR: string option got unknown keyword arguments \"value_\""
+      "line": "test cases/failing/56 bad option argument/meson_options.txt:1:0: ERROR: string option got unknown keyword arguments \"value_\""
     }
   ]
 }
diff --git a/test cases/failing/58 subproj filegrab/meson.build b/test cases/failing/57 subproj filegrab/meson.build
similarity index 100%
rename from test cases/failing/58 subproj filegrab/meson.build
rename to test cases/failing/57 subproj filegrab/meson.build
diff --git a/test cases/failing/58 subproj filegrab/prog.c b/test cases/failing/57 subproj filegrab/prog.c
similarity index 100%
rename from test cases/failing/58 subproj filegrab/prog.c
rename to test cases/failing/57 subproj filegrab/prog.c
diff --git a/test cases/failing/58 subproj filegrab/subprojects/a/meson.build b/test cases/failing/57 subproj filegrab/subprojects/a/meson.build
similarity index 100%
rename from test cases/failing/58 subproj filegrab/subprojects/a/meson.build
rename to test cases/failing/57 subproj filegrab/subprojects/a/meson.build
diff --git a/test cases/failing/58 subproj filegrab/test.json b/test cases/failing/57 subproj filegrab/test.json
similarity index 68%
rename from test cases/failing/58 subproj filegrab/test.json
rename to test cases/failing/57 subproj filegrab/test.json
index 950e109c9..8b0b27f67 100644
--- a/test cases/failing/58 subproj filegrab/test.json	
+++ b/test cases/failing/57 subproj filegrab/test.json	
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/58 subproj filegrab/subprojects/a/meson.build:3:0: ERROR: Sandbox violation: Tried to grab file prog.c outside current (sub)project."
+      "line": "test cases/failing/57 subproj filegrab/subprojects/a/meson.build:3:0: ERROR: Sandbox violation: Tried to grab file prog.c outside current (sub)project."
     }
   ]
 }
diff --git a/test cases/failing/59 grab subproj/meson.build b/test cases/failing/58 grab subproj/meson.build
similarity index 100%
rename from test cases/failing/59 grab subproj/meson.build
rename to test cases/failing/58 grab subproj/meson.build
diff --git a/test cases/failing/59 grab subproj/subprojects/foo/meson.build b/test cases/failing/58 grab subproj/subprojects/foo/meson.build
similarity index 100%
rename from test cases/failing/59 grab subproj/subprojects/foo/meson.build
rename to test cases/failing/58 grab subproj/subprojects/foo/meson.build
diff --git a/test cases/failing/59 grab subproj/subprojects/foo/sub.c b/test cases/failing/58 grab subproj/subprojects/foo/sub.c
similarity index 100%
rename from test cases/failing/59 grab subproj/subprojects/foo/sub.c
rename to test cases/failing/58 grab subproj/subprojects/foo/sub.c
diff --git a/test cases/failing/59 grab subproj/test.json b/test cases/failing/58 grab subproj/test.json
similarity index 64%
rename from test cases/failing/59 grab subproj/test.json
rename to test cases/failing/58 grab subproj/test.json
index 7c9020280..bdb0fdfc4 100644
--- a/test cases/failing/59 grab subproj/test.json	
+++ b/test cases/failing/58 grab subproj/test.json	
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/59 grab subproj/meson.build:7:0: ERROR: Sandbox violation: Tried to grab file sub.c from a nested subproject."
+      "line": "test cases/failing/58 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/60 grab sibling/meson.build b/test cases/failing/59 grab sibling/meson.build
similarity index 100%
rename from test cases/failing/60 grab sibling/meson.build
rename to test cases/failing/59 grab sibling/meson.build
diff --git a/test cases/failing/60 grab sibling/subprojects/a/meson.build b/test cases/failing/59 grab sibling/subprojects/a/meson.build
similarity index 100%
rename from test cases/failing/60 grab sibling/subprojects/a/meson.build
rename to test cases/failing/59 grab sibling/subprojects/a/meson.build
diff --git a/test cases/failing/60 grab sibling/subprojects/b/meson.build b/test cases/failing/59 grab sibling/subprojects/b/meson.build
similarity index 100%
rename from test cases/failing/60 grab sibling/subprojects/b/meson.build
rename to test cases/failing/59 grab sibling/subprojects/b/meson.build
diff --git a/test cases/failing/60 grab sibling/subprojects/b/sneaky.c b/test cases/failing/59 grab sibling/subprojects/b/sneaky.c
similarity index 100%
rename from test cases/failing/60 grab sibling/subprojects/b/sneaky.c
rename to test cases/failing/59 grab sibling/subprojects/b/sneaky.c
diff --git a/test cases/failing/60 grab sibling/test.json b/test cases/failing/59 grab sibling/test.json
similarity index 68%
rename from test cases/failing/60 grab sibling/test.json
rename to test cases/failing/59 grab sibling/test.json
index 8f42badb3..ec17e7e05 100644
--- a/test cases/failing/60 grab sibling/test.json	
+++ b/test cases/failing/59 grab sibling/test.json	
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/60 grab sibling/subprojects/a/meson.build:3:0: ERROR: Sandbox violation: Tried to grab file sneaky.c outside current (sub)project."
+      "line": "test cases/failing/59 grab sibling/subprojects/a/meson.build:3:0: ERROR: Sandbox violation: Tried to grab file sneaky.c outside current (sub)project."
     }
   ]
 }
diff --git a/test cases/failing/61 string as link target/meson.build b/test cases/failing/60 string as link target/meson.build
similarity index 100%
rename from test cases/failing/61 string as link target/meson.build
rename to test cases/failing/60 string as link target/meson.build
diff --git a/test cases/failing/61 string as link target/prog.c b/test cases/failing/60 string as link target/prog.c
similarity index 100%
rename from test cases/failing/61 string as link target/prog.c
rename to test cases/failing/60 string as link target/prog.c
diff --git a/test cases/failing/61 string as link target/test.json b/test cases/failing/60 string as link target/test.json
similarity index 53%
rename from test cases/failing/61 string as link target/test.json
rename to test cases/failing/60 string as link target/test.json
index b7f6bd784..a97b124ea 100644
--- a/test cases/failing/61 string as link target/test.json	
+++ b/test cases/failing/60 string as link target/test.json	
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/61 string as link target/meson.build:2:0: ERROR: '' is not a target."
+      "line": "test cases/failing/60 string as link target/meson.build:2:0: ERROR: '' is not a target."
     }
   ]
 }
diff --git a/test cases/failing/62 dependency not-found and required/meson.build b/test cases/failing/61 dependency not-found and required/meson.build
similarity index 100%
rename from test cases/failing/62 dependency not-found and required/meson.build
rename to test cases/failing/61 dependency not-found and required/meson.build
diff --git a/test cases/failing/62 dependency not-found and required/test.json b/test cases/failing/61 dependency not-found and required/test.json
similarity index 63%
rename from test cases/failing/62 dependency not-found and required/test.json
rename to test cases/failing/61 dependency not-found and required/test.json
index 69a67ffbb..f7a6c9f21 100644
--- a/test cases/failing/62 dependency not-found and required/test.json	
+++ b/test cases/failing/61 dependency not-found and required/test.json	
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/62 dependency not-found and required/meson.build:2:6: ERROR: Dependency is required but has no candidates."
+      "line": "test cases/failing/61 dependency not-found and required/meson.build:2:6: ERROR: Dependency is required but has no candidates."
     }
   ]
 }
diff --git a/test cases/failing/63 subproj different versions/main.c b/test cases/failing/62 subproj different versions/main.c
similarity index 100%
rename from test cases/failing/63 subproj different versions/main.c
rename to test cases/failing/62 subproj different versions/main.c
diff --git a/test cases/failing/63 subproj different versions/meson.build b/test cases/failing/62 subproj different versions/meson.build
similarity index 100%
rename from test cases/failing/63 subproj different versions/meson.build
rename to test cases/failing/62 subproj different versions/meson.build
diff --git a/test cases/failing/63 subproj different versions/subprojects/a/a.c b/test cases/failing/62 subproj different versions/subprojects/a/a.c
similarity index 100%
rename from test cases/failing/63 subproj different versions/subprojects/a/a.c
rename to test cases/failing/62 subproj different versions/subprojects/a/a.c
diff --git a/test cases/failing/63 subproj different versions/subprojects/a/a.h b/test cases/failing/62 subproj different versions/subprojects/a/a.h
similarity index 100%
rename from test cases/failing/63 subproj different versions/subprojects/a/a.h
rename to test cases/failing/62 subproj different versions/subprojects/a/a.h
diff --git a/test cases/failing/63 subproj different versions/subprojects/a/meson.build b/test cases/failing/62 subproj different versions/subprojects/a/meson.build
similarity index 100%
rename from test cases/failing/63 subproj different versions/subprojects/a/meson.build
rename to test cases/failing/62 subproj different versions/subprojects/a/meson.build
diff --git a/test cases/failing/63 subproj different versions/subprojects/b/b.c b/test cases/failing/62 subproj different versions/subprojects/b/b.c
similarity index 100%
rename from test cases/failing/63 subproj different versions/subprojects/b/b.c
rename to test cases/failing/62 subproj different versions/subprojects/b/b.c
diff --git a/test cases/failing/63 subproj different versions/subprojects/b/b.h b/test cases/failing/62 subproj different versions/subprojects/b/b.h
similarity index 100%
rename from test cases/failing/63 subproj different versions/subprojects/b/b.h
rename to test cases/failing/62 subproj different versions/subprojects/b/b.h
diff --git a/test cases/failing/63 subproj different versions/subprojects/b/meson.build b/test cases/failing/62 subproj different versions/subprojects/b/meson.build
similarity index 100%
rename from test cases/failing/63 subproj different versions/subprojects/b/meson.build
rename to test cases/failing/62 subproj different versions/subprojects/b/meson.build
diff --git a/test cases/failing/63 subproj different versions/subprojects/c/c.h b/test cases/failing/62 subproj different versions/subprojects/c/c.h
similarity index 100%
rename from test cases/failing/63 subproj different versions/subprojects/c/c.h
rename to test cases/failing/62 subproj different versions/subprojects/c/c.h
diff --git a/test cases/failing/63 subproj different versions/subprojects/c/meson.build b/test cases/failing/62 subproj different versions/subprojects/c/meson.build
similarity index 100%
rename from test cases/failing/63 subproj different versions/subprojects/c/meson.build
rename to test cases/failing/62 subproj different versions/subprojects/c/meson.build
diff --git a/test cases/failing/63 subproj different versions/test.json b/test cases/failing/62 subproj different versions/test.json
similarity index 64%
rename from test cases/failing/63 subproj different versions/test.json
rename to test cases/failing/62 subproj different versions/test.json
index f2535fafd..705ff51f1 100644
--- a/test cases/failing/63 subproj different versions/test.json	
+++ b/test cases/failing/62 subproj different versions/test.json	
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/63 subproj different versions/subprojects/b/meson.build:3:8: ERROR: Dependency 'c' is required but not found."
+      "line": "test cases/failing/62 subproj different versions/subprojects/b/meson.build:3:8: ERROR: Dependency 'c' is required but not found."
     }
   ]
 }
diff --git a/test cases/failing/64 wrong boost module/meson.build b/test cases/failing/63 wrong boost module/meson.build
similarity index 100%
rename from test cases/failing/64 wrong boost module/meson.build
rename to test cases/failing/63 wrong boost module/meson.build
diff --git a/test cases/failing/64 wrong boost module/test.json b/test cases/failing/63 wrong boost module/test.json
similarity index 60%
rename from test cases/failing/64 wrong boost module/test.json
rename to test cases/failing/63 wrong boost module/test.json
index 78e206999..ec3c1b083 100644
--- a/test cases/failing/64 wrong boost module/test.json	
+++ b/test cases/failing/63 wrong boost module/test.json	
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/64 wrong boost module/meson.build:9:10: ERROR: Dependency \"boost\" not found, tried system"
+      "line": "test cases/failing/63 wrong boost module/meson.build:9:10: ERROR: Dependency \"boost\" not found, tried system"
     }
   ]
 }
diff --git a/test cases/failing/65 install_data rename bad size/file1.txt b/test cases/failing/64 install_data rename bad size/file1.txt
similarity index 100%
rename from test cases/failing/65 install_data rename bad size/file1.txt
rename to test cases/failing/64 install_data rename bad size/file1.txt
diff --git a/test cases/failing/65 install_data rename bad size/file2.txt b/test cases/failing/64 install_data rename bad size/file2.txt
similarity index 100%
rename from test cases/failing/65 install_data rename bad size/file2.txt
rename to test cases/failing/64 install_data rename bad size/file2.txt
diff --git a/test cases/failing/65 install_data rename bad size/meson.build b/test cases/failing/64 install_data rename bad size/meson.build
similarity index 100%
rename from test cases/failing/65 install_data rename bad size/meson.build
rename to test cases/failing/64 install_data rename bad size/meson.build
diff --git a/test cases/failing/65 install_data rename bad size/test.json b/test cases/failing/64 install_data rename bad size/test.json
similarity index 75%
rename from test cases/failing/65 install_data rename bad size/test.json
rename to test cases/failing/64 install_data rename bad size/test.json
index efc62907d..5ed47480a 100644
--- a/test cases/failing/65 install_data rename bad size/test.json	
+++ b/test cases/failing/64 install_data rename bad size/test.json	
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/65 install_data rename bad size/meson.build:3:0: ERROR: \"rename\" and \"sources\" argument lists must be the same length if \"rename\" is given. Rename has 1 elements and sources has 2."
+      "line": "test cases/failing/64 install_data rename bad size/meson.build:3:0: ERROR: \"rename\" and \"sources\" argument lists must be the same length if \"rename\" is given. Rename has 1 elements and sources has 2."
     }
   ]
 }
diff --git a/test cases/failing/66 skip only subdir/meson.build b/test cases/failing/65 skip only subdir/meson.build
similarity index 100%
rename from test cases/failing/66 skip only subdir/meson.build
rename to test cases/failing/65 skip only subdir/meson.build
diff --git a/test cases/failing/66 skip only subdir/subdir/meson.build b/test cases/failing/65 skip only subdir/subdir/meson.build
similarity index 100%
rename from test cases/failing/66 skip only subdir/subdir/meson.build
rename to test cases/failing/65 skip only subdir/subdir/meson.build
diff --git a/test cases/failing/66 skip only subdir/test.json b/test cases/failing/65 skip only subdir/test.json
similarity index 55%
rename from test cases/failing/66 skip only subdir/test.json
rename to test cases/failing/65 skip only subdir/test.json
index de21e006c..2747566dc 100644
--- a/test cases/failing/66 skip only subdir/test.json	
+++ b/test cases/failing/65 skip only subdir/test.json	
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/66 skip only subdir/meson.build:8:0: ERROR: File main.cpp does not exist."
+      "line": "test cases/failing/65 skip only subdir/meson.build:8:0: ERROR: File main.cpp does not exist."
     }
   ]
 }
diff --git a/test cases/failing/67 dual override/meson.build b/test cases/failing/66 dual override/meson.build
similarity index 100%
rename from test cases/failing/67 dual override/meson.build
rename to test cases/failing/66 dual override/meson.build
diff --git a/test cases/failing/67 dual override/overrides.py b/test cases/failing/66 dual override/overrides.py
similarity index 100%
rename from test cases/failing/67 dual override/overrides.py
rename to test cases/failing/66 dual override/overrides.py
diff --git a/test cases/failing/67 dual override/test.json b/test cases/failing/66 dual override/test.json
similarity index 65%
rename from test cases/failing/67 dual override/test.json
rename to test cases/failing/66 dual override/test.json
index b50f3aca8..b8c26510d 100644
--- a/test cases/failing/67 dual override/test.json	
+++ b/test cases/failing/66 dual override/test.json	
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/67 dual override/meson.build:5:6: ERROR: Tried to override executable \"override\" which has already been overridden."
+      "line": "test cases/failing/66 dual override/meson.build:5:6: ERROR: Tried to override executable \"override\" which has already been overridden."
     }
   ]
 }
diff --git a/test cases/failing/68 override used/meson.build b/test cases/failing/67 override used/meson.build
similarity index 100%
rename from test cases/failing/68 override used/meson.build
rename to test cases/failing/67 override used/meson.build
diff --git a/test cases/failing/68 override used/other.py b/test cases/failing/67 override used/other.py
similarity index 100%
rename from test cases/failing/68 override used/other.py
rename to test cases/failing/67 override used/other.py
diff --git a/test cases/failing/68 override used/something.py b/test cases/failing/67 override used/something.py
similarity index 100%
rename from test cases/failing/68 override used/something.py
rename to test cases/failing/67 override used/something.py
diff --git a/test cases/failing/68 override used/test.json b/test cases/failing/67 override used/test.json
similarity index 67%
rename from test cases/failing/68 override used/test.json
rename to test cases/failing/67 override used/test.json
index f11aac619..90d8b4b8d 100644
--- a/test cases/failing/68 override used/test.json	
+++ b/test cases/failing/67 override used/test.json	
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/68 override used/meson.build:5:6: ERROR: Tried to override finding of executable \"something.py\" which has already been found."
+      "line": "test cases/failing/67 override used/meson.build:5:6: ERROR: Tried to override finding of executable \"something.py\" which has already been found."
     }
   ]
 }
diff --git a/test cases/failing/69 run_command unclean exit/meson.build b/test cases/failing/68 run_command unclean exit/meson.build
similarity index 100%
rename from test cases/failing/69 run_command unclean exit/meson.build
rename to test cases/failing/68 run_command unclean exit/meson.build
diff --git a/test cases/failing/69 run_command unclean exit/returncode.py b/test cases/failing/68 run_command unclean exit/returncode.py
similarity index 100%
rename from test cases/failing/69 run_command unclean exit/returncode.py
rename to test cases/failing/68 run_command unclean exit/returncode.py
diff --git a/test cases/failing/69 run_command unclean exit/test.json b/test cases/failing/68 run_command unclean exit/test.json
similarity index 56%
rename from test cases/failing/69 run_command unclean exit/test.json
rename to test cases/failing/68 run_command unclean exit/test.json
index 96c2141fc..cef67e515 100644
--- a/test cases/failing/69 run_command unclean exit/test.json	
+++ b/test cases/failing/68 run_command unclean exit/test.json	
@@ -2,7 +2,7 @@
   "stdout": [
     {
       "match": "re",
-      "line": "test cases/failing/69 run_command unclean exit/meson\\.build:4:0: ERROR: Command `.*['\"].*[\\\\/]test cases[\\\\/]failing[\\\\/]69 run_command unclean exit[\\\\/]\\.[\\\\/]returncode\\.py['\"] 1` failed with status 1\\."
+      "line": "test cases/failing/68 run_command unclean exit/meson\\.build:4:0: ERROR: Command `.*['\"].*[\\\\/]test cases[\\\\/]failing[\\\\/]68 run_command unclean exit[\\\\/]\\.[\\\\/]returncode\\.py['\"] 1` failed with status 1\\."
     }
   ]
 }
diff --git a/test cases/failing/70 int literal leading zero/meson.build b/test cases/failing/69 int literal leading zero/meson.build
similarity index 100%
rename from test cases/failing/70 int literal leading zero/meson.build
rename to test cases/failing/69 int literal leading zero/meson.build
diff --git a/test cases/failing/70 int literal leading zero/test.json b/test cases/failing/69 int literal leading zero/test.json
similarity index 69%
rename from test cases/failing/70 int literal leading zero/test.json
rename to test cases/failing/69 int literal leading zero/test.json
index fafbf0d04..200b569b2 100644
--- a/test cases/failing/70 int literal leading zero/test.json	
+++ b/test cases/failing/69 int literal leading zero/test.json	
@@ -2,7 +2,7 @@
   "stdout": [
     {
       "comment": "this error message is not very informative",
-      "line": "test cases/failing/70 int literal leading zero/meson.build:5:13: ERROR: Expecting eof got number."
+      "line": "test cases/failing/69 int literal leading zero/meson.build:5:13: ERROR: Expecting eof got number."
     }
   ]
 }
diff --git a/test cases/failing/71 configuration immutable/input b/test cases/failing/70 configuration immutable/input
similarity index 100%
rename from test cases/failing/71 configuration immutable/input
rename to test cases/failing/70 configuration immutable/input
diff --git a/test cases/failing/71 configuration immutable/meson.build b/test cases/failing/70 configuration immutable/meson.build
similarity index 100%
rename from test cases/failing/71 configuration immutable/meson.build
rename to test cases/failing/70 configuration immutable/meson.build
diff --git a/test cases/failing/71 configuration immutable/test.json b/test cases/failing/70 configuration immutable/test.json
similarity index 65%
rename from test cases/failing/71 configuration immutable/test.json
rename to test cases/failing/70 configuration immutable/test.json
index af1a65ddd..fc735fa38 100644
--- a/test cases/failing/71 configuration immutable/test.json	
+++ b/test cases/failing/70 configuration immutable/test.json	
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/71 configuration immutable/meson.build:12:16: ERROR: Can not set values on configuration object that has been used."
+      "line": "test cases/failing/70 configuration immutable/meson.build:12:16: ERROR: Can not set values on configuration object that has been used."
     }
   ]
 }
diff --git a/test cases/failing/72 link with shared module on osx/meson.build b/test cases/failing/71 link with shared module on osx/meson.build
similarity index 100%
rename from test cases/failing/72 link with shared module on osx/meson.build
rename to test cases/failing/71 link with shared module on osx/meson.build
diff --git a/test cases/failing/72 link with shared module on osx/module.c b/test cases/failing/71 link with shared module on osx/module.c
similarity index 100%
rename from test cases/failing/72 link with shared module on osx/module.c
rename to test cases/failing/71 link with shared module on osx/module.c
diff --git a/test cases/failing/72 link with shared module on osx/prog.c b/test cases/failing/71 link with shared module on osx/prog.c
similarity index 100%
rename from test cases/failing/72 link with shared module on osx/prog.c
rename to test cases/failing/71 link with shared module on osx/prog.c
diff --git a/test cases/failing/72 link with shared module on osx/test.json b/test cases/failing/71 link with shared module on osx/test.json
similarity index 68%
rename from test cases/failing/72 link with shared module on osx/test.json
rename to test cases/failing/71 link with shared module on osx/test.json
index 1a2d78cd7..206d4297b 100644
--- a/test cases/failing/72 link with shared module on osx/test.json	
+++ b/test cases/failing/71 link with shared module on osx/test.json	
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/72 link with shared module on osx/meson.build:8:4: ERROR: target prog links against shared module mymodule. This is not permitted on OSX"
+      "line": "test cases/failing/71 link with shared module on osx/meson.build:8:4: ERROR: target prog links against shared module mymodule. This is not permitted on OSX"
     }
   ]
 }
diff --git a/test cases/failing/73 non-ascii in ascii encoded configure file/config9.h.in b/test cases/failing/72 non-ascii in ascii encoded configure file/config9.h.in
similarity index 100%
rename from test cases/failing/73 non-ascii in ascii encoded configure file/config9.h.in
rename to test cases/failing/72 non-ascii in ascii encoded configure file/config9.h.in
diff --git a/test cases/failing/73 non-ascii in ascii encoded configure file/meson.build b/test cases/failing/72 non-ascii in ascii encoded configure file/meson.build
similarity index 100%
rename from test cases/failing/73 non-ascii in ascii encoded configure file/meson.build
rename to test cases/failing/72 non-ascii in ascii encoded configure file/meson.build
diff --git a/test cases/failing/73 non-ascii in ascii encoded configure file/test.json b/test cases/failing/72 non-ascii in ascii encoded configure file/test.json
similarity index 79%
rename from test cases/failing/73 non-ascii in ascii encoded configure file/test.json
rename to test cases/failing/72 non-ascii in ascii encoded configure file/test.json
index 63f5bef85..1dc0b913a 100644
--- a/test cases/failing/73 non-ascii in ascii encoded configure file/test.json	
+++ b/test cases/failing/72 non-ascii in ascii encoded configure file/test.json	
@@ -2,7 +2,7 @@
   "stdout": [
     {
       "match": "re",
-      "line": "test cases/failing/73 non-ascii in ascii encoded configure file/meson\\.build:5:0: ERROR: Could not write output file .*[\\\\/]config9\\.h: 'ascii' codec can't encode character '\\\\u0434' in position 17: ordinal not in range\\(128\\)"
+      "line": "test cases/failing/72 non-ascii in ascii encoded configure file/meson\\.build:5:0: ERROR: Could not write output file .*[\\\\/]config9\\.h: 'ascii' codec can't encode character '\\\\u0434' in position 17: ordinal not in range\\(128\\)"
     }
   ]
 }
diff --git a/test cases/failing/74 subproj dependency not-found and required/meson.build b/test cases/failing/73 subproj dependency not-found and required/meson.build
similarity index 100%
rename from test cases/failing/74 subproj dependency not-found and required/meson.build
rename to test cases/failing/73 subproj dependency not-found and required/meson.build
diff --git a/test cases/failing/74 subproj dependency not-found and required/test.json b/test cases/failing/73 subproj dependency not-found and required/test.json
similarity index 68%
rename from test cases/failing/74 subproj dependency not-found and required/test.json
rename to test cases/failing/73 subproj dependency not-found and required/test.json
index 997bc56b2..11ab0318b 100644
--- a/test cases/failing/74 subproj dependency not-found and required/test.json	
+++ b/test cases/failing/73 subproj dependency not-found and required/test.json	
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/74 subproj dependency not-found and required/meson.build:2:10: ERROR: Neither a subproject directory nor a missing.wrap file was found."
+      "line": "test cases/failing/73 subproj dependency not-found and required/meson.build:2:10: ERROR: Neither a subproject directory nor a missing.wrap file was found."
     }
   ]
 }
diff --git a/test cases/failing/75 unfound run/meson.build b/test cases/failing/74 unfound run/meson.build
similarity index 100%
rename from test cases/failing/75 unfound run/meson.build
rename to test cases/failing/74 unfound run/meson.build
diff --git a/test cases/failing/75 unfound run/test.json b/test cases/failing/74 unfound run/test.json
similarity index 60%
rename from test cases/failing/75 unfound run/test.json
rename to test cases/failing/74 unfound run/test.json
index 855c2a477..8d31785f7 100644
--- a/test cases/failing/75 unfound run/test.json	
+++ b/test cases/failing/74 unfound run/test.json	
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/75 unfound run/meson.build:4:0: ERROR: Tried to use non-existing executable 'nonexisting_prog'"
+      "line": "test cases/failing/74 unfound run/meson.build:4:0: ERROR: Tried to use non-existing executable 'nonexisting_prog'"
     }
   ]
 }
diff --git a/test cases/failing/76 framework dependency with version/meson.build b/test cases/failing/75 framework dependency with version/meson.build
similarity index 100%
rename from test cases/failing/76 framework dependency with version/meson.build
rename to test cases/failing/75 framework dependency with version/meson.build
diff --git a/test cases/failing/76 framework dependency with version/test.json b/test cases/failing/75 framework dependency with version/test.json
similarity index 72%
rename from test cases/failing/76 framework dependency with version/test.json
rename to test cases/failing/75 framework dependency with version/test.json
index 07b4a6eba..8a01356b2 100644
--- a/test cases/failing/76 framework dependency with version/test.json	
+++ b/test cases/failing/75 framework dependency with version/test.json	
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/76 framework dependency with version/meson.build:8:6: ERROR: Dependency lookup for appleframeworks with method 'framework' failed: Unknown version, but need ['>0']."
+      "line": "test cases/failing/75 framework dependency with version/meson.build:8:6: ERROR: Dependency lookup for appleframeworks with method 'framework' failed: Unknown version, but need ['>0']."
     }
   ]
 }
diff --git a/test cases/failing/77 override exe config/foo.c b/test cases/failing/76 override exe config/foo.c
similarity index 100%
rename from test cases/failing/77 override exe config/foo.c
rename to test cases/failing/76 override exe config/foo.c
diff --git a/test cases/failing/77 override exe config/meson.build b/test cases/failing/76 override exe config/meson.build
similarity index 100%
rename from test cases/failing/77 override exe config/meson.build
rename to test cases/failing/76 override exe config/meson.build
diff --git a/test cases/failing/77 override exe config/test.json b/test cases/failing/76 override exe config/test.json
similarity index 72%
rename from test cases/failing/77 override exe config/test.json
rename to test cases/failing/76 override exe config/test.json
index a0dd7ae6e..23b9055ea 100644
--- a/test cases/failing/77 override exe config/test.json	
+++ b/test cases/failing/76 override exe config/test.json	
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/77 override exe config/meson.build:6:0: ERROR: Program 'bar' was overridden with the compiled executable 'foo' and therefore cannot be used during configuration"
+      "line": "test cases/failing/76 override exe config/meson.build:6:0: ERROR: Program 'bar' was overridden with the compiled executable 'foo' and therefore cannot be used during configuration"
     }
   ]
 }
diff --git a/test cases/failing/78 gl dependency with version/meson.build b/test cases/failing/77 gl dependency with version/meson.build
similarity index 100%
rename from test cases/failing/78 gl dependency with version/meson.build
rename to test cases/failing/77 gl dependency with version/meson.build
diff --git a/test cases/failing/78 gl dependency with version/test.json b/test cases/failing/77 gl dependency with version/test.json
similarity index 69%
rename from test cases/failing/78 gl dependency with version/test.json
rename to test cases/failing/77 gl dependency with version/test.json
index fbd9ff9ee..83665cbfb 100644
--- a/test cases/failing/78 gl dependency with version/test.json	
+++ b/test cases/failing/77 gl dependency with version/test.json	
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/78 gl dependency with version/meson.build:9:6: ERROR: Dependency lookup for gl with method 'system' failed: Unknown version, but need ['>0']."
+      "line": "test cases/failing/77 gl dependency with version/meson.build:9:6: ERROR: Dependency lookup for gl with method 'system' failed: Unknown version, but need ['>0']."
     }
   ]
 }
diff --git a/test cases/failing/79 threads dependency with version/meson.build b/test cases/failing/78 threads dependency with version/meson.build
similarity index 100%
rename from test cases/failing/79 threads dependency with version/meson.build
rename to test cases/failing/78 threads dependency with version/meson.build
diff --git a/test cases/failing/79 threads dependency with version/test.json b/test cases/failing/78 threads dependency with version/test.json
similarity index 71%
rename from test cases/failing/79 threads dependency with version/test.json
rename to test cases/failing/78 threads dependency with version/test.json
index 890695b64..ec02c2bfd 100644
--- a/test cases/failing/79 threads dependency with version/test.json	
+++ b/test cases/failing/78 threads dependency with version/test.json	
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/79 threads dependency with version/meson.build:3:6: ERROR: Dependency lookup for threads with method 'system' failed: Unknown version, but need ['>0']."
+      "line": "test cases/failing/78 threads dependency with version/meson.build:3:6: ERROR: Dependency lookup for threads with method 'system' failed: Unknown version, but need ['>0']."
     }
   ]
 }
diff --git a/test cases/failing/80 gtest dependency with version/meson.build b/test cases/failing/79 gtest dependency with version/meson.build
similarity index 100%
rename from test cases/failing/80 gtest dependency with version/meson.build
rename to test cases/failing/79 gtest dependency with version/meson.build
diff --git a/test cases/failing/80 gtest dependency with version/test.json b/test cases/failing/79 gtest dependency with version/test.json
similarity index 62%
rename from test cases/failing/80 gtest dependency with version/test.json
rename to test cases/failing/79 gtest dependency with version/test.json
index 3f9934d49..a32a3c207 100644
--- a/test cases/failing/80 gtest dependency with version/test.json	
+++ b/test cases/failing/79 gtest dependency with version/test.json	
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/80 gtest dependency with version/meson.build:8:6: ERROR: Dependency 'gtest' is required but not found."
+      "line": "test cases/failing/79 gtest dependency with version/meson.build:8:6: ERROR: Dependency 'gtest' is required but not found."
     }
   ]
 }
diff --git a/test cases/failing/81 dub library/meson.build b/test cases/failing/80 dub library/meson.build
similarity index 100%
rename from test cases/failing/81 dub library/meson.build
rename to test cases/failing/80 dub library/meson.build
diff --git a/test cases/failing/81 dub library/test.json b/test cases/failing/80 dub library/test.json
similarity index 57%
rename from test cases/failing/81 dub library/test.json
rename to test cases/failing/80 dub library/test.json
index 2db91eed5..d3c7d4264 100644
--- a/test cases/failing/81 dub library/test.json	
+++ b/test cases/failing/80 dub library/test.json	
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/81 dub library/meson.build:11:0: ERROR: Dependency \"dubtestproject\" not found"
+      "line": "test cases/failing/80 dub library/meson.build:11:0: ERROR: Dependency \"dubtestproject\" not found"
     }
   ]
 }
diff --git a/test cases/failing/82 dub executable/meson.build b/test cases/failing/81 dub executable/meson.build
similarity index 100%
rename from test cases/failing/82 dub executable/meson.build
rename to test cases/failing/81 dub executable/meson.build
diff --git a/test cases/failing/82 dub executable/test.json b/test cases/failing/81 dub executable/test.json
similarity index 59%
rename from test cases/failing/82 dub executable/test.json
rename to test cases/failing/81 dub executable/test.json
index 8ae46b848..8aefa1706 100644
--- a/test cases/failing/82 dub executable/test.json	
+++ b/test cases/failing/81 dub executable/test.json	
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/82 dub executable/meson.build:11:0: ERROR: Dependency \"dubtestproject:test1\" not found"
+      "line": "test cases/failing/81 dub executable/meson.build:11:0: ERROR: Dependency \"dubtestproject:test1\" not found"
     }
   ]
 }
diff --git a/test cases/failing/83 dub compiler/meson.build b/test cases/failing/82 dub compiler/meson.build
similarity index 100%
rename from test cases/failing/83 dub compiler/meson.build
rename to test cases/failing/82 dub compiler/meson.build
diff --git a/test cases/failing/83 dub compiler/test.json b/test cases/failing/82 dub compiler/test.json
similarity index 81%
rename from test cases/failing/83 dub compiler/test.json
rename to test cases/failing/82 dub compiler/test.json
index 07241d21e..89d1882d9 100644
--- a/test cases/failing/83 dub compiler/test.json	
+++ b/test cases/failing/82 dub compiler/test.json	
@@ -13,7 +13,7 @@
   },
   "stdout": [
     {
-      "line": "test cases/failing/83 dub compiler/meson.build:17:0: ERROR: Dependency \"dubtestproject:test2\" not found"
+      "line": "test cases/failing/82 dub compiler/meson.build:17:0: ERROR: Dependency \"dubtestproject:test2\" not found"
     }
   ]
 }
diff --git a/test cases/failing/84 subproj not-found dep/meson.build b/test cases/failing/83 subproj not-found dep/meson.build
similarity index 100%
rename from test cases/failing/84 subproj not-found dep/meson.build
rename to test cases/failing/83 subproj not-found dep/meson.build
diff --git a/test cases/failing/84 subproj not-found dep/subprojects/somesubproj/meson.build b/test cases/failing/83 subproj not-found dep/subprojects/somesubproj/meson.build
similarity index 100%
rename from test cases/failing/84 subproj not-found dep/subprojects/somesubproj/meson.build
rename to test cases/failing/83 subproj not-found dep/subprojects/somesubproj/meson.build
diff --git a/test cases/failing/84 subproj not-found dep/test.json b/test cases/failing/83 subproj not-found dep/test.json
similarity index 62%
rename from test cases/failing/84 subproj not-found dep/test.json
rename to test cases/failing/83 subproj not-found dep/test.json
index bea1ed0e3..5da4fb9a3 100644
--- a/test cases/failing/84 subproj not-found dep/test.json	
+++ b/test cases/failing/83 subproj not-found dep/test.json	
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/84 subproj not-found dep/meson.build:2:10: ERROR: Dependency '(anonymous)' is required but not found."
+      "line": "test cases/failing/83 subproj not-found dep/meson.build:2:10: ERROR: Dependency '(anonymous)' is required but not found."
     }
   ]
 }
diff --git a/test cases/failing/85 invalid configure file/input b/test cases/failing/84 invalid configure file/input
similarity index 100%
rename from test cases/failing/85 invalid configure file/input
rename to test cases/failing/84 invalid configure file/input
diff --git a/test cases/failing/85 invalid configure file/meson.build b/test cases/failing/84 invalid configure file/meson.build
similarity index 100%
rename from test cases/failing/85 invalid configure file/meson.build
rename to test cases/failing/84 invalid configure file/meson.build
diff --git a/test cases/failing/85 invalid configure file/test.json b/test cases/failing/84 invalid configure file/test.json
similarity index 67%
rename from test cases/failing/85 invalid configure file/test.json
rename to test cases/failing/84 invalid configure file/test.json
index 1cee20880..2b7a7457b 100644
--- a/test cases/failing/85 invalid configure file/test.json	
+++ b/test cases/failing/84 invalid configure file/test.json	
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/85 invalid configure file/meson.build:3:0: ERROR: \"install_dir\" must be specified when \"install\" in a configure_file is true"
+      "line": "test cases/failing/84 invalid configure file/meson.build:3:0: ERROR: \"install_dir\" must be specified when \"install\" in a configure_file is true"
     }
   ]
 }
diff --git a/test cases/failing/86 kwarg dupe/meson.build b/test cases/failing/85 kwarg dupe/meson.build
similarity index 100%
rename from test cases/failing/86 kwarg dupe/meson.build
rename to test cases/failing/85 kwarg dupe/meson.build
diff --git a/test cases/failing/86 kwarg dupe/prog.c b/test cases/failing/85 kwarg dupe/prog.c
similarity index 100%
rename from test cases/failing/86 kwarg dupe/prog.c
rename to test cases/failing/85 kwarg dupe/prog.c
diff --git a/test cases/failing/86 kwarg dupe/test.json b/test cases/failing/85 kwarg dupe/test.json
similarity index 65%
rename from test cases/failing/86 kwarg dupe/test.json
rename to test cases/failing/85 kwarg dupe/test.json
index 229debbea..99719ad4c 100644
--- a/test cases/failing/86 kwarg dupe/test.json	
+++ b/test cases/failing/85 kwarg dupe/test.json	
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/86 kwarg dupe/meson.build:6:2: ERROR: Entry \"install\" defined both as a keyword argument and in a \"kwarg\" entry."
+      "line": "test cases/failing/85 kwarg dupe/meson.build:6:2: ERROR: Entry \"install\" defined both as a keyword argument and in a \"kwarg\" entry."
     }
   ]
 }
diff --git a/test cases/failing/87 missing pch file/meson.build b/test cases/failing/86 missing pch file/meson.build
similarity index 100%
rename from test cases/failing/87 missing pch file/meson.build
rename to test cases/failing/86 missing pch file/meson.build
diff --git a/test cases/failing/87 missing pch file/prog.c b/test cases/failing/86 missing pch file/prog.c
similarity index 100%
rename from test cases/failing/87 missing pch file/prog.c
rename to test cases/failing/86 missing pch file/prog.c
diff --git a/test cases/failing/87 missing pch file/test.json b/test cases/failing/86 missing pch file/test.json
similarity index 74%
rename from test cases/failing/87 missing pch file/test.json
rename to test cases/failing/86 missing pch file/test.json
index a54acb7a7..d6a50c237 100644
--- a/test cases/failing/87 missing pch file/test.json	
+++ b/test cases/failing/86 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/87 missing pch file/meson.build:2:6: ERROR: File pch/prog.h does not exist."
+      "line": "test cases/failing/86 missing pch file/meson.build:2:6: ERROR: File pch/prog.h does not exist."
     }
   ]
 }
diff --git a/test cases/failing/88 pch source different folder/include/pch.h b/test cases/failing/87 pch source different folder/include/pch.h
similarity index 100%
rename from test cases/failing/88 pch source different folder/include/pch.h
rename to test cases/failing/87 pch source different folder/include/pch.h
diff --git a/test cases/failing/88 pch source different folder/meson.build b/test cases/failing/87 pch source different folder/meson.build
similarity index 100%
rename from test cases/failing/88 pch source different folder/meson.build
rename to test cases/failing/87 pch source different folder/meson.build
diff --git a/test cases/failing/88 pch source different folder/prog.c b/test cases/failing/87 pch source different folder/prog.c
similarity index 100%
rename from test cases/failing/88 pch source different folder/prog.c
rename to test cases/failing/87 pch source different folder/prog.c
diff --git a/test cases/failing/88 pch source different folder/src/pch.c b/test cases/failing/87 pch source different folder/src/pch.c
similarity index 100%
rename from test cases/failing/88 pch source different folder/src/pch.c
rename to test cases/failing/87 pch source different folder/src/pch.c
diff --git a/test cases/failing/88 pch source different folder/test.json b/test cases/failing/87 pch source different folder/test.json
similarity index 62%
rename from test cases/failing/88 pch source different folder/test.json
rename to test cases/failing/87 pch source different folder/test.json
index 60fa4e0a6..0a9d39d6f 100644
--- a/test cases/failing/88 pch source different folder/test.json	
+++ b/test cases/failing/87 pch source different folder/test.json	
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/88 pch source different folder/meson.build:4:6: ERROR: PCH files must be stored in the same folder."
+      "line": "test cases/failing/87 pch source different folder/meson.build:4:6: ERROR: PCH files must be stored in the same folder."
     }
   ]
 }
diff --git a/test cases/failing/89 unknown config tool/meson.build b/test cases/failing/88 unknown config tool/meson.build
similarity index 100%
rename from test cases/failing/89 unknown config tool/meson.build
rename to test cases/failing/88 unknown config tool/meson.build
diff --git a/test cases/failing/89 unknown config tool/test.json b/test cases/failing/88 unknown config tool/test.json
similarity index 60%
rename from test cases/failing/89 unknown config tool/test.json
rename to test cases/failing/88 unknown config tool/test.json
index f5c0d96ab..5a53b26f0 100644
--- a/test cases/failing/89 unknown config tool/test.json	
+++ b/test cases/failing/88 unknown config tool/test.json	
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/89 unknown config tool/meson.build:2:0: ERROR: Dependency \"no-such-config-tool\" not found"
+      "line": "test cases/failing/88 unknown config tool/meson.build:2:0: ERROR: Dependency \"no-such-config-tool\" not found"
     }
   ]
 }
diff --git a/test cases/failing/90 custom target install data/Info.plist.cpp b/test cases/failing/89 custom target install data/Info.plist.cpp
similarity index 100%
rename from test cases/failing/90 custom target install data/Info.plist.cpp
rename to test cases/failing/89 custom target install data/Info.plist.cpp
diff --git a/test cases/failing/90 custom target install data/meson.build b/test cases/failing/89 custom target install data/meson.build
similarity index 100%
rename from test cases/failing/90 custom target install data/meson.build
rename to test cases/failing/89 custom target install data/meson.build
diff --git a/test cases/failing/90 custom target install data/preproc.py b/test cases/failing/89 custom target install data/preproc.py
similarity index 100%
rename from test cases/failing/90 custom target install data/preproc.py
rename to test cases/failing/89 custom target install data/preproc.py
diff --git a/test cases/failing/90 custom target install data/test.json b/test cases/failing/89 custom target install data/test.json
similarity index 71%
rename from test cases/failing/90 custom target install data/test.json
rename to test cases/failing/89 custom target install data/test.json
index d495163f2..3364a6a6c 100644
--- a/test cases/failing/90 custom target install data/test.json	
+++ b/test cases/failing/89 custom target install data/test.json	
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/90 custom target install data/meson.build:11:0: ERROR: install_data argument 1 was of type \"CustomTarget\" but should have been one of: \"str\", \"File\""
+      "line": "test cases/failing/89 custom target install data/meson.build:11:0: ERROR: install_data argument 1 was of type \"CustomTarget\" but should have been one of: \"str\", \"File\""
     }
   ]
 }
diff --git a/test cases/failing/91 add dict non string key/meson.build b/test cases/failing/90 add dict non string key/meson.build
similarity index 100%
rename from test cases/failing/91 add dict non string key/meson.build
rename to test cases/failing/90 add dict non string key/meson.build
diff --git a/test cases/failing/91 add dict non string key/test.json b/test cases/failing/90 add dict non string key/test.json
similarity index 54%
rename from test cases/failing/91 add dict non string key/test.json
rename to test cases/failing/90 add dict non string key/test.json
index db506b2e0..822e09f54 100644
--- a/test cases/failing/91 add dict non string key/test.json	
+++ b/test cases/failing/90 add dict non string key/test.json	
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/91 add dict non string key/meson.build:9:9: ERROR: Key must be a string"
+      "line": "test cases/failing/90 add dict non string key/meson.build:9:9: ERROR: Key must be a string"
     }
   ]
 }
diff --git a/test cases/failing/92 add dict duplicate keys/meson.build b/test cases/failing/91 add dict duplicate keys/meson.build
similarity index 100%
rename from test cases/failing/92 add dict duplicate keys/meson.build
rename to test cases/failing/91 add dict duplicate keys/meson.build
diff --git a/test cases/failing/92 add dict duplicate keys/test.json b/test cases/failing/91 add dict duplicate keys/test.json
similarity index 58%
rename from test cases/failing/92 add dict duplicate keys/test.json
rename to test cases/failing/91 add dict duplicate keys/test.json
index b428a5387..b6941e75f 100644
--- a/test cases/failing/92 add dict duplicate keys/test.json	
+++ b/test cases/failing/91 add dict duplicate keys/test.json	
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/92 add dict duplicate keys/meson.build:9:27: ERROR: Duplicate dictionary key: myKey"
+      "line": "test cases/failing/91 add dict duplicate keys/meson.build:9:27: ERROR: Duplicate dictionary key: myKey"
     }
   ]
 }
diff --git a/test cases/failing/93 no host get_external_property/meson.build b/test cases/failing/92 no host get_external_property/meson.build
similarity index 100%
rename from test cases/failing/93 no host get_external_property/meson.build
rename to test cases/failing/92 no host get_external_property/meson.build
diff --git a/test cases/failing/93 no host get_external_property/test.json b/test cases/failing/92 no host get_external_property/test.json
similarity index 63%
rename from test cases/failing/93 no host get_external_property/test.json
rename to test cases/failing/92 no host get_external_property/test.json
index b26f3c9b6..0f7a803ff 100644
--- a/test cases/failing/93 no host get_external_property/test.json	
+++ b/test cases/failing/92 no host get_external_property/test.json	
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/93 no host get_external_property/meson.build:3:14: ERROR: Unknown property for host machine: nonexisting"
+      "line": "test cases/failing/92 no host get_external_property/meson.build:3:14: ERROR: Unknown property for host machine: nonexisting"
     }
   ]
 }
diff --git a/test cases/failing/94 no native compiler/main.c b/test cases/failing/93 no native compiler/main.c
similarity index 100%
rename from test cases/failing/94 no native compiler/main.c
rename to test cases/failing/93 no native compiler/main.c
diff --git a/test cases/failing/94 no native compiler/meson.build b/test cases/failing/93 no native compiler/meson.build
similarity index 100%
rename from test cases/failing/94 no native compiler/meson.build
rename to test cases/failing/93 no native compiler/meson.build
diff --git a/test cases/failing/94 no native compiler/test.json b/test cases/failing/93 no native compiler/test.json
similarity index 58%
rename from test cases/failing/94 no native compiler/test.json
rename to test cases/failing/93 no native compiler/test.json
index 7181c6b7e..adf99f1a2 100644
--- a/test cases/failing/94 no native compiler/test.json	
+++ b/test cases/failing/93 no native compiler/test.json	
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/94 no native compiler/meson.build:12:0: ERROR: No host machine compiler for \"main.c\""
+      "line": "test cases/failing/93 no native compiler/meson.build:12:0: ERROR: No host machine compiler for \"main.c\""
     }
   ]
 }
diff --git a/test cases/failing/95 subdir parse error/meson.build b/test cases/failing/94 subdir parse error/meson.build
similarity index 100%
rename from test cases/failing/95 subdir parse error/meson.build
rename to test cases/failing/94 subdir parse error/meson.build
diff --git a/test cases/failing/95 subdir parse error/subdir/meson.build b/test cases/failing/94 subdir parse error/subdir/meson.build
similarity index 100%
rename from test cases/failing/95 subdir parse error/subdir/meson.build
rename to test cases/failing/94 subdir parse error/subdir/meson.build
diff --git a/test cases/failing/95 subdir parse error/test.json b/test cases/failing/94 subdir parse error/test.json
similarity index 59%
rename from test cases/failing/95 subdir parse error/test.json
rename to test cases/failing/94 subdir parse error/test.json
index c94ed58d4..0bf82c1e2 100644
--- a/test cases/failing/95 subdir parse error/test.json	
+++ b/test cases/failing/94 subdir parse error/test.json	
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/95 subdir parse error/subdir/meson.build:1:0: ERROR: Plusassignment target must be an id."
+      "line": "test cases/failing/94 subdir parse error/subdir/meson.build:1:0: ERROR: Plusassignment target must be an id."
     }
   ]
 }
diff --git a/test cases/failing/96 invalid option file/meson.build b/test cases/failing/95 invalid option file/meson.build
similarity index 100%
rename from test cases/failing/96 invalid option file/meson.build
rename to test cases/failing/95 invalid option file/meson.build
diff --git a/test cases/failing/96 invalid option file/meson_options.txt b/test cases/failing/95 invalid option file/meson_options.txt
similarity index 100%
rename from test cases/failing/96 invalid option file/meson_options.txt
rename to test cases/failing/95 invalid option file/meson_options.txt
diff --git a/test cases/failing/96 invalid option file/test.json b/test cases/failing/95 invalid option file/test.json
similarity index 50%
rename from test cases/failing/96 invalid option file/test.json
rename to test cases/failing/95 invalid option file/test.json
index 5f1a89f7c..073ac6717 100644
--- a/test cases/failing/96 invalid option file/test.json	
+++ b/test cases/failing/95 invalid option file/test.json	
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/96 invalid option file/meson_options.txt:1:0: ERROR: lexer"
+      "line": "test cases/failing/95 invalid option file/meson_options.txt:1:0: ERROR: lexer"
     }
   ]
 }
diff --git a/test cases/failing/97 no lang/main.c b/test cases/failing/96 no lang/main.c
similarity index 100%
rename from test cases/failing/97 no lang/main.c
rename to test cases/failing/96 no lang/main.c
diff --git a/test cases/failing/97 no lang/meson.build b/test cases/failing/96 no lang/meson.build
similarity index 100%
rename from test cases/failing/97 no lang/meson.build
rename to test cases/failing/96 no lang/meson.build
diff --git a/test cases/failing/97 no lang/test.json b/test cases/failing/96 no lang/test.json
similarity index 54%
rename from test cases/failing/97 no lang/test.json
rename to test cases/failing/96 no lang/test.json
index a2af0a197..ab4ca5cdf 100644
--- a/test cases/failing/97 no lang/test.json	
+++ b/test cases/failing/96 no lang/test.json	
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/97 no lang/meson.build:2:0: ERROR: No host machine compiler for 'main.c'"
+      "line": "test cases/failing/96 no lang/meson.build:2:0: ERROR: No host machine compiler for 'main.c'"
     }
   ]
 }
diff --git a/test cases/failing/98 no glib-compile-resources/meson.build b/test cases/failing/97 no glib-compile-resources/meson.build
similarity index 100%
rename from test cases/failing/98 no glib-compile-resources/meson.build
rename to test cases/failing/97 no glib-compile-resources/meson.build
diff --git a/test cases/failing/98 no glib-compile-resources/test.json b/test cases/failing/97 no glib-compile-resources/test.json
similarity index 65%
rename from test cases/failing/98 no glib-compile-resources/test.json
rename to test cases/failing/97 no glib-compile-resources/test.json
index d5edd7692..f3d92ddfb 100644
--- a/test cases/failing/98 no glib-compile-resources/test.json	
+++ b/test cases/failing/97 no glib-compile-resources/test.json	
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/98 no glib-compile-resources/meson.build:8:12: ERROR: Program 'glib-compile-resources' not found or not executable"
+      "line": "test cases/failing/97 no glib-compile-resources/meson.build:8:12: ERROR: Program 'glib-compile-resources' not found or not executable"
     }
   ]
 }
diff --git a/test cases/failing/98 no glib-compile-resources/trivial.gresource.xml b/test cases/failing/97 no glib-compile-resources/trivial.gresource.xml
similarity index 100%
rename from test cases/failing/98 no glib-compile-resources/trivial.gresource.xml
rename to test cases/failing/97 no glib-compile-resources/trivial.gresource.xml
diff --git a/test cases/failing/99 number in combo/meson.build b/test cases/failing/98 number in combo/meson.build
similarity index 100%
rename from test cases/failing/99 number in combo/meson.build
rename to test cases/failing/98 number in combo/meson.build
diff --git a/test cases/failing/99 number in combo/nativefile.ini b/test cases/failing/98 number in combo/nativefile.ini
similarity index 100%
rename from test cases/failing/99 number in combo/nativefile.ini
rename to test cases/failing/98 number in combo/nativefile.ini
diff --git a/test cases/failing/99 number in combo/test.json b/test cases/failing/98 number in combo/test.json
similarity index 77%
rename from test cases/failing/99 number in combo/test.json
rename to test cases/failing/98 number in combo/test.json
index f59812e3b..ecac6676d 100644
--- a/test cases/failing/99 number in combo/test.json	
+++ b/test cases/failing/98 number in combo/test.json	
@@ -1,5 +1,5 @@
 {
   "stdout": [
-    { "line": "test cases/failing/99 number in combo/meson.build:1:0: ERROR: Value \"1\" (of type \"number\") for combo option \"Optimization level\" is not one of the choices. Possible choices are (as string): \"plain\", \"0\", \"g\", \"1\", \"2\", \"3\", \"s\"." }
+    { "line": "test cases/failing/98 number in combo/meson.build:1:0: ERROR: Value \"1\" (of type \"number\") for combo option \"Optimization level\" is not one of the choices. Possible choices are (as string): \"plain\", \"0\", \"g\", \"1\", \"2\", \"3\", \"s\"." }
   ]
 }
diff --git a/test cases/failing/100 bool in combo/meson.build b/test cases/failing/99 bool in combo/meson.build
similarity index 100%
rename from test cases/failing/100 bool in combo/meson.build
rename to test cases/failing/99 bool in combo/meson.build
diff --git a/test cases/failing/100 bool in combo/meson_options.txt b/test cases/failing/99 bool in combo/meson_options.txt
similarity index 100%
rename from test cases/failing/100 bool in combo/meson_options.txt
rename to test cases/failing/99 bool in combo/meson_options.txt
diff --git a/test cases/failing/100 bool in combo/nativefile.ini b/test cases/failing/99 bool in combo/nativefile.ini
similarity index 100%
rename from test cases/failing/100 bool in combo/nativefile.ini
rename to test cases/failing/99 bool in combo/nativefile.ini
diff --git a/test cases/failing/99 bool in combo/test.json b/test cases/failing/99 bool in combo/test.json
new file mode 100644
index 000000000..364dde8a4
--- /dev/null
+++ b/test cases/failing/99 bool in combo/test.json	
@@ -0,0 +1,5 @@
+{
+  "stdout": [
+    { "line": "test cases/failing/99 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/unittests/allplatformstests.py b/unittests/allplatformstests.py
index 1064e6adb..2475b17f9 100644
--- a/unittests/allplatformstests.py
+++ b/unittests/allplatformstests.py
@@ -2317,9 +2317,9 @@ class AllPlatformTests(BasePlatformTests):
         for (t, f) in [
             ('10 out of bounds', 'meson.build'),
             ('18 wrong plusassign', 'meson.build'),
-            ('57 bad option argument', 'meson_options.txt'),
-            ('95 subdir parse error', os.path.join('subdir', 'meson.build')),
-            ('96 invalid option file', 'meson_options.txt'),
+            ('56 bad option argument', 'meson_options.txt'),
+            ('94 subdir parse error', os.path.join('subdir', 'meson.build')),
+            ('95 invalid option file', 'meson_options.txt'),
         ]:
             tdir = os.path.join(self.src_root, 'test cases', 'failing', t)