Condense test dirs.

520 files changed, 50 insertions, 50 deletions

diff --git a/run_project_tests.py b/run_project_tests.py
index 36b7655b9..1385a78af 100755
--- a/run_project_tests.py
+++ b/run_project_tests.py
@@ -294,16 +294,16 @@ def run_test(skipped, testdir, extra_args, compiler, backend, flags, commands, s
                 mlog.shutdown() # Close the log file because otherwise Windows wets itself.
 
 def pass_prefix_to_test(dirname):
-    if '40 prefix absolute' in dirname:
+    if '39 prefix absolute' in dirname:
         return False
     return True
 
 def pass_libdir_to_test(dirname):
     if '8 install' in dirname:
         return False
-    if '39 libdir must be inside prefix' in dirname:
+    if '38 libdir must be inside prefix' in dirname:
         return False
-    if '201 install_mode' in dirname:
+    if '199 install_mode' in dirname:
         return False
     return True
 
diff --git a/run_unittests.py b/run_unittests.py
index 66d663af9..ace0ffab9 100755
--- a/run_unittests.py
+++ b/run_unittests.py
@@ -983,7 +983,7 @@ class AllPlatformTests(BasePlatformTests):
         dependent defaults for other options, and that those defaults can
         be overridden in default_options or by the command line.
         '''
-        testdir = os.path.join(self.common_test_dir, '173 default options prefix dependent defaults')
+        testdir = os.path.join(self.common_test_dir, '172 default options prefix dependent defaults')
         expected = {
             '':
             {'prefix':         '/usr',
@@ -1108,7 +1108,7 @@ class AllPlatformTests(BasePlatformTests):
         self.assertPathDoesNotExist(exename)
 
     def test_forcefallback(self):
-        testdir = os.path.join(self.unit_test_dir, '27 forcefallback')
+        testdir = os.path.join(self.unit_test_dir, '31 forcefallback')
         self.init(testdir, ['--wrap-mode=forcefallback'])
         self.build()
         self.run_tests()
@@ -1144,7 +1144,7 @@ class AllPlatformTests(BasePlatformTests):
         self._run(self.mtest_command + ['--setup=timeout'])
 
     def test_testsetup_selection(self):
-        testdir = os.path.join(self.unit_test_dir, '13 testsetup selection')
+        testdir = os.path.join(self.unit_test_dir, '14 testsetup selection')
         self.init(testdir)
         self.build()
 
@@ -1648,7 +1648,7 @@ int main(int argc, char **argv) {
                 self.assertTrue(rpath is None)
 
     def test_dash_d_dedup(self):
-        testdir = os.path.join(self.unit_test_dir, '10 d dedup')
+        testdir = os.path.join(self.unit_test_dir, '9 d dedup')
         self.init(testdir)
         cmd = self.get_compdb()[0]['command']
         self.assertTrue('-D FOO -D BAR' in cmd or
@@ -1658,10 +1658,10 @@ int main(int argc, char **argv) {
 
     def test_all_forbidden_targets_tested(self):
         '''
-        Test that all forbidden targets are tested in the '159 reserved targets'
+        Test that all forbidden targets are tested in the '158 reserved targets'
         test. Needs to be a unit test because it accesses Meson internals.
         '''
-        testdir = os.path.join(self.common_test_dir, '159 reserved targets')
+        testdir = os.path.join(self.common_test_dir, '158 reserved targets')
         targets = mesonbuild.coredata.forbidden_target_names
         # We don't actually define a target with this name
         targets.pop('build.ninja')
@@ -1699,7 +1699,7 @@ int main(int argc, char **argv) {
 
     def test_prebuilt_object(self):
         (compiler, _, object_suffix, _) = self.detect_prebuild_env()
-        tdir = os.path.join(self.unit_test_dir, '14 prebuilt object')
+        tdir = os.path.join(self.unit_test_dir, '15 prebuilt object')
         source = os.path.join(tdir, 'source.c')
         objectfile = os.path.join(tdir, 'prebuilt.' + object_suffix)
         self.pbcompile(compiler, source, objectfile)
@@ -1730,7 +1730,7 @@ int main(int argc, char **argv) {
 
     def test_prebuilt_static_lib(self):
         (cc, stlinker, object_suffix, _) = self.detect_prebuild_env()
-        tdir = os.path.join(self.unit_test_dir, '15 prebuilt static')
+        tdir = os.path.join(self.unit_test_dir, '16 prebuilt static')
         source = os.path.join(tdir, 'libdir/best.c')
         objectfile = os.path.join(tdir, 'libdir/best.' + object_suffix)
         stlibfile = os.path.join(tdir, 'libdir/libbest.a')
@@ -1762,7 +1762,7 @@ int main(int argc, char **argv) {
 
     def test_prebuilt_shared_lib(self):
         (cc, _, object_suffix, shared_suffix) = self.detect_prebuild_env()
-        tdir = os.path.join(self.unit_test_dir, '16 prebuilt shared')
+        tdir = os.path.join(self.unit_test_dir, '17 prebuilt shared')
         source = os.path.join(tdir, 'alexandria.c')
         objectfile = os.path.join(tdir, 'alexandria.' + object_suffix)
         impfile = os.path.join(tdir, 'alexandria.lib')
@@ -1799,7 +1799,7 @@ int main(int argc, char **argv) {
         https://github.com/mesonbuild/meson/issues/2785
         '''
         (cc, stlinker, objext, shext) = self.detect_prebuild_env()
-        testdir = os.path.join(self.unit_test_dir, '17 pkgconfig static')
+        testdir = os.path.join(self.unit_test_dir, '18 pkgconfig static')
         source = os.path.join(testdir, 'foo.c')
         objectfile = os.path.join(testdir, 'foo.' + objext)
         stlibfile = os.path.join(testdir, 'libfoo.a')
@@ -1864,7 +1864,7 @@ int main(int argc, char **argv) {
             'type': 'array',
             'value': ['foo', 'bar'],
         }
-        tdir = os.path.join(self.unit_test_dir, '18 array option')
+        tdir = os.path.join(self.unit_test_dir, '19 array option')
         self.init(tdir)
         original = get_opt()
         self.assertDictEqual(original, expected)
@@ -1888,7 +1888,7 @@ int main(int argc, char **argv) {
             'type': 'array',
             'value': ['foo', 'bar'],
         }
-        tdir = os.path.join(self.unit_test_dir, '18 array option')
+        tdir = os.path.join(self.unit_test_dir, '19 array option')
         self.init(tdir)
         original = get_opt()
         self.assertDictEqual(original, expected)
@@ -1912,7 +1912,7 @@ int main(int argc, char **argv) {
             'type': 'array',
             'value': [],
         }
-        tdir = os.path.join(self.unit_test_dir, '18 array option')
+        tdir = os.path.join(self.unit_test_dir, '19 array option')
         self.init(tdir, extra_args='-Dlist=')
         original = get_opt()
         self.assertDictEqual(original, expected)
@@ -1937,7 +1937,7 @@ int main(int argc, char **argv) {
         self.opt_has('free_array_opt', ['a,b', 'c,d'])
 
     def test_subproject_promotion(self):
-        testdir = os.path.join(self.unit_test_dir, '13 promote')
+        testdir = os.path.join(self.unit_test_dir, '12 promote')
         workdir = os.path.join(self.builddir, 'work')
         shutil.copytree(testdir, workdir)
         spdir = os.path.join(workdir, 'subprojects')
@@ -1961,7 +1961,7 @@ int main(int argc, char **argv) {
         self.build()
 
     def test_warning_location(self):
-        tdir = os.path.join(self.unit_test_dir, '21 warning location')
+        tdir = os.path.join(self.unit_test_dir, '22 warning location')
         out = self.init(tdir)
         for expected in [
             r'meson.build:4: WARNING: Keyword argument "link_with" defined multiple times.',
@@ -1975,7 +1975,7 @@ int main(int argc, char **argv) {
             self.assertRegex(out, re.escape(expected))
 
     def test_permitted_method_kwargs(self):
-        tdir = os.path.join(self.unit_test_dir, '23 non-permitted kwargs')
+        tdir = os.path.join(self.unit_test_dir, '25 non-permitted kwargs')
         out = self.init(tdir)
         for expected in [
             r'WARNING: Passed invalid keyword argument "prefixxx".',
@@ -2059,7 +2059,7 @@ int main(int argc, char **argv) {
         The test checks that the compiler object can be passed to
         run_command().
         '''
-        testdir = os.path.join(self.unit_test_dir, '23 compiler run_command')
+        testdir = os.path.join(self.unit_test_dir, '24 compiler run_command')
         self.init(testdir)
 
     def test_identical_target_name_in_subproject_flat_layout(self):
@@ -2067,7 +2067,7 @@ int main(int argc, char **argv) {
         Test that identical targets in different subprojects do not collide
         if layout is flat.
         '''
-        testdir = os.path.join(self.common_test_dir, '182 identical target name in subproject flat layout')
+        testdir = os.path.join(self.common_test_dir, '181 identical target name in subproject flat layout')
         self.init(testdir, extra_args=['--layout=flat'])
         self.build()
 
@@ -2076,7 +2076,7 @@ int main(int argc, char **argv) {
         Test that identical targets in different subdirs do not collide
         if layout is flat.
         '''
-        testdir = os.path.join(self.common_test_dir, '192 same target name flat layout')
+        testdir = os.path.join(self.common_test_dir, '190 same target name flat layout')
         self.init(testdir, extra_args=['--layout=flat'])
         self.build()
 
@@ -2099,21 +2099,21 @@ int main(int argc, char **argv) {
         https://github.com/mesonbuild/meson/issues/2865
         (That an error is raised on OSX is exercised by test failing/78)
         """
-        tdir = os.path.join(self.unit_test_dir, '26 shared_mod linking')
+        tdir = os.path.join(self.unit_test_dir, '30 shared_mod linking')
         out = self.init(tdir)
         msg = ('''WARNING: target links against shared modules. This is not
 recommended as it is not supported on some platforms''')
         self.assertIn(msg, out)
 
     def test_ndebug_if_release_disabled(self):
-        testdir = os.path.join(self.unit_test_dir, '25 ndebug if-release')
+        testdir = os.path.join(self.unit_test_dir, '28 ndebug if-release')
         self.init(testdir, extra_args=['--buildtype=release', '-Db_ndebug=if-release'])
         self.build()
         exe = os.path.join(self.builddir, 'main')
         self.assertEqual(b'NDEBUG=1', subprocess.check_output(exe).strip())
 
     def test_ndebug_if_release_enabled(self):
-        testdir = os.path.join(self.unit_test_dir, '25 ndebug if-release')
+        testdir = os.path.join(self.unit_test_dir, '28 ndebug if-release')
         self.init(testdir, extra_args=['--buildtype=debugoptimized', '-Db_ndebug=if-release'])
         self.build()
         exe = os.path.join(self.builddir, 'main')
@@ -2125,7 +2125,7 @@ recommended as it is not supported on some platforms''')
         linker command line.
         '''
         # build library
-        testdirbase = os.path.join(self.unit_test_dir, '26 guessed linker dependencies')
+        testdirbase = os.path.join(self.unit_test_dir, '29 guessed linker dependencies')
         testdirlib = os.path.join(testdirbase, 'lib')
         extra_args = None
         env = Environment(testdirlib, self.builddir, get_fake_options(self.prefix))
@@ -2168,14 +2168,14 @@ recommended as it is not supported on some platforms''')
         self.assertRebuiltTarget('app')
 
     def test_conflicting_d_dash_option(self):
-        testdir = os.path.join(self.unit_test_dir, '30 mixed command line args')
+        testdir = os.path.join(self.unit_test_dir, '35 mixed command line args')
         with self.assertRaises(subprocess.CalledProcessError) as e:
             self.init(testdir, extra_args=['-Dbindir=foo', '--bindir=bar'])
             # Just to ensure that we caught the correct error
             self.assertIn('passed as both', e.stderr)
 
     def _test_same_option_twice(self, arg, args):
-        testdir = os.path.join(self.unit_test_dir, '30 mixed command line args')
+        testdir = os.path.join(self.unit_test_dir, '35 mixed command line args')
         self.init(testdir, extra_args=args)
         opts = self.introspect('--buildoptions')
         for item in opts:
@@ -2194,7 +2194,7 @@ recommended as it is not supported on some platforms''')
         self._test_same_option_twice('one', ['-Done=foo', '-Done=bar'])
 
     def _test_same_option_twice_configure(self, arg, args):
-        testdir = os.path.join(self.unit_test_dir, '30 mixed command line args')
+        testdir = os.path.join(self.unit_test_dir, '35 mixed command line args')
         self.init(testdir)
         self.setconf(args)
         opts = self.introspect('--buildoptions')
@@ -2217,7 +2217,7 @@ recommended as it is not supported on some platforms''')
             'one', ['-Done=foo', '-Done=bar'])
 
     def test_command_line(self):
-        testdir = os.path.join(self.unit_test_dir, '30 command line')
+        testdir = os.path.join(self.unit_test_dir, '34 command line')
 
         # Verify default values when passing no args
         self.init(testdir)
@@ -2392,7 +2392,7 @@ recommended as it is not supported on some platforms''')
                 self.assertIn(f, toc)
 
     def test_feature_check_usage_subprojects(self):
-        testdir = os.path.join(self.unit_test_dir, '34 featurenew subprojects')
+        testdir = os.path.join(self.unit_test_dir, '39 featurenew subprojects')
         out = self.init(testdir)
         # Parent project warns correctly
         self.assertRegex(out, "WARNING: Project targetting '>=0.45'.*'0.47.0': dict")
@@ -2687,7 +2687,7 @@ class WindowsTests(BasePlatformTests):
         correctly. Cannot be an ordinary test because it involves manipulating
         PATH to point to a directory with Python scripts.
         '''
-        testdir = os.path.join(self.platform_test_dir, '9 find program')
+        testdir = os.path.join(self.platform_test_dir, '8 find program')
         # Find `cmd` and `cmd.exe`
         prog1 = ExternalProgram('cmd')
         self.assertTrue(prog1.found(), msg='cmd not found')
@@ -2755,7 +2755,7 @@ class WindowsTests(BasePlatformTests):
         self.wipe()
 
         if depfile_works:
-            testdir = os.path.join(self.platform_test_dir, '13 resources with custom targets')
+            testdir = os.path.join(self.platform_test_dir, '12 resources with custom targets')
             self.init(testdir)
             self.build()
             # Immediately rebuilding should not do anything
@@ -2880,7 +2880,7 @@ class LinuxlikeTests(BasePlatformTests):
         self.assertEqual(sorted(out), sorted(['libexposed', 'libfoo >= 1.0', 'libhello']))
 
     def test_pkg_unfound(self):
-        testdir = os.path.join(self.unit_test_dir, '22 unfound pkgconfig')
+        testdir = os.path.join(self.unit_test_dir, '23 unfound pkgconfig')
         self.init(testdir)
         with open(os.path.join(self.privatedir, 'somename.pc')) as f:
             pcfile = f.read()
@@ -3154,7 +3154,7 @@ class LinuxlikeTests(BasePlatformTests):
         '''
         Test that files are installed with correct permissions using install_mode.
         '''
-        testdir = os.path.join(self.common_test_dir, '201 install_mode')
+        testdir = os.path.join(self.common_test_dir, '199 install_mode')
         self.init(testdir)
         self.build()
         self.install()
@@ -3194,11 +3194,11 @@ class LinuxlikeTests(BasePlatformTests):
         '''
         # Copy source tree to a temporary directory and change permissions
         # there to simulate a checkout with umask 002.
-        orig_testdir = os.path.join(self.unit_test_dir, '24 install umask')
+        orig_testdir = os.path.join(self.unit_test_dir, '26 install umask')
         # Create a new testdir under tmpdir.
         tmpdir = os.path.realpath(tempfile.mkdtemp())
         self.addCleanup(windows_proof_rmtree, tmpdir)
-        testdir = os.path.join(tmpdir, '24 install umask')
+        testdir = os.path.join(tmpdir, '26 install umask')
         # Copy the tree using shutil.copyfile, which will use the current umask
         # instead of preserving permissions of the old tree.
         save_umask = os.umask(0o002)
@@ -3306,7 +3306,7 @@ class LinuxlikeTests(BasePlatformTests):
             self.assertTrue('prog' in v or 'foo' in v)
 
     def test_order_of_l_arguments(self):
-        testdir = os.path.join(self.unit_test_dir, '9 -L -l order')
+        testdir = os.path.join(self.unit_test_dir, '8 -L -l order')
         os.environ['PKG_CONFIG_PATH'] = testdir
         self.init(testdir)
         # NOTE: .pc file has -Lfoo -lfoo -Lbar -lbar but pkg-config reorders
@@ -3366,7 +3366,7 @@ class LinuxlikeTests(BasePlatformTests):
     def test_build_rpath(self):
         if is_cygwin():
             raise unittest.SkipTest('Windows PE/COFF binaries do not use RPATH')
-        testdir = os.path.join(self.unit_test_dir, '11 build_rpath')
+        testdir = os.path.join(self.unit_test_dir, '10 build_rpath')
         self.init(testdir)
         self.build()
         # C program RPATH
@@ -3409,7 +3409,7 @@ class LinuxlikeTests(BasePlatformTests):
         self.run_target('coverage-html')
 
     def test_cross_find_program(self):
-        testdir = os.path.join(self.unit_test_dir, '12 cross prog')
+        testdir = os.path.join(self.unit_test_dir, '11 cross prog')
         crossfile = tempfile.NamedTemporaryFile(mode='w')
         print(os.path.join(testdir, 'some_cross_tool.py'))
         crossfile.write('''[binaries]
@@ -3472,8 +3472,8 @@ endian = 'little'
 
     @skipIfNoPkgconfig
     def test_pkgconfig_usage(self):
-        testdir1 = os.path.join(self.unit_test_dir, '24 pkgconfig usage/dependency')
-        testdir2 = os.path.join(self.unit_test_dir, '24 pkgconfig usage/dependee')
+        testdir1 = os.path.join(self.unit_test_dir, '27 pkgconfig usage/dependency')
+        testdir2 = os.path.join(self.unit_test_dir, '27 pkgconfig usage/dependee')
         if subprocess.call(['pkg-config', '--cflags', 'glib-2.0'],
                            stdout=subprocess.DEVNULL,
                            stderr=subprocess.DEVNULL) != 0:
@@ -3512,7 +3512,7 @@ endian = 'little'
         '''
         with tempfile.TemporaryDirectory() as tempdirname:
             # build library
-            testdirbase = os.path.join(self.unit_test_dir, '28 pkgconfig use libraries')
+            testdirbase = os.path.join(self.unit_test_dir, '32 pkgconfig use libraries')
             testdirlib = os.path.join(testdirbase, 'lib')
             self.init(testdirlib, extra_args=['--prefix=' + tempdirname,
                                               '--libdir=lib',
@@ -3529,7 +3529,7 @@ endian = 'little'
 
     @skipIfNoPkgconfig
     def test_pkgconfig_formatting(self):
-        testdir = os.path.join(self.unit_test_dir, '31 pkgconfig format')
+        testdir = os.path.join(self.unit_test_dir, '36 pkgconfig format')
         self.init(testdir)
         myenv = os.environ.copy()
         myenv['PKG_CONFIG_PATH'] = self.privatedir
@@ -3591,7 +3591,7 @@ endian = 'little'
         '''
         Test that the dependencies are always listed in a deterministic order.
         '''
-        testdir = os.path.join(self.unit_test_dir, '36 dep order')
+        testdir = os.path.join(self.unit_test_dir, '41 dep order')
         self.init(testdir)
         with open(os.path.join(self.builddir, 'build.ninja')) as bfile:
             for line in bfile:
@@ -3606,7 +3606,7 @@ endian = 'little'
         '''
         if is_cygwin():
             raise unittest.SkipTest('rpath are not used on Cygwin')
-        testdir = os.path.join(self.unit_test_dir, '35 rpath order')
+        testdir = os.path.join(self.unit_test_dir, '40 rpath order')
         self.init(testdir)
         if is_osx():
             rpathre = re.compile('-rpath,.*/subprojects/sub1.*-rpath,.*/subprojects/sub2')
@@ -3633,7 +3633,7 @@ endian = 'little'
             raise unittest.SkipTest('workflow currently only works on macOS')
         oldprefix = self.prefix
         # Install external library so we can find it
-        testdir = os.path.join(self.unit_test_dir, '33 external, internal library rpath', 'external library')
+        testdir = os.path.join(self.unit_test_dir, '38 external, internal library rpath', 'external library')
         # install into installdir without using DESTDIR
         installdir = self.installdir
         self.prefix = installdir
@@ -3645,7 +3645,7 @@ endian = 'little'
         self.new_builddir()
         os.environ['LIBRARY_PATH'] = os.path.join(installdir, self.libdir)
         os.environ['PKG_CONFIG_PATH'] = os.path.join(installdir, self.libdir, 'pkgconfig')
-        testdir = os.path.join(self.unit_test_dir, '33 external, internal library rpath', 'built library')
+        testdir = os.path.join(self.unit_test_dir, '38 external, internal library rpath', 'built library')
         # install into installdir without using DESTDIR
         self.prefix = self.installdir
         self.init(testdir)
@@ -3703,7 +3703,7 @@ class LinuxArmCrossCompileTests(BasePlatformTests):
         https://github.com/mesonbuild/meson/issues/3049
         https://github.com/mesonbuild/meson/issues/3089
         '''
-        testdir = os.path.join(self.unit_test_dir, '29 cross file overrides always args')
+        testdir = os.path.join(self.unit_test_dir, '33 cross file overrides always args')
         self.meson_cross_file = os.path.join(testdir, 'ubuntu-armhf-overrides.txt')
         self.init(testdir)
         compdb = self.get_compdb()
@@ -3719,7 +3719,7 @@ class PythonTests(BasePlatformTests):
         if self.backend is not Backend.ninja:
             raise unittest.SkipTest('Skipping python tests with {} backend'.format(self.backend.name))
 
-        testdir = os.path.join(self.src_root, 'test cases', 'unit', '32 python extmodule')
+        testdir = os.path.join(self.src_root, 'test cases', 'unit', '37 python extmodule')
 
         # No python version specified, this will use meson's python
         self.init(testdir)
diff --git a/test cases/common/158 dotinclude/dotproc.c b/test cases/common/157 dotinclude/dotproc.c
index 5e65f7b43..5e65f7b43 100644
--- a/test cases/common/158 dotinclude/dotproc.c
+++ b/test cases/common/157 dotinclude/dotproc.c
diff --git a/test cases/common/158 dotinclude/meson.build b/test cases/common/157 dotinclude/meson.build
index e0c2cd7a0..e0c2cd7a0 100644
--- a/test cases/common/158 dotinclude/meson.build
+++ b/test cases/common/157 dotinclude/meson.build
diff --git a/test cases/common/158 dotinclude/stdio.h b/test cases/common/157 dotinclude/stdio.h
index b6bd09fc4..b6bd09fc4 100644
--- a/test cases/common/158 dotinclude/stdio.h
+++ b/test cases/common/157 dotinclude/stdio.h
diff --git a/test cases/common/159 reserved targets/all/meson.build b/test cases/common/158 reserved targets/all/meson.build
index adee88214..adee88214 100644
--- a/test cases/common/159 reserved targets/all/meson.build
+++ b/test cases/common/158 reserved targets/all/meson.build
diff --git a/test cases/common/159 reserved targets/benchmark/meson.build b/test cases/common/158 reserved targets/benchmark/meson.build
index 242cc235d..242cc235d 100644
--- a/test cases/common/159 reserved targets/benchmark/meson.build
+++ b/test cases/common/158 reserved targets/benchmark/meson.build
diff --git a/test cases/common/159 reserved targets/clean-ctlist/meson.build b/test cases/common/158 reserved targets/clean-ctlist/meson.build
index 75eb207db..75eb207db 100644
--- a/test cases/common/159 reserved targets/clean-ctlist/meson.build
+++ b/test cases/common/158 reserved targets/clean-ctlist/meson.build
diff --git a/test cases/common/159 reserved targets/clean-gcda/meson.build b/test cases/common/158 reserved targets/clean-gcda/meson.build
index 488a527fc..488a527fc 100644
--- a/test cases/common/159 reserved targets/clean-gcda/meson.build
+++ b/test cases/common/158 reserved targets/clean-gcda/meson.build
diff --git a/test cases/common/159 reserved targets/clean-gcno/meson.build b/test cases/common/158 reserved targets/clean-gcno/meson.build
index eec789ac2..eec789ac2 100644
--- a/test cases/common/159 reserved targets/clean-gcno/meson.build
+++ b/test cases/common/158 reserved targets/clean-gcno/meson.build
diff --git a/test cases/common/159 reserved targets/clean/meson.build b/test cases/common/158 reserved targets/clean/meson.build
index 4e27b6c27..4e27b6c27 100644
--- a/test cases/common/159 reserved targets/clean/meson.build
+++ b/test cases/common/158 reserved targets/clean/meson.build
diff --git a/test cases/common/159 reserved targets/coverage-html/meson.build b/test cases/common/158 reserved targets/coverage-html/meson.build
index 10a4cc89b..10a4cc89b 100644
--- a/test cases/common/159 reserved targets/coverage-html/meson.build
+++ b/test cases/common/158 reserved targets/coverage-html/meson.build
diff --git a/test cases/common/159 reserved targets/coverage-text/meson.build b/test cases/common/158 reserved targets/coverage-text/meson.build
index 21dcae5fe..21dcae5fe 100644
--- a/test cases/common/159 reserved targets/coverage-text/meson.build
+++ b/test cases/common/158 reserved targets/coverage-text/meson.build
diff --git a/test cases/common/159 reserved targets/coverage-xml/meson.build b/test cases/common/158 reserved targets/coverage-xml/meson.build
index 44d7bfbe3..44d7bfbe3 100644
--- a/test cases/common/159 reserved targets/coverage-xml/meson.build
+++ b/test cases/common/158 reserved targets/coverage-xml/meson.build
diff --git a/test cases/common/159 reserved targets/coverage/meson.build b/test cases/common/158 reserved targets/coverage/meson.build
index b40105550..b40105550 100644
--- a/test cases/common/159 reserved targets/coverage/meson.build
+++ b/test cases/common/158 reserved targets/coverage/meson.build
diff --git a/test cases/common/159 reserved targets/dist/meson.build b/test cases/common/158 reserved targets/dist/meson.build
index 951bbb4da..951bbb4da 100644
--- a/test cases/common/159 reserved targets/dist/meson.build
+++ b/test cases/common/158 reserved targets/dist/meson.build
diff --git a/test cases/common/159 reserved targets/distcheck/meson.build b/test cases/common/158 reserved targets/distcheck/meson.build
index 12b9328ad..12b9328ad 100644
--- a/test cases/common/159 reserved targets/distcheck/meson.build
+++ b/test cases/common/158 reserved targets/distcheck/meson.build
diff --git a/test cases/common/159 reserved targets/install/meson.build b/test cases/common/158 reserved targets/install/meson.build
index 483990186..483990186 100644
--- a/test cases/common/159 reserved targets/install/meson.build
+++ b/test cases/common/158 reserved targets/install/meson.build
diff --git a/test cases/common/159 reserved targets/meson.build b/test cases/common/158 reserved targets/meson.build
index 24fd937bc..24fd937bc 100644
--- a/test cases/common/159 reserved targets/meson.build
+++ b/test cases/common/158 reserved targets/meson.build
diff --git a/test cases/common/159 reserved targets/phony/meson.build b/test cases/common/158 reserved targets/phony/meson.build
index 6710fc124..6710fc124 100644
--- a/test cases/common/159 reserved targets/phony/meson.build
+++ b/test cases/common/158 reserved targets/phony/meson.build
diff --git a/test cases/common/159 reserved targets/reconfigure/meson.build b/test cases/common/158 reserved targets/reconfigure/meson.build
index c3ea3da8a..c3ea3da8a 100644
--- a/test cases/common/159 reserved targets/reconfigure/meson.build
+++ b/test cases/common/158 reserved targets/reconfigure/meson.build
diff --git a/test cases/common/159 reserved targets/runtarget/meson.build b/test cases/common/158 reserved targets/runtarget/meson.build
index 52c371b5d..52c371b5d 100644
--- a/test cases/common/159 reserved targets/runtarget/meson.build
+++ b/test cases/common/158 reserved targets/runtarget/meson.build
diff --git a/test cases/common/159 reserved targets/scan-build/meson.build b/test cases/common/158 reserved targets/scan-build/meson.build
index 100205346..100205346 100644
--- a/test cases/common/159 reserved targets/scan-build/meson.build
+++ b/test cases/common/158 reserved targets/scan-build/meson.build
diff --git a/test cases/common/159 reserved targets/test.c b/test cases/common/158 reserved targets/test.c
index 0fb4389f7..0fb4389f7 100644
--- a/test cases/common/159 reserved targets/test.c
+++ b/test cases/common/158 reserved targets/test.c
diff --git a/test cases/common/159 reserved targets/test/meson.build b/test cases/common/158 reserved targets/test/meson.build
index 4ab123cdd..4ab123cdd 100644
--- a/test cases/common/159 reserved targets/test/meson.build
+++ b/test cases/common/158 reserved targets/test/meson.build
diff --git a/test cases/common/159 reserved targets/uninstall/meson.build b/test cases/common/158 reserved targets/uninstall/meson.build
index 21c6ca60d..21c6ca60d 100644
--- a/test cases/common/159 reserved targets/uninstall/meson.build
+++ b/test cases/common/158 reserved targets/uninstall/meson.build
diff --git a/test cases/common/160 duplicate source names/dir1/file.c b/test cases/common/159 duplicate source names/dir1/file.c
index 094e18713..094e18713 100644
--- a/test cases/common/160 duplicate source names/dir1/file.c
+++ b/test cases/common/159 duplicate source names/dir1/file.c
diff --git a/test cases/common/160 duplicate source names/dir1/meson.build b/test cases/common/159 duplicate source names/dir1/meson.build
index 00bc85daf..00bc85daf 100644
--- a/test cases/common/160 duplicate source names/dir1/meson.build
+++ b/test cases/common/159 duplicate source names/dir1/meson.build
diff --git a/test cases/common/160 duplicate source names/dir2/dir1/file.c b/test cases/common/159 duplicate source names/dir2/dir1/file.c
index 5aac8e53f..5aac8e53f 100644
--- a/test cases/common/160 duplicate source names/dir2/dir1/file.c
+++ b/test cases/common/159 duplicate source names/dir2/dir1/file.c
diff --git a/test cases/common/160 duplicate source names/dir2/file.c b/test cases/common/159 duplicate source names/dir2/file.c
index 6cf8d6602..6cf8d6602 100644
--- a/test cases/common/160 duplicate source names/dir2/file.c
+++ b/test cases/common/159 duplicate source names/dir2/file.c
diff --git a/test cases/common/160 duplicate source names/dir2/meson.build b/test cases/common/159 duplicate source names/dir2/meson.build
index f116a0200..f116a0200 100644
--- a/test cases/common/160 duplicate source names/dir2/meson.build
+++ b/test cases/common/159 duplicate source names/dir2/meson.build
diff --git a/test cases/common/160 duplicate source names/dir3/dir1/file.c b/test cases/common/159 duplicate source names/dir3/dir1/file.c
index 04667c2ff..04667c2ff 100644
--- a/test cases/common/160 duplicate source names/dir3/dir1/file.c
+++ b/test cases/common/159 duplicate source names/dir3/dir1/file.c
diff --git a/test cases/common/160 duplicate source names/dir3/file.c b/test cases/common/159 duplicate source names/dir3/file.c
index d16d0a8cf..d16d0a8cf 100644
--- a/test cases/common/160 duplicate source names/dir3/file.c
+++ b/test cases/common/159 duplicate source names/dir3/file.c
diff --git a/test cases/common/160 duplicate source names/dir3/meson.build b/test cases/common/159 duplicate source names/dir3/meson.build
index 70ddbf2d0..70ddbf2d0 100644
--- a/test cases/common/160 duplicate source names/dir3/meson.build
+++ b/test cases/common/159 duplicate source names/dir3/meson.build
diff --git a/test cases/common/160 duplicate source names/meson.build b/test cases/common/159 duplicate source names/meson.build
index cac519401..cac519401 100644
--- a/test cases/common/160 duplicate source names/meson.build
+++ b/test cases/common/159 duplicate source names/meson.build
diff --git a/test cases/common/161 index customtarget/check_args.py b/test cases/common/160 index customtarget/check_args.py
index 8663a6fe2..8663a6fe2 100644
--- a/test cases/common/161 index customtarget/check_args.py
+++ b/test cases/common/160 index customtarget/check_args.py
diff --git a/test cases/common/161 index customtarget/gen_sources.py b/test cases/common/160 index customtarget/gen_sources.py
index 0bdb529cd..0bdb529cd 100644
--- a/test cases/common/161 index customtarget/gen_sources.py
+++ b/test cases/common/160 index customtarget/gen_sources.py
diff --git a/test cases/common/161 index customtarget/lib.c b/test cases/common/160 index customtarget/lib.c
index 17117d54c..17117d54c 100644
--- a/test cases/common/161 index customtarget/lib.c
+++ b/test cases/common/160 index customtarget/lib.c
diff --git a/test cases/common/161 index customtarget/meson.build b/test cases/common/160 index customtarget/meson.build
index 27d28b56a..27d28b56a 100644
--- a/test cases/common/161 index customtarget/meson.build
+++ b/test cases/common/160 index customtarget/meson.build
diff --git a/test cases/common/161 index customtarget/subdir/foo.c b/test cases/common/160 index customtarget/subdir/foo.c
index c620a1183..c620a1183 100644
--- a/test cases/common/161 index customtarget/subdir/foo.c
+++ b/test cases/common/160 index customtarget/subdir/foo.c
diff --git a/test cases/common/161 index customtarget/subdir/meson.build b/test cases/common/160 index customtarget/subdir/meson.build
index 47bcd322a..47bcd322a 100644
--- a/test cases/common/161 index customtarget/subdir/meson.build
+++ b/test cases/common/160 index customtarget/subdir/meson.build
diff --git a/test cases/common/162 wrap file should not failed/meson.build b/test cases/common/161 wrap file should not failed/meson.build
index 9cf4e9a6b..9cf4e9a6b 100644
--- a/test cases/common/162 wrap file should not failed/meson.build
+++ b/test cases/common/161 wrap file should not failed/meson.build
diff --git a/test cases/common/162 wrap file should not failed/src/meson.build b/test cases/common/161 wrap file should not failed/src/meson.build
index 69f666d1a..69f666d1a 100644
--- a/test cases/common/162 wrap file should not failed/src/meson.build
+++ b/test cases/common/161 wrap file should not failed/src/meson.build
diff --git a/test cases/common/162 wrap file should not failed/src/subprojects/foo/prog2.c b/test cases/common/161 wrap file should not failed/src/subprojects/foo/prog2.c
index 56f61a81a..56f61a81a 100644
--- a/test cases/common/162 wrap file should not failed/src/subprojects/foo/prog2.c
+++ b/test cases/common/161 wrap file should not failed/src/subprojects/foo/prog2.c
diff --git a/test cases/common/162 wrap file should not failed/src/subprojects/prog.c b/test cases/common/161 wrap file should not failed/src/subprojects/prog.c
index 56f61a81a..56f61a81a 100644
--- a/test cases/common/162 wrap file should not failed/src/subprojects/prog.c
+++ b/test cases/common/161 wrap file should not failed/src/subprojects/prog.c
diff --git a/test cases/common/162 wrap file should not failed/subprojects/packagecache/zlib-1.2.8-8-wrap.zip b/test cases/common/161 wrap file should not failed/subprojects/packagecache/zlib-1.2.8-8-wrap.zip
index 421376db9..421376db9 100644
--- a/test cases/common/162 wrap file should not failed/subprojects/packagecache/zlib-1.2.8-8-wrap.zip
+++ b/test cases/common/161 wrap file should not failed/subprojects/packagecache/zlib-1.2.8-8-wrap.zip
diff --git a/test cases/common/162 wrap file should not failed/subprojects/packagecache/zlib-1.2.8.tar.gz b/test cases/common/161 wrap file should not failed/subprojects/packagecache/zlib-1.2.8.tar.gz
index 421376db9..421376db9 100644
--- a/test cases/common/162 wrap file should not failed/subprojects/packagecache/zlib-1.2.8.tar.gz
+++ b/test cases/common/161 wrap file should not failed/subprojects/packagecache/zlib-1.2.8.tar.gz
diff --git a/test cases/common/162 wrap file should not failed/subprojects/zlib-1.2.8/foo.c b/test cases/common/161 wrap file should not failed/subprojects/zlib-1.2.8/foo.c
index 019f2bab1..019f2bab1 100644
--- a/test cases/common/162 wrap file should not failed/subprojects/zlib-1.2.8/foo.c
+++ b/test cases/common/161 wrap file should not failed/subprojects/zlib-1.2.8/foo.c
diff --git a/test cases/common/162 wrap file should not failed/subprojects/zlib-1.2.8/meson.build b/test cases/common/161 wrap file should not failed/subprojects/zlib-1.2.8/meson.build
index 8d8008e47..8d8008e47 100644
--- a/test cases/common/162 wrap file should not failed/subprojects/zlib-1.2.8/meson.build
+++ b/test cases/common/161 wrap file should not failed/subprojects/zlib-1.2.8/meson.build
diff --git a/test cases/common/162 wrap file should not failed/subprojects/zlib.wrap b/test cases/common/161 wrap file should not failed/subprojects/zlib.wrap
index 6d5896f79..6d5896f79 100644
--- a/test cases/common/162 wrap file should not failed/subprojects/zlib.wrap
+++ b/test cases/common/161 wrap file should not failed/subprojects/zlib.wrap
diff --git a/test cases/common/163 includedir subproj/meson.build b/test cases/common/162 includedir subproj/meson.build
index b3de5af6c..b3de5af6c 100644
--- a/test cases/common/163 includedir subproj/meson.build
+++ b/test cases/common/162 includedir subproj/meson.build
diff --git a/test cases/common/163 includedir subproj/prog.c b/test cases/common/162 includedir subproj/prog.c
index 772681ea8..772681ea8 100644
--- a/test cases/common/163 includedir subproj/prog.c
+++ b/test cases/common/162 includedir subproj/prog.c
diff --git a/test cases/common/163 includedir subproj/subprojects/inctest/include/incfile.h b/test cases/common/162 includedir subproj/subprojects/inctest/include/incfile.h
index ec740dab0..ec740dab0 100644
--- a/test cases/common/163 includedir subproj/subprojects/inctest/include/incfile.h
+++ b/test cases/common/162 includedir subproj/subprojects/inctest/include/incfile.h
diff --git a/test cases/common/163 includedir subproj/subprojects/inctest/meson.build b/test cases/common/162 includedir subproj/subprojects/inctest/meson.build
index 74aabcb6d..74aabcb6d 100644
--- a/test cases/common/163 includedir subproj/subprojects/inctest/meson.build
+++ b/test cases/common/162 includedir subproj/subprojects/inctest/meson.build
diff --git a/test cases/common/164 subproject dir name collision/a.c b/test cases/common/163 subproject dir name collision/a.c
index 6ed96fa05..6ed96fa05 100644
--- a/test cases/common/164 subproject dir name collision/a.c
+++ b/test cases/common/163 subproject dir name collision/a.c
diff --git a/test cases/common/164 subproject dir name collision/custom_subproject_dir/B/b.c b/test cases/common/163 subproject dir name collision/custom_subproject_dir/B/b.c
index 4c94ee95f..4c94ee95f 100644
--- a/test cases/common/164 subproject dir name collision/custom_subproject_dir/B/b.c
+++ b/test cases/common/163 subproject dir name collision/custom_subproject_dir/B/b.c
diff --git a/test cases/common/164 subproject dir name collision/custom_subproject_dir/B/meson.build b/test cases/common/163 subproject dir name collision/custom_subproject_dir/B/meson.build
index 280c60ce2..280c60ce2 100644
--- a/test cases/common/164 subproject dir name collision/custom_subproject_dir/B/meson.build
+++ b/test cases/common/163 subproject dir name collision/custom_subproject_dir/B/meson.build
diff --git a/test cases/common/164 subproject dir name collision/custom_subproject_dir/C/c.c b/test cases/common/163 subproject dir name collision/custom_subproject_dir/C/c.c
index eebfb9fba..eebfb9fba 100644
--- a/test cases/common/164 subproject dir name collision/custom_subproject_dir/C/c.c
+++ b/test cases/common/163 subproject dir name collision/custom_subproject_dir/C/c.c
diff --git a/test cases/common/164 subproject dir name collision/custom_subproject_dir/C/meson.build b/test cases/common/163 subproject dir name collision/custom_subproject_dir/C/meson.build
index abf0b1e26..abf0b1e26 100644
--- a/test cases/common/164 subproject dir name collision/custom_subproject_dir/C/meson.build
+++ b/test cases/common/163 subproject dir name collision/custom_subproject_dir/C/meson.build
diff --git a/test cases/common/164 subproject dir name collision/meson.build b/test cases/common/163 subproject dir name collision/meson.build
index 55312175e..55312175e 100644
--- a/test cases/common/164 subproject dir name collision/meson.build
+++ b/test cases/common/163 subproject dir name collision/meson.build
diff --git a/test cases/common/164 subproject dir name collision/other_subdir/custom_subproject_dir/other.c b/test cases/common/163 subproject dir name collision/other_subdir/custom_subproject_dir/other.c
index 0c27f8431..0c27f8431 100644
--- a/test cases/common/164 subproject dir name collision/other_subdir/custom_subproject_dir/other.c
+++ b/test cases/common/163 subproject dir name collision/other_subdir/custom_subproject_dir/other.c
diff --git a/test cases/common/164 subproject dir name collision/other_subdir/meson.build b/test cases/common/163 subproject dir name collision/other_subdir/meson.build
index 90cb67a63..90cb67a63 100644
--- a/test cases/common/164 subproject dir name collision/other_subdir/meson.build
+++ b/test cases/common/163 subproject dir name collision/other_subdir/meson.build
diff --git a/test cases/common/165 config tool variable/meson.build b/test cases/common/164 config tool variable/meson.build
index 0643042d8..0643042d8 100644
--- a/test cases/common/165 config tool variable/meson.build
+++ b/test cases/common/164 config tool variable/meson.build
diff --git a/test cases/common/166 custom target subdir depend files/copyfile.py b/test cases/common/165 custom target subdir depend files/copyfile.py
index ff42ac359..ff42ac359 100644
--- a/test cases/common/166 custom target subdir depend files/copyfile.py
+++ b/test cases/common/165 custom target subdir depend files/copyfile.py
diff --git a/test cases/common/166 custom target subdir depend files/meson.build b/test cases/common/165 custom target subdir depend files/meson.build
index 44f5c7157..44f5c7157 100644
--- a/test cases/common/166 custom target subdir depend files/meson.build
+++ b/test cases/common/165 custom target subdir depend files/meson.build
diff --git a/test cases/common/166 custom target subdir depend files/subdir/dep.dat b/test cases/common/165 custom target subdir depend files/subdir/dep.dat
index 5daee496d..5daee496d 100644
--- a/test cases/common/166 custom target subdir depend files/subdir/dep.dat
+++ b/test cases/common/165 custom target subdir depend files/subdir/dep.dat
diff --git a/test cases/common/166 custom target subdir depend files/subdir/foo.c.in b/test cases/common/165 custom target subdir depend files/subdir/foo.c.in
index d53846f52..d53846f52 100644
--- a/test cases/common/166 custom target subdir depend files/subdir/foo.c.in
+++ b/test cases/common/165 custom target subdir depend files/subdir/foo.c.in
diff --git a/test cases/common/166 custom target subdir depend files/subdir/meson.build b/test cases/common/165 custom target subdir depend files/subdir/meson.build
index f9d31c4c7..f9d31c4c7 100644
--- a/test cases/common/166 custom target subdir depend files/subdir/meson.build
+++ b/test cases/common/165 custom target subdir depend files/subdir/meson.build
diff --git a/test cases/common/167 external program shebang parsing/input.txt b/test cases/common/166 external program shebang parsing/input.txt
index 40e30d4b2..40e30d4b2 100644
--- a/test cases/common/167 external program shebang parsing/input.txt
+++ b/test cases/common/166 external program shebang parsing/input.txt
diff --git a/test cases/common/167 external program shebang parsing/main.c b/test cases/common/166 external program shebang parsing/main.c
index a90206bc7..a90206bc7 100644
--- a/test cases/common/167 external program shebang parsing/main.c
+++ b/test cases/common/166 external program shebang parsing/main.c
diff --git a/test cases/common/167 external program shebang parsing/meson.build b/test cases/common/166 external program shebang parsing/meson.build
index c1cc5af9d..c1cc5af9d 100644
--- a/test cases/common/167 external program shebang parsing/meson.build
+++ b/test cases/common/166 external program shebang parsing/meson.build
diff --git a/test cases/common/167 external program shebang parsing/script.int.in b/test cases/common/166 external program shebang parsing/script.int.in
index 77ff90907..77ff90907 100644
--- a/test cases/common/167 external program shebang parsing/script.int.in
+++ b/test cases/common/166 external program shebang parsing/script.int.in
diff --git a/test cases/common/168 disabler/meson.build b/test cases/common/167 disabler/meson.build
index 1956cd38a..1956cd38a 100644
--- a/test cases/common/168 disabler/meson.build
+++ b/test cases/common/167 disabler/meson.build
diff --git a/test cases/common/169 array option/meson.build b/test cases/common/168 array option/meson.build
index 034b9a545..034b9a545 100644
--- a/test cases/common/169 array option/meson.build
+++ b/test cases/common/168 array option/meson.build
diff --git a/test cases/common/169 array option/meson_options.txt b/test cases/common/168 array option/meson_options.txt
index 7ed0ac14d..7ed0ac14d 100644
--- a/test cases/common/169 array option/meson_options.txt
+++ b/test cases/common/168 array option/meson_options.txt
diff --git a/test cases/common/170 custom target template substitution/checkcopy.py b/test cases/common/169 custom target template substitution/checkcopy.py
index ab9f436ce..ab9f436ce 100644
--- a/test cases/common/170 custom target template substitution/checkcopy.py
+++ b/test cases/common/169 custom target template substitution/checkcopy.py
diff --git a/test cases/common/170 custom target template substitution/foo.c.in b/test cases/common/169 custom target template substitution/foo.c.in
index d53846f52..d53846f52 100644
--- a/test cases/common/170 custom target template substitution/foo.c.in
+++ b/test cases/common/169 custom target template substitution/foo.c.in
diff --git a/test cases/common/170 custom target template substitution/meson.build b/test cases/common/169 custom target template substitution/meson.build
index 737408ebf..737408ebf 100644
--- a/test cases/common/170 custom target template substitution/meson.build
+++ b/test cases/common/169 custom target template substitution/meson.build
diff --git a/test cases/common/171 not-found dependency/meson.build b/test cases/common/170 not-found dependency/meson.build
index 02072b6a0..02072b6a0 100644
--- a/test cases/common/171 not-found dependency/meson.build
+++ b/test cases/common/170 not-found dependency/meson.build
diff --git a/test cases/common/171 not-found dependency/sub/meson.build b/test cases/common/170 not-found dependency/sub/meson.build
index 2a33cae06..2a33cae06 100644
--- a/test cases/common/171 not-found dependency/sub/meson.build
+++ b/test cases/common/170 not-found dependency/sub/meson.build
diff --git a/test cases/common/171 not-found dependency/subprojects/trivial/meson.build b/test cases/common/170 not-found dependency/subprojects/trivial/meson.build
index 8769c7008..8769c7008 100644
--- a/test cases/common/171 not-found dependency/subprojects/trivial/meson.build
+++ b/test cases/common/170 not-found dependency/subprojects/trivial/meson.build
diff --git a/test cases/common/171 not-found dependency/subprojects/trivial/trivial.c b/test cases/common/170 not-found dependency/subprojects/trivial/trivial.c
index 35b21e0ce..35b21e0ce 100644
--- a/test cases/common/171 not-found dependency/subprojects/trivial/trivial.c
+++ b/test cases/common/170 not-found dependency/subprojects/trivial/trivial.c
diff --git a/test cases/common/171 not-found dependency/testlib.c b/test cases/common/170 not-found dependency/testlib.c
index e69de29bb..e69de29bb 100644
--- a/test cases/common/171 not-found dependency/testlib.c
+++ b/test cases/common/170 not-found dependency/testlib.c
diff --git a/test cases/common/172 subdir if_found/meson.build b/test cases/common/171 subdir if_found/meson.build
index 2c640cfad..2c640cfad 100644
--- a/test cases/common/172 subdir if_found/meson.build
+++ b/test cases/common/171 subdir if_found/meson.build
diff --git a/test cases/common/172 subdir if_found/subdir/meson.build b/test cases/common/171 subdir if_found/subdir/meson.build
index 1030e2551..1030e2551 100644
--- a/test cases/common/172 subdir if_found/subdir/meson.build
+++ b/test cases/common/171 subdir if_found/subdir/meson.build
diff --git a/test cases/common/173 default options prefix dependent defaults/meson.build b/test cases/common/172 default options prefix dependent defaults/meson.build
index 9ca4ec552..9ca4ec552 100644
--- a/test cases/common/173 default options prefix dependent defaults/meson.build
+++ b/test cases/common/172 default options prefix dependent defaults/meson.build
diff --git a/test cases/common/174 dependency factory/meson.build b/test cases/common/173 dependency factory/meson.build
index 1b8ed176b..1b8ed176b 100644
--- a/test cases/common/174 dependency factory/meson.build
+++ b/test cases/common/173 dependency factory/meson.build
diff --git a/test cases/common/175 get project license/bar.c b/test cases/common/174 get project license/bar.c
index 864869b4f..864869b4f 100644
--- a/test cases/common/175 get project license/bar.c
+++ b/test cases/common/174 get project license/bar.c
diff --git a/test cases/common/175 get project license/meson.build b/test cases/common/174 get project license/meson.build
index 37303e372..37303e372 100644
--- a/test cases/common/175 get project license/meson.build
+++ b/test cases/common/174 get project license/meson.build
diff --git a/test cases/common/176 yield/meson.build b/test cases/common/175 yield/meson.build
index ba3e426b1..ba3e426b1 100644
--- a/test cases/common/176 yield/meson.build
+++ b/test cases/common/175 yield/meson.build
diff --git a/test cases/common/176 yield/meson_options.txt b/test cases/common/175 yield/meson_options.txt
index 36bad4bd7..36bad4bd7 100644
--- a/test cases/common/176 yield/meson_options.txt
+++ b/test cases/common/175 yield/meson_options.txt
diff --git a/test cases/common/176 yield/subprojects/sub/meson.build b/test cases/common/175 yield/subprojects/sub/meson.build
index 3a506e07e..3a506e07e 100644
--- a/test cases/common/176 yield/subprojects/sub/meson.build
+++ b/test cases/common/175 yield/subprojects/sub/meson.build
diff --git a/test cases/common/176 yield/subprojects/sub/meson_options.txt b/test cases/common/175 yield/subprojects/sub/meson_options.txt
index a96c3073c..a96c3073c 100644
--- a/test cases/common/176 yield/subprojects/sub/meson_options.txt
+++ b/test cases/common/175 yield/subprojects/sub/meson_options.txt
diff --git a/test cases/common/177 subproject nested subproject dirs/contrib/subprojects/alpha/a.c b/test cases/common/176 subproject nested subproject dirs/contrib/subprojects/alpha/a.c
index 7ac3e5e57..7ac3e5e57 100644
--- a/test cases/common/177 subproject nested subproject dirs/contrib/subprojects/alpha/a.c
+++ b/test cases/common/176 subproject nested subproject dirs/contrib/subprojects/alpha/a.c
diff --git a/test cases/common/177 subproject nested subproject dirs/contrib/subprojects/alpha/meson.build b/test cases/common/176 subproject nested subproject dirs/contrib/subprojects/alpha/meson.build
index 12f656427..12f656427 100644
--- a/test cases/common/177 subproject nested subproject dirs/contrib/subprojects/alpha/meson.build
+++ b/test cases/common/176 subproject nested subproject dirs/contrib/subprojects/alpha/meson.build
diff --git a/test cases/common/177 subproject nested subproject dirs/contrib/subprojects/alpha/var/subprojects/wrap_files_might_be_here b/test cases/common/176 subproject nested subproject dirs/contrib/subprojects/alpha/var/subprojects/wrap_files_might_be_here
index 8d1c8b69c..8d1c8b69c 100644
--- a/test cases/common/177 subproject nested subproject dirs/contrib/subprojects/alpha/var/subprojects/wrap_files_might_be_here
+++ b/test cases/common/176 subproject nested subproject dirs/contrib/subprojects/alpha/var/subprojects/wrap_files_might_be_here
diff --git a/test cases/common/177 subproject nested subproject dirs/contrib/subprojects/beta/b.c b/test cases/common/176 subproject nested subproject dirs/contrib/subprojects/beta/b.c
index a95651bc0..a95651bc0 100644
--- a/test cases/common/177 subproject nested subproject dirs/contrib/subprojects/beta/b.c
+++ b/test cases/common/176 subproject nested subproject dirs/contrib/subprojects/beta/b.c
diff --git a/test cases/common/177 subproject nested subproject dirs/contrib/subprojects/beta/meson.build b/test cases/common/176 subproject nested subproject dirs/contrib/subprojects/beta/meson.build
index ea4cc9bdf..ea4cc9bdf 100644
--- a/test cases/common/177 subproject nested subproject dirs/contrib/subprojects/beta/meson.build
+++ b/test cases/common/176 subproject nested subproject dirs/contrib/subprojects/beta/meson.build
diff --git a/test cases/common/177 subproject nested subproject dirs/meson.build b/test cases/common/176 subproject nested subproject dirs/meson.build
index a4d0a9716..a4d0a9716 100644
--- a/test cases/common/177 subproject nested subproject dirs/meson.build
+++ b/test cases/common/176 subproject nested subproject dirs/meson.build
diff --git a/test cases/common/177 subproject nested subproject dirs/prog.c b/test cases/common/176 subproject nested subproject dirs/prog.c
index 394f139eb..394f139eb 100644
--- a/test cases/common/177 subproject nested subproject dirs/prog.c
+++ b/test cases/common/176 subproject nested subproject dirs/prog.c
diff --git a/test cases/common/178 preserve gendir/base.inp b/test cases/common/177 preserve gendir/base.inp
index df967b96a..df967b96a 100644
--- a/test cases/common/178 preserve gendir/base.inp
+++ b/test cases/common/177 preserve gendir/base.inp
diff --git a/test cases/common/178 preserve gendir/com/mesonbuild/subbie.inp b/test cases/common/177 preserve gendir/com/mesonbuild/subbie.inp
index df0f4e9ae..df0f4e9ae 100644
--- a/test cases/common/178 preserve gendir/com/mesonbuild/subbie.inp
+++ b/test cases/common/177 preserve gendir/com/mesonbuild/subbie.inp
diff --git a/test cases/common/178 preserve gendir/genprog.py b/test cases/common/177 preserve gendir/genprog.py
index 1e10998ee..1e10998ee 100755
--- a/test cases/common/178 preserve gendir/genprog.py
+++ b/test cases/common/177 preserve gendir/genprog.py
diff --git a/test cases/common/178 preserve gendir/meson.build b/test cases/common/177 preserve gendir/meson.build
index ce219f0d8..ce219f0d8 100644
--- a/test cases/common/178 preserve gendir/meson.build
+++ b/test cases/common/177 preserve gendir/meson.build
diff --git a/test cases/common/178 preserve gendir/testprog.c b/test cases/common/177 preserve gendir/testprog.c
index 46b460257..46b460257 100644
--- a/test cases/common/178 preserve gendir/testprog.c
+++ b/test cases/common/177 preserve gendir/testprog.c
diff --git a/test cases/common/179 source in dep/bar.cpp b/test cases/common/178 source in dep/bar.cpp
index bda8cb6ec..bda8cb6ec 100644
--- a/test cases/common/179 source in dep/bar.cpp
+++ b/test cases/common/178 source in dep/bar.cpp
diff --git a/test cases/common/179 source in dep/foo.c b/test cases/common/178 source in dep/foo.c
index 1ecfa8c79..1ecfa8c79 100644
--- a/test cases/common/179 source in dep/foo.c
+++ b/test cases/common/178 source in dep/foo.c
diff --git a/test cases/common/179 source in dep/generated/funname b/test cases/common/178 source in dep/generated/funname
index 79f3c867f..79f3c867f 100644
--- a/test cases/common/179 source in dep/generated/funname
+++ b/test cases/common/178 source in dep/generated/funname
diff --git a/test cases/common/179 source in dep/generated/genheader.py b/test cases/common/178 source in dep/generated/genheader.py
index eafc07545..eafc07545 100755
--- a/test cases/common/179 source in dep/generated/genheader.py
+++ b/test cases/common/178 source in dep/generated/genheader.py
diff --git a/test cases/common/179 source in dep/generated/main.c b/test cases/common/178 source in dep/generated/main.c
index 07e7c932e..07e7c932e 100644
--- a/test cases/common/179 source in dep/generated/main.c
+++ b/test cases/common/178 source in dep/generated/main.c
diff --git a/test cases/common/179 source in dep/generated/meson.build b/test cases/common/178 source in dep/generated/meson.build
index 286270901..286270901 100644
--- a/test cases/common/179 source in dep/generated/meson.build
+++ b/test cases/common/178 source in dep/generated/meson.build
diff --git a/test cases/common/179 source in dep/meson.build b/test cases/common/178 source in dep/meson.build
index 7111ba11f..7111ba11f 100644
--- a/test cases/common/179 source in dep/meson.build
+++ b/test cases/common/178 source in dep/meson.build
diff --git a/test cases/common/180 generator link whole/export.h b/test cases/common/179 generator link whole/export.h
index f4f6f451b..f4f6f451b 100644
--- a/test cases/common/180 generator link whole/export.h
+++ b/test cases/common/179 generator link whole/export.h
diff --git a/test cases/common/180 generator link whole/generator.py b/test cases/common/179 generator link whole/generator.py
index 0076b7499..0076b7499 100755
--- a/test cases/common/180 generator link whole/generator.py
+++ b/test cases/common/179 generator link whole/generator.py
diff --git a/test cases/common/180 generator link whole/main.c b/test cases/common/179 generator link whole/main.c
index acf871782..acf871782 100644
--- a/test cases/common/180 generator link whole/main.c
+++ b/test cases/common/179 generator link whole/main.c
diff --git a/test cases/common/180 generator link whole/meson.build b/test cases/common/179 generator link whole/meson.build
index 30ae9c62c..30ae9c62c 100644
--- a/test cases/common/180 generator link whole/meson.build
+++ b/test cases/common/179 generator link whole/meson.build
diff --git a/test cases/common/180 generator link whole/meson_test_function.tmpl b/test cases/common/179 generator link whole/meson_test_function.tmpl
index e69de29bb..e69de29bb 100644
--- a/test cases/common/180 generator link whole/meson_test_function.tmpl
+++ b/test cases/common/179 generator link whole/meson_test_function.tmpl
diff --git a/test cases/common/180 generator link whole/pull_meson_test_function.c b/test cases/common/179 generator link whole/pull_meson_test_function.c
index c54dda6d7..c54dda6d7 100644
--- a/test cases/common/180 generator link whole/pull_meson_test_function.c
+++ b/test cases/common/179 generator link whole/pull_meson_test_function.c
diff --git a/test cases/common/181 initial c_args/meson.build b/test cases/common/180 initial c_args/meson.build
index 169d2bd51..169d2bd51 100644
--- a/test cases/common/181 initial c_args/meson.build
+++ b/test cases/common/180 initial c_args/meson.build
diff --git a/test cases/common/181 initial c_args/test_args.txt b/test cases/common/180 initial c_args/test_args.txt
index 9a6da068a..9a6da068a 100644
--- a/test cases/common/181 initial c_args/test_args.txt
+++ b/test cases/common/180 initial c_args/test_args.txt
diff --git a/test cases/common/182 identical target name in subproject flat layout/foo.c b/test cases/common/181 identical target name in subproject flat layout/foo.c
index ed427899a..ed427899a 100644
--- a/test cases/common/182 identical target name in subproject flat layout/foo.c
+++ b/test cases/common/181 identical target name in subproject flat layout/foo.c
diff --git a/test cases/common/182 identical target name in subproject flat layout/main.c b/test cases/common/181 identical target name in subproject flat layout/main.c
index 6f02aeb82..6f02aeb82 100644
--- a/test cases/common/182 identical target name in subproject flat layout/main.c
+++ b/test cases/common/181 identical target name in subproject flat layout/main.c
diff --git a/test cases/common/182 identical target name in subproject flat layout/meson.build b/test cases/common/181 identical target name in subproject flat layout/meson.build
index d859fda3e..d859fda3e 100644
--- a/test cases/common/182 identical target name in subproject flat layout/meson.build
+++ b/test cases/common/181 identical target name in subproject flat layout/meson.build
diff --git a/test cases/common/182 identical target name in subproject flat layout/subprojects/subproj/foo.c b/test cases/common/181 identical target name in subproject flat layout/subprojects/subproj/foo.c
index f33429229..f33429229 100644
--- a/test cases/common/182 identical target name in subproject flat layout/subprojects/subproj/foo.c
+++ b/test cases/common/181 identical target name in subproject flat layout/subprojects/subproj/foo.c
diff --git a/test cases/common/182 identical target name in subproject flat layout/subprojects/subproj/meson.build b/test cases/common/181 identical target name in subproject flat layout/subprojects/subproj/meson.build
index c92719469..c92719469 100644
--- a/test cases/common/182 identical target name in subproject flat layout/subprojects/subproj/meson.build
+++ b/test cases/common/181 identical target name in subproject flat layout/subprojects/subproj/meson.build
diff --git a/test cases/common/184 as-needed/config.h b/test cases/common/182 as-needed/config.h
index b8fb60fe4..b8fb60fe4 100644
--- a/test cases/common/184 as-needed/config.h
+++ b/test cases/common/182 as-needed/config.h
diff --git a/test cases/common/184 as-needed/libA.cpp b/test cases/common/182 as-needed/libA.cpp
index 5f45bc077..5f45bc077 100644
--- a/test cases/common/184 as-needed/libA.cpp
+++ b/test cases/common/182 as-needed/libA.cpp
diff --git a/test cases/common/184 as-needed/libA.h b/test cases/common/182 as-needed/libA.h
index 8e76d22fa..8e76d22fa 100644
--- a/test cases/common/184 as-needed/libA.h
+++ b/test cases/common/182 as-needed/libA.h
diff --git a/test cases/common/184 as-needed/libB.cpp b/test cases/common/182 as-needed/libB.cpp
index a8723941b..a8723941b 100644
--- a/test cases/common/184 as-needed/libB.cpp
+++ b/test cases/common/182 as-needed/libB.cpp
diff --git a/test cases/common/184 as-needed/main.cpp b/test cases/common/182 as-needed/main.cpp
index 191d15c4d..191d15c4d 100644
--- a/test cases/common/184 as-needed/main.cpp
+++ b/test cases/common/182 as-needed/main.cpp
diff --git a/test cases/common/184 as-needed/meson.build b/test cases/common/182 as-needed/meson.build
index 3b54aaa02..3b54aaa02 100644
--- a/test cases/common/184 as-needed/meson.build
+++ b/test cases/common/182 as-needed/meson.build
diff --git a/test cases/common/185 ndebug if-release enabled/main.c b/test cases/common/183 ndebug if-release enabled/main.c
index 984ebcabe..984ebcabe 100644
--- a/test cases/common/185 ndebug if-release enabled/main.c
+++ b/test cases/common/183 ndebug if-release enabled/main.c
diff --git a/test cases/common/185 ndebug if-release enabled/meson.build b/test cases/common/183 ndebug if-release enabled/meson.build
index be263752a..be263752a 100644
--- a/test cases/common/185 ndebug if-release enabled/meson.build
+++ b/test cases/common/183 ndebug if-release enabled/meson.build
diff --git a/test cases/common/186 ndebug if-release disabled/main.c b/test cases/common/184 ndebug if-release disabled/main.c
index cb3ec3f65..cb3ec3f65 100644
--- a/test cases/common/186 ndebug if-release disabled/main.c
+++ b/test cases/common/184 ndebug if-release disabled/main.c
diff --git a/test cases/common/186 ndebug if-release disabled/meson.build b/test cases/common/184 ndebug if-release disabled/meson.build
index a9a79ea9b..a9a79ea9b 100644
--- a/test cases/common/186 ndebug if-release disabled/meson.build
+++ b/test cases/common/184 ndebug if-release disabled/meson.build
diff --git a/test cases/common/187 subproject version/meson.build b/test cases/common/185 subproject version/meson.build
index bd8fc0392..bd8fc0392 100644
--- a/test cases/common/187 subproject version/meson.build
+++ b/test cases/common/185 subproject version/meson.build
diff --git a/test cases/common/187 subproject version/subprojects/a/meson.build b/test cases/common/185 subproject version/subprojects/a/meson.build
index dae31300f..dae31300f 100644
--- a/test cases/common/187 subproject version/subprojects/a/meson.build
+++ b/test cases/common/185 subproject version/subprojects/a/meson.build
diff --git a/test cases/common/188 subdir_done/meson.build b/test cases/common/186 subdir_done/meson.build
index 457e613b1..457e613b1 100644
--- a/test cases/common/188 subdir_done/meson.build
+++ b/test cases/common/186 subdir_done/meson.build
diff --git a/test cases/common/189 bothlibraries/libfile.c b/test cases/common/187 bothlibraries/libfile.c
index 085ef3b87..085ef3b87 100644
--- a/test cases/common/189 bothlibraries/libfile.c
+++ b/test cases/common/187 bothlibraries/libfile.c
diff --git a/test cases/common/189 bothlibraries/main.c b/test cases/common/187 bothlibraries/main.c
index 03a8e02b8..03a8e02b8 100644
--- a/test cases/common/189 bothlibraries/main.c
+++ b/test cases/common/187 bothlibraries/main.c
diff --git a/test cases/common/189 bothlibraries/meson.build b/test cases/common/187 bothlibraries/meson.build
index 3a13d6259..3a13d6259 100644
--- a/test cases/common/189 bothlibraries/meson.build
+++ b/test cases/common/187 bothlibraries/meson.build
diff --git a/test cases/common/189 bothlibraries/mylib.h b/test cases/common/187 bothlibraries/mylib.h
index 1038a0142..1038a0142 100644
--- a/test cases/common/189 bothlibraries/mylib.h
+++ b/test cases/common/187 bothlibraries/mylib.h
diff --git a/test cases/common/190 escape and unicode/file.c.in b/test cases/common/188 escape and unicode/file.c.in
index 413ed4297..413ed4297 100644
--- a/test cases/common/190 escape and unicode/file.c.in
+++ b/test cases/common/188 escape and unicode/file.c.in
diff --git a/test cases/common/190 escape and unicode/file.py b/test cases/common/188 escape and unicode/file.py
index af67a0950..af67a0950 100644
--- a/test cases/common/190 escape and unicode/file.py
+++ b/test cases/common/188 escape and unicode/file.py
diff --git a/test cases/common/190 escape and unicode/find.py b/test cases/common/188 escape and unicode/find.py
index 34a3eb835..34a3eb835 100644
--- a/test cases/common/190 escape and unicode/find.py
+++ b/test cases/common/188 escape and unicode/find.py
diff --git a/test cases/common/190 escape and unicode/fun.c b/test cases/common/188 escape and unicode/fun.c
index 8eeb8ea00..8eeb8ea00 100644
--- a/test cases/common/190 escape and unicode/fun.c
+++ b/test cases/common/188 escape and unicode/fun.c
diff --git a/test cases/common/190 escape and unicode/main.c b/test cases/common/188 escape and unicode/main.c
index 0bcde169c..0bcde169c 100644
--- a/test cases/common/190 escape and unicode/main.c
+++ b/test cases/common/188 escape and unicode/main.c
diff --git a/test cases/common/190 escape and unicode/meson.build b/test cases/common/188 escape and unicode/meson.build
index 65377b6a3..65377b6a3 100644
--- a/test cases/common/190 escape and unicode/meson.build
+++ b/test cases/common/188 escape and unicode/meson.build
diff --git a/test cases/common/191 has link arg/meson.build b/test cases/common/189 has link arg/meson.build
index e166101ab..e166101ab 100644
--- a/test cases/common/191 has link arg/meson.build
+++ b/test cases/common/189 has link arg/meson.build
diff --git a/test cases/common/192 same target name flat layout/foo.c b/test cases/common/190 same target name flat layout/foo.c
index ed427899a..ed427899a 100644
--- a/test cases/common/192 same target name flat layout/foo.c
+++ b/test cases/common/190 same target name flat layout/foo.c
diff --git a/test cases/common/192 same target name flat layout/main.c b/test cases/common/190 same target name flat layout/main.c
index 6f02aeb82..6f02aeb82 100644
--- a/test cases/common/192 same target name flat layout/main.c
+++ b/test cases/common/190 same target name flat layout/main.c
diff --git a/test cases/common/192 same target name flat layout/meson.build b/test cases/common/190 same target name flat layout/meson.build
index a3c95fa25..a3c95fa25 100644
--- a/test cases/common/192 same target name flat layout/meson.build
+++ b/test cases/common/190 same target name flat layout/meson.build
diff --git a/test cases/common/192 same target name flat layout/subdir/foo.c b/test cases/common/190 same target name flat layout/subdir/foo.c
index f33429229..f33429229 100644
--- a/test cases/common/192 same target name flat layout/subdir/foo.c
+++ b/test cases/common/190 same target name flat layout/subdir/foo.c
diff --git a/test cases/common/192 same target name flat layout/subdir/meson.build b/test cases/common/190 same target name flat layout/subdir/meson.build
index 223a5ef90..223a5ef90 100644
--- a/test cases/common/192 same target name flat layout/subdir/meson.build
+++ b/test cases/common/190 same target name flat layout/subdir/meson.build
diff --git a/test cases/common/193 find override/meson.build b/test cases/common/191 find override/meson.build
index 3b8af8091..3b8af8091 100644
--- a/test cases/common/193 find override/meson.build
+++ b/test cases/common/191 find override/meson.build
diff --git a/test cases/common/193 find override/otherdir/main.c b/test cases/common/191 find override/otherdir/main.c
index 2cef67c8d..2cef67c8d 100644
--- a/test cases/common/193 find override/otherdir/main.c
+++ b/test cases/common/191 find override/otherdir/main.c
diff --git a/test cases/common/193 find override/otherdir/main2.c b/test cases/common/191 find override/otherdir/main2.c
index 6d716882c..6d716882c 100644
--- a/test cases/common/193 find override/otherdir/main2.c
+++ b/test cases/common/191 find override/otherdir/main2.c
diff --git a/test cases/common/193 find override/otherdir/meson.build b/test cases/common/191 find override/otherdir/meson.build
index dc41f5bf7..dc41f5bf7 100644
--- a/test cases/common/193 find override/otherdir/meson.build
+++ b/test cases/common/191 find override/otherdir/meson.build
diff --git a/test cases/common/193 find override/otherdir/source.desc b/test cases/common/191 find override/otherdir/source.desc
index 8b19c9c2f..8b19c9c2f 100644
--- a/test cases/common/193 find override/otherdir/source.desc
+++ b/test cases/common/191 find override/otherdir/source.desc
diff --git a/test cases/common/193 find override/otherdir/source2.desc b/test cases/common/191 find override/otherdir/source2.desc
index 965f868df..965f868df 100644
--- a/test cases/common/193 find override/otherdir/source2.desc
+++ b/test cases/common/191 find override/otherdir/source2.desc
diff --git a/test cases/common/193 find override/subdir/converter.py b/test cases/common/191 find override/subdir/converter.py
index ee2ff85a3..ee2ff85a3 100755
--- a/test cases/common/193 find override/subdir/converter.py
+++ b/test cases/common/191 find override/subdir/converter.py
diff --git a/test cases/common/193 find override/subdir/gencodegen.py.in b/test cases/common/191 find override/subdir/gencodegen.py.in
index 57d9c40b4..57d9c40b4 100755
--- a/test cases/common/193 find override/subdir/gencodegen.py.in
+++ b/test cases/common/191 find override/subdir/gencodegen.py.in
diff --git a/test cases/common/193 find override/subdir/meson.build b/test cases/common/191 find override/subdir/meson.build
index e5de34dde..e5de34dde 100644
--- a/test cases/common/193 find override/subdir/meson.build
+++ b/test cases/common/191 find override/subdir/meson.build
diff --git a/test cases/common/194 partial dependency/declare_dependency/headers/foo.c b/test cases/common/192 partial dependency/declare_dependency/headers/foo.c
index 215112ca5..215112ca5 100644
--- a/test cases/common/194 partial dependency/declare_dependency/headers/foo.c
+++ b/test cases/common/192 partial dependency/declare_dependency/headers/foo.c
diff --git a/test cases/common/194 partial dependency/declare_dependency/headers/foo.h b/test cases/common/192 partial dependency/declare_dependency/headers/foo.h
index 28c81c9d3..28c81c9d3 100644
--- a/test cases/common/194 partial dependency/declare_dependency/headers/foo.h
+++ b/test cases/common/192 partial dependency/declare_dependency/headers/foo.h
diff --git a/test cases/common/194 partial dependency/declare_dependency/main.c b/test cases/common/192 partial dependency/declare_dependency/main.c
index e9ed0329a..e9ed0329a 100644
--- a/test cases/common/194 partial dependency/declare_dependency/main.c
+++ b/test cases/common/192 partial dependency/declare_dependency/main.c
diff --git a/test cases/common/194 partial dependency/declare_dependency/meson.build b/test cases/common/192 partial dependency/declare_dependency/meson.build
index 86e26089d..86e26089d 100644
--- a/test cases/common/194 partial dependency/declare_dependency/meson.build
+++ b/test cases/common/192 partial dependency/declare_dependency/meson.build
diff --git a/test cases/common/194 partial dependency/declare_dependency/other.c b/test cases/common/192 partial dependency/declare_dependency/other.c
index b1e199e44..b1e199e44 100644
--- a/test cases/common/194 partial dependency/declare_dependency/other.c
+++ b/test cases/common/192 partial dependency/declare_dependency/other.c
diff --git a/test cases/common/194 partial dependency/meson.build b/test cases/common/192 partial dependency/meson.build
index e908487f1..e908487f1 100644
--- a/test cases/common/194 partial dependency/meson.build
+++ b/test cases/common/192 partial dependency/meson.build
diff --git a/test cases/common/195 openmp/main.c b/test cases/common/193 openmp/main.c
index cc81f4897..cc81f4897 100644
--- a/test cases/common/195 openmp/main.c
+++ b/test cases/common/193 openmp/main.c
diff --git a/test cases/common/195 openmp/main.cpp b/test cases/common/193 openmp/main.cpp
index b12be3fd8..b12be3fd8 100644
--- a/test cases/common/195 openmp/main.cpp
+++ b/test cases/common/193 openmp/main.cpp
diff --git a/test cases/common/195 openmp/main.f90 b/test cases/common/193 openmp/main.f90
index c062d8691..c062d8691 100644
--- a/test cases/common/195 openmp/main.f90
+++ b/test cases/common/193 openmp/main.f90
diff --git a/test cases/common/195 openmp/meson.build b/test cases/common/193 openmp/meson.build
index a05ca59d9..a05ca59d9 100644
--- a/test cases/common/195 openmp/meson.build
+++ b/test cases/common/193 openmp/meson.build
diff --git a/test cases/common/196 same target name/file.c b/test cases/common/194 same target name/file.c
index 6f1c172d6..6f1c172d6 100644
--- a/test cases/common/196 same target name/file.c
+++ b/test cases/common/194 same target name/file.c
diff --git a/test cases/common/196 same target name/meson.build b/test cases/common/194 same target name/meson.build
index 4e585d56e..4e585d56e 100644
--- a/test cases/common/196 same target name/meson.build
+++ b/test cases/common/194 same target name/meson.build
diff --git a/test cases/common/196 same target name/sub/file2.c b/test cases/common/194 same target name/sub/file2.c
index a5e453d2f..a5e453d2f 100644
--- a/test cases/common/196 same target name/sub/file2.c
+++ b/test cases/common/194 same target name/sub/file2.c
diff --git a/test cases/common/196 same target name/sub/meson.build b/test cases/common/194 same target name/sub/meson.build
index 610a4a3c7..610a4a3c7 100644
--- a/test cases/common/196 same target name/sub/meson.build
+++ b/test cases/common/194 same target name/sub/meson.build
diff --git a/test cases/common/197 test depends/gen.py b/test cases/common/195 test depends/gen.py
index ee4ed9818..ee4ed9818 100755
--- a/test cases/common/197 test depends/gen.py
+++ b/test cases/common/195 test depends/gen.py
diff --git a/test cases/common/197 test depends/main.c b/test cases/common/195 test depends/main.c
index 78f2de106..78f2de106 100644
--- a/test cases/common/197 test depends/main.c
+++ b/test cases/common/195 test depends/main.c
diff --git a/test cases/common/197 test depends/meson.build b/test cases/common/195 test depends/meson.build
index 888c45118..888c45118 100644
--- a/test cases/common/197 test depends/meson.build
+++ b/test cases/common/195 test depends/meson.build
diff --git a/test cases/common/197 test depends/test.py b/test cases/common/195 test depends/test.py
index 5b9f65c86..5b9f65c86 100755
--- a/test cases/common/197 test depends/test.py
+++ b/test cases/common/195 test depends/test.py
diff --git a/test cases/common/198 args flattening/meson.build b/test cases/common/196 args flattening/meson.build
index 6da2e8f25..6da2e8f25 100644
--- a/test cases/common/198 args flattening/meson.build
+++ b/test cases/common/196 args flattening/meson.build
diff --git a/test cases/common/199 dict/meson.build b/test cases/common/197 dict/meson.build
index e1ee2e33b..e1ee2e33b 100644
--- a/test cases/common/199 dict/meson.build
+++ b/test cases/common/197 dict/meson.build
diff --git a/test cases/common/199 dict/prog.c b/test cases/common/197 dict/prog.c
index bf0999d4a..bf0999d4a 100644
--- a/test cases/common/199 dict/prog.c
+++ b/test cases/common/197 dict/prog.c
diff --git a/test cases/common/200 check header/meson.build b/test cases/common/198 check header/meson.build
index 7b343d7e3..7b343d7e3 100644
--- a/test cases/common/200 check header/meson.build
+++ b/test cases/common/198 check header/meson.build
diff --git a/test cases/common/200 check header/ouagadougou.h b/test cases/common/198 check header/ouagadougou.h
index 2f76c49cc..2f76c49cc 100644
--- a/test cases/common/200 check header/ouagadougou.h
+++ b/test cases/common/198 check header/ouagadougou.h
diff --git a/test cases/common/201 install_mode/config.h.in b/test cases/common/199 install_mode/config.h.in
index 14a155874..14a155874 100644
--- a/test cases/common/201 install_mode/config.h.in
+++ b/test cases/common/199 install_mode/config.h.in
diff --git a/test cases/common/201 install_mode/data_source.txt b/test cases/common/199 install_mode/data_source.txt
index 0c23cc0c3..0c23cc0c3 100644
--- a/test cases/common/201 install_mode/data_source.txt
+++ b/test cases/common/199 install_mode/data_source.txt
diff --git a/test cases/common/201 install_mode/foo.1 b/test cases/common/199 install_mode/foo.1
index 647c0970c..647c0970c 100644
--- a/test cases/common/201 install_mode/foo.1
+++ b/test cases/common/199 install_mode/foo.1
diff --git a/test cases/common/201 install_mode/installed_files.txt b/test cases/common/199 install_mode/installed_files.txt
index 00fb231e7..00fb231e7 100644
--- a/test cases/common/201 install_mode/installed_files.txt
+++ b/test cases/common/199 install_mode/installed_files.txt
diff --git a/test cases/common/201 install_mode/meson.build b/test cases/common/199 install_mode/meson.build
index d06371f84..d06371f84 100644
--- a/test cases/common/201 install_mode/meson.build
+++ b/test cases/common/199 install_mode/meson.build
diff --git a/test cases/common/201 install_mode/rootdir.h b/test cases/common/199 install_mode/rootdir.h
index 72fb13220..72fb13220 100644
--- a/test cases/common/201 install_mode/rootdir.h
+++ b/test cases/common/199 install_mode/rootdir.h
diff --git a/test cases/common/201 install_mode/runscript.sh b/test cases/common/199 install_mode/runscript.sh
index 8bc5ca6ce..8bc5ca6ce 100644
--- a/test cases/common/201 install_mode/runscript.sh
+++ b/test cases/common/199 install_mode/runscript.sh
diff --git a/test cases/common/201 install_mode/stat.c b/test cases/common/199 install_mode/stat.c
index fa76a658f..fa76a658f 100644
--- a/test cases/common/201 install_mode/stat.c
+++ b/test cases/common/199 install_mode/stat.c
diff --git a/test cases/common/201 install_mode/sub1/second.dat b/test cases/common/199 install_mode/sub1/second.dat
index 48857a8b6..48857a8b6 100644
--- a/test cases/common/201 install_mode/sub1/second.dat
+++ b/test cases/common/199 install_mode/sub1/second.dat
diff --git a/test cases/common/201 install_mode/trivial.c b/test cases/common/199 install_mode/trivial.c
index 24ac454c3..24ac454c3 100644
--- a/test cases/common/201 install_mode/trivial.c
+++ b/test cases/common/199 install_mode/trivial.c
diff --git a/test cases/common/202 subproject array version/meson.build b/test cases/common/200 subproject array version/meson.build
index 0870bc498..0870bc498 100644
--- a/test cases/common/202 subproject array version/meson.build
+++ b/test cases/common/200 subproject array version/meson.build
diff --git a/test cases/common/202 subproject array version/subprojects/foo/meson.build b/test cases/common/200 subproject array version/subprojects/foo/meson.build
index f4ff53548..f4ff53548 100644
--- a/test cases/common/202 subproject array version/subprojects/foo/meson.build
+++ b/test cases/common/200 subproject array version/subprojects/foo/meson.build
diff --git a/test cases/common/203 feature option/meson.build b/test cases/common/201 feature option/meson.build
index ef3fa2285..ef3fa2285 100644
--- a/test cases/common/203 feature option/meson.build
+++ b/test cases/common/201 feature option/meson.build
diff --git a/test cases/common/203 feature option/meson_options.txt b/test cases/common/201 feature option/meson_options.txt
index 063a35f39..063a35f39 100644
--- a/test cases/common/203 feature option/meson_options.txt
+++ b/test cases/common/201 feature option/meson_options.txt
diff --git a/test cases/common/204 feature option disabled/meson.build b/test cases/common/202 feature option disabled/meson.build
index 1a831872a..1a831872a 100644
--- a/test cases/common/204 feature option disabled/meson.build
+++ b/test cases/common/202 feature option disabled/meson.build
diff --git a/test cases/common/204 feature option disabled/meson_options.txt b/test cases/common/202 feature option disabled/meson_options.txt
index 063a35f39..063a35f39 100644
--- a/test cases/common/204 feature option disabled/meson_options.txt
+++ b/test cases/common/202 feature option disabled/meson_options.txt
diff --git a/test cases/common/205 static threads/lib1.c b/test cases/common/203 static threads/lib1.c
index 1aa786c66..1aa786c66 100644
--- a/test cases/common/205 static threads/lib1.c
+++ b/test cases/common/203 static threads/lib1.c
diff --git a/test cases/common/205 static threads/lib2.c b/test cases/common/203 static threads/lib2.c
index e988814e2..e988814e2 100644
--- a/test cases/common/205 static threads/lib2.c
+++ b/test cases/common/203 static threads/lib2.c
diff --git a/test cases/common/205 static threads/meson.build b/test cases/common/203 static threads/meson.build
index 427920034..427920034 100644
--- a/test cases/common/205 static threads/meson.build
+++ b/test cases/common/203 static threads/meson.build
diff --git a/test cases/common/205 static threads/prog.c b/test cases/common/203 static threads/prog.c
index 14a7c760f..14a7c760f 100644
--- a/test cases/common/205 static threads/prog.c
+++ b/test cases/common/203 static threads/prog.c
diff --git a/test cases/failing/25 int conversion/meson.build b/test cases/failing/24 int conversion/meson.build
index 51f6c7e16..51f6c7e16 100644
--- a/test cases/failing/25 int conversion/meson.build
+++ b/test cases/failing/24 int conversion/meson.build
diff --git a/test cases/failing/26 badlang/meson.build b/test cases/failing/25 badlang/meson.build
index f6bf0cca0..f6bf0cca0 100644
--- a/test cases/failing/26 badlang/meson.build
+++ b/test cases/failing/25 badlang/meson.build
diff --git a/test cases/failing/27 output subdir/foo.in b/test cases/failing/26 output subdir/foo.in
index 3d1bf19eb..3d1bf19eb 100644
--- a/test cases/failing/27 output subdir/foo.in
+++ b/test cases/failing/26 output subdir/foo.in
diff --git a/test cases/failing/27 output subdir/meson.build b/test cases/failing/26 output subdir/meson.build
index 4eb422ce4..4eb422ce4 100644
--- a/test cases/failing/27 output subdir/meson.build
+++ b/test cases/failing/26 output subdir/meson.build
diff --git a/test cases/failing/27 output subdir/subdir/dummy.txt b/test cases/failing/26 output subdir/subdir/dummy.txt
index f10acf3e5..f10acf3e5 100644
--- a/test cases/failing/27 output subdir/subdir/dummy.txt
+++ b/test cases/failing/26 output subdir/subdir/dummy.txt
diff --git a/test cases/failing/28 noprog use/meson.build b/test cases/failing/27 noprog use/meson.build
index e4de42fbd..e4de42fbd 100644
--- a/test cases/failing/28 noprog use/meson.build
+++ b/test cases/failing/27 noprog use/meson.build
diff --git a/test cases/failing/29 no crossprop/meson.build b/test cases/failing/28 no crossprop/meson.build
index bd3a743d6..bd3a743d6 100644
--- a/test cases/failing/29 no crossprop/meson.build
+++ b/test cases/failing/28 no crossprop/meson.build
diff --git a/test cases/failing/30 nested ternary/meson.build b/test cases/failing/29 nested ternary/meson.build
index f9c2e5f8a..f9c2e5f8a 100644
--- a/test cases/failing/30 nested ternary/meson.build
+++ b/test cases/failing/29 nested ternary/meson.build
diff --git a/test cases/failing/31 invalid man extension/meson.build b/test cases/failing/30 invalid man extension/meson.build
index 45eddca40..45eddca40 100644
--- a/test cases/failing/31 invalid man extension/meson.build
+++ b/test cases/failing/30 invalid man extension/meson.build
diff --git a/test cases/failing/32 no man extension/meson.build b/test cases/failing/31 no man extension/meson.build
index bf835713f..bf835713f 100644
--- a/test cases/failing/32 no man extension/meson.build
+++ b/test cases/failing/31 no man extension/meson.build
diff --git a/test cases/failing/33 exe static shared/meson.build b/test cases/failing/32 exe static shared/meson.build
index b1027647d..b1027647d 100644
--- a/test cases/failing/33 exe static shared/meson.build
+++ b/test cases/failing/32 exe static shared/meson.build
diff --git a/test cases/failing/33 exe static shared/prog.c b/test cases/failing/32 exe static shared/prog.c
index 26603b694..26603b694 100644
--- a/test cases/failing/33 exe static shared/prog.c
+++ b/test cases/failing/32 exe static shared/prog.c
diff --git a/test cases/failing/33 exe static shared/shlib2.c b/test cases/failing/32 exe static shared/shlib2.c
index 5b68843dc..5b68843dc 100644
--- a/test cases/failing/33 exe static shared/shlib2.c
+++ b/test cases/failing/32 exe static shared/shlib2.c
diff --git a/test cases/failing/33 exe static shared/stat.c b/test cases/failing/32 exe static shared/stat.c
index 56ec66c67..56ec66c67 100644
--- a/test cases/failing/33 exe static shared/stat.c
+++ b/test cases/failing/32 exe static shared/stat.c
diff --git a/test cases/failing/34 non-root subproject/meson.build b/test cases/failing/33 non-root subproject/meson.build
index c84dce7f9..c84dce7f9 100644
--- a/test cases/failing/34 non-root subproject/meson.build
+++ b/test cases/failing/33 non-root subproject/meson.build
diff --git a/test cases/failing/34 non-root subproject/some/meson.build b/test cases/failing/33 non-root subproject/some/meson.build
index d82f45123..d82f45123 100644
--- a/test cases/failing/34 non-root subproject/some/meson.build
+++ b/test cases/failing/33 non-root subproject/some/meson.build
diff --git a/test cases/failing/35 dependency not-required then required/meson.build b/test cases/failing/34 dependency not-required then required/meson.build
index 1796699e4..1796699e4 100644
--- a/test cases/failing/35 dependency not-required then required/meson.build
+++ b/test cases/failing/34 dependency not-required then required/meson.build
diff --git a/test cases/failing/36 project argument after target/exe.c b/test cases/failing/35 project argument after target/exe.c
index 11b7fad8e..11b7fad8e 100644
--- a/test cases/failing/36 project argument after target/exe.c
+++ b/test cases/failing/35 project argument after target/exe.c
diff --git a/test cases/failing/36 project argument after target/meson.build b/test cases/failing/35 project argument after target/meson.build
index 5402c67fc..5402c67fc 100644
--- a/test cases/failing/36 project argument after target/meson.build
+++ b/test cases/failing/35 project argument after target/meson.build
diff --git a/test cases/failing/37 pkgconfig dependency impossible conditions/meson.build b/test cases/failing/36 pkgconfig dependency impossible conditions/meson.build
index 54d434c09..54d434c09 100644
--- a/test cases/failing/37 pkgconfig dependency impossible conditions/meson.build
+++ b/test cases/failing/36 pkgconfig dependency impossible conditions/meson.build
diff --git a/test cases/failing/38 has function external dependency/meson.build b/test cases/failing/37 has function external dependency/meson.build
index 45a3bc246..45a3bc246 100644
--- a/test cases/failing/38 has function external dependency/meson.build
+++ b/test cases/failing/37 has function external dependency/meson.build
diff --git a/test cases/failing/38 has function external dependency/mylib.c b/test cases/failing/37 has function external dependency/mylib.c
index d9fbd342b..d9fbd342b 100644
--- a/test cases/failing/38 has function external dependency/mylib.c
+++ b/test cases/failing/37 has function external dependency/mylib.c
diff --git a/test cases/failing/39 libdir must be inside prefix/meson.build b/test cases/failing/38 libdir must be inside prefix/meson.build
index 66272ea3f..66272ea3f 100644
--- a/test cases/failing/39 libdir must be inside prefix/meson.build
+++ b/test cases/failing/38 libdir must be inside prefix/meson.build
diff --git a/test cases/failing/40 prefix absolute/meson.build b/test cases/failing/39 prefix absolute/meson.build
index e2863e79c..e2863e79c 100644
--- a/test cases/failing/40 prefix absolute/meson.build
+++ b/test cases/failing/39 prefix absolute/meson.build
diff --git a/test cases/failing/41 kwarg assign/dummy.c b/test cases/failing/40 kwarg assign/dummy.c
index 16fcdd9f4..16fcdd9f4 100644
--- a/test cases/failing/41 kwarg assign/dummy.c
+++ b/test cases/failing/40 kwarg assign/dummy.c
diff --git a/test cases/failing/41 kwarg assign/meson.build b/test cases/failing/40 kwarg assign/meson.build
index c86786fd1..c86786fd1 100644
--- a/test cases/failing/41 kwarg assign/meson.build
+++ b/test cases/failing/40 kwarg assign/meson.build
diff --git a/test cases/failing/41 kwarg assign/prog.c b/test cases/failing/40 kwarg assign/prog.c
index 11b7fad8e..11b7fad8e 100644
--- a/test cases/failing/41 kwarg assign/prog.c
+++ b/test cases/failing/40 kwarg assign/prog.c
diff --git a/test cases/failing/42 custom target plainname many inputs/1.txt b/test cases/failing/41 custom target plainname many inputs/1.txt
index d00491fd7..d00491fd7 100644
--- a/test cases/failing/42 custom target plainname many inputs/1.txt
+++ b/test cases/failing/41 custom target plainname many inputs/1.txt
diff --git a/test cases/failing/42 custom target plainname many inputs/2.txt b/test cases/failing/41 custom target plainname many inputs/2.txt
index 0cfbf0888..0cfbf0888 100644
--- a/test cases/failing/42 custom target plainname many inputs/2.txt
+++ b/test cases/failing/41 custom target plainname many inputs/2.txt
diff --git a/test cases/failing/42 custom target plainname many inputs/catfiles.py b/test cases/failing/41 custom target plainname many inputs/catfiles.py
index 1c53e24e7..1c53e24e7 100644
--- a/test cases/failing/42 custom target plainname many inputs/catfiles.py
+++ b/test cases/failing/41 custom target plainname many inputs/catfiles.py
diff --git a/test cases/failing/42 custom target plainname many inputs/meson.build b/test cases/failing/41 custom target plainname many inputs/meson.build
index 1bcfc0672..1bcfc0672 100644
--- a/test cases/failing/42 custom target plainname many inputs/meson.build
+++ b/test cases/failing/41 custom target plainname many inputs/meson.build
diff --git a/test cases/failing/43 custom target outputs not matching install_dirs/generator.py b/test cases/failing/42 custom target outputs not matching install_dirs/generator.py
index 4ac61795b..4ac61795b 100755
--- a/test cases/failing/43 custom target outputs not matching install_dirs/generator.py
+++ b/test cases/failing/42 custom target outputs not matching install_dirs/generator.py
diff --git a/test cases/failing/43 custom target outputs not matching install_dirs/installed_files.txt b/test cases/failing/42 custom target outputs not matching install_dirs/installed_files.txt
index 21e1249b1..21e1249b1 100644
--- a/test cases/failing/43 custom target outputs not matching install_dirs/installed_files.txt
+++ b/test cases/failing/42 custom target outputs not matching install_dirs/installed_files.txt
diff --git a/test cases/failing/43 custom target outputs not matching install_dirs/meson.build b/test cases/failing/42 custom target outputs not matching install_dirs/meson.build
index 45bd7b397..45bd7b397 100644
--- a/test cases/failing/43 custom target outputs not matching install_dirs/meson.build
+++ b/test cases/failing/42 custom target outputs not matching install_dirs/meson.build
diff --git a/test cases/failing/44 project name colon/meson.build b/test cases/failing/43 project name colon/meson.build
index 53e947ef2..53e947ef2 100644
--- a/test cases/failing/44 project name colon/meson.build
+++ b/test cases/failing/43 project name colon/meson.build
diff --git a/test cases/failing/45 abs subdir/bob/meson.build b/test cases/failing/44 abs subdir/bob/meson.build
index 7bbf4b284..7bbf4b284 100644
--- a/test cases/failing/45 abs subdir/bob/meson.build
+++ b/test cases/failing/44 abs subdir/bob/meson.build
diff --git a/test cases/failing/45 abs subdir/meson.build b/test cases/failing/44 abs subdir/meson.build
index 8c23224a4..8c23224a4 100644
--- a/test cases/failing/45 abs subdir/meson.build
+++ b/test cases/failing/44 abs subdir/meson.build
diff --git a/test cases/failing/46 abspath to srcdir/meson.build b/test cases/failing/45 abspath to srcdir/meson.build
index 964a19b56..964a19b56 100644
--- a/test cases/failing/46 abspath to srcdir/meson.build
+++ b/test cases/failing/45 abspath to srcdir/meson.build
diff --git a/test cases/failing/47 pkgconfig variables reserved/meson.build b/test cases/failing/46 pkgconfig variables reserved/meson.build
index 82ae995d4..82ae995d4 100644
--- a/test cases/failing/47 pkgconfig variables reserved/meson.build
+++ b/test cases/failing/46 pkgconfig variables reserved/meson.build
diff --git a/test cases/failing/47 pkgconfig variables reserved/simple.c b/test cases/failing/46 pkgconfig variables reserved/simple.c
index e8a6d8330..e8a6d8330 100644
--- a/test cases/failing/47 pkgconfig variables reserved/simple.c
+++ b/test cases/failing/46 pkgconfig variables reserved/simple.c
diff --git a/test cases/failing/47 pkgconfig variables reserved/simple.h b/test cases/failing/46 pkgconfig variables reserved/simple.h
index bb52e6d72..bb52e6d72 100644
--- a/test cases/failing/47 pkgconfig variables reserved/simple.h
+++ b/test cases/failing/46 pkgconfig variables reserved/simple.h
diff --git a/test cases/failing/48 pkgconfig variables zero length/meson.build b/test cases/failing/47 pkgconfig variables zero length/meson.build
index 65d33445c..65d33445c 100644
--- a/test cases/failing/48 pkgconfig variables zero length/meson.build
+++ b/test cases/failing/47 pkgconfig variables zero length/meson.build
diff --git a/test cases/failing/48 pkgconfig variables zero length/simple.c b/test cases/failing/47 pkgconfig variables zero length/simple.c
index e8a6d8330..e8a6d8330 100644
--- a/test cases/failing/48 pkgconfig variables zero length/simple.c
+++ b/test cases/failing/47 pkgconfig variables zero length/simple.c
diff --git a/test cases/failing/48 pkgconfig variables zero length/simple.h b/test cases/failing/47 pkgconfig variables zero length/simple.h
index bb52e6d72..bb52e6d72 100644
--- a/test cases/failing/48 pkgconfig variables zero length/simple.h
+++ b/test cases/failing/47 pkgconfig variables zero length/simple.h
diff --git a/test cases/failing/49 pkgconfig variables zero length value/meson.build b/test cases/failing/48 pkgconfig variables zero length value/meson.build
index 33977b273..33977b273 100644
--- a/test cases/failing/49 pkgconfig variables zero length value/meson.build
+++ b/test cases/failing/48 pkgconfig variables zero length value/meson.build
diff --git a/test cases/failing/49 pkgconfig variables zero length value/simple.c b/test cases/failing/48 pkgconfig variables zero length value/simple.c
index e8a6d8330..e8a6d8330 100644
--- a/test cases/failing/49 pkgconfig variables zero length value/simple.c
+++ b/test cases/failing/48 pkgconfig variables zero length value/simple.c
diff --git a/test cases/failing/49 pkgconfig variables zero length value/simple.h b/test cases/failing/48 pkgconfig variables zero length value/simple.h
index bb52e6d72..bb52e6d72 100644
--- a/test cases/failing/49 pkgconfig variables zero length value/simple.h
+++ b/test cases/failing/48 pkgconfig variables zero length value/simple.h
diff --git a/test cases/failing/50 pkgconfig variables not key value/meson.build b/test cases/failing/49 pkgconfig variables not key value/meson.build
index 02fa7376f..02fa7376f 100644
--- a/test cases/failing/50 pkgconfig variables not key value/meson.build
+++ b/test cases/failing/49 pkgconfig variables not key value/meson.build
diff --git a/test cases/failing/50 pkgconfig variables not key value/simple.c b/test cases/failing/49 pkgconfig variables not key value/simple.c
index e8a6d8330..e8a6d8330 100644
--- a/test cases/failing/50 pkgconfig variables not key value/simple.c
+++ b/test cases/failing/49 pkgconfig variables not key value/simple.c
diff --git a/test cases/failing/50 pkgconfig variables not key value/simple.h b/test cases/failing/49 pkgconfig variables not key value/simple.h
index bb52e6d72..bb52e6d72 100644
--- a/test cases/failing/50 pkgconfig variables not key value/simple.h
+++ b/test cases/failing/49 pkgconfig variables not key value/simple.h
diff --git a/test cases/failing/51 executable comparison/meson.build b/test cases/failing/50 executable comparison/meson.build
index 041bcf3d3..041bcf3d3 100644
--- a/test cases/failing/51 executable comparison/meson.build
+++ b/test cases/failing/50 executable comparison/meson.build
diff --git a/test cases/failing/51 executable comparison/prog.c b/test cases/failing/50 executable comparison/prog.c
index 0314ff17b..0314ff17b 100644
--- a/test cases/failing/51 executable comparison/prog.c
+++ b/test cases/failing/50 executable comparison/prog.c
diff --git a/test cases/failing/52 inconsistent comparison/meson.build b/test cases/failing/51 inconsistent comparison/meson.build
index 7694c2cd2..7694c2cd2 100644
--- a/test cases/failing/52 inconsistent comparison/meson.build
+++ b/test cases/failing/51 inconsistent comparison/meson.build
diff --git a/test cases/failing/53 slashname/meson.build b/test cases/failing/52 slashname/meson.build
index bba5301bf..bba5301bf 100644
--- a/test cases/failing/53 slashname/meson.build
+++ b/test cases/failing/52 slashname/meson.build
diff --git a/test cases/failing/53 slashname/sub/meson.build b/test cases/failing/52 slashname/sub/meson.build
index e10489001..e10489001 100644
--- a/test cases/failing/53 slashname/sub/meson.build
+++ b/test cases/failing/52 slashname/sub/meson.build
diff --git a/test cases/failing/53 slashname/sub/prog.c b/test cases/failing/52 slashname/sub/prog.c
index 722de0abe..722de0abe 100644
--- a/test cases/failing/53 slashname/sub/prog.c
+++ b/test cases/failing/52 slashname/sub/prog.c
diff --git a/test cases/failing/54 reserved meson prefix/meson-foo/meson.build b/test cases/failing/53 reserved meson prefix/meson-foo/meson.build
index e69de29bb..e69de29bb 100644
--- a/test cases/failing/54 reserved meson prefix/meson-foo/meson.build
+++ b/test cases/failing/53 reserved meson prefix/meson-foo/meson.build
diff --git a/test cases/failing/54 reserved meson prefix/meson.build b/test cases/failing/53 reserved meson prefix/meson.build
index 1339035ad..1339035ad 100644
--- a/test cases/failing/54 reserved meson prefix/meson.build
+++ b/test cases/failing/53 reserved meson prefix/meson.build
diff --git a/test cases/failing/55 wrong shared crate type/foo.rs b/test cases/failing/54 wrong shared crate type/foo.rs
index e69de29bb..e69de29bb 100644
--- a/test cases/failing/55 wrong shared crate type/foo.rs
+++ b/test cases/failing/54 wrong shared crate type/foo.rs
diff --git a/test cases/failing/55 wrong shared crate type/meson.build b/test cases/failing/54 wrong shared crate type/meson.build
index 69ac3dad5..69ac3dad5 100644
--- a/test cases/failing/55 wrong shared crate type/meson.build
+++ b/test cases/failing/54 wrong shared crate type/meson.build
diff --git a/test cases/failing/56 wrong static crate type/foo.rs b/test cases/failing/55 wrong static crate type/foo.rs
index e69de29bb..e69de29bb 100644
--- a/test cases/failing/56 wrong static crate type/foo.rs
+++ b/test cases/failing/55 wrong static crate type/foo.rs
diff --git a/test cases/failing/56 wrong static crate type/meson.build b/test cases/failing/55 wrong static crate type/meson.build
index c094613b2..c094613b2 100644
--- a/test cases/failing/56 wrong static crate type/meson.build
+++ b/test cases/failing/55 wrong static crate type/meson.build
diff --git a/test cases/failing/57 or on new line/meson.build b/test cases/failing/56 or on new line/meson.build
index 12f27058d..12f27058d 100644
--- a/test cases/failing/57 or on new line/meson.build
+++ b/test cases/failing/56 or on new line/meson.build
diff --git a/test cases/failing/57 or on new line/meson_options.txt b/test cases/failing/56 or on new line/meson_options.txt
index 3302cf4ec..3302cf4ec 100644
--- a/test cases/failing/57 or on new line/meson_options.txt
+++ b/test cases/failing/56 or on new line/meson_options.txt
diff --git a/test cases/failing/58 kwarg in module/meson.build b/test cases/failing/57 kwarg in module/meson.build
index b105db152..b105db152 100644
--- a/test cases/failing/58 kwarg in module/meson.build
+++ b/test cases/failing/57 kwarg in module/meson.build
diff --git a/test cases/failing/59 link with executable/meson.build b/test cases/failing/58 link with executable/meson.build
index 186b3e595..186b3e595 100644
--- a/test cases/failing/59 link with executable/meson.build
+++ b/test cases/failing/58 link with executable/meson.build
diff --git a/test cases/failing/59 link with executable/module.c b/test cases/failing/58 link with executable/module.c
index dc0124a24..dc0124a24 100644
--- a/test cases/failing/59 link with executable/module.c
+++ b/test cases/failing/58 link with executable/module.c
diff --git a/test cases/failing/59 link with executable/prog.c b/test cases/failing/58 link with executable/prog.c
index f3836d7ba..f3836d7ba 100644
--- a/test cases/failing/59 link with executable/prog.c
+++ b/test cases/failing/58 link with executable/prog.c
diff --git a/test cases/failing/60 assign custom target index/meson.build b/test cases/failing/59 assign custom target index/meson.build
index 7f2a820b8..7f2a820b8 100644
--- a/test cases/failing/60 assign custom target index/meson.build
+++ b/test cases/failing/59 assign custom target index/meson.build
diff --git a/test cases/failing/61 getoption prefix/meson.build b/test cases/failing/60 getoption prefix/meson.build
index 8f85cff2a..8f85cff2a 100644
--- a/test cases/failing/61 getoption prefix/meson.build
+++ b/test cases/failing/60 getoption prefix/meson.build
diff --git a/test cases/failing/61 getoption prefix/subprojects/abc/meson.build b/test cases/failing/60 getoption prefix/subprojects/abc/meson.build
index aa9c3df0f..aa9c3df0f 100644
--- a/test cases/failing/61 getoption prefix/subprojects/abc/meson.build
+++ b/test cases/failing/60 getoption prefix/subprojects/abc/meson.build
diff --git a/test cases/failing/61 getoption prefix/subprojects/abc/meson_options.txt b/test cases/failing/60 getoption prefix/subprojects/abc/meson_options.txt
index 89e624e24..89e624e24 100644
--- a/test cases/failing/61 getoption prefix/subprojects/abc/meson_options.txt
+++ b/test cases/failing/60 getoption prefix/subprojects/abc/meson_options.txt
diff --git a/test cases/failing/62 bad option argument/meson.build b/test cases/failing/61 bad option argument/meson.build
index 5219cfb96..5219cfb96 100644
--- a/test cases/failing/62 bad option argument/meson.build
+++ b/test cases/failing/61 bad option argument/meson.build
diff --git a/test cases/failing/62 bad option argument/meson_options.txt b/test cases/failing/61 bad option argument/meson_options.txt
index de1fff6fb..de1fff6fb 100644
--- a/test cases/failing/62 bad option argument/meson_options.txt
+++ b/test cases/failing/61 bad option argument/meson_options.txt
diff --git a/test cases/failing/63 subproj filegrab/meson.build b/test cases/failing/62 subproj filegrab/meson.build
index f38d6c74c..f38d6c74c 100644
--- a/test cases/failing/63 subproj filegrab/meson.build
+++ b/test cases/failing/62 subproj filegrab/meson.build
diff --git a/test cases/failing/63 subproj filegrab/prog.c b/test cases/failing/62 subproj filegrab/prog.c
index 0314ff17b..0314ff17b 100644
--- a/test cases/failing/63 subproj filegrab/prog.c
+++ b/test cases/failing/62 subproj filegrab/prog.c
diff --git a/test cases/failing/63 subproj filegrab/subprojects/a/meson.build b/test cases/failing/62 subproj filegrab/subprojects/a/meson.build
index 80b988804..80b988804 100644
--- a/test cases/failing/63 subproj filegrab/subprojects/a/meson.build
+++ b/test cases/failing/62 subproj filegrab/subprojects/a/meson.build
diff --git a/test cases/failing/64 grab subproj/meson.build b/test cases/failing/63 grab subproj/meson.build
index 30fc69093..30fc69093 100644
--- a/test cases/failing/64 grab subproj/meson.build
+++ b/test cases/failing/63 grab subproj/meson.build
diff --git a/test cases/failing/64 grab subproj/subprojects/foo/meson.build b/test cases/failing/63 grab subproj/subprojects/foo/meson.build
index b346f6d9a..b346f6d9a 100644
--- a/test cases/failing/64 grab subproj/subprojects/foo/meson.build
+++ b/test cases/failing/63 grab subproj/subprojects/foo/meson.build
diff --git a/test cases/failing/64 grab subproj/subprojects/foo/sub.c b/test cases/failing/63 grab subproj/subprojects/foo/sub.c
index a94b1f5ad..a94b1f5ad 100644
--- a/test cases/failing/64 grab subproj/subprojects/foo/sub.c
+++ b/test cases/failing/63 grab subproj/subprojects/foo/sub.c
diff --git a/test cases/failing/65 grab sibling/meson.build b/test cases/failing/64 grab sibling/meson.build
index 60b926a95..60b926a95 100644
--- a/test cases/failing/65 grab sibling/meson.build
+++ b/test cases/failing/64 grab sibling/meson.build
diff --git a/test cases/failing/65 grab sibling/subprojects/a/meson.build b/test cases/failing/64 grab sibling/subprojects/a/meson.build
index 6dd9f61fc..6dd9f61fc 100644
--- a/test cases/failing/65 grab sibling/subprojects/a/meson.build
+++ b/test cases/failing/64 grab sibling/subprojects/a/meson.build
diff --git a/test cases/failing/65 grab sibling/subprojects/b/meson.build b/test cases/failing/64 grab sibling/subprojects/b/meson.build
index 7c70fe55b..7c70fe55b 100644
--- a/test cases/failing/65 grab sibling/subprojects/b/meson.build
+++ b/test cases/failing/64 grab sibling/subprojects/b/meson.build
diff --git a/test cases/failing/65 grab sibling/subprojects/b/sneaky.c b/test cases/failing/64 grab sibling/subprojects/b/sneaky.c
index 46718c6cc..46718c6cc 100644
--- a/test cases/failing/65 grab sibling/subprojects/b/sneaky.c
+++ b/test cases/failing/64 grab sibling/subprojects/b/sneaky.c
diff --git a/test cases/failing/66 string as link target/meson.build b/test cases/failing/65 string as link target/meson.build
index cb83fff6a..cb83fff6a 100644
--- a/test cases/failing/66 string as link target/meson.build
+++ b/test cases/failing/65 string as link target/meson.build
diff --git a/test cases/failing/66 string as link target/prog.c b/test cases/failing/65 string as link target/prog.c
index 0314ff17b..0314ff17b 100644
--- a/test cases/failing/66 string as link target/prog.c
+++ b/test cases/failing/65 string as link target/prog.c
diff --git a/test cases/failing/67 dependency not-found and required/meson.build b/test cases/failing/66 dependency not-found and required/meson.build
index 1ce574738..1ce574738 100644
--- a/test cases/failing/67 dependency not-found and required/meson.build
+++ b/test cases/failing/66 dependency not-found and required/meson.build
diff --git a/test cases/failing/68 subproj different versions/main.c b/test cases/failing/67 subproj different versions/main.c
index 8793c623a..8793c623a 100644
--- a/test cases/failing/68 subproj different versions/main.c
+++ b/test cases/failing/67 subproj different versions/main.c
diff --git a/test cases/failing/68 subproj different versions/meson.build b/test cases/failing/67 subproj different versions/meson.build
index e964e423e..e964e423e 100644
--- a/test cases/failing/68 subproj different versions/meson.build
+++ b/test cases/failing/67 subproj different versions/meson.build
diff --git a/test cases/failing/68 subproj different versions/subprojects/a/a.c b/test cases/failing/67 subproj different versions/subprojects/a/a.c
index cd41a6588..cd41a6588 100644
--- a/test cases/failing/68 subproj different versions/subprojects/a/a.c
+++ b/test cases/failing/67 subproj different versions/subprojects/a/a.c
diff --git a/test cases/failing/68 subproj different versions/subprojects/a/a.h b/test cases/failing/67 subproj different versions/subprojects/a/a.h
index 8f1d49eda..8f1d49eda 100644
--- a/test cases/failing/68 subproj different versions/subprojects/a/a.h
+++ b/test cases/failing/67 subproj different versions/subprojects/a/a.h
diff --git a/test cases/failing/68 subproj different versions/subprojects/a/meson.build b/test cases/failing/67 subproj different versions/subprojects/a/meson.build
index e84182a07..e84182a07 100644
--- a/test cases/failing/68 subproj different versions/subprojects/a/meson.build
+++ b/test cases/failing/67 subproj different versions/subprojects/a/meson.build
diff --git a/test cases/failing/68 subproj different versions/subprojects/b/b.c b/test cases/failing/67 subproj different versions/subprojects/b/b.c
index f85f8c3f8..f85f8c3f8 100644
--- a/test cases/failing/68 subproj different versions/subprojects/b/b.c
+++ b/test cases/failing/67 subproj different versions/subprojects/b/b.c
diff --git a/test cases/failing/68 subproj different versions/subprojects/b/b.h b/test cases/failing/67 subproj different versions/subprojects/b/b.h
index eced786a0..eced786a0 100644
--- a/test cases/failing/68 subproj different versions/subprojects/b/b.h
+++ b/test cases/failing/67 subproj different versions/subprojects/b/b.h
diff --git a/test cases/failing/68 subproj different versions/subprojects/b/meson.build b/test cases/failing/67 subproj different versions/subprojects/b/meson.build
index 0398340e6..0398340e6 100644
--- a/test cases/failing/68 subproj different versions/subprojects/b/meson.build
+++ b/test cases/failing/67 subproj different versions/subprojects/b/meson.build
diff --git a/test cases/failing/68 subproj different versions/subprojects/c/c.h b/test cases/failing/67 subproj different versions/subprojects/c/c.h
index 2b15f607c..2b15f607c 100644
--- a/test cases/failing/68 subproj different versions/subprojects/c/c.h
+++ b/test cases/failing/67 subproj different versions/subprojects/c/c.h
diff --git a/test cases/failing/68 subproj different versions/subprojects/c/meson.build b/test cases/failing/67 subproj different versions/subprojects/c/meson.build
index 7184933b2..7184933b2 100644
--- a/test cases/failing/68 subproj different versions/subprojects/c/meson.build
+++ b/test cases/failing/67 subproj different versions/subprojects/c/meson.build
diff --git a/test cases/failing/69 wrong boost module/meson.build b/test cases/failing/68 wrong boost module/meson.build
index 7fb3a40b2..7fb3a40b2 100644
--- a/test cases/failing/69 wrong boost module/meson.build
+++ b/test cases/failing/68 wrong boost module/meson.build
diff --git a/test cases/failing/70 install_data rename bad size/file1.txt b/test cases/failing/69 install_data rename bad size/file1.txt
index e69de29bb..e69de29bb 100644
--- a/test cases/failing/70 install_data rename bad size/file1.txt
+++ b/test cases/failing/69 install_data rename bad size/file1.txt
diff --git a/test cases/failing/70 install_data rename bad size/file2.txt b/test cases/failing/69 install_data rename bad size/file2.txt
index e69de29bb..e69de29bb 100644
--- a/test cases/failing/70 install_data rename bad size/file2.txt
+++ b/test cases/failing/69 install_data rename bad size/file2.txt
diff --git a/test cases/failing/70 install_data rename bad size/meson.build b/test cases/failing/69 install_data rename bad size/meson.build
index c7cde087d..c7cde087d 100644
--- a/test cases/failing/70 install_data rename bad size/meson.build
+++ b/test cases/failing/69 install_data rename bad size/meson.build
diff --git a/test cases/failing/71 skip only subdir/meson.build b/test cases/failing/70 skip only subdir/meson.build
index 4832bd49c..4832bd49c 100644
--- a/test cases/failing/71 skip only subdir/meson.build
+++ b/test cases/failing/70 skip only subdir/meson.build
diff --git a/test cases/failing/71 skip only subdir/subdir/meson.build b/test cases/failing/70 skip only subdir/subdir/meson.build
index 1ba447b22..1ba447b22 100644
--- a/test cases/failing/71 skip only subdir/subdir/meson.build
+++ b/test cases/failing/70 skip only subdir/subdir/meson.build
diff --git a/test cases/failing/72 invalid escape char/meson.build b/test cases/failing/71 invalid escape char/meson.build
index b4e9196cc..b4e9196cc 100644
--- a/test cases/failing/72 invalid escape char/meson.build
+++ b/test cases/failing/71 invalid escape char/meson.build
diff --git a/test cases/failing/73 dual override/meson.build b/test cases/failing/72 dual override/meson.build
index e5f86baaf..e5f86baaf 100644
--- a/test cases/failing/73 dual override/meson.build
+++ b/test cases/failing/72 dual override/meson.build
diff --git a/test cases/failing/73 dual override/overrides.py b/test cases/failing/72 dual override/overrides.py
index 49e9b7ad6..49e9b7ad6 100644
--- a/test cases/failing/73 dual override/overrides.py
+++ b/test cases/failing/72 dual override/overrides.py
diff --git a/test cases/failing/74 override used/meson.build b/test cases/failing/73 override used/meson.build
index 61885bba1..61885bba1 100644
--- a/test cases/failing/74 override used/meson.build
+++ b/test cases/failing/73 override used/meson.build
diff --git a/test cases/failing/74 override used/other.py b/test cases/failing/73 override used/other.py
index f62ba960d..f62ba960d 100755
--- a/test cases/failing/74 override used/other.py
+++ b/test cases/failing/73 override used/other.py
diff --git a/test cases/failing/74 override used/something.py b/test cases/failing/73 override used/something.py
index 64c9454c3..64c9454c3 100755
--- a/test cases/failing/74 override used/something.py
+++ b/test cases/failing/73 override used/something.py
diff --git a/test cases/failing/75 run_command unclean exit/meson.build b/test cases/failing/74 run_command unclean exit/meson.build
index 4bc02ae7b..4bc02ae7b 100644
--- a/test cases/failing/75 run_command unclean exit/meson.build
+++ b/test cases/failing/74 run_command unclean exit/meson.build
diff --git a/test cases/failing/75 run_command unclean exit/returncode.py b/test cases/failing/74 run_command unclean exit/returncode.py
index 84dbc5df6..84dbc5df6 100755
--- a/test cases/failing/75 run_command unclean exit/returncode.py
+++ b/test cases/failing/74 run_command unclean exit/returncode.py
diff --git a/test cases/failing/76 int literal leading zero/meson.build b/test cases/failing/75 int literal leading zero/meson.build
index 7ad64ae09..7ad64ae09 100644
--- a/test cases/failing/76 int literal leading zero/meson.build
+++ b/test cases/failing/75 int literal leading zero/meson.build
diff --git a/test cases/failing/77 configuration immutable/input b/test cases/failing/76 configuration immutable/input
index e69de29bb..e69de29bb 100644
--- a/test cases/failing/77 configuration immutable/input
+++ b/test cases/failing/76 configuration immutable/input
diff --git a/test cases/failing/77 configuration immutable/meson.build b/test cases/failing/76 configuration immutable/meson.build
index b6cac4126..b6cac4126 100644
--- a/test cases/failing/77 configuration immutable/meson.build
+++ b/test cases/failing/76 configuration immutable/meson.build
diff --git a/test cases/failing/78 link with shared module on osx/meson.build b/test cases/failing/77 link with shared module on osx/meson.build
index 2c714f97a..2c714f97a 100644
--- a/test cases/failing/78 link with shared module on osx/meson.build
+++ b/test cases/failing/77 link with shared module on osx/meson.build
diff --git a/test cases/failing/78 link with shared module on osx/module.c b/test cases/failing/77 link with shared module on osx/module.c
index 81b0d5af0..81b0d5af0 100644
--- a/test cases/failing/78 link with shared module on osx/module.c
+++ b/test cases/failing/77 link with shared module on osx/module.c
diff --git a/test cases/failing/78 link with shared module on osx/prog.c b/test cases/failing/77 link with shared module on osx/prog.c
index 8164d8da1..8164d8da1 100644
--- a/test cases/failing/78 link with shared module on osx/prog.c
+++ b/test cases/failing/77 link with shared module on osx/prog.c
diff --git a/test cases/failing/79 non ascii in ascii encoded configure file/config9.h.in b/test cases/failing/78 non ascii in ascii encoded configure file/config9.h.in
index 323bec64a..323bec64a 100644
--- a/test cases/failing/79 non ascii in ascii encoded configure file/config9.h.in
+++ b/test cases/failing/78 non ascii in ascii encoded configure file/config9.h.in
diff --git a/test cases/failing/79 non ascii in ascii encoded configure file/meson.build b/test cases/failing/78 non ascii in ascii encoded configure file/meson.build
index 846daaf89..846daaf89 100644
--- a/test cases/failing/79 non ascii in ascii encoded configure file/meson.build
+++ b/test cases/failing/78 non ascii in ascii encoded configure file/meson.build
diff --git a/test cases/failing/80 subproj dependency not-found and required/meson.build b/test cases/failing/79 subproj dependency not-found and required/meson.build
index c5a296104..c5a296104 100644
--- a/test cases/failing/80 subproj dependency not-found and required/meson.build
+++ b/test cases/failing/79 subproj dependency not-found and required/meson.build
diff --git a/test cases/failing/81 unfound run/meson.build b/test cases/failing/80 unfound run/meson.build
index 3f37e9a06..3f37e9a06 100644
--- a/test cases/failing/81 unfound run/meson.build
+++ b/test cases/failing/80 unfound run/meson.build
diff --git a/test cases/objc/6 c++ project objc subproject/master.cpp b/test cases/objc/4 c++ project objc subproject/master.cpp
index 2f351d1ca..2f351d1ca 100644
--- a/test cases/objc/6 c++ project objc subproject/master.cpp
+++ b/test cases/objc/4 c++ project objc subproject/master.cpp
diff --git a/test cases/objc/6 c++ project objc subproject/meson.build b/test cases/objc/4 c++ project objc subproject/meson.build
index 8a77dedce..8a77dedce 100644
--- a/test cases/objc/6 c++ project objc subproject/meson.build
+++ b/test cases/objc/4 c++ project objc subproject/meson.build
diff --git a/test cases/objc/6 c++ project objc subproject/subprojects/foo/foo.m b/test cases/objc/4 c++ project objc subproject/subprojects/foo/foo.m
index e193b8681..e193b8681 100644
--- a/test cases/objc/6 c++ project objc subproject/subprojects/foo/foo.m
+++ b/test cases/objc/4 c++ project objc subproject/subprojects/foo/foo.m
diff --git a/test cases/objc/6 c++ project objc subproject/subprojects/foo/meson.build b/test cases/objc/4 c++ project objc subproject/subprojects/foo/meson.build
index 2dbf8ab26..2dbf8ab26 100644
--- a/test cases/objc/6 c++ project objc subproject/subprojects/foo/meson.build
+++ b/test cases/objc/4 c++ project objc subproject/subprojects/foo/meson.build
diff --git a/test cases/unit/11 build_rpath/meson.build b/test cases/unit/10 build_rpath/meson.build
index c0bc3bd27..c0bc3bd27 100644
--- a/test cases/unit/11 build_rpath/meson.build
+++ b/test cases/unit/10 build_rpath/meson.build
diff --git a/test cases/unit/11 build_rpath/prog.c b/test cases/unit/10 build_rpath/prog.c
index 45b2fa3df..45b2fa3df 100644
--- a/test cases/unit/11 build_rpath/prog.c
+++ b/test cases/unit/10 build_rpath/prog.c
diff --git a/test cases/unit/11 build_rpath/prog.cc b/test cases/unit/10 build_rpath/prog.cc
index c7c212370..c7c212370 100644
--- a/test cases/unit/11 build_rpath/prog.cc
+++ b/test cases/unit/10 build_rpath/prog.cc
diff --git a/test cases/unit/11 build_rpath/sub/meson.build b/test cases/unit/10 build_rpath/sub/meson.build
index 6879ec666..6879ec666 100644
--- a/test cases/unit/11 build_rpath/sub/meson.build
+++ b/test cases/unit/10 build_rpath/sub/meson.build
diff --git a/test cases/unit/11 build_rpath/sub/stuff.c b/test cases/unit/10 build_rpath/sub/stuff.c
index d56d8b0ea..d56d8b0ea 100644
--- a/test cases/unit/11 build_rpath/sub/stuff.c
+++ b/test cases/unit/10 build_rpath/sub/stuff.c
diff --git a/test cases/unit/12 cross prog/meson.build b/test cases/unit/11 cross prog/meson.build
index a7adeb284..a7adeb284 100644
--- a/test cases/unit/12 cross prog/meson.build
+++ b/test cases/unit/11 cross prog/meson.build
diff --git a/test cases/unit/12 cross prog/some_cross_tool.py b/test cases/unit/11 cross prog/some_cross_tool.py
index 1edd10f6a..1edd10f6a 100755
--- a/test cases/unit/12 cross prog/some_cross_tool.py
+++ b/test cases/unit/11 cross prog/some_cross_tool.py
diff --git a/test cases/unit/12 cross prog/sometool.py b/test cases/unit/11 cross prog/sometool.py
index 4c0e3b184..4c0e3b184 100755
--- a/test cases/unit/12 cross prog/sometool.py
+++ b/test cases/unit/11 cross prog/sometool.py
diff --git a/test cases/unit/13 promote/meson.build b/test cases/unit/12 promote/meson.build
index 066cf36cf..066cf36cf 100644
--- a/test cases/unit/13 promote/meson.build
+++ b/test cases/unit/12 promote/meson.build
diff --git a/test cases/unit/13 promote/subprojects/s1/meson.build b/test cases/unit/12 promote/subprojects/s1/meson.build
index 88c467bf4..88c467bf4 100644
--- a/test cases/unit/13 promote/subprojects/s1/meson.build
+++ b/test cases/unit/12 promote/subprojects/s1/meson.build
diff --git a/test cases/unit/13 promote/subprojects/s1/s1.c b/test cases/unit/12 promote/subprojects/s1/s1.c
index 7d1d775c1..7d1d775c1 100644
--- a/test cases/unit/13 promote/subprojects/s1/s1.c
+++ b/test cases/unit/12 promote/subprojects/s1/s1.c
diff --git a/test cases/unit/13 promote/subprojects/s1/subprojects/s3/meson.build b/test cases/unit/12 promote/subprojects/s1/subprojects/s3/meson.build
index 894fe265b..894fe265b 100644
--- a/test cases/unit/13 promote/subprojects/s1/subprojects/s3/meson.build
+++ b/test cases/unit/12 promote/subprojects/s1/subprojects/s3/meson.build
diff --git a/test cases/unit/13 promote/subprojects/s1/subprojects/s3/s3.c b/test cases/unit/12 promote/subprojects/s1/subprojects/s3/s3.c
index 0166603e5..0166603e5 100644
--- a/test cases/unit/13 promote/subprojects/s1/subprojects/s3/s3.c
+++ b/test cases/unit/12 promote/subprojects/s1/subprojects/s3/s3.c
diff --git a/test cases/unit/13 promote/subprojects/s1/subprojects/scommon/meson.build b/test cases/unit/12 promote/subprojects/s1/subprojects/scommon/meson.build
index 231f2757b..231f2757b 100644
--- a/test cases/unit/13 promote/subprojects/s1/subprojects/scommon/meson.build
+++ b/test cases/unit/12 promote/subprojects/s1/subprojects/scommon/meson.build
diff --git a/test cases/unit/13 promote/subprojects/s1/subprojects/scommon/scommon_broken.c b/test cases/unit/12 promote/subprojects/s1/subprojects/scommon/scommon_broken.c
index 3665a9cbc..3665a9cbc 100644
--- a/test cases/unit/13 promote/subprojects/s1/subprojects/scommon/scommon_broken.c
+++ b/test cases/unit/12 promote/subprojects/s1/subprojects/scommon/scommon_broken.c
diff --git a/test cases/unit/13 promote/subprojects/s2/meson.build b/test cases/unit/12 promote/subprojects/s2/meson.build
index 32bcf8f39..32bcf8f39 100644
--- a/test cases/unit/13 promote/subprojects/s2/meson.build
+++ b/test cases/unit/12 promote/subprojects/s2/meson.build
diff --git a/test cases/unit/13 promote/subprojects/s2/s2.c b/test cases/unit/12 promote/subprojects/s2/s2.c
index 2a6d1e63d..2a6d1e63d 100644
--- a/test cases/unit/13 promote/subprojects/s2/s2.c
+++ b/test cases/unit/12 promote/subprojects/s2/s2.c
diff --git a/test cases/unit/13 promote/subprojects/s2/subprojects/athing.wrap b/test cases/unit/12 promote/subprojects/s2/subprojects/athing.wrap
index 09ba4e87f..09ba4e87f 100644
--- a/test cases/unit/13 promote/subprojects/s2/subprojects/athing.wrap
+++ b/test cases/unit/12 promote/subprojects/s2/subprojects/athing.wrap
diff --git a/test cases/unit/13 promote/subprojects/s2/subprojects/scommon/meson.build b/test cases/unit/12 promote/subprojects/s2/subprojects/scommon/meson.build
index e0d8c7ddc..e0d8c7ddc 100644
--- a/test cases/unit/13 promote/subprojects/s2/subprojects/scommon/meson.build
+++ b/test cases/unit/12 promote/subprojects/s2/subprojects/scommon/meson.build
diff --git a/test cases/unit/13 promote/subprojects/s2/subprojects/scommon/scommon_ok.c b/test cases/unit/12 promote/subprojects/s2/subprojects/scommon/scommon_ok.c
index 652f4eb13..652f4eb13 100644
--- a/test cases/unit/13 promote/subprojects/s2/subprojects/scommon/scommon_ok.c
+++ b/test cases/unit/12 promote/subprojects/s2/subprojects/scommon/scommon_ok.c
diff --git a/test cases/unit/13 testsetup selection/main.c b/test cases/unit/14 testsetup selection/main.c
index cb3f7482f..cb3f7482f 100644
--- a/test cases/unit/13 testsetup selection/main.c
+++ b/test cases/unit/14 testsetup selection/main.c
diff --git a/test cases/unit/13 testsetup selection/meson.build b/test cases/unit/14 testsetup selection/meson.build
index ae996c5be..ae996c5be 100644
--- a/test cases/unit/13 testsetup selection/meson.build
+++ b/test cases/unit/14 testsetup selection/meson.build
diff --git a/test cases/unit/13 testsetup selection/subprojects/bar/bar.c b/test cases/unit/14 testsetup selection/subprojects/bar/bar.c
index cb3f7482f..cb3f7482f 100644
--- a/test cases/unit/13 testsetup selection/subprojects/bar/bar.c
+++ b/test cases/unit/14 testsetup selection/subprojects/bar/bar.c
diff --git a/test cases/unit/13 testsetup selection/subprojects/bar/meson.build b/test cases/unit/14 testsetup selection/subprojects/bar/meson.build
index 1155a88aa..1155a88aa 100644
--- a/test cases/unit/13 testsetup selection/subprojects/bar/meson.build
+++ b/test cases/unit/14 testsetup selection/subprojects/bar/meson.build
diff --git a/test cases/unit/13 testsetup selection/subprojects/foo/foo.c b/test cases/unit/14 testsetup selection/subprojects/foo/foo.c
index cb3f7482f..cb3f7482f 100644
--- a/test cases/unit/13 testsetup selection/subprojects/foo/foo.c
+++ b/test cases/unit/14 testsetup selection/subprojects/foo/foo.c
diff --git a/test cases/unit/13 testsetup selection/subprojects/foo/meson.build b/test cases/unit/14 testsetup selection/subprojects/foo/meson.build
index 2eef840cd..2eef840cd 100644
--- a/test cases/unit/13 testsetup selection/subprojects/foo/meson.build
+++ b/test cases/unit/14 testsetup selection/subprojects/foo/meson.build
diff --git a/test cases/unit/14 prebuilt object/main.c b/test cases/unit/15 prebuilt object/main.c
index 480bda5f4..480bda5f4 100644
--- a/test cases/unit/14 prebuilt object/main.c
+++ b/test cases/unit/15 prebuilt object/main.c
diff --git a/test cases/unit/14 prebuilt object/meson.build b/test cases/unit/15 prebuilt object/meson.build
index 92f966b97..92f966b97 100644
--- a/test cases/unit/14 prebuilt object/meson.build
+++ b/test cases/unit/15 prebuilt object/meson.build
diff --git a/test cases/unit/14 prebuilt object/source.c b/test cases/unit/15 prebuilt object/source.c
index f39b4f366..f39b4f366 100644
--- a/test cases/unit/14 prebuilt object/source.c
+++ b/test cases/unit/15 prebuilt object/source.c
diff --git a/test cases/unit/15 prebuilt static/libdir/best.c b/test cases/unit/16 prebuilt static/libdir/best.c
index ab774e1f5..ab774e1f5 100644
--- a/test cases/unit/15 prebuilt static/libdir/best.c
+++ b/test cases/unit/16 prebuilt static/libdir/best.c
diff --git a/test cases/unit/15 prebuilt static/libdir/best.h b/test cases/unit/16 prebuilt static/libdir/best.h
index 063017f86..063017f86 100644
--- a/test cases/unit/15 prebuilt static/libdir/best.h
+++ b/test cases/unit/16 prebuilt static/libdir/best.h
diff --git a/test cases/unit/15 prebuilt static/libdir/meson.build b/test cases/unit/16 prebuilt static/libdir/meson.build
index 8d74ccf3f..8d74ccf3f 100644
--- a/test cases/unit/15 prebuilt static/libdir/meson.build
+++ b/test cases/unit/16 prebuilt static/libdir/meson.build
diff --git a/test cases/unit/15 prebuilt static/main.c b/test cases/unit/16 prebuilt static/main.c
index d172625b9..d172625b9 100644
--- a/test cases/unit/15 prebuilt static/main.c
+++ b/test cases/unit/16 prebuilt static/main.c
diff --git a/test cases/unit/15 prebuilt static/meson.build b/test cases/unit/16 prebuilt static/meson.build
index 9ea1d0dc7..9ea1d0dc7 100644
--- a/test cases/unit/15 prebuilt static/meson.build
+++ b/test cases/unit/16 prebuilt static/meson.build
diff --git a/test cases/unit/16 prebuilt shared/alexandria.c b/test cases/unit/17 prebuilt shared/alexandria.c
index 2d6b84831..2d6b84831 100644
--- a/test cases/unit/16 prebuilt shared/alexandria.c
+++ b/test cases/unit/17 prebuilt shared/alexandria.c
diff --git a/test cases/unit/16 prebuilt shared/alexandria.h b/test cases/unit/17 prebuilt shared/alexandria.h
index 6e507c5ae..6e507c5ae 100644
--- a/test cases/unit/16 prebuilt shared/alexandria.h
+++ b/test cases/unit/17 prebuilt shared/alexandria.h
diff --git a/test cases/unit/16 prebuilt shared/another_visitor.c b/test cases/unit/17 prebuilt shared/another_visitor.c
index 18e5f150e..18e5f150e 100644
--- a/test cases/unit/16 prebuilt shared/another_visitor.c
+++ b/test cases/unit/17 prebuilt shared/another_visitor.c
diff --git a/test cases/unit/16 prebuilt shared/meson.build b/test cases/unit/17 prebuilt shared/meson.build
index 41c11c656..41c11c656 100644
--- a/test cases/unit/16 prebuilt shared/meson.build
+++ b/test cases/unit/17 prebuilt shared/meson.build
diff --git a/test cases/unit/16 prebuilt shared/patron.c b/test cases/unit/17 prebuilt shared/patron.c
index 82d9678aa..82d9678aa 100644
--- a/test cases/unit/16 prebuilt shared/patron.c
+++ b/test cases/unit/17 prebuilt shared/patron.c
diff --git a/test cases/unit/17 pkgconfig static/foo.c b/test cases/unit/18 pkgconfig static/foo.c
index bf7fbddf3..bf7fbddf3 100644
--- a/test cases/unit/17 pkgconfig static/foo.c
+++ b/test cases/unit/18 pkgconfig static/foo.c
diff --git a/test cases/unit/17 pkgconfig static/foo.pc.in b/test cases/unit/18 pkgconfig static/foo.pc.in
index b26c0b0a2..b26c0b0a2 100644
--- a/test cases/unit/17 pkgconfig static/foo.pc.in
+++ b/test cases/unit/18 pkgconfig static/foo.pc.in
diff --git a/test cases/unit/17 pkgconfig static/include/foo.h b/test cases/unit/18 pkgconfig static/include/foo.h
index 88ef55494..88ef55494 100644
--- a/test cases/unit/17 pkgconfig static/include/foo.h
+++ b/test cases/unit/18 pkgconfig static/include/foo.h
diff --git a/test cases/unit/17 pkgconfig static/main.c b/test cases/unit/18 pkgconfig static/main.c
index cc4649f71..cc4649f71 100644
--- a/test cases/unit/17 pkgconfig static/main.c
+++ b/test cases/unit/18 pkgconfig static/main.c
diff --git a/test cases/unit/17 pkgconfig static/meson.build b/test cases/unit/18 pkgconfig static/meson.build
index d1b0fd5ac..d1b0fd5ac 100644
--- a/test cases/unit/17 pkgconfig static/meson.build
+++ b/test cases/unit/18 pkgconfig static/meson.build
diff --git a/test cases/unit/18 array option/meson.build b/test cases/unit/19 array option/meson.build
index 2b44181fb..2b44181fb 100644
--- a/test cases/unit/18 array option/meson.build
+++ b/test cases/unit/19 array option/meson.build
diff --git a/test cases/unit/18 array option/meson_options.txt b/test cases/unit/19 array option/meson_options.txt
index 0ccdcc4ad..0ccdcc4ad 100644
--- a/test cases/unit/18 array option/meson_options.txt
+++ b/test cases/unit/19 array option/meson_options.txt
diff --git a/test cases/unit/21 warning location/a.c b/test cases/unit/22 warning location/a.c
index e69de29bb..e69de29bb 100644
--- a/test cases/unit/21 warning location/a.c
+++ b/test cases/unit/22 warning location/a.c
diff --git a/test cases/unit/21 warning location/b.c b/test cases/unit/22 warning location/b.c
index e69de29bb..e69de29bb 100644
--- a/test cases/unit/21 warning location/b.c
+++ b/test cases/unit/22 warning location/b.c
diff --git a/test cases/unit/21 warning location/conf.in b/test cases/unit/22 warning location/conf.in
index a2903ed38..a2903ed38 100644
--- a/test cases/unit/21 warning location/conf.in
+++ b/test cases/unit/22 warning location/conf.in
diff --git a/test cases/unit/21 warning location/main.c b/test cases/unit/22 warning location/main.c
index e69de29bb..e69de29bb 100644
--- a/test cases/unit/21 warning location/main.c
+++ b/test cases/unit/22 warning location/main.c
diff --git a/test cases/unit/21 warning location/meson.build b/test cases/unit/22 warning location/meson.build
index 52a93d18c..52a93d18c 100644
--- a/test cases/unit/21 warning location/meson.build
+++ b/test cases/unit/22 warning location/meson.build
diff --git a/test cases/unit/21 warning location/sub/c.c b/test cases/unit/22 warning location/sub/c.c
index e69de29bb..e69de29bb 100644
--- a/test cases/unit/21 warning location/sub/c.c
+++ b/test cases/unit/22 warning location/sub/c.c
diff --git a/test cases/unit/21 warning location/sub/d.c b/test cases/unit/22 warning location/sub/d.c
index e69de29bb..e69de29bb 100644
--- a/test cases/unit/21 warning location/sub/d.c
+++ b/test cases/unit/22 warning location/sub/d.c
diff --git a/test cases/unit/21 warning location/sub/meson.build b/test cases/unit/22 warning location/sub/meson.build
index 27f67783c..27f67783c 100644
--- a/test cases/unit/21 warning location/sub/meson.build
+++ b/test cases/unit/22 warning location/sub/meson.build
diff --git a/test cases/unit/21 warning location/sub/sub.c b/test cases/unit/22 warning location/sub/sub.c
index e69de29bb..e69de29bb 100644
--- a/test cases/unit/21 warning location/sub/sub.c
+++ b/test cases/unit/22 warning location/sub/sub.c
diff --git a/test cases/unit/22 unfound pkgconfig/meson.build b/test cases/unit/23 unfound pkgconfig/meson.build
index 1285c0a10..1285c0a10 100644
--- a/test cases/unit/22 unfound pkgconfig/meson.build
+++ b/test cases/unit/23 unfound pkgconfig/meson.build
diff --git a/test cases/unit/22 unfound pkgconfig/some.c b/test cases/unit/23 unfound pkgconfig/some.c
index fb765fb1f..fb765fb1f 100644
--- a/test cases/unit/22 unfound pkgconfig/some.c
+++ b/test cases/unit/23 unfound pkgconfig/some.c
diff --git a/test cases/unit/23 compiler run_command/meson.build b/test cases/unit/24 compiler run_command/meson.build
index 6d9e0b969..6d9e0b969 100644
--- a/test cases/unit/23 compiler run_command/meson.build
+++ b/test cases/unit/24 compiler run_command/meson.build
diff --git a/test cases/unit/23 non-permitted kwargs/meson.build b/test cases/unit/25 non-permitted kwargs/meson.build
index 9f7dc1f76..9f7dc1f76 100644
--- a/test cases/unit/23 non-permitted kwargs/meson.build
+++ b/test cases/unit/25 non-permitted kwargs/meson.build
diff --git a/test cases/unit/24 install umask/datafile.cat b/test cases/unit/26 install umask/datafile.cat
index 53d81fc2a..53d81fc2a 100644
--- a/test cases/unit/24 install umask/datafile.cat
+++ b/test cases/unit/26 install umask/datafile.cat
diff --git a/test cases/unit/24 install umask/meson.build b/test cases/unit/26 install umask/meson.build
index 225f71c67..225f71c67 100644
--- a/test cases/unit/24 install umask/meson.build
+++ b/test cases/unit/26 install umask/meson.build
diff --git a/test cases/unit/24 install umask/myinstall.py b/test cases/unit/26 install umask/myinstall.py
index db6a51c2b..db6a51c2b 100644
--- a/test cases/unit/24 install umask/myinstall.py
+++ b/test cases/unit/26 install umask/myinstall.py
diff --git a/test cases/unit/24 install umask/prog.1 b/test cases/unit/26 install umask/prog.1
index 08ef7da62..08ef7da62 100644
--- a/test cases/unit/24 install umask/prog.1
+++ b/test cases/unit/26 install umask/prog.1
diff --git a/test cases/unit/24 install umask/prog.c b/test cases/unit/26 install umask/prog.c
index 0f0061d2a..0f0061d2a 100644
--- a/test cases/unit/24 install umask/prog.c
+++ b/test cases/unit/26 install umask/prog.c
diff --git a/test cases/unit/24 install umask/sample.h b/test cases/unit/26 install umask/sample.h
index dc030dac1..dc030dac1 100644
--- a/test cases/unit/24 install umask/sample.h
+++ b/test cases/unit/26 install umask/sample.h
diff --git a/test cases/unit/24 install umask/subdir/datafile.dog b/test cases/unit/26 install umask/subdir/datafile.dog
index 7a5bcb765..7a5bcb765 100644
--- a/test cases/unit/24 install umask/subdir/datafile.dog
+++ b/test cases/unit/26 install umask/subdir/datafile.dog
diff --git a/test cases/unit/24 install umask/subdir/sayhello b/test cases/unit/26 install umask/subdir/sayhello
index 1e1c90a85..1e1c90a85 100755
--- a/test cases/unit/24 install umask/subdir/sayhello
+++ b/test cases/unit/26 install umask/subdir/sayhello
diff --git a/test cases/unit/24 pkgconfig usage/dependee/meson.build b/test cases/unit/27 pkgconfig usage/dependee/meson.build
index beb446c18..beb446c18 100644
--- a/test cases/unit/24 pkgconfig usage/dependee/meson.build
+++ b/test cases/unit/27 pkgconfig usage/dependee/meson.build
diff --git a/test cases/unit/24 pkgconfig usage/dependee/pkguser.c b/test cases/unit/27 pkgconfig usage/dependee/pkguser.c
index 2bff316f1..2bff316f1 100644
--- a/test cases/unit/24 pkgconfig usage/dependee/pkguser.c
+++ b/test cases/unit/27 pkgconfig usage/dependee/pkguser.c
diff --git a/test cases/unit/24 pkgconfig usage/dependency/meson.build b/test cases/unit/27 pkgconfig usage/dependency/meson.build
index 89fae8e00..89fae8e00 100644
--- a/test cases/unit/24 pkgconfig usage/dependency/meson.build
+++ b/test cases/unit/27 pkgconfig usage/dependency/meson.build
diff --git a/test cases/unit/24 pkgconfig usage/dependency/pkgdep.c b/test cases/unit/27 pkgconfig usage/dependency/pkgdep.c
index bd5c3f4d3..bd5c3f4d3 100644
--- a/test cases/unit/24 pkgconfig usage/dependency/pkgdep.c
+++ b/test cases/unit/27 pkgconfig usage/dependency/pkgdep.c
diff --git a/test cases/unit/24 pkgconfig usage/dependency/pkgdep.h b/test cases/unit/27 pkgconfig usage/dependency/pkgdep.h
index 16d622eb1..16d622eb1 100644
--- a/test cases/unit/24 pkgconfig usage/dependency/pkgdep.h
+++ b/test cases/unit/27 pkgconfig usage/dependency/pkgdep.h
diff --git a/test cases/unit/24 pkgconfig usage/dependency/privatelib.c b/test cases/unit/27 pkgconfig usage/dependency/privatelib.c
index 71d2179c3..71d2179c3 100644
--- a/test cases/unit/24 pkgconfig usage/dependency/privatelib.c
+++ b/test cases/unit/27 pkgconfig usage/dependency/privatelib.c
diff --git a/test cases/unit/25 ndebug if-release/main.c b/test cases/unit/28 ndebug if-release/main.c
index 70b3d044a..70b3d044a 100644
--- a/test cases/unit/25 ndebug if-release/main.c
+++ b/test cases/unit/28 ndebug if-release/main.c
diff --git a/test cases/unit/25 ndebug if-release/meson.build b/test cases/unit/28 ndebug if-release/meson.build
index 4af2406d2..4af2406d2 100644
--- a/test cases/unit/25 ndebug if-release/meson.build
+++ b/test cases/unit/28 ndebug if-release/meson.build
diff --git a/test cases/unit/26 guessed linker dependencies/exe/app.c b/test cases/unit/29 guessed linker dependencies/exe/app.c
index 1031a4204..1031a4204 100644
--- a/test cases/unit/26 guessed linker dependencies/exe/app.c
+++ b/test cases/unit/29 guessed linker dependencies/exe/app.c
diff --git a/test cases/unit/26 guessed linker dependencies/exe/meson.build b/test cases/unit/29 guessed linker dependencies/exe/meson.build
index 8bb1bd7f6..8bb1bd7f6 100644
--- a/test cases/unit/26 guessed linker dependencies/exe/meson.build
+++ b/test cases/unit/29 guessed linker dependencies/exe/meson.build
diff --git a/test cases/unit/26 guessed linker dependencies/lib/lib.c b/test cases/unit/29 guessed linker dependencies/lib/lib.c
index 1a8f94ddb..1a8f94ddb 100644
--- a/test cases/unit/26 guessed linker dependencies/lib/lib.c
+++ b/test cases/unit/29 guessed linker dependencies/lib/lib.c
diff --git a/test cases/unit/26 guessed linker dependencies/lib/meson.build b/test cases/unit/29 guessed linker dependencies/lib/meson.build
index 36df112b2..36df112b2 100644
--- a/test cases/unit/26 guessed linker dependencies/lib/meson.build
+++ b/test cases/unit/29 guessed linker dependencies/lib/meson.build
diff --git a/test cases/unit/26 guessed linker dependencies/lib/meson_options.txt b/test cases/unit/29 guessed linker dependencies/lib/meson_options.txt
index 2123e457a..2123e457a 100644
--- a/test cases/unit/26 guessed linker dependencies/lib/meson_options.txt
+++ b/test cases/unit/29 guessed linker dependencies/lib/meson_options.txt
diff --git a/test cases/unit/26 shared_mod linking/libfile.c b/test cases/unit/30 shared_mod linking/libfile.c
index 44f7667d4..44f7667d4 100644
--- a/test cases/unit/26 shared_mod linking/libfile.c
+++ b/test cases/unit/30 shared_mod linking/libfile.c
diff --git a/test cases/unit/26 shared_mod linking/main.c b/test cases/unit/30 shared_mod linking/main.c
index 12f9c984b..12f9c984b 100644
--- a/test cases/unit/26 shared_mod linking/main.c
+++ b/test cases/unit/30 shared_mod linking/main.c
diff --git a/test cases/unit/26 shared_mod linking/meson.build b/test cases/unit/30 shared_mod linking/meson.build
index 994a5d390..994a5d390 100644
--- a/test cases/unit/26 shared_mod linking/meson.build
+++ b/test cases/unit/30 shared_mod linking/meson.build
diff --git a/test cases/unit/27 forcefallback/meson.build b/test cases/unit/31 forcefallback/meson.build
index 8d84a6035..8d84a6035 100644
--- a/test cases/unit/27 forcefallback/meson.build
+++ b/test cases/unit/31 forcefallback/meson.build
diff --git a/test cases/unit/27 forcefallback/subprojects/notzlib/meson.build b/test cases/unit/31 forcefallback/subprojects/notzlib/meson.build
index 254a1367b..254a1367b 100644
--- a/test cases/unit/27 forcefallback/subprojects/notzlib/meson.build
+++ b/test cases/unit/31 forcefallback/subprojects/notzlib/meson.build
diff --git a/test cases/unit/27 forcefallback/subprojects/notzlib/notzlib.c b/test cases/unit/31 forcefallback/subprojects/notzlib/notzlib.c
index c3b6bf9c2..c3b6bf9c2 100644
--- a/test cases/unit/27 forcefallback/subprojects/notzlib/notzlib.c
+++ b/test cases/unit/31 forcefallback/subprojects/notzlib/notzlib.c
diff --git a/test cases/unit/27 forcefallback/subprojects/notzlib/notzlib.h b/test cases/unit/31 forcefallback/subprojects/notzlib/notzlib.h
index 695921d75..695921d75 100644
--- a/test cases/unit/27 forcefallback/subprojects/notzlib/notzlib.h
+++ b/test cases/unit/31 forcefallback/subprojects/notzlib/notzlib.h
diff --git a/test cases/unit/27 forcefallback/test_not_zlib.c b/test cases/unit/31 forcefallback/test_not_zlib.c
index 36256af32..36256af32 100644
--- a/test cases/unit/27 forcefallback/test_not_zlib.c
+++ b/test cases/unit/31 forcefallback/test_not_zlib.c
diff --git a/test cases/unit/28 pkgconfig use libraries/app/app.c b/test cases/unit/32 pkgconfig use libraries/app/app.c
index b271a9e61..b271a9e61 100644
--- a/test cases/unit/28 pkgconfig use libraries/app/app.c
+++ b/test cases/unit/32 pkgconfig use libraries/app/app.c
diff --git a/test cases/unit/28 pkgconfig use libraries/app/meson.build b/test cases/unit/32 pkgconfig use libraries/app/meson.build
index 3d85a32f4..3d85a32f4 100644
--- a/test cases/unit/28 pkgconfig use libraries/app/meson.build
+++ b/test cases/unit/32 pkgconfig use libraries/app/meson.build
diff --git a/test cases/unit/28 pkgconfig use libraries/lib/liba.c b/test cases/unit/32 pkgconfig use libraries/lib/liba.c
index e98906b9c..e98906b9c 100644
--- a/test cases/unit/28 pkgconfig use libraries/lib/liba.c
+++ b/test cases/unit/32 pkgconfig use libraries/lib/liba.c
diff --git a/test cases/unit/28 pkgconfig use libraries/lib/libb.c b/test cases/unit/32 pkgconfig use libraries/lib/libb.c
index 3160e5f52..3160e5f52 100644
--- a/test cases/unit/28 pkgconfig use libraries/lib/libb.c
+++ b/test cases/unit/32 pkgconfig use libraries/lib/libb.c
diff --git a/test cases/unit/28 pkgconfig use libraries/lib/meson.build b/test cases/unit/32 pkgconfig use libraries/lib/meson.build
index 748adf47a..748adf47a 100644
--- a/test cases/unit/28 pkgconfig use libraries/lib/meson.build
+++ b/test cases/unit/32 pkgconfig use libraries/lib/meson.build
diff --git a/test cases/unit/29 cross file overrides always args/meson.build b/test cases/unit/33 cross file overrides always args/meson.build
index ef6556e54..ef6556e54 100644
--- a/test cases/unit/29 cross file overrides always args/meson.build
+++ b/test cases/unit/33 cross file overrides always args/meson.build
diff --git a/test cases/unit/29 cross file overrides always args/test.c b/test cases/unit/33 cross file overrides always args/test.c
index 315f92e96..315f92e96 100644
--- a/test cases/unit/29 cross file overrides always args/test.c
+++ b/test cases/unit/33 cross file overrides always args/test.c
diff --git a/test cases/unit/29 cross file overrides always args/ubuntu-armhf-overrides.txt b/test cases/unit/33 cross file overrides always args/ubuntu-armhf-overrides.txt
index a00a7d136..a00a7d136 100644
--- a/test cases/unit/29 cross file overrides always args/ubuntu-armhf-overrides.txt
+++ b/test cases/unit/33 cross file overrides always args/ubuntu-armhf-overrides.txt
diff --git a/test cases/unit/30 command line/meson.build b/test cases/unit/34 command line/meson.build
index 6207ca5e2..6207ca5e2 100644
--- a/test cases/unit/30 command line/meson.build
+++ b/test cases/unit/34 command line/meson.build
diff --git a/test cases/unit/30 command line/meson_options.txt b/test cases/unit/34 command line/meson_options.txt
index 7acc112d8..7acc112d8 100644
--- a/test cases/unit/30 command line/meson_options.txt
+++ b/test cases/unit/34 command line/meson_options.txt
diff --git a/test cases/unit/30 command line/subprojects/subp/meson.build b/test cases/unit/34 command line/subprojects/subp/meson.build
index cf79fa42a..cf79fa42a 100644
--- a/test cases/unit/30 command line/subprojects/subp/meson.build
+++ b/test cases/unit/34 command line/subprojects/subp/meson.build
diff --git a/test cases/unit/30 command line/subprojects/subp/meson_options.txt b/test cases/unit/34 command line/subprojects/subp/meson_options.txt
index 8c50615dd..8c50615dd 100644
--- a/test cases/unit/30 command line/subprojects/subp/meson_options.txt
+++ b/test cases/unit/34 command line/subprojects/subp/meson_options.txt
diff --git a/test cases/unit/30 mixed command line args/meson.build b/test cases/unit/35 mixed command line args/meson.build
index af5cdc790..af5cdc790 100644
--- a/test cases/unit/30 mixed command line args/meson.build
+++ b/test cases/unit/35 mixed command line args/meson.build
diff --git a/test cases/unit/30 mixed command line args/meson_options.txt b/test cases/unit/35 mixed command line args/meson_options.txt
index 5a4bc22bf..5a4bc22bf 100644
--- a/test cases/unit/30 mixed command line args/meson_options.txt
+++ b/test cases/unit/35 mixed command line args/meson_options.txt
diff --git a/test cases/unit/31 pkgconfig format/meson.build b/test cases/unit/36 pkgconfig format/meson.build
index ea00f5df4..ea00f5df4 100644
--- a/test cases/unit/31 pkgconfig format/meson.build
+++ b/test cases/unit/36 pkgconfig format/meson.build
diff --git a/test cases/unit/31 pkgconfig format/somelib.c b/test cases/unit/36 pkgconfig format/somelib.c
index 0558024b3..0558024b3 100644
--- a/test cases/unit/31 pkgconfig format/somelib.c
+++ b/test cases/unit/36 pkgconfig format/somelib.c
diff --git a/test cases/unit/31 pkgconfig format/someret.c b/test cases/unit/36 pkgconfig format/someret.c
index 69f429928..69f429928 100644
--- a/test cases/unit/31 pkgconfig format/someret.c
+++ b/test cases/unit/36 pkgconfig format/someret.c
diff --git a/test cases/unit/32 python extmodule/blaster.py b/test cases/unit/37 python extmodule/blaster.py
index 163b6d426..163b6d426 100755
--- a/test cases/unit/32 python extmodule/blaster.py
+++ b/test cases/unit/37 python extmodule/blaster.py
diff --git a/test cases/unit/32 python extmodule/ext/meson.build b/test cases/unit/37 python extmodule/ext/meson.build
index b13bb326f..b13bb326f 100644
--- a/test cases/unit/32 python extmodule/ext/meson.build
+++ b/test cases/unit/37 python extmodule/ext/meson.build
diff --git a/test cases/unit/32 python extmodule/ext/tachyon_module.c b/test cases/unit/37 python extmodule/ext/tachyon_module.c
index 68eda5380..68eda5380 100644
--- a/test cases/unit/32 python extmodule/ext/tachyon_module.c
+++ b/test cases/unit/37 python extmodule/ext/tachyon_module.c
diff --git a/test cases/unit/32 python extmodule/meson.build b/test cases/unit/37 python extmodule/meson.build
index 479865482..479865482 100644
--- a/test cases/unit/32 python extmodule/meson.build
+++ b/test cases/unit/37 python extmodule/meson.build
diff --git a/test cases/unit/32 python extmodule/meson_options.txt b/test cases/unit/37 python extmodule/meson_options.txt
index b8f645d09..b8f645d09 100644
--- a/test cases/unit/32 python extmodule/meson_options.txt
+++ b/test cases/unit/37 python extmodule/meson_options.txt
diff --git a/test cases/unit/33 external, internal library rpath/built library/bar.c b/test cases/unit/38 external, internal library rpath/built library/bar.c
index 4f5662ebd..4f5662ebd 100644
--- a/test cases/unit/33 external, internal library rpath/built library/bar.c
+++ b/test cases/unit/38 external, internal library rpath/built library/bar.c
diff --git a/test cases/unit/33 external, internal library rpath/built library/meson.build b/test cases/unit/38 external, internal library rpath/built library/meson.build
index 2b422f438..2b422f438 100644
--- a/test cases/unit/33 external, internal library rpath/built library/meson.build
+++ b/test cases/unit/38 external, internal library rpath/built library/meson.build
diff --git a/test cases/unit/33 external, internal library rpath/built library/meson_options.txt b/test cases/unit/38 external, internal library rpath/built library/meson_options.txt
index aa1d2ec9b..aa1d2ec9b 100644
--- a/test cases/unit/33 external, internal library rpath/built library/meson_options.txt
+++ b/test cases/unit/38 external, internal library rpath/built library/meson_options.txt
diff --git a/test cases/unit/33 external, internal library rpath/built library/prog.c b/test cases/unit/38 external, internal library rpath/built library/prog.c
index e3d4cf63f..e3d4cf63f 100644
--- a/test cases/unit/33 external, internal library rpath/built library/prog.c
+++ b/test cases/unit/38 external, internal library rpath/built library/prog.c
diff --git a/test cases/unit/33 external, internal library rpath/external library/faa.c b/test cases/unit/38 external, internal library rpath/external library/faa.c
index 473357516..473357516 100644
--- a/test cases/unit/33 external, internal library rpath/external library/faa.c
+++ b/test cases/unit/38 external, internal library rpath/external library/faa.c
diff --git a/test cases/unit/33 external, internal library rpath/external library/foo.c b/test cases/unit/38 external, internal library rpath/external library/foo.c
index a34e4a885..a34e4a885 100644
--- a/test cases/unit/33 external, internal library rpath/external library/foo.c
+++ b/test cases/unit/38 external, internal library rpath/external library/foo.c
diff --git a/test cases/unit/33 external, internal library rpath/external library/meson.build b/test cases/unit/38 external, internal library rpath/external library/meson.build
index 6dcc97e79..6dcc97e79 100644
--- a/test cases/unit/33 external, internal library rpath/external library/meson.build
+++ b/test cases/unit/38 external, internal library rpath/external library/meson.build
diff --git a/test cases/unit/34 featurenew subprojects/meson.build b/test cases/unit/39 featurenew subprojects/meson.build
index 27898cd79..27898cd79 100644
--- a/test cases/unit/34 featurenew subprojects/meson.build
+++ b/test cases/unit/39 featurenew subprojects/meson.build
diff --git a/test cases/unit/34 featurenew subprojects/subprojects/bar/meson.build b/test cases/unit/39 featurenew subprojects/subprojects/bar/meson.build
index 712a125f7..712a125f7 100644
--- a/test cases/unit/34 featurenew subprojects/subprojects/bar/meson.build
+++ b/test cases/unit/39 featurenew subprojects/subprojects/bar/meson.build
diff --git a/test cases/unit/34 featurenew subprojects/subprojects/foo/meson.build b/test cases/unit/39 featurenew subprojects/subprojects/foo/meson.build
index 0ef4472bd..0ef4472bd 100644
--- a/test cases/unit/34 featurenew subprojects/subprojects/foo/meson.build
+++ b/test cases/unit/39 featurenew subprojects/subprojects/foo/meson.build
diff --git a/test cases/unit/35 rpath order/meson.build b/test cases/unit/40 rpath order/meson.build
index a722894e5..a722894e5 100644
--- a/test cases/unit/35 rpath order/meson.build
+++ b/test cases/unit/40 rpath order/meson.build
diff --git a/test cases/unit/35 rpath order/myexe.c b/test cases/unit/40 rpath order/myexe.c
index 03b2213bb..03b2213bb 100644
--- a/test cases/unit/35 rpath order/myexe.c
+++ b/test cases/unit/40 rpath order/myexe.c
diff --git a/test cases/unit/35 rpath order/subprojects/sub1/lib.c b/test cases/unit/40 rpath order/subprojects/sub1/lib.c
index e69de29bb..e69de29bb 100644
--- a/test cases/unit/35 rpath order/subprojects/sub1/lib.c
+++ b/test cases/unit/40 rpath order/subprojects/sub1/lib.c
diff --git a/test cases/unit/35 rpath order/subprojects/sub1/meson.build b/test cases/unit/40 rpath order/subprojects/sub1/meson.build
index 4dd5d0843..4dd5d0843 100644
--- a/test cases/unit/35 rpath order/subprojects/sub1/meson.build
+++ b/test cases/unit/40 rpath order/subprojects/sub1/meson.build
diff --git a/test cases/unit/35 rpath order/subprojects/sub2/lib.c b/test cases/unit/40 rpath order/subprojects/sub2/lib.c
index e69de29bb..e69de29bb 100644
--- a/test cases/unit/35 rpath order/subprojects/sub2/lib.c
+++ b/test cases/unit/40 rpath order/subprojects/sub2/lib.c
diff --git a/test cases/unit/35 rpath order/subprojects/sub2/meson.build b/test cases/unit/40 rpath order/subprojects/sub2/meson.build
index bc3510db3..bc3510db3 100644
--- a/test cases/unit/35 rpath order/subprojects/sub2/meson.build
+++ b/test cases/unit/40 rpath order/subprojects/sub2/meson.build
diff --git a/test cases/unit/36 dep order/lib1.c b/test cases/unit/41 dep order/lib1.c
index e69de29bb..e69de29bb 100644
--- a/test cases/unit/36 dep order/lib1.c
+++ b/test cases/unit/41 dep order/lib1.c
diff --git a/test cases/unit/36 dep order/lib2.c b/test cases/unit/41 dep order/lib2.c
index e69de29bb..e69de29bb 100644
--- a/test cases/unit/36 dep order/lib2.c
+++ b/test cases/unit/41 dep order/lib2.c
diff --git a/test cases/unit/36 dep order/meson.build b/test cases/unit/41 dep order/meson.build
index 17cf9dfba..17cf9dfba 100644
--- a/test cases/unit/36 dep order/meson.build
+++ b/test cases/unit/41 dep order/meson.build
diff --git a/test cases/unit/36 dep order/myexe.c b/test cases/unit/41 dep order/myexe.c
index 8f4c045ee..8f4c045ee 100644
--- a/test cases/unit/36 dep order/myexe.c
+++ b/test cases/unit/41 dep order/myexe.c
diff --git a/test cases/unit/9 -L -l order/first.pc b/test cases/unit/8 -L -l order/first.pc
index 3b811b2e2..3b811b2e2 100644
--- a/test cases/unit/9 -L -l order/first.pc
+++ b/test cases/unit/8 -L -l order/first.pc
diff --git a/test cases/unit/9 -L -l order/meson.build b/test cases/unit/8 -L -l order/meson.build
index cfcf033fa..cfcf033fa 100644
--- a/test cases/unit/9 -L -l order/meson.build
+++ b/test cases/unit/8 -L -l order/meson.build
diff --git a/test cases/unit/9 -L -l order/prog.c b/test cases/unit/8 -L -l order/prog.c
index 3a16ac3dc..3a16ac3dc 100644
--- a/test cases/unit/9 -L -l order/prog.c
+++ b/test cases/unit/8 -L -l order/prog.c
diff --git a/test cases/unit/9 -L -l order/second.pc b/test cases/unit/8 -L -l order/second.pc
index 196824b74..196824b74 100644
--- a/test cases/unit/9 -L -l order/second.pc
+++ b/test cases/unit/8 -L -l order/second.pc
diff --git a/test cases/unit/10 d dedup/meson.build b/test cases/unit/9 d dedup/meson.build
index 08f3a6c67..08f3a6c67 100644
--- a/test cases/unit/10 d dedup/meson.build
+++ b/test cases/unit/9 d dedup/meson.build
diff --git a/test cases/unit/10 d dedup/prog.c b/test cases/unit/9 d dedup/prog.c
index 505f12280..505f12280 100644
--- a/test cases/unit/10 d dedup/prog.c
+++ b/test cases/unit/9 d dedup/prog.c
diff --git a/test cases/windows/11 vs module defs generated custom target/meson.build b/test cases/windows/10 vs module defs generated custom target/meson.build
index fe594c878..fe594c878 100644
--- a/test cases/windows/11 vs module defs generated custom target/meson.build
+++ b/test cases/windows/10 vs module defs generated custom target/meson.build
diff --git a/test cases/windows/10 vs module defs generated/prog.c b/test cases/windows/10 vs module defs generated custom target/prog.c
index f35f4a02d..f35f4a02d 100644
--- a/test cases/windows/10 vs module defs generated/prog.c
+++ b/test cases/windows/10 vs module defs generated custom target/prog.c
diff --git a/test cases/windows/11 vs module defs generated custom target/subdir/make_def.py b/test cases/windows/10 vs module defs generated custom target/subdir/make_def.py
index 50acfb5ef..50acfb5ef 100755
--- a/test cases/windows/11 vs module defs generated custom target/subdir/make_def.py
+++ b/test cases/windows/10 vs module defs generated custom target/subdir/make_def.py
diff --git a/test cases/windows/11 vs module defs generated custom target/subdir/meson.build b/test cases/windows/10 vs module defs generated custom target/subdir/meson.build
index c4ae33ae4..c4ae33ae4 100644
--- a/test cases/windows/11 vs module defs generated custom target/subdir/meson.build
+++ b/test cases/windows/10 vs module defs generated custom target/subdir/meson.build
diff --git a/test cases/windows/10 vs module defs generated/subdir/somedll.c b/test cases/windows/10 vs module defs generated custom target/subdir/somedll.c
index b23d8fed5..b23d8fed5 100644
--- a/test cases/windows/10 vs module defs generated/subdir/somedll.c
+++ b/test cases/windows/10 vs module defs generated custom target/subdir/somedll.c
diff --git a/test cases/windows/12 exe implib/installed_files.txt b/test cases/windows/11 exe implib/installed_files.txt
index bd2abe92b..bd2abe92b 100644
--- a/test cases/windows/12 exe implib/installed_files.txt
+++ b/test cases/windows/11 exe implib/installed_files.txt
diff --git a/test cases/windows/12 exe implib/meson.build b/test cases/windows/11 exe implib/meson.build
index 0a38ec13e..0a38ec13e 100644
--- a/test cases/windows/12 exe implib/meson.build
+++ b/test cases/windows/11 exe implib/meson.build
diff --git a/test cases/windows/12 exe implib/prog.c b/test cases/windows/11 exe implib/prog.c
index 6d5a9f501..6d5a9f501 100644
--- a/test cases/windows/12 exe implib/prog.c
+++ b/test cases/windows/11 exe implib/prog.c
diff --git a/test cases/windows/13 resources with custom targets/meson.build b/test cases/windows/12 resources with custom targets/meson.build
index b1e2b091b..b1e2b091b 100644
--- a/test cases/windows/13 resources with custom targets/meson.build
+++ b/test cases/windows/12 resources with custom targets/meson.build
diff --git a/test cases/windows/13 resources with custom targets/prog.c b/test cases/windows/12 resources with custom targets/prog.c
index 2bef6a278..2bef6a278 100644
--- a/test cases/windows/13 resources with custom targets/prog.c
+++ b/test cases/windows/12 resources with custom targets/prog.c
diff --git a/test cases/windows/13 resources with custom targets/res/gen-res.py b/test cases/windows/12 resources with custom targets/res/gen-res.py
index 2feb02f5b..2feb02f5b 100755
--- a/test cases/windows/13 resources with custom targets/res/gen-res.py
+++ b/test cases/windows/12 resources with custom targets/res/gen-res.py
diff --git a/test cases/windows/13 resources with custom targets/res/meson.build b/test cases/windows/12 resources with custom targets/res/meson.build
index 97976370b..97976370b 100644
--- a/test cases/windows/13 resources with custom targets/res/meson.build
+++ b/test cases/windows/12 resources with custom targets/res/meson.build
diff --git a/test cases/windows/13 resources with custom targets/res/myres.rc.in b/test cases/windows/12 resources with custom targets/res/myres.rc.in
index 0cff642ba..0cff642ba 100644
--- a/test cases/windows/13 resources with custom targets/res/myres.rc.in
+++ b/test cases/windows/12 resources with custom targets/res/myres.rc.in
diff --git a/test cases/windows/13 resources with custom targets/res/myres_static.rc b/test cases/windows/12 resources with custom targets/res/myres_static.rc
index 12838aee2..12838aee2 100644
--- a/test cases/windows/13 resources with custom targets/res/myres_static.rc
+++ b/test cases/windows/12 resources with custom targets/res/myres_static.rc
diff --git a/test cases/windows/13 resources with custom targets/res/resource.h b/test cases/windows/12 resources with custom targets/res/resource.h
index e69de29bb..e69de29bb 100644
--- a/test cases/windows/13 resources with custom targets/res/resource.h
+++ b/test cases/windows/12 resources with custom targets/res/resource.h
diff --git a/test cases/windows/13 resources with custom targets/res/sample.ico b/test cases/windows/12 resources with custom targets/res/sample.ico
index 24bd3d9e9..24bd3d9e9 100644
--- a/test cases/windows/13 resources with custom targets/res/sample.ico
+++ b/test cases/windows/12 resources with custom targets/res/sample.ico
diff --git a/test cases/windows/14 test argument extra paths/exe/main.c b/test cases/windows/13 test argument extra paths/exe/main.c
index 0ac9e3892..0ac9e3892 100644
--- a/test cases/windows/14 test argument extra paths/exe/main.c
+++ b/test cases/windows/13 test argument extra paths/exe/main.c
diff --git a/test cases/windows/14 test argument extra paths/exe/meson.build b/test cases/windows/13 test argument extra paths/exe/meson.build
index 138500a58..138500a58 100644
--- a/test cases/windows/14 test argument extra paths/exe/meson.build
+++ b/test cases/windows/13 test argument extra paths/exe/meson.build
diff --git a/test cases/windows/14 test argument extra paths/lib/foo.c b/test cases/windows/13 test argument extra paths/lib/foo.c
index 86b1a03cd..86b1a03cd 100644
--- a/test cases/windows/14 test argument extra paths/lib/foo.c
+++ b/test cases/windows/13 test argument extra paths/lib/foo.c
diff --git a/test cases/windows/14 test argument extra paths/lib/foo.h b/test cases/windows/13 test argument extra paths/lib/foo.h
index 5078c583a..5078c583a 100644
--- a/test cases/windows/14 test argument extra paths/lib/foo.h
+++ b/test cases/windows/13 test argument extra paths/lib/foo.h
diff --git a/test cases/windows/14 test argument extra paths/lib/meson.build b/test cases/windows/13 test argument extra paths/lib/meson.build
index aa0bf145c..aa0bf145c 100644
--- a/test cases/windows/14 test argument extra paths/lib/meson.build
+++ b/test cases/windows/13 test argument extra paths/lib/meson.build
diff --git a/test cases/windows/14 test argument extra paths/meson.build b/test cases/windows/13 test argument extra paths/meson.build
index f105946e9..f105946e9 100644
--- a/test cases/windows/14 test argument extra paths/meson.build
+++ b/test cases/windows/13 test argument extra paths/meson.build
diff --git a/test cases/windows/14 test argument extra paths/test/meson.build b/test cases/windows/13 test argument extra paths/test/meson.build
index 2e608be5d..2e608be5d 100644
--- a/test cases/windows/14 test argument extra paths/test/meson.build
+++ b/test cases/windows/13 test argument extra paths/test/meson.build
diff --git a/test cases/windows/14 test argument extra paths/test/test_run_exe.py b/test cases/windows/13 test argument extra paths/test/test_run_exe.py
index 77c7ddc59..77c7ddc59 100644
--- a/test cases/windows/14 test argument extra paths/test/test_run_exe.py
+++ b/test cases/windows/13 test argument extra paths/test/test_run_exe.py
diff --git a/test cases/windows/15 resources with custom target depend_files/ico/gen-ico.py b/test cases/windows/14 resources with custom target depend_files/ico/gen-ico.py
index c49e0dd59..c49e0dd59 100755
--- a/test cases/windows/15 resources with custom target depend_files/ico/gen-ico.py
+++ b/test cases/windows/14 resources with custom target depend_files/ico/gen-ico.py
diff --git a/test cases/windows/15 resources with custom target depend_files/ico/meson.build b/test cases/windows/14 resources with custom target depend_files/ico/meson.build
index 3fae9e86c..3fae9e86c 100644
--- a/test cases/windows/15 resources with custom target depend_files/ico/meson.build
+++ b/test cases/windows/14 resources with custom target depend_files/ico/meson.build
diff --git a/test cases/windows/15 resources with custom target depend_files/ico/sample.ico.in b/test cases/windows/14 resources with custom target depend_files/ico/sample.ico.in
index 24bd3d9e9..24bd3d9e9 100644
--- a/test cases/windows/15 resources with custom target depend_files/ico/sample.ico.in
+++ b/test cases/windows/14 resources with custom target depend_files/ico/sample.ico.in
diff --git a/test cases/windows/15 resources with custom target depend_files/meson.build b/test cases/windows/14 resources with custom target depend_files/meson.build
index 85ba06fa2..85ba06fa2 100644
--- a/test cases/windows/15 resources with custom target depend_files/meson.build
+++ b/test cases/windows/14 resources with custom target depend_files/meson.build
diff --git a/test cases/windows/15 resources with custom target depend_files/prog.c b/test cases/windows/14 resources with custom target depend_files/prog.c
index 2bef6a278..2bef6a278 100644
--- a/test cases/windows/15 resources with custom target depend_files/prog.c
+++ b/test cases/windows/14 resources with custom target depend_files/prog.c
diff --git a/test cases/windows/15 resources with custom target depend_files/res/meson.build b/test cases/windows/14 resources with custom target depend_files/res/meson.build
index 3d43b3f51..3d43b3f51 100644
--- a/test cases/windows/15 resources with custom target depend_files/res/meson.build
+++ b/test cases/windows/14 resources with custom target depend_files/res/meson.build
diff --git a/test cases/windows/15 resources with custom target depend_files/res/myres.rc b/test cases/windows/14 resources with custom target depend_files/res/myres.rc
index 12838aee2..12838aee2 100644
--- a/test cases/windows/15 resources with custom target depend_files/res/myres.rc
+++ b/test cases/windows/14 resources with custom target depend_files/res/myres.rc
diff --git a/test cases/windows/16 resource scripts with duplicate filenames/a/meson.build b/test cases/windows/15 resource scripts with duplicate filenames/a/meson.build
index 73f18c8b6..73f18c8b6 100644
--- a/test cases/windows/16 resource scripts with duplicate filenames/a/meson.build
+++ b/test cases/windows/15 resource scripts with duplicate filenames/a/meson.build
diff --git a/test cases/windows/16 resource scripts with duplicate filenames/a/rsrc.rc b/test cases/windows/15 resource scripts with duplicate filenames/a/rsrc.rc
index 1997b8ecb..1997b8ecb 100644
--- a/test cases/windows/16 resource scripts with duplicate filenames/a/rsrc.rc
+++ b/test cases/windows/15 resource scripts with duplicate filenames/a/rsrc.rc
diff --git a/test cases/windows/16 resource scripts with duplicate filenames/b/meson.build b/test cases/windows/15 resource scripts with duplicate filenames/b/meson.build
index d0b0aabb5..d0b0aabb5 100644
--- a/test cases/windows/16 resource scripts with duplicate filenames/b/meson.build
+++ b/test cases/windows/15 resource scripts with duplicate filenames/b/meson.build
diff --git a/test cases/windows/16 resource scripts with duplicate filenames/b/rsrc.rc b/test cases/windows/15 resource scripts with duplicate filenames/b/rsrc.rc
index a8e3b27b4..a8e3b27b4 100644
--- a/test cases/windows/16 resource scripts with duplicate filenames/b/rsrc.rc
+++ b/test cases/windows/15 resource scripts with duplicate filenames/b/rsrc.rc
diff --git a/test cases/windows/16 resource scripts with duplicate filenames/c/meson.build b/test cases/windows/15 resource scripts with duplicate filenames/c/meson.build
index a7b7e309c..a7b7e309c 100644
--- a/test cases/windows/16 resource scripts with duplicate filenames/c/meson.build
+++ b/test cases/windows/15 resource scripts with duplicate filenames/c/meson.build
diff --git a/test cases/windows/16 resource scripts with duplicate filenames/c/rsrc.rc b/test cases/windows/15 resource scripts with duplicate filenames/c/rsrc.rc
index 1fa2c1cfa..1fa2c1cfa 100644
--- a/test cases/windows/16 resource scripts with duplicate filenames/c/rsrc.rc
+++ b/test cases/windows/15 resource scripts with duplicate filenames/c/rsrc.rc
diff --git a/test cases/windows/16 resource scripts with duplicate filenames/meson.build b/test cases/windows/15 resource scripts with duplicate filenames/meson.build
index 4073a8e7c..4073a8e7c 100644
--- a/test cases/windows/16 resource scripts with duplicate filenames/meson.build
+++ b/test cases/windows/15 resource scripts with duplicate filenames/meson.build
diff --git a/test cases/windows/16 resource scripts with duplicate filenames/rsrc.rc b/test cases/windows/15 resource scripts with duplicate filenames/rsrc.rc
index 8f6aa1f5c..8f6aa1f5c 100644
--- a/test cases/windows/16 resource scripts with duplicate filenames/rsrc.rc
+++ b/test cases/windows/15 resource scripts with duplicate filenames/rsrc.rc
diff --git a/test cases/windows/16 resource scripts with duplicate filenames/verify.c b/test cases/windows/15 resource scripts with duplicate filenames/verify.c
index 4d2ccf028..4d2ccf028 100644
--- a/test cases/windows/16 resource scripts with duplicate filenames/verify.c
+++ b/test cases/windows/15 resource scripts with duplicate filenames/verify.c
diff --git a/test cases/windows/8 dll versioning/copyfile.py b/test cases/windows/7 dll versioning/copyfile.py
index ff42ac359..ff42ac359 100644
--- a/test cases/windows/8 dll versioning/copyfile.py
+++ b/test cases/windows/7 dll versioning/copyfile.py
diff --git a/test cases/windows/8 dll versioning/exe.orig.c b/test cases/windows/7 dll versioning/exe.orig.c
index 86c4adc38..86c4adc38 100644
--- a/test cases/windows/8 dll versioning/exe.orig.c
+++ b/test cases/windows/7 dll versioning/exe.orig.c
diff --git a/test cases/windows/8 dll versioning/installed_files.txt b/test cases/windows/7 dll versioning/installed_files.txt
index 20482bff5..20482bff5 100644
--- a/test cases/windows/8 dll versioning/installed_files.txt
+++ b/test cases/windows/7 dll versioning/installed_files.txt
diff --git a/test cases/windows/8 dll versioning/lib.c b/test cases/windows/7 dll versioning/lib.c
index cf7dfdd07..cf7dfdd07 100644
--- a/test cases/windows/8 dll versioning/lib.c
+++ b/test cases/windows/7 dll versioning/lib.c
diff --git a/test cases/windows/8 dll versioning/meson.build b/test cases/windows/7 dll versioning/meson.build
index 80acf880a..80acf880a 100644
--- a/test cases/windows/8 dll versioning/meson.build
+++ b/test cases/windows/7 dll versioning/meson.build
diff --git a/test cases/windows/9 find program/meson.build b/test cases/windows/8 find program/meson.build
index 565fb626d..565fb626d 100644
--- a/test cases/windows/9 find program/meson.build
+++ b/test cases/windows/8 find program/meson.build
diff --git a/test cases/windows/9 find program/test-script b/test cases/windows/8 find program/test-script
index d105a818d..d105a818d 100644
--- a/test cases/windows/9 find program/test-script
+++ b/test cases/windows/8 find program/test-script
diff --git a/test cases/windows/9 find program/test-script-ext.py b/test cases/windows/8 find program/test-script-ext.py
index ae9adfb8e..ae9adfb8e 100644
--- a/test cases/windows/9 find program/test-script-ext.py
+++ b/test cases/windows/8 find program/test-script-ext.py
diff --git a/test cases/windows/10 vs module defs generated/meson.build b/test cases/windows/9 vs module defs generated/meson.build
index 7728ca77a..7728ca77a 100644
--- a/test cases/windows/10 vs module defs generated/meson.build
+++ b/test cases/windows/9 vs module defs generated/meson.build
diff --git a/test cases/windows/11 vs module defs generated custom target/prog.c b/test cases/windows/9 vs module defs generated/prog.c
index f35f4a02d..f35f4a02d 100644
--- a/test cases/windows/11 vs module defs generated custom target/prog.c
+++ b/test cases/windows/9 vs module defs generated/prog.c
diff --git a/test cases/windows/10 vs module defs generated/subdir/meson.build b/test cases/windows/9 vs module defs generated/subdir/meson.build
index 5d390a0b5..5d390a0b5 100644
--- a/test cases/windows/10 vs module defs generated/subdir/meson.build
+++ b/test cases/windows/9 vs module defs generated/subdir/meson.build
diff --git a/test cases/windows/11 vs module defs generated custom target/subdir/somedll.c b/test cases/windows/9 vs module defs generated/subdir/somedll.c
index b23d8fed5..b23d8fed5 100644
--- a/test cases/windows/11 vs module defs generated custom target/subdir/somedll.c
+++ b/test cases/windows/9 vs module defs generated/subdir/somedll.c
diff --git a/test cases/windows/10 vs module defs generated/subdir/somedll.def.in b/test cases/windows/9 vs module defs generated/subdir/somedll.def.in
index c29207c71..c29207c71 100644
--- a/test cases/windows/10 vs module defs generated/subdir/somedll.def.in
+++ b/test cases/windows/9 vs module defs generated/subdir/somedll.def.in