Condense test dirs.condense

932 files changed, 44 insertions, 44 deletions

diff --git a/run_project_tests.py b/run_project_tests.py
index e390aaf86..a74037bfb 100755
--- a/run_project_tests.py
+++ b/run_project_tests.py
@@ -303,7 +303,7 @@ def pass_libdir_to_test(dirname):
         return False
     if '38 libdir must be inside prefix' in dirname:
         return False
-    if '199 install_mode' in dirname:
+    if '196 install_mode' in dirname:
         return False
     return True
 
diff --git a/run_unittests.py b/run_unittests.py
index 411fd61d8..54a1363a9 100755
--- a/run_unittests.py
+++ b/run_unittests.py
@@ -1030,7 +1030,7 @@ class AllPlatformTests(BasePlatformTests):
         Can't be an ordinary test because we pass --prefix to meson there.
         https://github.com/mesonbuild/meson/issues/1349
         '''
-        testdir = os.path.join(self.common_test_dir, '94 default options')
+        testdir = os.path.join(self.common_test_dir, '91 default options')
         self.init(testdir, default_args=False)
         opts = self.introspect('--buildoptions')
         for opt in opts:
@@ -1045,7 +1045,7 @@ class AllPlatformTests(BasePlatformTests):
         https://github.com/mesonbuild/meson/issues/1341
         https://github.com/mesonbuild/meson/issues/1345
         '''
-        testdir = os.path.join(self.common_test_dir, '94 default options')
+        testdir = os.path.join(self.common_test_dir, '91 default options')
         prefix = '/someabs'
         libdir = 'libdir'
         extra_args = ['--prefix=' + prefix,
@@ -1127,7 +1127,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, '172 default options prefix dependent defaults')
+        testdir = os.path.join(self.common_test_dir, '169 default options prefix dependent defaults')
         expected = {
             '':
             {'prefix':         '/usr',
@@ -1222,7 +1222,7 @@ class AllPlatformTests(BasePlatformTests):
         Test that run_targets are run from the correct directory
         https://github.com/mesonbuild/meson/issues/957
         '''
-        testdir = os.path.join(self.common_test_dir, '58 run target')
+        testdir = os.path.join(self.common_test_dir, '55 run target')
         self.init(testdir)
         self.run_target('check_exists')
 
@@ -1368,7 +1368,7 @@ class AllPlatformTests(BasePlatformTests):
         self.assertFailedTestCount(1, self.mtest_command + ['--no-suite', 'subprjfail:fail', '--no-suite', 'subprjmix:fail'])
 
     def test_build_by_default(self):
-        testdir = os.path.join(self.common_test_dir, '137 build by default')
+        testdir = os.path.join(self.common_test_dir, '134 build by default')
         self.init(testdir)
         self.build()
         genfile1 = os.path.join(self.builddir, 'generated1.dat')
@@ -1385,7 +1385,7 @@ class AllPlatformTests(BasePlatformTests):
         self.assertPathExists(exe2)
 
     def test_internal_include_order(self):
-        testdir = os.path.join(self.common_test_dir, '138 include order')
+        testdir = os.path.join(self.common_test_dir, '135 include order')
         self.init(testdir)
         execmd = fxecmd = None
         for cmd in self.get_compdb():
@@ -1556,7 +1556,7 @@ class AllPlatformTests(BasePlatformTests):
                 self.assertEqual(cc.is_64, wcc.is_64)
 
     def test_always_prefer_c_compiler_for_asm(self):
-        testdir = os.path.join(self.common_test_dir, '141 c cpp and asm')
+        testdir = os.path.join(self.common_test_dir, '138 c cpp and asm')
         # Skip if building with MSVC
         env = Environment(testdir, self.builddir, get_fake_options(self.prefix))
         if env.detect_c_compiler(False).get_id() == 'msvc':
@@ -1625,7 +1625,7 @@ class AllPlatformTests(BasePlatformTests):
         '''
         Test that preprocessor compiler checks read CPPFLAGS but not CFLAGS
         '''
-        testdir = os.path.join(self.common_test_dir, '140 get define')
+        testdir = os.path.join(self.common_test_dir, '137 get define')
         define = 'MESON_TEST_DEFINE_VALUE'
         # NOTE: this list can't have \n, ' or "
         # \n is never substituted by the GNU pre-processor via a -D define
@@ -1638,7 +1638,7 @@ class AllPlatformTests(BasePlatformTests):
         self.init(testdir, ['-D{}={}'.format(define, value)])
 
     def test_custom_target_exe_data_deterministic(self):
-        testdir = os.path.join(self.common_test_dir, '117 custom target capture')
+        testdir = os.path.join(self.common_test_dir, '114 custom target capture')
         self.init(testdir)
         meson_exe_dat1 = glob(os.path.join(self.privatedir, 'meson_exe*.dat'))
         self.wipe()
@@ -1652,7 +1652,7 @@ class AllPlatformTests(BasePlatformTests):
         changes to unused files (as determined by the dependency file) in the
         input files list.
         '''
-        testdir = os.path.join(self.common_test_dir, '22 header in file list')
+        testdir = os.path.join(self.common_test_dir, '20 header in file list')
         self.init(testdir)
         self.build()
         # Immediately rebuilding should not do anything
@@ -1667,7 +1667,7 @@ class AllPlatformTests(BasePlatformTests):
         ExternalProgram, and any File objects on the command-line cause
         a rebuild.
         '''
-        testdir = os.path.join(self.common_test_dir, '64 custom header generator')
+        testdir = os.path.join(self.common_test_dir, '61 custom header generator')
         self.init(testdir)
         self.build()
         # Immediately rebuilding should not do anything
@@ -1766,7 +1766,7 @@ int main(int argc, char **argv) {
         '''
         if is_windows() or is_cygwin():
             raise unittest.SkipTest('Windows PE/COFF binaries do not use RPATH')
-        testdir = os.path.join(self.common_test_dir, '46 library chain')
+        testdir = os.path.join(self.common_test_dir, '43 library chain')
         self.init(testdir)
         self.build()
         for each in ('prog', 'subdir/liblib1.so', ):
@@ -1802,10 +1802,10 @@ int main(int argc, char **argv) {
 
     def test_all_forbidden_targets_tested(self):
         '''
-        Test that all forbidden targets are tested in the '158 reserved targets'
+        Test that all forbidden targets are tested in the '155 reserved targets'
         test. Needs to be a unit test because it accesses Meson internals.
         '''
-        testdir = os.path.join(self.common_test_dir, '158 reserved targets')
+        testdir = os.path.join(self.common_test_dir, '155 reserved targets')
         targets = mesonbuild.coredata.forbidden_target_names
         # We don't actually define a target with this name
         targets.pop('build.ninja')
@@ -1975,7 +1975,7 @@ int main(int argc, char **argv) {
 
     @skipIfNoPkgconfig
     def test_pkgconfig_gen_escaping(self):
-        testdir = os.path.join(self.common_test_dir, '51 pkgconfig-gen')
+        testdir = os.path.join(self.common_test_dir, '48 pkgconfig-gen')
         prefix = '/usr/with spaces'
         libdir = 'lib'
         self.init(testdir, extra_args=['--prefix=' + prefix,
@@ -2072,7 +2072,7 @@ int main(int argc, char **argv) {
         self.assertTrue(found, "Array option not found in introspect data.")
 
     def test_free_stringarray_setting(self):
-        testdir = os.path.join(self.common_test_dir, '47 options')
+        testdir = os.path.join(self.common_test_dir, '44 options')
         self.init(testdir)
         self.opt_has('free_array_opt', [])
         self.setconf('-Dfree_array_opt=foo,bar', will_build=False)
@@ -2108,7 +2108,7 @@ int main(int argc, char **argv) {
         self.build()
 
     def test_subproject_promotion_wrap(self):
-        testdir = os.path.join(self.unit_test_dir, '42 promote wrap')
+        testdir = os.path.join(self.unit_test_dir, '43 promote wrap')
         workdir = os.path.join(self.builddir, 'work')
         shutil.copytree(testdir, workdir)
         spdir = os.path.join(workdir, 'subprojects')
@@ -2228,7 +2228,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, '181 identical target name in subproject flat layout')
+        testdir = os.path.join(self.common_test_dir, '178 identical target name in subproject flat layout')
         self.init(testdir, extra_args=['--layout=flat'])
         self.build()
 
@@ -2237,7 +2237,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, '190 same target name flat layout')
+        testdir = os.path.join(self.common_test_dir, '187 same target name flat layout')
         self.init(testdir, extra_args=['--layout=flat'])
         self.build()
 
@@ -2329,14 +2329,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, '35 mixed command line args')
+        testdir = os.path.join(self.unit_test_dir, '36 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, '35 mixed command line args')
+        testdir = os.path.join(self.unit_test_dir, '36 mixed command line args')
         self.init(testdir, extra_args=args)
         opts = self.introspect('--buildoptions')
         for item in opts:
@@ -2355,7 +2355,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, '35 mixed command line args')
+        testdir = os.path.join(self.unit_test_dir, '36 mixed command line args')
         self.init(testdir)
         self.setconf(args)
         opts = self.introspect('--buildoptions')
@@ -2499,7 +2499,7 @@ recommended as it is not supported on some platforms''')
             pass
 
     def test_feature_check_usage_subprojects(self):
-        testdir = os.path.join(self.unit_test_dir, '39 featurenew subprojects')
+        testdir = os.path.join(self.unit_test_dir, '40 featurenew subprojects')
         out = self.init(testdir)
         # Parent project warns correctly
         self.assertRegex(out, "WARNING: Project targetting '>=0.45'.*'0.47.0': dict")
@@ -2514,7 +2514,7 @@ recommended as it is not supported on some platforms''')
         self.assertRegex(out, " * 0.47.0: {'dict'}")
 
     def test_configure_file_warnings(self):
-        testdir = os.path.join(self.common_test_dir, "16 configure file")
+        testdir = os.path.join(self.common_test_dir, "14 configure file")
         out = self.init(testdir)
         self.assertRegex(out, "WARNING:.*'empty'.*config.h.in.*not present.*")
         self.assertRegex(out, "WARNING:.*'FOO_BAR'.*nosubst-nocopy2.txt.in.*not present.*")
@@ -2942,7 +2942,7 @@ class LinuxlikeTests(BasePlatformTests):
         case because we need to run `readelf` and actually check the soname.
         https://github.com/mesonbuild/meson/issues/785
         '''
-        testdir = os.path.join(self.common_test_dir, '27 library versions')
+        testdir = os.path.join(self.common_test_dir, '25 library versions')
         self.init(testdir)
         self.build()
         lib1 = os.path.join(self.builddir, 'prefixsomelib.suffix')
@@ -2975,7 +2975,7 @@ class LinuxlikeTests(BasePlatformTests):
         need to run pkg-config outside of a Meson build file.
         https://github.com/mesonbuild/meson/issues/889
         '''
-        testdir = os.path.join(self.common_test_dir, '51 pkgconfig-gen')
+        testdir = os.path.join(self.common_test_dir, '48 pkgconfig-gen')
         self.init(testdir)
         env = Environment(testdir, self.builddir, get_fake_options(self.prefix))
         kwargs = {'required': True, 'silent': True}
@@ -2991,13 +2991,13 @@ class LinuxlikeTests(BasePlatformTests):
         '''
         Test that generated pkg-config files correctly handle dependencies
         '''
-        testdir = os.path.join(self.common_test_dir, '51 pkgconfig-gen')
+        testdir = os.path.join(self.common_test_dir, '48 pkgconfig-gen')
         self.init(testdir)
         privatedir1 = self.privatedir
 
         self.new_builddir()
         os.environ['PKG_CONFIG_LIBDIR'] = privatedir1
-        testdir = os.path.join(self.common_test_dir, '51 pkgconfig-gen', 'dependencies')
+        testdir = os.path.join(self.common_test_dir, '48 pkgconfig-gen', 'dependencies')
         self.init(testdir)
         privatedir2 = self.privatedir
 
@@ -3174,14 +3174,14 @@ class LinuxlikeTests(BasePlatformTests):
         '''
         Oflag = '-O3'
         os.environ['CFLAGS'] = os.environ['CXXFLAGS'] = Oflag
-        testdir = os.path.join(self.common_test_dir, '43 has function')
+        testdir = os.path.join(self.common_test_dir, '40 has function')
         self.init(testdir)
         cmds = self.get_meson_log_compiler_checks()
         for cmd in cmds:
             if cmd[0] == 'ccache':
                 cmd = cmd[1:]
             # Verify that -I flags from the `args` kwarg are first
-            # This is set in the '43 has function' test case
+            # This is set in the '40 has function' test case
             self.assertEqual(cmd[1], '-I/tmp')
             # Verify that -O3 set via the environment is overridden by -O0
             Oargs = [arg for arg in cmd if arg.startswith('-O')]
@@ -3248,7 +3248,7 @@ class LinuxlikeTests(BasePlatformTests):
         self._test_stds_impl(testdir, cpp, 'cpp')
 
     def test_unity_subproj(self):
-        testdir = os.path.join(self.common_test_dir, '49 subproject')
+        testdir = os.path.join(self.common_test_dir, '46 subproject')
         self.init(testdir, extra_args='--unity=subprojects')
         self.assertPathExists(os.path.join(self.builddir, 'subprojects/sublib/subprojects@sublib@@simpletest@exe/simpletest-unity.c'))
         self.assertPathExists(os.path.join(self.builddir, 'subprojects/sublib/subprojects@sublib@@sublib@sha/sublib-unity.c'))
@@ -3295,7 +3295,7 @@ class LinuxlikeTests(BasePlatformTests):
 
         self.wipe()
         # Test directory modes
-        testdir = os.path.join(self.common_test_dir, '66 install subdir')
+        testdir = os.path.join(self.common_test_dir, '63 install subdir')
         self.init(testdir)
         self.install()
 
@@ -3312,7 +3312,7 @@ class LinuxlikeTests(BasePlatformTests):
         '''
         Test that files are installed with correct permissions using install_mode.
         '''
-        testdir = os.path.join(self.common_test_dir, '199 install_mode')
+        testdir = os.path.join(self.common_test_dir, '196 install_mode')
         self.init(testdir)
         self.build()
         self.install()
@@ -3687,7 +3687,7 @@ endian = 'little'
 
     @skipIfNoPkgconfig
     def test_pkgconfig_formatting(self):
-        testdir = os.path.join(self.unit_test_dir, '36 pkgconfig format')
+        testdir = os.path.join(self.unit_test_dir, '37 pkgconfig format')
         self.init(testdir)
         myenv = os.environ.copy()
         myenv['PKG_CONFIG_PATH'] = self.privatedir
@@ -3739,7 +3739,7 @@ endian = 'little'
         '''
         if not is_osx():
             raise unittest.SkipTest('Apple bitcode not relevant')
-        testdir = os.path.join(self.common_test_dir, '156 shared module resolving symbol in executable')
+        testdir = os.path.join(self.common_test_dir, '153 shared module resolving symbol in executable')
         # Ensure that it builds even with bitcode enabled
         self.init(testdir, extra_args='-Db_bitcode=true')
         self.build()
@@ -3749,7 +3749,7 @@ endian = 'little'
         '''
         Test that the dependencies are always listed in a deterministic order.
         '''
-        testdir = os.path.join(self.unit_test_dir, '41 dep order')
+        testdir = os.path.join(self.unit_test_dir, '42 dep order')
         self.init(testdir)
         with open(os.path.join(self.builddir, 'build.ninja')) as bfile:
             for line in bfile:
@@ -3764,7 +3764,7 @@ endian = 'little'
         '''
         if is_cygwin():
             raise unittest.SkipTest('rpath are not used on Cygwin')
-        testdir = os.path.join(self.unit_test_dir, '40 rpath order')
+        testdir = os.path.join(self.unit_test_dir, '41 rpath order')
         self.init(testdir)
         if is_osx():
             rpathre = re.compile('-rpath,.*/subprojects/sub1.*-rpath,.*/subprojects/sub2')
@@ -3791,7 +3791,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, '38 external, internal library rpath', 'external library')
+        testdir = os.path.join(self.unit_test_dir, '39 external, internal library rpath', 'external library')
         # install into installdir without using DESTDIR
         installdir = self.installdir
         self.prefix = installdir
@@ -3803,7 +3803,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, '38 external, internal library rpath', 'built library')
+        testdir = os.path.join(self.unit_test_dir, '39 external, internal library rpath', 'built library')
         # install into installdir without using DESTDIR
         self.prefix = self.installdir
         self.init(testdir)
@@ -3859,13 +3859,13 @@ endian = 'little'
             os.chdir(curdir)
 
     def test_install_subdir_symlinks(self):
-        self.install_subdir_invalid_symlinks('66 install subdir', os.path.join('sub', 'sub1'))
+        self.install_subdir_invalid_symlinks('63 install subdir', os.path.join('sub', 'sub1'))
 
     def test_install_subdir_symlinks_with_default_umask(self):
-        self.install_subdir_invalid_symlinks('199 install_mode', 'sub2')
+        self.install_subdir_invalid_symlinks('196 install_mode', 'sub2')
 
     def test_install_subdir_symlinks_with_default_umask_and_mode(self):
-        self.install_subdir_invalid_symlinks('199 install_mode', 'sub1')
+        self.install_subdir_invalid_symlinks('196 install_mode', 'sub1')
 
 
 class LinuxCrossArmTests(BasePlatformTests):
@@ -3952,7 +3952,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', '37 python extmodule')
+        testdir = os.path.join(self.src_root, 'test cases', 'unit', '38 python extmodule')
 
         # No python version specified, this will use meson's python
         self.init(testdir)
diff --git a/test cases/common/103 manygen/depuser.c b/test cases/common/100 manygen/depuser.c
index 1a825e0ec..1a825e0ec 100644
--- a/test cases/common/103 manygen/depuser.c
+++ b/test cases/common/100 manygen/depuser.c
diff --git a/test cases/common/103 manygen/meson.build b/test cases/common/100 manygen/meson.build
index e70a55a17..e70a55a17 100644
--- a/test cases/common/103 manygen/meson.build
+++ b/test cases/common/100 manygen/meson.build
diff --git a/test cases/common/103 manygen/subdir/funcinfo.def b/test cases/common/100 manygen/subdir/funcinfo.def
index b0741862e..b0741862e 100644
--- a/test cases/common/103 manygen/subdir/funcinfo.def
+++ b/test cases/common/100 manygen/subdir/funcinfo.def
diff --git a/test cases/common/103 manygen/subdir/manygen.py b/test cases/common/100 manygen/subdir/manygen.py
index 7ffd435b2..7ffd435b2 100755
--- a/test cases/common/103 manygen/subdir/manygen.py
+++ b/test cases/common/100 manygen/subdir/manygen.py
diff --git a/test cases/common/103 manygen/subdir/meson.build b/test cases/common/100 manygen/subdir/meson.build
index 73b4ff710..73b4ff710 100644
--- a/test cases/common/103 manygen/subdir/meson.build
+++ b/test cases/common/100 manygen/subdir/meson.build
diff --git a/test cases/common/104 stringdef/meson.build b/test cases/common/101 stringdef/meson.build
index 3f9170e20..3f9170e20 100644
--- a/test cases/common/104 stringdef/meson.build
+++ b/test cases/common/101 stringdef/meson.build
diff --git a/test cases/common/104 stringdef/stringdef.c b/test cases/common/101 stringdef/stringdef.c
index 69ea65644..69ea65644 100644
--- a/test cases/common/104 stringdef/stringdef.c
+++ b/test cases/common/101 stringdef/stringdef.c
diff --git a/test cases/common/105 find program path/meson.build b/test cases/common/102 find program path/meson.build
index 0a812499a..0a812499a 100644
--- a/test cases/common/105 find program path/meson.build
+++ b/test cases/common/102 find program path/meson.build
diff --git a/test cases/common/105 find program path/program.py b/test cases/common/102 find program path/program.py
index 2ebc56419..2ebc56419 100755
--- a/test cases/common/105 find program path/program.py
+++ b/test cases/common/102 find program path/program.py
diff --git a/test cases/common/106 subproject subdir/meson.build b/test cases/common/103 subproject subdir/meson.build
index ec9fad123..ec9fad123 100644
--- a/test cases/common/106 subproject subdir/meson.build
+++ b/test cases/common/103 subproject subdir/meson.build
diff --git a/test cases/common/106 subproject subdir/prog.c b/test cases/common/103 subproject subdir/prog.c
index cf6f42548..cf6f42548 100644
--- a/test cases/common/106 subproject subdir/prog.c
+++ b/test cases/common/103 subproject subdir/prog.c
diff --git a/test cases/common/106 subproject subdir/subprojects/sub/lib/meson.build b/test cases/common/103 subproject subdir/subprojects/sub/lib/meson.build
index 731d22bfb..731d22bfb 100644
--- a/test cases/common/106 subproject subdir/subprojects/sub/lib/meson.build
+++ b/test cases/common/103 subproject subdir/subprojects/sub/lib/meson.build
diff --git a/test cases/common/106 subproject subdir/subprojects/sub/lib/sub.c b/test cases/common/103 subproject subdir/subprojects/sub/lib/sub.c
index 068a5b89c..068a5b89c 100644
--- a/test cases/common/106 subproject subdir/subprojects/sub/lib/sub.c
+++ b/test cases/common/103 subproject subdir/subprojects/sub/lib/sub.c
diff --git a/test cases/common/106 subproject subdir/subprojects/sub/lib/sub.h b/test cases/common/103 subproject subdir/subprojects/sub/lib/sub.h
index f1ab0e19d..f1ab0e19d 100644
--- a/test cases/common/106 subproject subdir/subprojects/sub/lib/sub.h
+++ b/test cases/common/103 subproject subdir/subprojects/sub/lib/sub.h
diff --git a/test cases/common/106 subproject subdir/subprojects/sub/meson.build b/test cases/common/103 subproject subdir/subprojects/sub/meson.build
index bf69c25b7..bf69c25b7 100644
--- a/test cases/common/106 subproject subdir/subprojects/sub/meson.build
+++ b/test cases/common/103 subproject subdir/subprojects/sub/meson.build
diff --git a/test cases/common/107 postconf/meson.build b/test cases/common/104 postconf/meson.build
index 12b3c5bfe..12b3c5bfe 100644
--- a/test cases/common/107 postconf/meson.build
+++ b/test cases/common/104 postconf/meson.build
diff --git a/test cases/common/107 postconf/postconf.py b/test cases/common/104 postconf/postconf.py
index 950c7064a..950c7064a 100644
--- a/test cases/common/107 postconf/postconf.py
+++ b/test cases/common/104 postconf/postconf.py
diff --git a/test cases/common/107 postconf/prog.c b/test cases/common/104 postconf/prog.c
index 1e5d4cbe5..1e5d4cbe5 100644
--- a/test cases/common/107 postconf/prog.c
+++ b/test cases/common/104 postconf/prog.c
diff --git a/test cases/common/107 postconf/raw.dat b/test cases/common/104 postconf/raw.dat
index ec635144f..ec635144f 100644
--- a/test cases/common/107 postconf/raw.dat
+++ b/test cases/common/104 postconf/raw.dat
diff --git a/test cases/common/108 postconf with args/meson.build b/test cases/common/105 postconf with args/meson.build
index 8510c5b81..8510c5b81 100644
--- a/test cases/common/108 postconf with args/meson.build
+++ b/test cases/common/105 postconf with args/meson.build
diff --git a/test cases/common/108 postconf with args/postconf.py b/test cases/common/105 postconf with args/postconf.py
index cef7f790f..cef7f790f 100644
--- a/test cases/common/108 postconf with args/postconf.py
+++ b/test cases/common/105 postconf with args/postconf.py
diff --git a/test cases/common/108 postconf with args/prog.c b/test cases/common/105 postconf with args/prog.c
index 0e63a8c5c..0e63a8c5c 100644
--- a/test cases/common/108 postconf with args/prog.c
+++ b/test cases/common/105 postconf with args/prog.c
diff --git a/test cases/common/108 postconf with args/raw.dat b/test cases/common/105 postconf with args/raw.dat
index ec635144f..ec635144f 100644
--- a/test cases/common/108 postconf with args/raw.dat
+++ b/test cases/common/105 postconf with args/raw.dat
diff --git a/test cases/common/109 testframework options/meson.build b/test cases/common/106 testframework options/meson.build
index 277373044..277373044 100644
--- a/test cases/common/109 testframework options/meson.build
+++ b/test cases/common/106 testframework options/meson.build
diff --git a/test cases/common/109 testframework options/meson_options.txt b/test cases/common/106 testframework options/meson_options.txt
index 653dd75f9..653dd75f9 100644
--- a/test cases/common/109 testframework options/meson_options.txt
+++ b/test cases/common/106 testframework options/meson_options.txt
diff --git a/test cases/common/109 testframework options/test_args.txt b/test cases/common/106 testframework options/test_args.txt
index a667e3a58..a667e3a58 100644
--- a/test cases/common/109 testframework options/test_args.txt
+++ b/test cases/common/106 testframework options/test_args.txt
diff --git a/test cases/common/110 extract same name/lib.c b/test cases/common/107 extract same name/lib.c
index 6bdeda747..6bdeda747 100644
--- a/test cases/common/110 extract same name/lib.c
+++ b/test cases/common/107 extract same name/lib.c
diff --git a/test cases/common/110 extract same name/main.c b/test cases/common/107 extract same name/main.c
index dc57dd598..dc57dd598 100644
--- a/test cases/common/110 extract same name/main.c
+++ b/test cases/common/107 extract same name/main.c
diff --git a/test cases/common/110 extract same name/meson.build b/test cases/common/107 extract same name/meson.build
index 0bfbb4d0e..0bfbb4d0e 100644
--- a/test cases/common/110 extract same name/meson.build
+++ b/test cases/common/107 extract same name/meson.build
diff --git a/test cases/common/110 extract same name/src/lib.c b/test cases/common/107 extract same name/src/lib.c
index 68e6ab975..68e6ab975 100644
--- a/test cases/common/110 extract same name/src/lib.c
+++ b/test cases/common/107 extract same name/src/lib.c
diff --git a/test cases/common/111 has header symbol/meson.build b/test cases/common/108 has header symbol/meson.build
index 54cedce1b..54cedce1b 100644
--- a/test cases/common/111 has header symbol/meson.build
+++ b/test cases/common/108 has header symbol/meson.build
diff --git a/test cases/common/112 has arg/meson.build b/test cases/common/109 has arg/meson.build
index ba0731111..ba0731111 100644
--- a/test cases/common/112 has arg/meson.build
+++ b/test cases/common/109 has arg/meson.build
diff --git a/test cases/common/113 generatorcustom/catter.py b/test cases/common/110 generatorcustom/catter.py
index 198fa98e2..198fa98e2 100755
--- a/test cases/common/113 generatorcustom/catter.py
+++ b/test cases/common/110 generatorcustom/catter.py
diff --git a/test cases/common/113 generatorcustom/gen.py b/test cases/common/110 generatorcustom/gen.py
index c1e34ed6c..c1e34ed6c 100755
--- a/test cases/common/113 generatorcustom/gen.py
+++ b/test cases/common/110 generatorcustom/gen.py
diff --git a/test cases/common/113 generatorcustom/main.c b/test cases/common/110 generatorcustom/main.c
index 04abcf69a..04abcf69a 100644
--- a/test cases/common/113 generatorcustom/main.c
+++ b/test cases/common/110 generatorcustom/main.c
diff --git a/test cases/common/113 generatorcustom/meson.build b/test cases/common/110 generatorcustom/meson.build
index 17d27e578..17d27e578 100644
--- a/test cases/common/113 generatorcustom/meson.build
+++ b/test cases/common/110 generatorcustom/meson.build
diff --git a/test cases/common/113 generatorcustom/res1.txt b/test cases/common/110 generatorcustom/res1.txt
index 6487c56ba..6487c56ba 100644
--- a/test cases/common/113 generatorcustom/res1.txt
+++ b/test cases/common/110 generatorcustom/res1.txt
diff --git a/test cases/common/113 generatorcustom/res2.txt b/test cases/common/110 generatorcustom/res2.txt
index 0a8879d51..0a8879d51 100644
--- a/test cases/common/113 generatorcustom/res2.txt
+++ b/test cases/common/110 generatorcustom/res2.txt
diff --git a/test cases/common/114 multiple dir configure file/meson.build b/test cases/common/111 multiple dir configure file/meson.build
index a4615fae8..a4615fae8 100644
--- a/test cases/common/114 multiple dir configure file/meson.build
+++ b/test cases/common/111 multiple dir configure file/meson.build
diff --git a/test cases/common/114 multiple dir configure file/subdir/foo.txt b/test cases/common/111 multiple dir configure file/subdir/foo.txt
index e69de29bb..e69de29bb 100644
--- a/test cases/common/114 multiple dir configure file/subdir/foo.txt
+++ b/test cases/common/111 multiple dir configure file/subdir/foo.txt
diff --git a/test cases/common/114 multiple dir configure file/subdir/meson.build b/test cases/common/111 multiple dir configure file/subdir/meson.build
index 503df964a..503df964a 100644
--- a/test cases/common/114 multiple dir configure file/subdir/meson.build
+++ b/test cases/common/111 multiple dir configure file/subdir/meson.build
diff --git a/test cases/common/114 multiple dir configure file/subdir/someinput.in b/test cases/common/111 multiple dir configure file/subdir/someinput.in
index e69de29bb..e69de29bb 100644
--- a/test cases/common/114 multiple dir configure file/subdir/someinput.in
+++ b/test cases/common/111 multiple dir configure file/subdir/someinput.in
diff --git a/test cases/common/115 spaces backslash/asm output/meson.build b/test cases/common/112 spaces backslash/asm output/meson.build
index b5f13f5ca..b5f13f5ca 100644
--- a/test cases/common/115 spaces backslash/asm output/meson.build
+++ b/test cases/common/112 spaces backslash/asm output/meson.build
diff --git a/test cases/common/115 spaces backslash/comparer-end-notstring.c b/test cases/common/112 spaces backslash/comparer-end-notstring.c
index 65bf8bc55..65bf8bc55 100644
--- a/test cases/common/115 spaces backslash/comparer-end-notstring.c
+++ b/test cases/common/112 spaces backslash/comparer-end-notstring.c
diff --git a/test cases/common/115 spaces backslash/comparer-end.c b/test cases/common/112 spaces backslash/comparer-end.c
index fef25a545..fef25a545 100644
--- a/test cases/common/115 spaces backslash/comparer-end.c
+++ b/test cases/common/112 spaces backslash/comparer-end.c
diff --git a/test cases/common/115 spaces backslash/comparer.c b/test cases/common/112 spaces backslash/comparer.c
index 937cb47f0..937cb47f0 100644
--- a/test cases/common/115 spaces backslash/comparer.c
+++ b/test cases/common/112 spaces backslash/comparer.c
diff --git a/test cases/common/115 spaces backslash/include/comparer.h b/test cases/common/112 spaces backslash/include/comparer.h
index 624d96c92..624d96c92 100644
--- a/test cases/common/115 spaces backslash/include/comparer.h
+++ b/test cases/common/112 spaces backslash/include/comparer.h
diff --git a/test cases/common/115 spaces backslash/meson.build b/test cases/common/112 spaces backslash/meson.build
index bf614e8fc..bf614e8fc 100644
--- a/test cases/common/115 spaces backslash/meson.build
+++ b/test cases/common/112 spaces backslash/meson.build
diff --git a/test cases/common/116 ternary/meson.build b/test cases/common/113 ternary/meson.build
index 3e650463f..3e650463f 100644
--- a/test cases/common/116 ternary/meson.build
+++ b/test cases/common/113 ternary/meson.build
diff --git a/test cases/common/117 custom target capture/data_source.txt b/test cases/common/114 custom target capture/data_source.txt
index 0c23cc0c3..0c23cc0c3 100644
--- a/test cases/common/117 custom target capture/data_source.txt
+++ b/test cases/common/114 custom target capture/data_source.txt
diff --git a/test cases/common/117 custom target capture/installed_files.txt b/test cases/common/114 custom target capture/installed_files.txt
index d90a6b01c..d90a6b01c 100644
--- a/test cases/common/117 custom target capture/installed_files.txt
+++ b/test cases/common/114 custom target capture/installed_files.txt
diff --git a/test cases/common/117 custom target capture/meson.build b/test cases/common/114 custom target capture/meson.build
index 58a69cacc..58a69cacc 100644
--- a/test cases/common/117 custom target capture/meson.build
+++ b/test cases/common/114 custom target capture/meson.build
diff --git a/test cases/common/117 custom target capture/my_compiler.py b/test cases/common/114 custom target capture/my_compiler.py
index b60722a5e..b60722a5e 100755
--- a/test cases/common/117 custom target capture/my_compiler.py
+++ b/test cases/common/114 custom target capture/my_compiler.py
diff --git a/test cases/common/118 allgenerate/converter.py b/test cases/common/115 allgenerate/converter.py
index f8e2ca05a..f8e2ca05a 100755
--- a/test cases/common/118 allgenerate/converter.py
+++ b/test cases/common/115 allgenerate/converter.py
diff --git a/test cases/common/118 allgenerate/foobar.cpp.in b/test cases/common/115 allgenerate/foobar.cpp.in
index c64f3b5c5..c64f3b5c5 100644
--- a/test cases/common/118 allgenerate/foobar.cpp.in
+++ b/test cases/common/115 allgenerate/foobar.cpp.in
diff --git a/test cases/common/118 allgenerate/meson.build b/test cases/common/115 allgenerate/meson.build
index 049e8498c..049e8498c 100644
--- a/test cases/common/118 allgenerate/meson.build
+++ b/test cases/common/115 allgenerate/meson.build
diff --git a/test cases/common/119 pathjoin/meson.build b/test cases/common/116 pathjoin/meson.build
index 751ca68ac..751ca68ac 100644
--- a/test cases/common/119 pathjoin/meson.build
+++ b/test cases/common/116 pathjoin/meson.build
diff --git a/test cases/common/120 subdir subproject/meson.build b/test cases/common/117 subdir subproject/meson.build
index 54ecfe07a..54ecfe07a 100644
--- a/test cases/common/120 subdir subproject/meson.build
+++ b/test cases/common/117 subdir subproject/meson.build
diff --git a/test cases/common/120 subdir subproject/prog/meson.build b/test cases/common/117 subdir subproject/prog/meson.build
index 360b5f59d..360b5f59d 100644
--- a/test cases/common/120 subdir subproject/prog/meson.build
+++ b/test cases/common/117 subdir subproject/prog/meson.build
diff --git a/test cases/common/120 subdir subproject/prog/prog.c b/test cases/common/117 subdir subproject/prog/prog.c
index cf6f42548..cf6f42548 100644
--- a/test cases/common/120 subdir subproject/prog/prog.c
+++ b/test cases/common/117 subdir subproject/prog/prog.c
diff --git a/test cases/common/120 subdir subproject/subprojects/sub/meson.build b/test cases/common/117 subdir subproject/subprojects/sub/meson.build
index 94e9eecd0..94e9eecd0 100644
--- a/test cases/common/120 subdir subproject/subprojects/sub/meson.build
+++ b/test cases/common/117 subdir subproject/subprojects/sub/meson.build
diff --git a/test cases/common/120 subdir subproject/subprojects/sub/sub.c b/test cases/common/117 subdir subproject/subprojects/sub/sub.c
index 068a5b89c..068a5b89c 100644
--- a/test cases/common/120 subdir subproject/subprojects/sub/sub.c
+++ b/test cases/common/117 subdir subproject/subprojects/sub/sub.c
diff --git a/test cases/common/120 subdir subproject/subprojects/sub/sub.h b/test cases/common/117 subdir subproject/subprojects/sub/sub.h
index f1ab0e19d..f1ab0e19d 100644
--- a/test cases/common/120 subdir subproject/subprojects/sub/sub.h
+++ b/test cases/common/117 subdir subproject/subprojects/sub/sub.h
diff --git a/test cases/common/121 interpreter copy mutable var on assignment/meson.build b/test cases/common/118 interpreter copy mutable var on assignment/meson.build
index 8b15357ad..8b15357ad 100644
--- a/test cases/common/121 interpreter copy mutable var on assignment/meson.build
+++ b/test cases/common/118 interpreter copy mutable var on assignment/meson.build
diff --git a/test cases/common/122 skip/meson.build b/test cases/common/119 skip/meson.build
index 1adedb6fd..1adedb6fd 100644
--- a/test cases/common/122 skip/meson.build
+++ b/test cases/common/119 skip/meson.build
diff --git a/test cases/common/123 subproject project arguments/exe.c b/test cases/common/120 subproject project arguments/exe.c
index d6440f01c..d6440f01c 100644
--- a/test cases/common/123 subproject project arguments/exe.c
+++ b/test cases/common/120 subproject project arguments/exe.c
diff --git a/test cases/common/123 subproject project arguments/exe.cpp b/test cases/common/120 subproject project arguments/exe.cpp
index 8471c6fec..8471c6fec 100644
--- a/test cases/common/123 subproject project arguments/exe.cpp
+++ b/test cases/common/120 subproject project arguments/exe.cpp
diff --git a/test cases/common/123 subproject project arguments/meson.build b/test cases/common/120 subproject project arguments/meson.build
index 90d4c05f3..90d4c05f3 100644
--- a/test cases/common/123 subproject project arguments/meson.build
+++ b/test cases/common/120 subproject project arguments/meson.build
diff --git a/test cases/common/123 subproject project arguments/subprojects/subexe/meson.build b/test cases/common/120 subproject project arguments/subprojects/subexe/meson.build
index ef141dc0a..ef141dc0a 100644
--- a/test cases/common/123 subproject project arguments/subprojects/subexe/meson.build
+++ b/test cases/common/120 subproject project arguments/subprojects/subexe/meson.build
diff --git a/test cases/common/123 subproject project arguments/subprojects/subexe/subexe.c b/test cases/common/120 subproject project arguments/subprojects/subexe/subexe.c
index f748afc18..f748afc18 100644
--- a/test cases/common/123 subproject project arguments/subprojects/subexe/subexe.c
+++ b/test cases/common/120 subproject project arguments/subprojects/subexe/subexe.c
diff --git a/test cases/common/124 test skip/meson.build b/test cases/common/121 test skip/meson.build
index 568527f18..568527f18 100644
--- a/test cases/common/124 test skip/meson.build
+++ b/test cases/common/121 test skip/meson.build
diff --git a/test cases/common/124 test skip/test_skip.c b/test cases/common/121 test skip/test_skip.c
index db26681e1..db26681e1 100644
--- a/test cases/common/124 test skip/test_skip.c
+++ b/test cases/common/121 test skip/test_skip.c
diff --git a/test cases/common/125 shared module/installed_files.txt b/test cases/common/122 shared module/installed_files.txt
index a351490b2..a351490b2 100644
--- a/test cases/common/125 shared module/installed_files.txt
+++ b/test cases/common/122 shared module/installed_files.txt
diff --git a/test cases/common/125 shared module/meson.build b/test cases/common/122 shared module/meson.build
index 9f9ad6353..9f9ad6353 100644
--- a/test cases/common/125 shared module/meson.build
+++ b/test cases/common/122 shared module/meson.build
diff --git a/test cases/common/125 shared module/module.c b/test cases/common/122 shared module/module.c
index 181b760ff..181b760ff 100644
--- a/test cases/common/125 shared module/module.c
+++ b/test cases/common/122 shared module/module.c
diff --git a/test cases/common/125 shared module/nosyms.c b/test cases/common/122 shared module/nosyms.c
index 3432b1c46..3432b1c46 100644
--- a/test cases/common/125 shared module/nosyms.c
+++ b/test cases/common/122 shared module/nosyms.c
diff --git a/test cases/common/125 shared module/prog.c b/test cases/common/122 shared module/prog.c
index 2b638409b..2b638409b 100644
--- a/test cases/common/125 shared module/prog.c
+++ b/test cases/common/122 shared module/prog.c
diff --git a/test cases/common/125 shared module/runtime.c b/test cases/common/122 shared module/runtime.c
index 03bde8614..03bde8614 100644
--- a/test cases/common/125 shared module/runtime.c
+++ b/test cases/common/122 shared module/runtime.c
diff --git a/test cases/common/126 llvm ir and assembly/main.c b/test cases/common/123 llvm ir and assembly/main.c
index 97fe723e3..97fe723e3 100644
--- a/test cases/common/126 llvm ir and assembly/main.c
+++ b/test cases/common/123 llvm ir and assembly/main.c
diff --git a/test cases/common/126 llvm ir and assembly/main.cpp b/test cases/common/123 llvm ir and assembly/main.cpp
index f2c7de36c..f2c7de36c 100644
--- a/test cases/common/126 llvm ir and assembly/main.cpp
+++ b/test cases/common/123 llvm ir and assembly/main.cpp
diff --git a/test cases/common/126 llvm ir and assembly/meson.build b/test cases/common/123 llvm ir and assembly/meson.build
index 51321fb4a..51321fb4a 100644
--- a/test cases/common/126 llvm ir and assembly/meson.build
+++ b/test cases/common/123 llvm ir and assembly/meson.build
diff --git a/test cases/common/126 llvm ir and assembly/square-arm.S b/test cases/common/123 llvm ir and assembly/square-arm.S
index 4dd446753..4dd446753 100644
--- a/test cases/common/126 llvm ir and assembly/square-arm.S
+++ b/test cases/common/123 llvm ir and assembly/square-arm.S
diff --git a/test cases/common/126 llvm ir and assembly/square-x86.S b/test cases/common/123 llvm ir and assembly/square-x86.S
index 18284c1a6..18284c1a6 100644
--- a/test cases/common/126 llvm ir and assembly/square-x86.S
+++ b/test cases/common/123 llvm ir and assembly/square-x86.S
diff --git a/test cases/common/126 llvm ir and assembly/square-x86_64.S b/test cases/common/123 llvm ir and assembly/square-x86_64.S
index 5678d00a3..5678d00a3 100644
--- a/test cases/common/126 llvm ir and assembly/square-x86_64.S
+++ b/test cases/common/123 llvm ir and assembly/square-x86_64.S
diff --git a/test cases/common/126 llvm ir and assembly/square.ll b/test cases/common/123 llvm ir and assembly/square.ll
index 7c321aa82..7c321aa82 100644
--- a/test cases/common/126 llvm ir and assembly/square.ll
+++ b/test cases/common/123 llvm ir and assembly/square.ll
diff --git a/test cases/common/126 llvm ir and assembly/symbol-underscore.h b/test cases/common/123 llvm ir and assembly/symbol-underscore.h
index d0f3ef9cc..d0f3ef9cc 100644
--- a/test cases/common/126 llvm ir and assembly/symbol-underscore.h
+++ b/test cases/common/123 llvm ir and assembly/symbol-underscore.h
diff --git a/test cases/common/127 cpp and asm/meson.build b/test cases/common/124 cpp and asm/meson.build
index 916077535..916077535 100644
--- a/test cases/common/127 cpp and asm/meson.build
+++ b/test cases/common/124 cpp and asm/meson.build
diff --git a/test cases/common/127 cpp and asm/retval-arm.S b/test cases/common/124 cpp and asm/retval-arm.S
index a8923624a..a8923624a 100644
--- a/test cases/common/127 cpp and asm/retval-arm.S
+++ b/test cases/common/124 cpp and asm/retval-arm.S
diff --git a/test cases/common/127 cpp and asm/retval-x86.S b/test cases/common/124 cpp and asm/retval-x86.S
index f9e819070..f9e819070 100644
--- a/test cases/common/127 cpp and asm/retval-x86.S
+++ b/test cases/common/124 cpp and asm/retval-x86.S
diff --git a/test cases/common/127 cpp and asm/retval-x86_64.S b/test cases/common/124 cpp and asm/retval-x86_64.S
index 1a5f3eb23..1a5f3eb23 100644
--- a/test cases/common/127 cpp and asm/retval-x86_64.S
+++ b/test cases/common/124 cpp and asm/retval-x86_64.S
diff --git a/test cases/common/127 cpp and asm/symbol-underscore.h b/test cases/common/124 cpp and asm/symbol-underscore.h
index d0f3ef9cc..d0f3ef9cc 100644
--- a/test cases/common/127 cpp and asm/symbol-underscore.h
+++ b/test cases/common/124 cpp and asm/symbol-underscore.h
diff --git a/test cases/common/127 cpp and asm/trivial.cc b/test cases/common/124 cpp and asm/trivial.cc
index d2928c0c9..d2928c0c9 100644
--- a/test cases/common/127 cpp and asm/trivial.cc
+++ b/test cases/common/124 cpp and asm/trivial.cc
diff --git a/test cases/common/128 extract all shared library/extractor.h b/test cases/common/125 extract all shared library/extractor.h
index d0917a11b..d0917a11b 100644
--- a/test cases/common/128 extract all shared library/extractor.h
+++ b/test cases/common/125 extract all shared library/extractor.h
diff --git a/test cases/common/128 extract all shared library/four.c b/test cases/common/125 extract all shared library/four.c
index 5ca6696d9..5ca6696d9 100644
--- a/test cases/common/128 extract all shared library/four.c
+++ b/test cases/common/125 extract all shared library/four.c
diff --git a/test cases/common/128 extract all shared library/func1234.def b/test cases/common/125 extract all shared library/func1234.def
index d62c08d78..d62c08d78 100644
--- a/test cases/common/128 extract all shared library/func1234.def
+++ b/test cases/common/125 extract all shared library/func1234.def
diff --git a/test cases/common/128 extract all shared library/meson.build b/test cases/common/125 extract all shared library/meson.build
index 7c24fdeeb..7c24fdeeb 100644
--- a/test cases/common/128 extract all shared library/meson.build
+++ b/test cases/common/125 extract all shared library/meson.build
diff --git a/test cases/common/128 extract all shared library/one.c b/test cases/common/125 extract all shared library/one.c
index cfb01571d..cfb01571d 100644
--- a/test cases/common/128 extract all shared library/one.c
+++ b/test cases/common/125 extract all shared library/one.c
diff --git a/test cases/common/128 extract all shared library/prog.c b/test cases/common/125 extract all shared library/prog.c
index 57a4c64dc..57a4c64dc 100644
--- a/test cases/common/128 extract all shared library/prog.c
+++ b/test cases/common/125 extract all shared library/prog.c
diff --git a/test cases/common/128 extract all shared library/three.c b/test cases/common/125 extract all shared library/three.c
index c41004651..c41004651 100644
--- a/test cases/common/128 extract all shared library/three.c
+++ b/test cases/common/125 extract all shared library/three.c
diff --git a/test cases/common/128 extract all shared library/two.c b/test cases/common/125 extract all shared library/two.c
index 3ece5121f..3ece5121f 100644
--- a/test cases/common/128 extract all shared library/two.c
+++ b/test cases/common/125 extract all shared library/two.c
diff --git a/test cases/common/129 object only target/installed_files.txt b/test cases/common/126 object only target/installed_files.txt
index c7dab9f6f..c7dab9f6f 100644
--- a/test cases/common/129 object only target/installed_files.txt
+++ b/test cases/common/126 object only target/installed_files.txt
diff --git a/test cases/common/129 object only target/meson.build b/test cases/common/126 object only target/meson.build
index d83a65825..d83a65825 100644
--- a/test cases/common/129 object only target/meson.build
+++ b/test cases/common/126 object only target/meson.build
diff --git a/test cases/common/129 object only target/obj_generator.py b/test cases/common/126 object only target/obj_generator.py
index a33872aac..a33872aac 100755
--- a/test cases/common/129 object only target/obj_generator.py
+++ b/test cases/common/126 object only target/obj_generator.py
diff --git a/test cases/common/129 object only target/prog.c b/test cases/common/126 object only target/prog.c
index 60459d6ed..60459d6ed 100644
--- a/test cases/common/129 object only target/prog.c
+++ b/test cases/common/126 object only target/prog.c
diff --git a/test cases/common/129 object only target/source.c b/test cases/common/126 object only target/source.c
index 7779b332c..7779b332c 100644
--- a/test cases/common/129 object only target/source.c
+++ b/test cases/common/126 object only target/source.c
diff --git a/test cases/common/129 object only target/source2.c b/test cases/common/126 object only target/source2.c
index 29aad40f3..29aad40f3 100644
--- a/test cases/common/129 object only target/source2.c
+++ b/test cases/common/126 object only target/source2.c
diff --git a/test cases/common/129 object only target/source2.def b/test cases/common/126 object only target/source2.def
index a993ab8ca..a993ab8ca 100644
--- a/test cases/common/129 object only target/source2.def
+++ b/test cases/common/126 object only target/source2.def
diff --git a/test cases/common/129 object only target/source3.c b/test cases/common/126 object only target/source3.c
index 1580f1ed4..1580f1ed4 100644
--- a/test cases/common/129 object only target/source3.c
+++ b/test cases/common/126 object only target/source3.c
diff --git a/test cases/common/130 no buildincdir/include/header.h b/test cases/common/127 no buildincdir/include/header.h
index add185031..add185031 100644
--- a/test cases/common/130 no buildincdir/include/header.h
+++ b/test cases/common/127 no buildincdir/include/header.h
diff --git a/test cases/common/130 no buildincdir/meson.build b/test cases/common/127 no buildincdir/meson.build
index ac69e8e46..ac69e8e46 100644
--- a/test cases/common/130 no buildincdir/meson.build
+++ b/test cases/common/127 no buildincdir/meson.build
diff --git a/test cases/common/130 no buildincdir/prog.c b/test cases/common/127 no buildincdir/prog.c
index 800f0d6d1..800f0d6d1 100644
--- a/test cases/common/130 no buildincdir/prog.c
+++ b/test cases/common/127 no buildincdir/prog.c
diff --git a/test cases/common/131 custom target directory install/docgen.py b/test cases/common/128 custom target directory install/docgen.py
index 245f37035..245f37035 100644
--- a/test cases/common/131 custom target directory install/docgen.py
+++ b/test cases/common/128 custom target directory install/docgen.py
diff --git a/test cases/common/131 custom target directory install/installed_files.txt b/test cases/common/128 custom target directory install/installed_files.txt
index bcf20e0ac..bcf20e0ac 100644
--- a/test cases/common/131 custom target directory install/installed_files.txt
+++ b/test cases/common/128 custom target directory install/installed_files.txt
diff --git a/test cases/common/131 custom target directory install/meson.build b/test cases/common/128 custom target directory install/meson.build
index ada9ae119..ada9ae119 100644
--- a/test cases/common/131 custom target directory install/meson.build
+++ b/test cases/common/128 custom target directory install/meson.build
diff --git a/test cases/common/132 dependency file generation/main .c b/test cases/common/129 dependency file generation/main .c
index 0fb4389f7..0fb4389f7 100644
--- a/test cases/common/132 dependency file generation/main .c
+++ b/test cases/common/129 dependency file generation/main .c
diff --git a/test cases/common/132 dependency file generation/meson.build b/test cases/common/129 dependency file generation/meson.build
index b5ee47bf2..b5ee47bf2 100644
--- a/test cases/common/132 dependency file generation/meson.build
+++ b/test cases/common/129 dependency file generation/meson.build
diff --git a/test cases/common/133 configure file in generator/inc/confdata.in b/test cases/common/130 configure file in generator/inc/confdata.in
index e44cdea20..e44cdea20 100644
--- a/test cases/common/133 configure file in generator/inc/confdata.in
+++ b/test cases/common/130 configure file in generator/inc/confdata.in
diff --git a/test cases/common/133 configure file in generator/inc/meson.build b/test cases/common/130 configure file in generator/inc/meson.build
index 05d2dcb8a..05d2dcb8a 100644
--- a/test cases/common/133 configure file in generator/inc/meson.build
+++ b/test cases/common/130 configure file in generator/inc/meson.build
diff --git a/test cases/common/133 configure file in generator/meson.build b/test cases/common/130 configure file in generator/meson.build
index e1c26b6d1..e1c26b6d1 100644
--- a/test cases/common/133 configure file in generator/meson.build
+++ b/test cases/common/130 configure file in generator/meson.build
diff --git a/test cases/common/133 configure file in generator/src/gen.py b/test cases/common/130 configure file in generator/src/gen.py
index 99b7cddb9..99b7cddb9 100755
--- a/test cases/common/133 configure file in generator/src/gen.py
+++ b/test cases/common/130 configure file in generator/src/gen.py
diff --git a/test cases/common/133 configure file in generator/src/main.c b/test cases/common/130 configure file in generator/src/main.c
index 54f4f57c6..54f4f57c6 100644
--- a/test cases/common/133 configure file in generator/src/main.c
+++ b/test cases/common/130 configure file in generator/src/main.c
diff --git a/test cases/common/133 configure file in generator/src/meson.build b/test cases/common/130 configure file in generator/src/meson.build
index 2fb804eec..2fb804eec 100644
--- a/test cases/common/133 configure file in generator/src/meson.build
+++ b/test cases/common/130 configure file in generator/src/meson.build
diff --git a/test cases/common/133 configure file in generator/src/source b/test cases/common/130 configure file in generator/src/source
index 409940768..409940768 100644
--- a/test cases/common/133 configure file in generator/src/source
+++ b/test cases/common/130 configure file in generator/src/source
diff --git a/test cases/common/134 generated llvm ir/copyfile.py b/test cases/common/131 generated llvm ir/copyfile.py
index ff42ac359..ff42ac359 100644
--- a/test cases/common/134 generated llvm ir/copyfile.py
+++ b/test cases/common/131 generated llvm ir/copyfile.py
diff --git a/test cases/common/134 generated llvm ir/main.c b/test cases/common/131 generated llvm ir/main.c
index 97fe723e3..97fe723e3 100644
--- a/test cases/common/134 generated llvm ir/main.c
+++ b/test cases/common/131 generated llvm ir/main.c
diff --git a/test cases/common/134 generated llvm ir/meson.build b/test cases/common/131 generated llvm ir/meson.build
index 111cdc063..111cdc063 100644
--- a/test cases/common/134 generated llvm ir/meson.build
+++ b/test cases/common/131 generated llvm ir/meson.build
diff --git a/test cases/common/134 generated llvm ir/square.ll.in b/test cases/common/131 generated llvm ir/square.ll.in
index 7c321aa82..7c321aa82 100644
--- a/test cases/common/134 generated llvm ir/square.ll.in
+++ b/test cases/common/131 generated llvm ir/square.ll.in
diff --git a/test cases/common/135 generated assembly/copyfile.py b/test cases/common/132 generated assembly/copyfile.py
index ff42ac359..ff42ac359 100644
--- a/test cases/common/135 generated assembly/copyfile.py
+++ b/test cases/common/132 generated assembly/copyfile.py
diff --git a/test cases/common/135 generated assembly/main.c b/test cases/common/132 generated assembly/main.c
index b669cba27..b669cba27 100644
--- a/test cases/common/135 generated assembly/main.c
+++ b/test cases/common/132 generated assembly/main.c
diff --git a/test cases/common/135 generated assembly/meson.build b/test cases/common/132 generated assembly/meson.build
index 6a8744b19..6a8744b19 100644
--- a/test cases/common/135 generated assembly/meson.build
+++ b/test cases/common/132 generated assembly/meson.build
diff --git a/test cases/common/135 generated assembly/square-arm.S.in b/test cases/common/132 generated assembly/square-arm.S.in
index d2fb7ac20..d2fb7ac20 100644
--- a/test cases/common/135 generated assembly/square-arm.S.in
+++ b/test cases/common/132 generated assembly/square-arm.S.in
diff --git a/test cases/common/135 generated assembly/square-x86.S.in b/test cases/common/132 generated assembly/square-x86.S.in
index ee77b81be..ee77b81be 100644
--- a/test cases/common/135 generated assembly/square-x86.S.in
+++ b/test cases/common/132 generated assembly/square-x86.S.in
diff --git a/test cases/common/135 generated assembly/square-x86_64.S.in b/test cases/common/132 generated assembly/square-x86_64.S.in
index 856af137e..856af137e 100644
--- a/test cases/common/135 generated assembly/square-x86_64.S.in
+++ b/test cases/common/132 generated assembly/square-x86_64.S.in
diff --git a/test cases/common/135 generated assembly/symbol-underscore.h b/test cases/common/132 generated assembly/symbol-underscore.h
index d0f3ef9cc..d0f3ef9cc 100644
--- a/test cases/common/135 generated assembly/symbol-underscore.h
+++ b/test cases/common/132 generated assembly/symbol-underscore.h
diff --git a/test cases/common/136 build by default targets in tests/main.c b/test cases/common/133 build by default targets in tests/main.c
index 63a62a1e1..63a62a1e1 100644
--- a/test cases/common/136 build by default targets in tests/main.c
+++ b/test cases/common/133 build by default targets in tests/main.c
diff --git a/test cases/common/136 build by default targets in tests/meson.build b/test cases/common/133 build by default targets in tests/meson.build
index 5cc505519..5cc505519 100644
--- a/test cases/common/136 build by default targets in tests/meson.build
+++ b/test cases/common/133 build by default targets in tests/meson.build
diff --git a/test cases/common/136 build by default targets in tests/write_file.py b/test cases/common/133 build by default targets in tests/write_file.py
index ff9c224f0..ff9c224f0 100644
--- a/test cases/common/136 build by default targets in tests/write_file.py
+++ b/test cases/common/133 build by default targets in tests/write_file.py
diff --git a/test cases/common/137 build by default/checkexists.py b/test cases/common/134 build by default/checkexists.py
index 6664f7291..6664f7291 100644
--- a/test cases/common/137 build by default/checkexists.py
+++ b/test cases/common/134 build by default/checkexists.py
diff --git a/test cases/common/137 build by default/foo.c b/test cases/common/134 build by default/foo.c
index ca9791619..ca9791619 100644
--- a/test cases/common/137 build by default/foo.c
+++ b/test cases/common/134 build by default/foo.c
diff --git a/test cases/common/137 build by default/meson.build b/test cases/common/134 build by default/meson.build
index b28b6347c..b28b6347c 100644
--- a/test cases/common/137 build by default/meson.build
+++ b/test cases/common/134 build by default/meson.build
diff --git a/test cases/common/137 build by default/mygen.py b/test cases/common/134 build by default/mygen.py
index 5a74153ee..5a74153ee 100644
--- a/test cases/common/137 build by default/mygen.py
+++ b/test cases/common/134 build by default/mygen.py
diff --git a/test cases/common/137 build by default/source.txt b/test cases/common/134 build by default/source.txt
index 3573f4b21..3573f4b21 100644
--- a/test cases/common/137 build by default/source.txt
+++ b/test cases/common/134 build by default/source.txt
diff --git a/test cases/common/138 include order/ctsub/copyfile.py b/test cases/common/135 include order/ctsub/copyfile.py
index ff42ac359..ff42ac359 100644
--- a/test cases/common/138 include order/ctsub/copyfile.py
+++ b/test cases/common/135 include order/ctsub/copyfile.py
diff --git a/test cases/common/138 include order/ctsub/emptyfile.c b/test cases/common/135 include order/ctsub/emptyfile.c
index e69de29bb..e69de29bb 100644
--- a/test cases/common/138 include order/ctsub/emptyfile.c
+++ b/test cases/common/135 include order/ctsub/emptyfile.c
diff --git a/test cases/common/138 include order/ctsub/main.h b/test cases/common/135 include order/ctsub/main.h
index 9d9acf36f..9d9acf36f 100644
--- a/test cases/common/138 include order/ctsub/main.h
+++ b/test cases/common/135 include order/ctsub/main.h
diff --git a/test cases/common/138 include order/ctsub/meson.build b/test cases/common/135 include order/ctsub/meson.build
index a242e0764..a242e0764 100644
--- a/test cases/common/138 include order/ctsub/meson.build
+++ b/test cases/common/135 include order/ctsub/meson.build
diff --git a/test cases/common/138 include order/inc1/hdr.h b/test cases/common/135 include order/inc1/hdr.h
index 9d755a830..9d755a830 100644
--- a/test cases/common/138 include order/inc1/hdr.h
+++ b/test cases/common/135 include order/inc1/hdr.h
diff --git a/test cases/common/138 include order/inc2/hdr.h b/test cases/common/135 include order/inc2/hdr.h
index 2ebcacaf4..2ebcacaf4 100644
--- a/test cases/common/138 include order/inc2/hdr.h
+++ b/test cases/common/135 include order/inc2/hdr.h
diff --git a/test cases/common/138 include order/meson.build b/test cases/common/135 include order/meson.build
index 9f275b866..9f275b866 100644
--- a/test cases/common/138 include order/meson.build
+++ b/test cases/common/135 include order/meson.build
diff --git a/test cases/common/138 include order/ordertest.c b/test cases/common/135 include order/ordertest.c
index 0d9173f35..0d9173f35 100644
--- a/test cases/common/138 include order/ordertest.c
+++ b/test cases/common/135 include order/ordertest.c
diff --git a/test cases/common/138 include order/sub1/main.h b/test cases/common/135 include order/sub1/main.h
index acf4a358c..acf4a358c 100644
--- a/test cases/common/138 include order/sub1/main.h
+++ b/test cases/common/135 include order/sub1/main.h
diff --git a/test cases/common/138 include order/sub1/meson.build b/test cases/common/135 include order/sub1/meson.build
index 9672945b6..9672945b6 100644
--- a/test cases/common/138 include order/sub1/meson.build
+++ b/test cases/common/135 include order/sub1/meson.build
diff --git a/test cases/common/138 include order/sub1/some.c b/test cases/common/135 include order/sub1/some.c
index 1ab0db4dd..1ab0db4dd 100644
--- a/test cases/common/138 include order/sub1/some.c
+++ b/test cases/common/135 include order/sub1/some.c
diff --git a/test cases/common/138 include order/sub1/some.h b/test cases/common/135 include order/sub1/some.h
index 6479492ea..6479492ea 100644
--- a/test cases/common/138 include order/sub1/some.h
+++ b/test cases/common/135 include order/sub1/some.h
diff --git a/test cases/common/138 include order/sub2/main.h b/test cases/common/135 include order/sub2/main.h
index b9c0da93a..b9c0da93a 100644
--- a/test cases/common/138 include order/sub2/main.h
+++ b/test cases/common/135 include order/sub2/main.h
diff --git a/test cases/common/138 include order/sub2/meson.build b/test cases/common/135 include order/sub2/meson.build
index b1e61900f..b1e61900f 100644
--- a/test cases/common/138 include order/sub2/meson.build
+++ b/test cases/common/135 include order/sub2/meson.build
diff --git a/test cases/common/138 include order/sub3/main.h b/test cases/common/135 include order/sub3/main.h
index 1ab723141..1ab723141 100644
--- a/test cases/common/138 include order/sub3/main.h
+++ b/test cases/common/135 include order/sub3/main.h
diff --git a/test cases/common/138 include order/sub3/meson.build b/test cases/common/135 include order/sub3/meson.build
index 0bd3906c1..0bd3906c1 100644
--- a/test cases/common/138 include order/sub3/meson.build
+++ b/test cases/common/135 include order/sub3/meson.build
diff --git a/test cases/common/138 include order/sub4/main.c b/test cases/common/135 include order/sub4/main.c
index 0b25eedfe..0b25eedfe 100644
--- a/test cases/common/138 include order/sub4/main.c
+++ b/test cases/common/135 include order/sub4/main.c
diff --git a/test cases/common/138 include order/sub4/main.h b/test cases/common/135 include order/sub4/main.h
index 194d7fe5f..194d7fe5f 100644
--- a/test cases/common/138 include order/sub4/main.h
+++ b/test cases/common/135 include order/sub4/main.h
diff --git a/test cases/common/138 include order/sub4/meson.build b/test cases/common/135 include order/sub4/meson.build
index c01edaa20..c01edaa20 100644
--- a/test cases/common/138 include order/sub4/meson.build
+++ b/test cases/common/135 include order/sub4/meson.build
diff --git a/test cases/common/139 override options/four.c b/test cases/common/136 override options/four.c
index 54f849188..54f849188 100644
--- a/test cases/common/139 override options/four.c
+++ b/test cases/common/136 override options/four.c
diff --git a/test cases/common/139 override options/meson.build b/test cases/common/136 override options/meson.build
index 4dd8d797e..4dd8d797e 100644
--- a/test cases/common/139 override options/meson.build
+++ b/test cases/common/136 override options/meson.build
diff --git a/test cases/common/139 override options/one.c b/test cases/common/136 override options/one.c
index 14fe9d622..14fe9d622 100644
--- a/test cases/common/139 override options/one.c
+++ b/test cases/common/136 override options/one.c
diff --git a/test cases/common/139 override options/three.c b/test cases/common/136 override options/three.c
index 305a575ac..305a575ac 100644
--- a/test cases/common/139 override options/three.c
+++ b/test cases/common/136 override options/three.c
diff --git a/test cases/common/139 override options/two.c b/test cases/common/136 override options/two.c
index 04b1d3f9c..04b1d3f9c 100644
--- a/test cases/common/139 override options/two.c
+++ b/test cases/common/136 override options/two.c
diff --git a/test cases/common/140 get define/concat.h b/test cases/common/137 get define/concat.h
index 6eb3e5e3b..6eb3e5e3b 100644
--- a/test cases/common/140 get define/concat.h
+++ b/test cases/common/137 get define/concat.h
diff --git a/test cases/common/140 get define/meson.build b/test cases/common/137 get define/meson.build
index b20c55402..b20c55402 100644
--- a/test cases/common/140 get define/meson.build
+++ b/test cases/common/137 get define/meson.build
diff --git a/test cases/common/140 get define/meson_options.txt b/test cases/common/137 get define/meson_options.txt
index 7d34a2e60..7d34a2e60 100644
--- a/test cases/common/140 get define/meson_options.txt
+++ b/test cases/common/137 get define/meson_options.txt
diff --git a/test cases/common/141 c cpp and asm/main.c b/test cases/common/138 c cpp and asm/main.c
index 897672309..897672309 100644
--- a/test cases/common/141 c cpp and asm/main.c
+++ b/test cases/common/138 c cpp and asm/main.c
diff --git a/test cases/common/141 c cpp and asm/main.cpp b/test cases/common/138 c cpp and asm/main.cpp
index c08987073..c08987073 100644
--- a/test cases/common/141 c cpp and asm/main.cpp
+++ b/test cases/common/138 c cpp and asm/main.cpp
diff --git a/test cases/common/141 c cpp and asm/meson.build b/test cases/common/138 c cpp and asm/meson.build
index 2c3610ea0..2c3610ea0 100644
--- a/test cases/common/141 c cpp and asm/meson.build
+++ b/test cases/common/138 c cpp and asm/meson.build
diff --git a/test cases/common/141 c cpp and asm/retval-arm.S b/test cases/common/138 c cpp and asm/retval-arm.S
index a8923624a..a8923624a 100644
--- a/test cases/common/141 c cpp and asm/retval-arm.S
+++ b/test cases/common/138 c cpp and asm/retval-arm.S
diff --git a/test cases/common/141 c cpp and asm/retval-x86.S b/test cases/common/138 c cpp and asm/retval-x86.S
index 3cb023764..3cb023764 100644
--- a/test cases/common/141 c cpp and asm/retval-x86.S
+++ b/test cases/common/138 c cpp and asm/retval-x86.S
diff --git a/test cases/common/141 c cpp and asm/retval-x86_64.S b/test cases/common/138 c cpp and asm/retval-x86_64.S
index 1a5f3eb23..1a5f3eb23 100644
--- a/test cases/common/141 c cpp and asm/retval-x86_64.S
+++ b/test cases/common/138 c cpp and asm/retval-x86_64.S
diff --git a/test cases/common/141 c cpp and asm/somelib.c b/test cases/common/138 c cpp and asm/somelib.c
index e585b8e9f..e585b8e9f 100644
--- a/test cases/common/141 c cpp and asm/somelib.c
+++ b/test cases/common/138 c cpp and asm/somelib.c
diff --git a/test cases/common/141 c cpp and asm/symbol-underscore.h b/test cases/common/138 c cpp and asm/symbol-underscore.h
index d0f3ef9cc..d0f3ef9cc 100644
--- a/test cases/common/141 c cpp and asm/symbol-underscore.h
+++ b/test cases/common/138 c cpp and asm/symbol-underscore.h
diff --git a/test cases/common/142 compute int/config.h.in b/test cases/common/139 compute int/config.h.in
index 0de63ab7d..0de63ab7d 100644
--- a/test cases/common/142 compute int/config.h.in
+++ b/test cases/common/139 compute int/config.h.in
diff --git a/test cases/common/142 compute int/foobar.h b/test cases/common/139 compute int/foobar.h
index fd3cb5ea6..fd3cb5ea6 100644
--- a/test cases/common/142 compute int/foobar.h
+++ b/test cases/common/139 compute int/foobar.h
diff --git a/test cases/common/142 compute int/meson.build b/test cases/common/139 compute int/meson.build
index 22bd26686..22bd26686 100644
--- a/test cases/common/142 compute int/meson.build
+++ b/test cases/common/139 compute int/meson.build
diff --git a/test cases/common/142 compute int/prog.c.in b/test cases/common/139 compute int/prog.c.in
index ff1ad5544..ff1ad5544 100644
--- a/test cases/common/142 compute int/prog.c.in
+++ b/test cases/common/139 compute int/prog.c.in
diff --git a/test cases/common/16 configure file/basename.py b/test cases/common/14 configure file/basename.py
index d2c866216..d2c866216 100644
--- a/test cases/common/16 configure file/basename.py
+++ b/test cases/common/14 configure file/basename.py
diff --git a/test cases/common/16 configure file/check_file.py b/test cases/common/14 configure file/check_file.py
index 6aa73e0a9..6aa73e0a9 100644
--- a/test cases/common/16 configure file/check_file.py
+++ b/test cases/common/14 configure file/check_file.py
diff --git a/test cases/common/16 configure file/config.h b/test cases/common/14 configure file/config.h
index e85b634b5..e85b634b5 100644
--- a/test cases/common/16 configure file/config.h
+++ b/test cases/common/14 configure file/config.h
diff --git a/test cases/common/16 configure file/config.h.in b/test cases/common/14 configure file/config.h.in
index 14a155874..14a155874 100644
--- a/test cases/common/16 configure file/config.h.in
+++ b/test cases/common/14 configure file/config.h.in
diff --git a/test cases/common/16 configure file/config4a.h.in b/test cases/common/14 configure file/config4a.h.in
index aafd195c2..aafd195c2 100644
--- a/test cases/common/16 configure file/config4a.h.in
+++ b/test cases/common/14 configure file/config4a.h.in
diff --git a/test cases/common/16 configure file/config4b.h.in b/test cases/common/14 configure file/config4b.h.in
index 3408bab6f..3408bab6f 100644
--- a/test cases/common/16 configure file/config4b.h.in
+++ b/test cases/common/14 configure file/config4b.h.in
diff --git a/test cases/common/16 configure file/config5.h.in b/test cases/common/14 configure file/config5.h.in
index 323bec64a..323bec64a 100644
--- a/test cases/common/16 configure file/config5.h.in
+++ b/test cases/common/14 configure file/config5.h.in
diff --git a/test cases/common/16 configure file/config6.h.in b/test cases/common/14 configure file/config6.h.in
index 9719f8715..9719f8715 100644
--- a/test cases/common/16 configure file/config6.h.in
+++ b/test cases/common/14 configure file/config6.h.in
diff --git a/test cases/common/16 configure file/config7.h.in b/test cases/common/14 configure file/config7.h.in
index edd0bb3fe..edd0bb3fe 100644
--- a/test cases/common/16 configure file/config7.h.in
+++ b/test cases/common/14 configure file/config7.h.in
diff --git a/test cases/common/16 configure file/config8.h.in b/test cases/common/14 configure file/config8.h.in
index b854ea04e..b854ea04e 100644
--- a/test cases/common/16 configure file/config8.h.in
+++ b/test cases/common/14 configure file/config8.h.in
diff --git a/test cases/common/16 configure file/dummy.dat b/test cases/common/14 configure file/dummy.dat
index e69de29bb..e69de29bb 100644
--- a/test cases/common/16 configure file/dummy.dat
+++ b/test cases/common/14 configure file/dummy.dat
diff --git a/test cases/common/16 configure file/dumpprog.c b/test cases/common/14 configure file/dumpprog.c
index 39a215ee8..39a215ee8 100644
--- a/test cases/common/16 configure file/dumpprog.c
+++ b/test cases/common/14 configure file/dumpprog.c
diff --git a/test cases/common/16 configure file/file_contains.py b/test cases/common/14 configure file/file_contains.py
index 25634f534..25634f534 100644
--- a/test cases/common/16 configure file/file_contains.py
+++ b/test cases/common/14 configure file/file_contains.py
diff --git a/test cases/common/16 configure file/generator-without-input-file.py b/test cases/common/14 configure file/generator-without-input-file.py
index 2ee059ee2..2ee059ee2 100755
--- a/test cases/common/16 configure file/generator-without-input-file.py
+++ b/test cases/common/14 configure file/generator-without-input-file.py
diff --git a/test cases/common/16 configure file/generator.py b/test cases/common/14 configure file/generator.py
index e3cc88101..e3cc88101 100755
--- a/test cases/common/16 configure file/generator.py
+++ b/test cases/common/14 configure file/generator.py
diff --git a/test cases/common/16 configure file/installed_files.txt b/test cases/common/14 configure file/installed_files.txt
index 542516e27..542516e27 100644
--- a/test cases/common/16 configure file/installed_files.txt
+++ b/test cases/common/14 configure file/installed_files.txt
diff --git a/test cases/common/16 configure file/invalid-utf8.bin.in b/test cases/common/14 configure file/invalid-utf8.bin.in
index 98e9ed9a9..98e9ed9a9 100644
--- a/test cases/common/16 configure file/invalid-utf8.bin.in
+++ b/test cases/common/14 configure file/invalid-utf8.bin.in
diff --git a/test cases/common/16 configure file/meson.build b/test cases/common/14 configure file/meson.build
index d7beeb1d3..d7beeb1d3 100644
--- a/test cases/common/16 configure file/meson.build
+++ b/test cases/common/14 configure file/meson.build
diff --git a/test cases/common/16 configure file/nosubst-nocopy1.txt.in b/test cases/common/14 configure file/nosubst-nocopy1.txt.in
index 6e893a105..6e893a105 100644
--- a/test cases/common/16 configure file/nosubst-nocopy1.txt.in
+++ b/test cases/common/14 configure file/nosubst-nocopy1.txt.in
diff --git a/test cases/common/16 configure file/nosubst-nocopy2.txt.in b/test cases/common/14 configure file/nosubst-nocopy2.txt.in
index a6a7ccad2..a6a7ccad2 100644
--- a/test cases/common/16 configure file/nosubst-nocopy2.txt.in
+++ b/test cases/common/14 configure file/nosubst-nocopy2.txt.in
diff --git a/test cases/common/16 configure file/prog.c b/test cases/common/14 configure file/prog.c
index 89a718e70..89a718e70 100644
--- a/test cases/common/16 configure file/prog.c
+++ b/test cases/common/14 configure file/prog.c
diff --git a/test cases/common/16 configure file/prog2.c b/test cases/common/14 configure file/prog2.c
index a88c70fe5..a88c70fe5 100644
--- a/test cases/common/16 configure file/prog2.c
+++ b/test cases/common/14 configure file/prog2.c
diff --git a/test cases/common/16 configure file/prog4.c b/test cases/common/14 configure file/prog4.c
index 92dc7cbb6..92dc7cbb6 100644
--- a/test cases/common/16 configure file/prog4.c
+++ b/test cases/common/14 configure file/prog4.c
diff --git a/test cases/common/16 configure file/prog5.c b/test cases/common/14 configure file/prog5.c
index 42c08f94c..42c08f94c 100644
--- a/test cases/common/16 configure file/prog5.c
+++ b/test cases/common/14 configure file/prog5.c
diff --git a/test cases/common/16 configure file/prog6.c b/test cases/common/14 configure file/prog6.c
index 741240478..741240478 100644
--- a/test cases/common/16 configure file/prog6.c
+++ b/test cases/common/14 configure file/prog6.c
diff --git a/test cases/common/16 configure file/prog7.c b/test cases/common/14 configure file/prog7.c
index 0bb7d1320..0bb7d1320 100644
--- a/test cases/common/16 configure file/prog7.c
+++ b/test cases/common/14 configure file/prog7.c
diff --git a/test cases/common/16 configure file/subdir/meson.build b/test cases/common/14 configure file/subdir/meson.build
index 146b7b66c..146b7b66c 100644
--- a/test cases/common/16 configure file/subdir/meson.build
+++ b/test cases/common/14 configure file/subdir/meson.build
diff --git a/test cases/common/16 configure file/test.py.in b/test cases/common/14 configure file/test.py.in
index 15a61f578..15a61f578 100644
--- a/test cases/common/16 configure file/test.py.in
+++ b/test cases/common/14 configure file/test.py.in
diff --git a/test cases/common/16 configure file/touch.py b/test cases/common/14 configure file/touch.py
index b48f48162..b48f48162 100644
--- a/test cases/common/16 configure file/touch.py
+++ b/test cases/common/14 configure file/touch.py
diff --git a/test cases/common/143 custom target object output/meson.build b/test cases/common/140 custom target object output/meson.build
index ede165bd4..ede165bd4 100644
--- a/test cases/common/143 custom target object output/meson.build
+++ b/test cases/common/140 custom target object output/meson.build
diff --git a/test cases/common/143 custom target object output/obj_generator.py b/test cases/common/140 custom target object output/obj_generator.py
index a33872aac..a33872aac 100644
--- a/test cases/common/143 custom target object output/obj_generator.py
+++ b/test cases/common/140 custom target object output/obj_generator.py
diff --git a/test cases/common/143 custom target object output/objdir/meson.build b/test cases/common/140 custom target object output/objdir/meson.build
index 0d7f6c259..0d7f6c259 100644
--- a/test cases/common/143 custom target object output/objdir/meson.build
+++ b/test cases/common/140 custom target object output/objdir/meson.build
diff --git a/test cases/common/143 custom target object output/objdir/source.c b/test cases/common/140 custom target object output/objdir/source.c
index 7779b332c..7779b332c 100644
--- a/test cases/common/143 custom target object output/objdir/source.c
+++ b/test cases/common/140 custom target object output/objdir/source.c
diff --git a/test cases/common/143 custom target object output/progdir/meson.build b/test cases/common/140 custom target object output/progdir/meson.build
index 4216c24a6..4216c24a6 100644
--- a/test cases/common/143 custom target object output/progdir/meson.build
+++ b/test cases/common/140 custom target object output/progdir/meson.build
diff --git a/test cases/common/143 custom target object output/progdir/prog.c b/test cases/common/140 custom target object output/progdir/prog.c
index c1ece33fb..c1ece33fb 100644
--- a/test cases/common/143 custom target object output/progdir/prog.c
+++ b/test cases/common/140 custom target object output/progdir/prog.c
diff --git a/test cases/common/144 empty build file/meson.build b/test cases/common/141 empty build file/meson.build
index 73d03974f..73d03974f 100644
--- a/test cases/common/144 empty build file/meson.build
+++ b/test cases/common/141 empty build file/meson.build
diff --git a/test cases/common/144 empty build file/subdir/meson.build b/test cases/common/141 empty build file/subdir/meson.build
index e69de29bb..e69de29bb 100644
--- a/test cases/common/144 empty build file/subdir/meson.build
+++ b/test cases/common/141 empty build file/subdir/meson.build
diff --git a/test cases/common/145 whole archive/exe/meson.build b/test cases/common/142 whole archive/exe/meson.build
index 91d298dce..91d298dce 100644
--- a/test cases/common/145 whole archive/exe/meson.build
+++ b/test cases/common/142 whole archive/exe/meson.build
diff --git a/test cases/common/145 whole archive/exe2/meson.build b/test cases/common/142 whole archive/exe2/meson.build
index 918486402..918486402 100644
--- a/test cases/common/145 whole archive/exe2/meson.build
+++ b/test cases/common/142 whole archive/exe2/meson.build
diff --git a/test cases/common/145 whole archive/exe3/meson.build b/test cases/common/142 whole archive/exe3/meson.build
index 82cf57e05..82cf57e05 100644
--- a/test cases/common/145 whole archive/exe3/meson.build
+++ b/test cases/common/142 whole archive/exe3/meson.build
diff --git a/test cases/common/145 whole archive/exe4/meson.build b/test cases/common/142 whole archive/exe4/meson.build
index 0781250fb..0781250fb 100644
--- a/test cases/common/145 whole archive/exe4/meson.build
+++ b/test cases/common/142 whole archive/exe4/meson.build
diff --git a/test cases/common/145 whole archive/func1.c b/test cases/common/142 whole archive/func1.c
index b2690a07f..b2690a07f 100644
--- a/test cases/common/145 whole archive/func1.c
+++ b/test cases/common/142 whole archive/func1.c
diff --git a/test cases/common/145 whole archive/func2.c b/test cases/common/142 whole archive/func2.c
index 9e287a4db..9e287a4db 100644
--- a/test cases/common/145 whole archive/func2.c
+++ b/test cases/common/142 whole archive/func2.c
diff --git a/test cases/common/145 whole archive/meson.build b/test cases/common/142 whole archive/meson.build
index 012df3335..012df3335 100644
--- a/test cases/common/145 whole archive/meson.build
+++ b/test cases/common/142 whole archive/meson.build
diff --git a/test cases/common/145 whole archive/mylib.h b/test cases/common/142 whole archive/mylib.h
index 813cc6783..813cc6783 100644
--- a/test cases/common/145 whole archive/mylib.h
+++ b/test cases/common/142 whole archive/mylib.h
diff --git a/test cases/common/145 whole archive/prog.c b/test cases/common/142 whole archive/prog.c
index 9111ad45a..9111ad45a 100644
--- a/test cases/common/145 whole archive/prog.c
+++ b/test cases/common/142 whole archive/prog.c
diff --git a/test cases/common/145 whole archive/sh_func2_dep_func1/meson.build b/test cases/common/142 whole archive/sh_func2_dep_func1/meson.build
index 92baca6fb..92baca6fb 100644
--- a/test cases/common/145 whole archive/sh_func2_dep_func1/meson.build
+++ b/test cases/common/142 whole archive/sh_func2_dep_func1/meson.build
diff --git a/test cases/common/145 whole archive/sh_func2_linked_func1/meson.build b/test cases/common/142 whole archive/sh_func2_linked_func1/meson.build
index 2858f65ec..2858f65ec 100644
--- a/test cases/common/145 whole archive/sh_func2_linked_func1/meson.build
+++ b/test cases/common/142 whole archive/sh_func2_linked_func1/meson.build
diff --git a/test cases/common/145 whole archive/sh_func2_transdep_func1/meson.build b/test cases/common/142 whole archive/sh_func2_transdep_func1/meson.build
index 07030772e..07030772e 100644
--- a/test cases/common/145 whole archive/sh_func2_transdep_func1/meson.build
+++ b/test cases/common/142 whole archive/sh_func2_transdep_func1/meson.build
diff --git a/test cases/common/145 whole archive/sh_only_link_whole/meson.build b/test cases/common/142 whole archive/sh_only_link_whole/meson.build
index 64baabd5d..64baabd5d 100644
--- a/test cases/common/145 whole archive/sh_only_link_whole/meson.build
+++ b/test cases/common/142 whole archive/sh_only_link_whole/meson.build
diff --git a/test cases/common/145 whole archive/st_func1/meson.build b/test cases/common/142 whole archive/st_func1/meson.build
index c84d78109..c84d78109 100644
--- a/test cases/common/145 whole archive/st_func1/meson.build
+++ b/test cases/common/142 whole archive/st_func1/meson.build
diff --git a/test cases/common/145 whole archive/st_func2/meson.build b/test cases/common/142 whole archive/st_func2/meson.build
index 2732f96ec..2732f96ec 100644
--- a/test cases/common/145 whole archive/st_func2/meson.build
+++ b/test cases/common/142 whole archive/st_func2/meson.build
diff --git a/test cases/common/146 C and CPP link/dummy.c b/test cases/common/143 C and CPP link/dummy.c
index e69de29bb..e69de29bb 100644
--- a/test cases/common/146 C and CPP link/dummy.c
+++ b/test cases/common/143 C and CPP link/dummy.c
diff --git a/test cases/common/146 C and CPP link/foo.c b/test cases/common/143 C and CPP link/foo.c
index 77c7e39ff..77c7e39ff 100644
--- a/test cases/common/146 C and CPP link/foo.c
+++ b/test cases/common/143 C and CPP link/foo.c
diff --git a/test cases/common/146 C and CPP link/foo.cpp b/test cases/common/143 C and CPP link/foo.cpp
index 9db7fb238..9db7fb238 100644
--- a/test cases/common/146 C and CPP link/foo.cpp
+++ b/test cases/common/143 C and CPP link/foo.cpp
diff --git a/test cases/common/146 C and CPP link/foo.h b/test cases/common/143 C and CPP link/foo.h
index 1ed8ce9b3..1ed8ce9b3 100644
--- a/test cases/common/146 C and CPP link/foo.h
+++ b/test cases/common/143 C and CPP link/foo.h
diff --git a/test cases/common/146 C and CPP link/foo.hpp b/test cases/common/143 C and CPP link/foo.hpp
index e47f01dce..e47f01dce 100644
--- a/test cases/common/146 C and CPP link/foo.hpp
+++ b/test cases/common/143 C and CPP link/foo.hpp
diff --git a/test cases/common/146 C and CPP link/foobar.c b/test cases/common/143 C and CPP link/foobar.c
index 27928bff5..27928bff5 100644
--- a/test cases/common/146 C and CPP link/foobar.c
+++ b/test cases/common/143 C and CPP link/foobar.c
diff --git a/test cases/common/146 C and CPP link/foobar.h b/test cases/common/143 C and CPP link/foobar.h
index 6dcb09664..6dcb09664 100644
--- a/test cases/common/146 C and CPP link/foobar.h
+++ b/test cases/common/143 C and CPP link/foobar.h
diff --git a/test cases/common/146 C and CPP link/meson.build b/test cases/common/143 C and CPP link/meson.build
index 55c1b87a5..55c1b87a5 100644
--- a/test cases/common/146 C and CPP link/meson.build
+++ b/test cases/common/143 C and CPP link/meson.build
diff --git a/test cases/common/146 C and CPP link/sub.c b/test cases/common/143 C and CPP link/sub.c
index 7c078f8e3..7c078f8e3 100644
--- a/test cases/common/146 C and CPP link/sub.c
+++ b/test cases/common/143 C and CPP link/sub.c
diff --git a/test cases/common/146 C and CPP link/sub.h b/test cases/common/143 C and CPP link/sub.h
index 5b02e172d..5b02e172d 100644
--- a/test cases/common/146 C and CPP link/sub.h
+++ b/test cases/common/143 C and CPP link/sub.h
diff --git a/test cases/common/147 mesonintrospect from scripts/check_env.py b/test cases/common/144 mesonintrospect from scripts/check_env.py
index 2d46d888f..2d46d888f 100644
--- a/test cases/common/147 mesonintrospect from scripts/check_env.py
+++ b/test cases/common/144 mesonintrospect from scripts/check_env.py
diff --git a/test cases/common/147 mesonintrospect from scripts/meson.build b/test cases/common/144 mesonintrospect from scripts/meson.build
index f78710b47..f78710b47 100644
--- a/test cases/common/147 mesonintrospect from scripts/meson.build
+++ b/test cases/common/144 mesonintrospect from scripts/meson.build
diff --git a/test cases/common/148 custom target multiple outputs/generator.py b/test cases/common/145 custom target multiple outputs/generator.py
index 39dbd11c4..39dbd11c4 100755
--- a/test cases/common/148 custom target multiple outputs/generator.py
+++ b/test cases/common/145 custom target multiple outputs/generator.py
diff --git a/test cases/common/148 custom target multiple outputs/installed_files.txt b/test cases/common/145 custom target multiple outputs/installed_files.txt
index 21e1249b1..21e1249b1 100644
--- a/test cases/common/148 custom target multiple outputs/installed_files.txt
+++ b/test cases/common/145 custom target multiple outputs/installed_files.txt
diff --git a/test cases/common/148 custom target multiple outputs/meson.build b/test cases/common/145 custom target multiple outputs/meson.build
index 64128641e..64128641e 100644
--- a/test cases/common/148 custom target multiple outputs/meson.build
+++ b/test cases/common/145 custom target multiple outputs/meson.build
diff --git a/test cases/common/149 special characters/check_quoting.py b/test cases/common/146 special characters/check_quoting.py
index d6e50ea69..d6e50ea69 100644
--- a/test cases/common/149 special characters/check_quoting.py
+++ b/test cases/common/146 special characters/check_quoting.py
diff --git a/test cases/common/149 special characters/installed_files.txt b/test cases/common/146 special characters/installed_files.txt
index f67788181..f67788181 100644
--- a/test cases/common/149 special characters/installed_files.txt
+++ b/test cases/common/146 special characters/installed_files.txt
diff --git a/test cases/common/149 special characters/meson.build b/test cases/common/146 special characters/meson.build
index ecba65003..ecba65003 100644
--- a/test cases/common/149 special characters/meson.build
+++ b/test cases/common/146 special characters/meson.build
diff --git a/test cases/common/150 nested links/meson.build b/test cases/common/147 nested links/meson.build
index 0821b038d..0821b038d 100644
--- a/test cases/common/150 nested links/meson.build
+++ b/test cases/common/147 nested links/meson.build
diff --git a/test cases/common/150 nested links/xephyr.c b/test cases/common/147 nested links/xephyr.c
index 33c14ce1d..33c14ce1d 100644
--- a/test cases/common/150 nested links/xephyr.c
+++ b/test cases/common/147 nested links/xephyr.c
diff --git a/test cases/common/151 list of file sources/foo b/test cases/common/148 list of file sources/foo
index 7b57bd29e..7b57bd29e 100644
--- a/test cases/common/151 list of file sources/foo
+++ b/test cases/common/148 list of file sources/foo
diff --git a/test cases/common/151 list of file sources/gen.py b/test cases/common/148 list of file sources/gen.py
index 2337d3d6b..2337d3d6b 100644
--- a/test cases/common/151 list of file sources/gen.py
+++ b/test cases/common/148 list of file sources/gen.py
diff --git a/test cases/common/151 list of file sources/meson.build b/test cases/common/148 list of file sources/meson.build
index 819509dd6..819509dd6 100644
--- a/test cases/common/151 list of file sources/meson.build
+++ b/test cases/common/148 list of file sources/meson.build
diff --git a/test cases/common/152 link depends custom target/foo.c b/test cases/common/149 link depends custom target/foo.c
index 8700a9e32..8700a9e32 100644
--- a/test cases/common/152 link depends custom target/foo.c
+++ b/test cases/common/149 link depends custom target/foo.c
diff --git a/test cases/common/152 link depends custom target/make_file.py b/test cases/common/149 link depends custom target/make_file.py
index ceb6e19aa..ceb6e19aa 100755
--- a/test cases/common/152 link depends custom target/make_file.py
+++ b/test cases/common/149 link depends custom target/make_file.py
diff --git a/test cases/common/152 link depends custom target/meson.build b/test cases/common/149 link depends custom target/meson.build
index ee7a865d9..ee7a865d9 100644
--- a/test cases/common/152 link depends custom target/meson.build
+++ b/test cases/common/149 link depends custom target/meson.build
diff --git a/test cases/common/17 if/meson.build b/test cases/common/15 if/meson.build
index b0288dbe6..b0288dbe6 100644
--- a/test cases/common/17 if/meson.build
+++ b/test cases/common/15 if/meson.build
diff --git a/test cases/common/17 if/prog.c b/test cases/common/15 if/prog.c
index 0314ff17b..0314ff17b 100644
--- a/test cases/common/17 if/prog.c
+++ b/test cases/common/15 if/prog.c
diff --git a/test cases/common/153 recursive linking/3rdorderdeps/lib.c.in b/test cases/common/150 recursive linking/3rdorderdeps/lib.c.in
index 461f85995..461f85995 100644
--- a/test cases/common/153 recursive linking/3rdorderdeps/lib.c.in
+++ b/test cases/common/150 recursive linking/3rdorderdeps/lib.c.in
diff --git a/test cases/common/153 recursive linking/3rdorderdeps/main.c.in b/test cases/common/150 recursive linking/3rdorderdeps/main.c.in
index 8155f357e..8155f357e 100644
--- a/test cases/common/153 recursive linking/3rdorderdeps/main.c.in
+++ b/test cases/common/150 recursive linking/3rdorderdeps/main.c.in
diff --git a/test cases/common/153 recursive linking/3rdorderdeps/meson.build b/test cases/common/150 recursive linking/3rdorderdeps/meson.build
index d4ef7453d..d4ef7453d 100644
--- a/test cases/common/153 recursive linking/3rdorderdeps/meson.build
+++ b/test cases/common/150 recursive linking/3rdorderdeps/meson.build
diff --git a/test cases/common/153 recursive linking/circular/lib1.c b/test cases/common/150 recursive linking/circular/lib1.c
index 38889cfa0..38889cfa0 100644
--- a/test cases/common/153 recursive linking/circular/lib1.c
+++ b/test cases/common/150 recursive linking/circular/lib1.c
diff --git a/test cases/common/153 recursive linking/circular/lib2.c b/test cases/common/150 recursive linking/circular/lib2.c
index 31cd37cc1..31cd37cc1 100644
--- a/test cases/common/153 recursive linking/circular/lib2.c
+++ b/test cases/common/150 recursive linking/circular/lib2.c
diff --git a/test cases/common/153 recursive linking/circular/lib3.c b/test cases/common/150 recursive linking/circular/lib3.c
index 67d473aac..67d473aac 100644
--- a/test cases/common/153 recursive linking/circular/lib3.c
+++ b/test cases/common/150 recursive linking/circular/lib3.c
diff --git a/test cases/common/153 recursive linking/circular/main.c b/test cases/common/150 recursive linking/circular/main.c
index 5f797a5ff..5f797a5ff 100644
--- a/test cases/common/153 recursive linking/circular/main.c
+++ b/test cases/common/150 recursive linking/circular/main.c
diff --git a/test cases/common/153 recursive linking/circular/meson.build b/test cases/common/150 recursive linking/circular/meson.build
index b7a70a86b..b7a70a86b 100644
--- a/test cases/common/153 recursive linking/circular/meson.build
+++ b/test cases/common/150 recursive linking/circular/meson.build
diff --git a/test cases/common/153 recursive linking/circular/prop1.c b/test cases/common/150 recursive linking/circular/prop1.c
index 4e571f5ee..4e571f5ee 100644
--- a/test cases/common/153 recursive linking/circular/prop1.c
+++ b/test cases/common/150 recursive linking/circular/prop1.c
diff --git a/test cases/common/153 recursive linking/circular/prop2.c b/test cases/common/150 recursive linking/circular/prop2.c
index ceabba055..ceabba055 100644
--- a/test cases/common/153 recursive linking/circular/prop2.c
+++ b/test cases/common/150 recursive linking/circular/prop2.c
diff --git a/test cases/common/153 recursive linking/circular/prop3.c b/test cases/common/150 recursive linking/circular/prop3.c
index 246206c2c..246206c2c 100644
--- a/test cases/common/153 recursive linking/circular/prop3.c
+++ b/test cases/common/150 recursive linking/circular/prop3.c
diff --git a/test cases/common/153 recursive linking/edge-cases/libsto.c b/test cases/common/150 recursive linking/edge-cases/libsto.c
index 93f46a88c..93f46a88c 100644
--- a/test cases/common/153 recursive linking/edge-cases/libsto.c
+++ b/test cases/common/150 recursive linking/edge-cases/libsto.c
diff --git a/test cases/common/153 recursive linking/edge-cases/meson.build b/test cases/common/150 recursive linking/edge-cases/meson.build
index 6a46266b4..6a46266b4 100644
--- a/test cases/common/153 recursive linking/edge-cases/meson.build
+++ b/test cases/common/150 recursive linking/edge-cases/meson.build
diff --git a/test cases/common/153 recursive linking/edge-cases/shstmain.c b/test cases/common/150 recursive linking/edge-cases/shstmain.c
index b44c55f6c..b44c55f6c 100644
--- a/test cases/common/153 recursive linking/edge-cases/shstmain.c
+++ b/test cases/common/150 recursive linking/edge-cases/shstmain.c
diff --git a/test cases/common/153 recursive linking/edge-cases/stobuilt.c b/test cases/common/150 recursive linking/edge-cases/stobuilt.c
index 9cc15bcae..9cc15bcae 100644
--- a/test cases/common/153 recursive linking/edge-cases/stobuilt.c
+++ b/test cases/common/150 recursive linking/edge-cases/stobuilt.c
diff --git a/test cases/common/153 recursive linking/edge-cases/stomain.c b/test cases/common/150 recursive linking/edge-cases/stomain.c
index 90208a77a..90208a77a 100644
--- a/test cases/common/153 recursive linking/edge-cases/stomain.c
+++ b/test cases/common/150 recursive linking/edge-cases/stomain.c
diff --git a/test cases/common/153 recursive linking/lib.h b/test cases/common/150 recursive linking/lib.h
index b54bf3673..b54bf3673 100644
--- a/test cases/common/153 recursive linking/lib.h
+++ b/test cases/common/150 recursive linking/lib.h
diff --git a/test cases/common/153 recursive linking/main.c b/test cases/common/150 recursive linking/main.c
index 085161115..085161115 100644
--- a/test cases/common/153 recursive linking/main.c
+++ b/test cases/common/150 recursive linking/main.c
diff --git a/test cases/common/153 recursive linking/meson.build b/test cases/common/150 recursive linking/meson.build
index 2ca715157..2ca715157 100644
--- a/test cases/common/153 recursive linking/meson.build
+++ b/test cases/common/150 recursive linking/meson.build
diff --git a/test cases/common/153 recursive linking/shnodep/lib.c b/test cases/common/150 recursive linking/shnodep/lib.c
index a3b7993c2..a3b7993c2 100644
--- a/test cases/common/153 recursive linking/shnodep/lib.c
+++ b/test cases/common/150 recursive linking/shnodep/lib.c
diff --git a/test cases/common/153 recursive linking/shnodep/meson.build b/test cases/common/150 recursive linking/shnodep/meson.build
index 66cfd9bc6..66cfd9bc6 100644
--- a/test cases/common/153 recursive linking/shnodep/meson.build
+++ b/test cases/common/150 recursive linking/shnodep/meson.build
diff --git a/test cases/common/153 recursive linking/shshdep/lib.c b/test cases/common/150 recursive linking/shshdep/lib.c
index 715d12092..715d12092 100644
--- a/test cases/common/153 recursive linking/shshdep/lib.c
+++ b/test cases/common/150 recursive linking/shshdep/lib.c
diff --git a/test cases/common/153 recursive linking/shshdep/meson.build b/test cases/common/150 recursive linking/shshdep/meson.build
index 020b481cf..020b481cf 100644
--- a/test cases/common/153 recursive linking/shshdep/meson.build
+++ b/test cases/common/150 recursive linking/shshdep/meson.build
diff --git a/test cases/common/153 recursive linking/shstdep/lib.c b/test cases/common/150 recursive linking/shstdep/lib.c
index 5da8d0b2e..5da8d0b2e 100644
--- a/test cases/common/153 recursive linking/shstdep/lib.c
+++ b/test cases/common/150 recursive linking/shstdep/lib.c
diff --git a/test cases/common/153 recursive linking/shstdep/meson.build b/test cases/common/150 recursive linking/shstdep/meson.build
index 008f9f893..008f9f893 100644
--- a/test cases/common/153 recursive linking/shstdep/meson.build
+++ b/test cases/common/150 recursive linking/shstdep/meson.build
diff --git a/test cases/common/153 recursive linking/stnodep/lib.c b/test cases/common/150 recursive linking/stnodep/lib.c
index 4bc50bea2..4bc50bea2 100644
--- a/test cases/common/153 recursive linking/stnodep/lib.c
+++ b/test cases/common/150 recursive linking/stnodep/lib.c
diff --git a/test cases/common/153 recursive linking/stnodep/meson.build b/test cases/common/150 recursive linking/stnodep/meson.build
index 77f7129b6..77f7129b6 100644
--- a/test cases/common/153 recursive linking/stnodep/meson.build
+++ b/test cases/common/150 recursive linking/stnodep/meson.build
diff --git a/test cases/common/153 recursive linking/stshdep/lib.c b/test cases/common/150 recursive linking/stshdep/lib.c
index 3cfa12bcb..3cfa12bcb 100644
--- a/test cases/common/153 recursive linking/stshdep/lib.c
+++ b/test cases/common/150 recursive linking/stshdep/lib.c
diff --git a/test cases/common/153 recursive linking/stshdep/meson.build b/test cases/common/150 recursive linking/stshdep/meson.build
index 0967c1ce4..0967c1ce4 100644
--- a/test cases/common/153 recursive linking/stshdep/meson.build
+++ b/test cases/common/150 recursive linking/stshdep/meson.build
diff --git a/test cases/common/153 recursive linking/ststdep/lib.c b/test cases/common/150 recursive linking/ststdep/lib.c
index fca870669..fca870669 100644
--- a/test cases/common/153 recursive linking/ststdep/lib.c
+++ b/test cases/common/150 recursive linking/ststdep/lib.c
diff --git a/test cases/common/153 recursive linking/ststdep/meson.build b/test cases/common/150 recursive linking/ststdep/meson.build
index 3602442aa..3602442aa 100644
--- a/test cases/common/153 recursive linking/ststdep/meson.build
+++ b/test cases/common/150 recursive linking/ststdep/meson.build
diff --git a/test cases/common/154 library at root/lib.c b/test cases/common/151 library at root/lib.c
index a5b3dc3b8..a5b3dc3b8 100644
--- a/test cases/common/154 library at root/lib.c
+++ b/test cases/common/151 library at root/lib.c
diff --git a/test cases/common/154 library at root/main/main.c b/test cases/common/151 library at root/main/main.c
index c4e1b4ee3..c4e1b4ee3 100644
--- a/test cases/common/154 library at root/main/main.c
+++ b/test cases/common/151 library at root/main/main.c
diff --git a/test cases/common/154 library at root/main/meson.build b/test cases/common/151 library at root/main/meson.build
index 557378ae5..557378ae5 100644
--- a/test cases/common/154 library at root/main/meson.build
+++ b/test cases/common/151 library at root/main/meson.build
diff --git a/test cases/common/154 library at root/meson.build b/test cases/common/151 library at root/meson.build
index bfdd869d7..bfdd869d7 100644
--- a/test cases/common/154 library at root/meson.build
+++ b/test cases/common/151 library at root/meson.build
diff --git a/test cases/common/155 simd/fallback.c b/test cases/common/152 simd/fallback.c
index ab435f433..ab435f433 100644
--- a/test cases/common/155 simd/fallback.c
+++ b/test cases/common/152 simd/fallback.c
diff --git a/test cases/common/155 simd/include/simdheader.h b/test cases/common/152 simd/include/simdheader.h
index 6515e413e..6515e413e 100644
--- a/test cases/common/155 simd/include/simdheader.h
+++ b/test cases/common/152 simd/include/simdheader.h
diff --git a/test cases/common/155 simd/meson.build b/test cases/common/152 simd/meson.build
index 2628a1234..2628a1234 100644
--- a/test cases/common/155 simd/meson.build
+++ b/test cases/common/152 simd/meson.build
diff --git a/test cases/common/155 simd/simd_avx.c b/test cases/common/152 simd/simd_avx.c
index 1c84dae35..1c84dae35 100644
--- a/test cases/common/155 simd/simd_avx.c
+++ b/test cases/common/152 simd/simd_avx.c
diff --git a/test cases/common/155 simd/simd_avx2.c b/test cases/common/152 simd/simd_avx2.c
index 15297eb2b..15297eb2b 100644
--- a/test cases/common/155 simd/simd_avx2.c
+++ b/test cases/common/152 simd/simd_avx2.c
diff --git a/test cases/common/155 simd/simd_mmx.c b/test cases/common/152 simd/simd_mmx.c
index 731abd14a..731abd14a 100644
--- a/test cases/common/155 simd/simd_mmx.c
+++ b/test cases/common/152 simd/simd_mmx.c
diff --git a/test cases/common/155 simd/simd_neon.c b/test cases/common/152 simd/simd_neon.c
index 20820992b..20820992b 100644
--- a/test cases/common/155 simd/simd_neon.c
+++ b/test cases/common/152 simd/simd_neon.c
diff --git a/test cases/common/155 simd/simd_sse.c b/test cases/common/152 simd/simd_sse.c
index 3c9fe622e..3c9fe622e 100644
--- a/test cases/common/155 simd/simd_sse.c
+++ b/test cases/common/152 simd/simd_sse.c
diff --git a/test cases/common/155 simd/simd_sse2.c b/test cases/common/152 simd/simd_sse2.c
index 02745337b..02745337b 100644
--- a/test cases/common/155 simd/simd_sse2.c
+++ b/test cases/common/152 simd/simd_sse2.c
diff --git a/test cases/common/155 simd/simd_sse3.c b/test cases/common/152 simd/simd_sse3.c
index e97d10285..e97d10285 100644
--- a/test cases/common/155 simd/simd_sse3.c
+++ b/test cases/common/152 simd/simd_sse3.c
diff --git a/test cases/common/155 simd/simd_sse41.c b/test cases/common/152 simd/simd_sse41.c
index 0308c7e49..0308c7e49 100644
--- a/test cases/common/155 simd/simd_sse41.c
+++ b/test cases/common/152 simd/simd_sse41.c
diff --git a/test cases/common/155 simd/simd_sse42.c b/test cases/common/152 simd/simd_sse42.c
index 137ffc441..137ffc441 100644
--- a/test cases/common/155 simd/simd_sse42.c
+++ b/test cases/common/152 simd/simd_sse42.c
diff --git a/test cases/common/155 simd/simd_ssse3.c b/test cases/common/152 simd/simd_ssse3.c
index ab4dff4f8..ab4dff4f8 100644
--- a/test cases/common/155 simd/simd_ssse3.c
+++ b/test cases/common/152 simd/simd_ssse3.c
diff --git a/test cases/common/155 simd/simdchecker.c b/test cases/common/152 simd/simdchecker.c
index 222fbf3e3..222fbf3e3 100644
--- a/test cases/common/155 simd/simdchecker.c
+++ b/test cases/common/152 simd/simdchecker.c
diff --git a/test cases/common/155 simd/simdfuncs.h b/test cases/common/152 simd/simdfuncs.h
index dfb056068..dfb056068 100644
--- a/test cases/common/155 simd/simdfuncs.h
+++ b/test cases/common/152 simd/simdfuncs.h
diff --git a/test cases/common/156 shared module resolving symbol in executable/meson.build b/test cases/common/153 shared module resolving symbol in executable/meson.build
index 282a4d28c..282a4d28c 100644
--- a/test cases/common/156 shared module resolving symbol in executable/meson.build
+++ b/test cases/common/153 shared module resolving symbol in executable/meson.build
diff --git a/test cases/common/156 shared module resolving symbol in executable/module.c b/test cases/common/153 shared module resolving symbol in executable/module.c
index 64374d590..64374d590 100644
--- a/test cases/common/156 shared module resolving symbol in executable/module.c
+++ b/test cases/common/153 shared module resolving symbol in executable/module.c
diff --git a/test cases/common/156 shared module resolving symbol in executable/prog.c b/test cases/common/153 shared module resolving symbol in executable/prog.c
index 746c19280..746c19280 100644
--- a/test cases/common/156 shared module resolving symbol in executable/prog.c
+++ b/test cases/common/153 shared module resolving symbol in executable/prog.c
diff --git a/test cases/common/157 dotinclude/dotproc.c b/test cases/common/154 dotinclude/dotproc.c
index 5e65f7b43..5e65f7b43 100644
--- a/test cases/common/157 dotinclude/dotproc.c
+++ b/test cases/common/154 dotinclude/dotproc.c
diff --git a/test cases/common/157 dotinclude/meson.build b/test cases/common/154 dotinclude/meson.build
index e0c2cd7a0..e0c2cd7a0 100644
--- a/test cases/common/157 dotinclude/meson.build
+++ b/test cases/common/154 dotinclude/meson.build
diff --git a/test cases/common/157 dotinclude/stdio.h b/test cases/common/154 dotinclude/stdio.h
index b6bd09fc4..b6bd09fc4 100644
--- a/test cases/common/157 dotinclude/stdio.h
+++ b/test cases/common/154 dotinclude/stdio.h
diff --git a/test cases/common/158 reserved targets/all/meson.build b/test cases/common/155 reserved targets/all/meson.build
index adee88214..adee88214 100644
--- a/test cases/common/158 reserved targets/all/meson.build
+++ b/test cases/common/155 reserved targets/all/meson.build
diff --git a/test cases/common/158 reserved targets/benchmark/meson.build b/test cases/common/155 reserved targets/benchmark/meson.build
index 242cc235d..242cc235d 100644
--- a/test cases/common/158 reserved targets/benchmark/meson.build
+++ b/test cases/common/155 reserved targets/benchmark/meson.build
diff --git a/test cases/common/158 reserved targets/clean-ctlist/meson.build b/test cases/common/155 reserved targets/clean-ctlist/meson.build
index 75eb207db..75eb207db 100644
--- a/test cases/common/158 reserved targets/clean-ctlist/meson.build
+++ b/test cases/common/155 reserved targets/clean-ctlist/meson.build
diff --git a/test cases/common/158 reserved targets/clean-gcda/meson.build b/test cases/common/155 reserved targets/clean-gcda/meson.build
index 488a527fc..488a527fc 100644
--- a/test cases/common/158 reserved targets/clean-gcda/meson.build
+++ b/test cases/common/155 reserved targets/clean-gcda/meson.build
diff --git a/test cases/common/158 reserved targets/clean-gcno/meson.build b/test cases/common/155 reserved targets/clean-gcno/meson.build
index eec789ac2..eec789ac2 100644
--- a/test cases/common/158 reserved targets/clean-gcno/meson.build
+++ b/test cases/common/155 reserved targets/clean-gcno/meson.build
diff --git a/test cases/common/158 reserved targets/clean/meson.build b/test cases/common/155 reserved targets/clean/meson.build
index 4e27b6c27..4e27b6c27 100644
--- a/test cases/common/158 reserved targets/clean/meson.build
+++ b/test cases/common/155 reserved targets/clean/meson.build
diff --git a/test cases/common/158 reserved targets/coverage-html/meson.build b/test cases/common/155 reserved targets/coverage-html/meson.build
index 10a4cc89b..10a4cc89b 100644
--- a/test cases/common/158 reserved targets/coverage-html/meson.build
+++ b/test cases/common/155 reserved targets/coverage-html/meson.build
diff --git a/test cases/common/158 reserved targets/coverage-text/meson.build b/test cases/common/155 reserved targets/coverage-text/meson.build
index 21dcae5fe..21dcae5fe 100644
--- a/test cases/common/158 reserved targets/coverage-text/meson.build
+++ b/test cases/common/155 reserved targets/coverage-text/meson.build
diff --git a/test cases/common/158 reserved targets/coverage-xml/meson.build b/test cases/common/155 reserved targets/coverage-xml/meson.build
index 44d7bfbe3..44d7bfbe3 100644
--- a/test cases/common/158 reserved targets/coverage-xml/meson.build
+++ b/test cases/common/155 reserved targets/coverage-xml/meson.build
diff --git a/test cases/common/158 reserved targets/coverage/meson.build b/test cases/common/155 reserved targets/coverage/meson.build
index b40105550..b40105550 100644
--- a/test cases/common/158 reserved targets/coverage/meson.build
+++ b/test cases/common/155 reserved targets/coverage/meson.build
diff --git a/test cases/common/158 reserved targets/dist/meson.build b/test cases/common/155 reserved targets/dist/meson.build
index 951bbb4da..951bbb4da 100644
--- a/test cases/common/158 reserved targets/dist/meson.build
+++ b/test cases/common/155 reserved targets/dist/meson.build
diff --git a/test cases/common/158 reserved targets/distcheck/meson.build b/test cases/common/155 reserved targets/distcheck/meson.build
index 12b9328ad..12b9328ad 100644
--- a/test cases/common/158 reserved targets/distcheck/meson.build
+++ b/test cases/common/155 reserved targets/distcheck/meson.build
diff --git a/test cases/common/158 reserved targets/install/meson.build b/test cases/common/155 reserved targets/install/meson.build
index 483990186..483990186 100644
--- a/test cases/common/158 reserved targets/install/meson.build
+++ b/test cases/common/155 reserved targets/install/meson.build
diff --git a/test cases/common/158 reserved targets/meson.build b/test cases/common/155 reserved targets/meson.build
index 24fd937bc..24fd937bc 100644
--- a/test cases/common/158 reserved targets/meson.build
+++ b/test cases/common/155 reserved targets/meson.build
diff --git a/test cases/common/158 reserved targets/phony/meson.build b/test cases/common/155 reserved targets/phony/meson.build
index 6710fc124..6710fc124 100644
--- a/test cases/common/158 reserved targets/phony/meson.build
+++ b/test cases/common/155 reserved targets/phony/meson.build
diff --git a/test cases/common/158 reserved targets/reconfigure/meson.build b/test cases/common/155 reserved targets/reconfigure/meson.build
index c3ea3da8a..c3ea3da8a 100644
--- a/test cases/common/158 reserved targets/reconfigure/meson.build
+++ b/test cases/common/155 reserved targets/reconfigure/meson.build
diff --git a/test cases/common/158 reserved targets/runtarget/meson.build b/test cases/common/155 reserved targets/runtarget/meson.build
index 52c371b5d..52c371b5d 100644
--- a/test cases/common/158 reserved targets/runtarget/meson.build
+++ b/test cases/common/155 reserved targets/runtarget/meson.build
diff --git a/test cases/common/158 reserved targets/scan-build/meson.build b/test cases/common/155 reserved targets/scan-build/meson.build
index 100205346..100205346 100644
--- a/test cases/common/158 reserved targets/scan-build/meson.build
+++ b/test cases/common/155 reserved targets/scan-build/meson.build
diff --git a/test cases/common/158 reserved targets/test.c b/test cases/common/155 reserved targets/test.c
index 0fb4389f7..0fb4389f7 100644
--- a/test cases/common/158 reserved targets/test.c
+++ b/test cases/common/155 reserved targets/test.c
diff --git a/test cases/common/158 reserved targets/test/meson.build b/test cases/common/155 reserved targets/test/meson.build
index 4ab123cdd..4ab123cdd 100644
--- a/test cases/common/158 reserved targets/test/meson.build
+++ b/test cases/common/155 reserved targets/test/meson.build
diff --git a/test cases/common/158 reserved targets/uninstall/meson.build b/test cases/common/155 reserved targets/uninstall/meson.build
index 21c6ca60d..21c6ca60d 100644
--- a/test cases/common/158 reserved targets/uninstall/meson.build
+++ b/test cases/common/155 reserved targets/uninstall/meson.build
diff --git a/test cases/common/159 duplicate source names/dir1/file.c b/test cases/common/156 duplicate source names/dir1/file.c
index 094e18713..094e18713 100644
--- a/test cases/common/159 duplicate source names/dir1/file.c
+++ b/test cases/common/156 duplicate source names/dir1/file.c
diff --git a/test cases/common/159 duplicate source names/dir1/meson.build b/test cases/common/156 duplicate source names/dir1/meson.build
index 00bc85daf..00bc85daf 100644
--- a/test cases/common/159 duplicate source names/dir1/meson.build
+++ b/test cases/common/156 duplicate source names/dir1/meson.build
diff --git a/test cases/common/159 duplicate source names/dir2/dir1/file.c b/test cases/common/156 duplicate source names/dir2/dir1/file.c
index 5aac8e53f..5aac8e53f 100644
--- a/test cases/common/159 duplicate source names/dir2/dir1/file.c
+++ b/test cases/common/156 duplicate source names/dir2/dir1/file.c
diff --git a/test cases/common/159 duplicate source names/dir2/file.c b/test cases/common/156 duplicate source names/dir2/file.c
index 6cf8d6602..6cf8d6602 100644
--- a/test cases/common/159 duplicate source names/dir2/file.c
+++ b/test cases/common/156 duplicate source names/dir2/file.c
diff --git a/test cases/common/159 duplicate source names/dir2/meson.build b/test cases/common/156 duplicate source names/dir2/meson.build
index f116a0200..f116a0200 100644
--- a/test cases/common/159 duplicate source names/dir2/meson.build
+++ b/test cases/common/156 duplicate source names/dir2/meson.build
diff --git a/test cases/common/159 duplicate source names/dir3/dir1/file.c b/test cases/common/156 duplicate source names/dir3/dir1/file.c
index 04667c2ff..04667c2ff 100644
--- a/test cases/common/159 duplicate source names/dir3/dir1/file.c
+++ b/test cases/common/156 duplicate source names/dir3/dir1/file.c
diff --git a/test cases/common/159 duplicate source names/dir3/file.c b/test cases/common/156 duplicate source names/dir3/file.c
index d16d0a8cf..d16d0a8cf 100644
--- a/test cases/common/159 duplicate source names/dir3/file.c
+++ b/test cases/common/156 duplicate source names/dir3/file.c
diff --git a/test cases/common/159 duplicate source names/dir3/meson.build b/test cases/common/156 duplicate source names/dir3/meson.build
index 70ddbf2d0..70ddbf2d0 100644
--- a/test cases/common/159 duplicate source names/dir3/meson.build
+++ b/test cases/common/156 duplicate source names/dir3/meson.build
diff --git a/test cases/common/159 duplicate source names/meson.build b/test cases/common/156 duplicate source names/meson.build
index cac519401..cac519401 100644
--- a/test cases/common/159 duplicate source names/meson.build
+++ b/test cases/common/156 duplicate source names/meson.build
diff --git a/test cases/common/160 index customtarget/check_args.py b/test cases/common/157 index customtarget/check_args.py
index 8663a6fe2..8663a6fe2 100644
--- a/test cases/common/160 index customtarget/check_args.py
+++ b/test cases/common/157 index customtarget/check_args.py
diff --git a/test cases/common/160 index customtarget/gen_sources.py b/test cases/common/157 index customtarget/gen_sources.py
index 0bdb529cd..0bdb529cd 100644
--- a/test cases/common/160 index customtarget/gen_sources.py
+++ b/test cases/common/157 index customtarget/gen_sources.py
diff --git a/test cases/common/160 index customtarget/lib.c b/test cases/common/157 index customtarget/lib.c
index 17117d54c..17117d54c 100644
--- a/test cases/common/160 index customtarget/lib.c
+++ b/test cases/common/157 index customtarget/lib.c
diff --git a/test cases/common/160 index customtarget/meson.build b/test cases/common/157 index customtarget/meson.build
index 27d28b56a..27d28b56a 100644
--- a/test cases/common/160 index customtarget/meson.build
+++ b/test cases/common/157 index customtarget/meson.build
diff --git a/test cases/common/160 index customtarget/subdir/foo.c b/test cases/common/157 index customtarget/subdir/foo.c
index c620a1183..c620a1183 100644
--- a/test cases/common/160 index customtarget/subdir/foo.c
+++ b/test cases/common/157 index customtarget/subdir/foo.c
diff --git a/test cases/common/160 index customtarget/subdir/meson.build b/test cases/common/157 index customtarget/subdir/meson.build
index 47bcd322a..47bcd322a 100644
--- a/test cases/common/160 index customtarget/subdir/meson.build
+++ b/test cases/common/157 index customtarget/subdir/meson.build
diff --git a/test cases/common/161 wrap file should not failed/meson.build b/test cases/common/158 wrap file should not failed/meson.build
index 9cf4e9a6b..9cf4e9a6b 100644
--- a/test cases/common/161 wrap file should not failed/meson.build
+++ b/test cases/common/158 wrap file should not failed/meson.build
diff --git a/test cases/common/161 wrap file should not failed/src/meson.build b/test cases/common/158 wrap file should not failed/src/meson.build
index 69f666d1a..69f666d1a 100644
--- a/test cases/common/161 wrap file should not failed/src/meson.build
+++ b/test cases/common/158 wrap file should not failed/src/meson.build
diff --git a/test cases/common/161 wrap file should not failed/src/subprojects/foo/prog2.c b/test cases/common/158 wrap file should not failed/src/subprojects/foo/prog2.c
index 56f61a81a..56f61a81a 100644
--- a/test cases/common/161 wrap file should not failed/src/subprojects/foo/prog2.c
+++ b/test cases/common/158 wrap file should not failed/src/subprojects/foo/prog2.c
diff --git a/test cases/common/161 wrap file should not failed/src/subprojects/prog.c b/test cases/common/158 wrap file should not failed/src/subprojects/prog.c
index 56f61a81a..56f61a81a 100644
--- a/test cases/common/161 wrap file should not failed/src/subprojects/prog.c
+++ b/test cases/common/158 wrap file should not failed/src/subprojects/prog.c
diff --git a/test cases/common/161 wrap file should not failed/subprojects/packagecache/zlib-1.2.8-8-wrap.zip b/test cases/common/158 wrap file should not failed/subprojects/packagecache/zlib-1.2.8-8-wrap.zip
index 421376db9..421376db9 100644
--- a/test cases/common/161 wrap file should not failed/subprojects/packagecache/zlib-1.2.8-8-wrap.zip
+++ b/test cases/common/158 wrap file should not failed/subprojects/packagecache/zlib-1.2.8-8-wrap.zip
diff --git a/test cases/common/161 wrap file should not failed/subprojects/packagecache/zlib-1.2.8.tar.gz b/test cases/common/158 wrap file should not failed/subprojects/packagecache/zlib-1.2.8.tar.gz
index 421376db9..421376db9 100644
--- a/test cases/common/161 wrap file should not failed/subprojects/packagecache/zlib-1.2.8.tar.gz
+++ b/test cases/common/158 wrap file should not failed/subprojects/packagecache/zlib-1.2.8.tar.gz
diff --git a/test cases/common/161 wrap file should not failed/subprojects/zlib-1.2.8/foo.c b/test cases/common/158 wrap file should not failed/subprojects/zlib-1.2.8/foo.c
index 019f2bab1..019f2bab1 100644
--- a/test cases/common/161 wrap file should not failed/subprojects/zlib-1.2.8/foo.c
+++ b/test cases/common/158 wrap file should not failed/subprojects/zlib-1.2.8/foo.c
diff --git a/test cases/common/161 wrap file should not failed/subprojects/zlib-1.2.8/meson.build b/test cases/common/158 wrap file should not failed/subprojects/zlib-1.2.8/meson.build
index 8d8008e47..8d8008e47 100644
--- a/test cases/common/161 wrap file should not failed/subprojects/zlib-1.2.8/meson.build
+++ b/test cases/common/158 wrap file should not failed/subprojects/zlib-1.2.8/meson.build
diff --git a/test cases/common/161 wrap file should not failed/subprojects/zlib.wrap b/test cases/common/158 wrap file should not failed/subprojects/zlib.wrap
index 6d5896f79..6d5896f79 100644
--- a/test cases/common/161 wrap file should not failed/subprojects/zlib.wrap
+++ b/test cases/common/158 wrap file should not failed/subprojects/zlib.wrap
diff --git a/test cases/common/162 includedir subproj/meson.build b/test cases/common/159 includedir subproj/meson.build
index b3de5af6c..b3de5af6c 100644
--- a/test cases/common/162 includedir subproj/meson.build
+++ b/test cases/common/159 includedir subproj/meson.build
diff --git a/test cases/common/162 includedir subproj/prog.c b/test cases/common/159 includedir subproj/prog.c
index 772681ea8..772681ea8 100644
--- a/test cases/common/162 includedir subproj/prog.c
+++ b/test cases/common/159 includedir subproj/prog.c
diff --git a/test cases/common/162 includedir subproj/subprojects/inctest/include/incfile.h b/test cases/common/159 includedir subproj/subprojects/inctest/include/incfile.h
index ec740dab0..ec740dab0 100644
--- a/test cases/common/162 includedir subproj/subprojects/inctest/include/incfile.h
+++ b/test cases/common/159 includedir subproj/subprojects/inctest/include/incfile.h
diff --git a/test cases/common/162 includedir subproj/subprojects/inctest/meson.build b/test cases/common/159 includedir subproj/subprojects/inctest/meson.build
index 74aabcb6d..74aabcb6d 100644
--- a/test cases/common/162 includedir subproj/subprojects/inctest/meson.build
+++ b/test cases/common/159 includedir subproj/subprojects/inctest/meson.build
diff --git a/test cases/common/18 else/meson.build b/test cases/common/16 else/meson.build
index 99cb927ef..99cb927ef 100644
--- a/test cases/common/18 else/meson.build
+++ b/test cases/common/16 else/meson.build
diff --git a/test cases/common/18 else/prog.c b/test cases/common/16 else/prog.c
index 0314ff17b..0314ff17b 100644
--- a/test cases/common/18 else/prog.c
+++ b/test cases/common/16 else/prog.c
diff --git a/test cases/common/163 subproject dir name collision/a.c b/test cases/common/160 subproject dir name collision/a.c
index 6ed96fa05..6ed96fa05 100644
--- a/test cases/common/163 subproject dir name collision/a.c
+++ b/test cases/common/160 subproject dir name collision/a.c
diff --git a/test cases/common/163 subproject dir name collision/custom_subproject_dir/B/b.c b/test cases/common/160 subproject dir name collision/custom_subproject_dir/B/b.c
index 4c94ee95f..4c94ee95f 100644
--- a/test cases/common/163 subproject dir name collision/custom_subproject_dir/B/b.c
+++ b/test cases/common/160 subproject dir name collision/custom_subproject_dir/B/b.c
diff --git a/test cases/common/163 subproject dir name collision/custom_subproject_dir/B/meson.build b/test cases/common/160 subproject dir name collision/custom_subproject_dir/B/meson.build
index 280c60ce2..280c60ce2 100644
--- a/test cases/common/163 subproject dir name collision/custom_subproject_dir/B/meson.build
+++ b/test cases/common/160 subproject dir name collision/custom_subproject_dir/B/meson.build
diff --git a/test cases/common/163 subproject dir name collision/custom_subproject_dir/C/c.c b/test cases/common/160 subproject dir name collision/custom_subproject_dir/C/c.c
index eebfb9fba..eebfb9fba 100644
--- a/test cases/common/163 subproject dir name collision/custom_subproject_dir/C/c.c
+++ b/test cases/common/160 subproject dir name collision/custom_subproject_dir/C/c.c
diff --git a/test cases/common/163 subproject dir name collision/custom_subproject_dir/C/meson.build b/test cases/common/160 subproject dir name collision/custom_subproject_dir/C/meson.build
index abf0b1e26..abf0b1e26 100644
--- a/test cases/common/163 subproject dir name collision/custom_subproject_dir/C/meson.build
+++ b/test cases/common/160 subproject dir name collision/custom_subproject_dir/C/meson.build
diff --git a/test cases/common/163 subproject dir name collision/meson.build b/test cases/common/160 subproject dir name collision/meson.build
index 55312175e..55312175e 100644
--- a/test cases/common/163 subproject dir name collision/meson.build
+++ b/test cases/common/160 subproject dir name collision/meson.build
diff --git a/test cases/common/163 subproject dir name collision/other_subdir/custom_subproject_dir/other.c b/test cases/common/160 subproject dir name collision/other_subdir/custom_subproject_dir/other.c
index 0c27f8431..0c27f8431 100644
--- a/test cases/common/163 subproject dir name collision/other_subdir/custom_subproject_dir/other.c
+++ b/test cases/common/160 subproject dir name collision/other_subdir/custom_subproject_dir/other.c
diff --git a/test cases/common/163 subproject dir name collision/other_subdir/meson.build b/test cases/common/160 subproject dir name collision/other_subdir/meson.build
index 90cb67a63..90cb67a63 100644
--- a/test cases/common/163 subproject dir name collision/other_subdir/meson.build
+++ b/test cases/common/160 subproject dir name collision/other_subdir/meson.build
diff --git a/test cases/common/164 config tool variable/meson.build b/test cases/common/161 config tool variable/meson.build
index 0643042d8..0643042d8 100644
--- a/test cases/common/164 config tool variable/meson.build
+++ b/test cases/common/161 config tool variable/meson.build
diff --git a/test cases/common/165 custom target subdir depend files/copyfile.py b/test cases/common/162 custom target subdir depend files/copyfile.py
index ff42ac359..ff42ac359 100644
--- a/test cases/common/165 custom target subdir depend files/copyfile.py
+++ b/test cases/common/162 custom target subdir depend files/copyfile.py
diff --git a/test cases/common/165 custom target subdir depend files/meson.build b/test cases/common/162 custom target subdir depend files/meson.build
index 44f5c7157..44f5c7157 100644
--- a/test cases/common/165 custom target subdir depend files/meson.build
+++ b/test cases/common/162 custom target subdir depend files/meson.build
diff --git a/test cases/common/165 custom target subdir depend files/subdir/dep.dat b/test cases/common/162 custom target subdir depend files/subdir/dep.dat
index 5daee496d..5daee496d 100644
--- a/test cases/common/165 custom target subdir depend files/subdir/dep.dat
+++ b/test cases/common/162 custom target subdir depend files/subdir/dep.dat
diff --git a/test cases/common/165 custom target subdir depend files/subdir/foo.c.in b/test cases/common/162 custom target subdir depend files/subdir/foo.c.in
index d53846f52..d53846f52 100644
--- a/test cases/common/165 custom target subdir depend files/subdir/foo.c.in
+++ b/test cases/common/162 custom target subdir depend files/subdir/foo.c.in
diff --git a/test cases/common/165 custom target subdir depend files/subdir/meson.build b/test cases/common/162 custom target subdir depend files/subdir/meson.build
index f9d31c4c7..f9d31c4c7 100644
--- a/test cases/common/165 custom target subdir depend files/subdir/meson.build
+++ b/test cases/common/162 custom target subdir depend files/subdir/meson.build
diff --git a/test cases/common/166 external program shebang parsing/input.txt b/test cases/common/163 external program shebang parsing/input.txt
index 40e30d4b2..40e30d4b2 100644
--- a/test cases/common/166 external program shebang parsing/input.txt
+++ b/test cases/common/163 external program shebang parsing/input.txt
diff --git a/test cases/common/166 external program shebang parsing/main.c b/test cases/common/163 external program shebang parsing/main.c
index a90206bc7..a90206bc7 100644
--- a/test cases/common/166 external program shebang parsing/main.c
+++ b/test cases/common/163 external program shebang parsing/main.c
diff --git a/test cases/common/166 external program shebang parsing/meson.build b/test cases/common/163 external program shebang parsing/meson.build
index c1cc5af9d..c1cc5af9d 100644
--- a/test cases/common/166 external program shebang parsing/meson.build
+++ b/test cases/common/163 external program shebang parsing/meson.build
diff --git a/test cases/common/166 external program shebang parsing/script.int.in b/test cases/common/163 external program shebang parsing/script.int.in
index 77ff90907..77ff90907 100644
--- a/test cases/common/166 external program shebang parsing/script.int.in
+++ b/test cases/common/163 external program shebang parsing/script.int.in
diff --git a/test cases/common/167 disabler/meson.build b/test cases/common/164 disabler/meson.build
index 1956cd38a..1956cd38a 100644
--- a/test cases/common/167 disabler/meson.build
+++ b/test cases/common/164 disabler/meson.build
diff --git a/test cases/common/168 array option/meson.build b/test cases/common/165 array option/meson.build
index 034b9a545..034b9a545 100644
--- a/test cases/common/168 array option/meson.build
+++ b/test cases/common/165 array option/meson.build
diff --git a/test cases/common/168 array option/meson_options.txt b/test cases/common/165 array option/meson_options.txt
index 7ed0ac14d..7ed0ac14d 100644
--- a/test cases/common/168 array option/meson_options.txt
+++ b/test cases/common/165 array option/meson_options.txt
diff --git a/test cases/common/169 custom target template substitution/checkcopy.py b/test cases/common/166 custom target template substitution/checkcopy.py
index ab9f436ce..ab9f436ce 100644
--- a/test cases/common/169 custom target template substitution/checkcopy.py
+++ b/test cases/common/166 custom target template substitution/checkcopy.py
diff --git a/test cases/common/169 custom target template substitution/foo.c.in b/test cases/common/166 custom target template substitution/foo.c.in
index d53846f52..d53846f52 100644
--- a/test cases/common/169 custom target template substitution/foo.c.in
+++ b/test cases/common/166 custom target template substitution/foo.c.in
diff --git a/test cases/common/169 custom target template substitution/meson.build b/test cases/common/166 custom target template substitution/meson.build
index 737408ebf..737408ebf 100644
--- a/test cases/common/169 custom target template substitution/meson.build
+++ b/test cases/common/166 custom target template substitution/meson.build
diff --git a/test cases/common/170 not-found dependency/meson.build b/test cases/common/167 not-found dependency/meson.build
index 02072b6a0..02072b6a0 100644
--- a/test cases/common/170 not-found dependency/meson.build
+++ b/test cases/common/167 not-found dependency/meson.build
diff --git a/test cases/common/170 not-found dependency/sub/meson.build b/test cases/common/167 not-found dependency/sub/meson.build
index 2a33cae06..2a33cae06 100644
--- a/test cases/common/170 not-found dependency/sub/meson.build
+++ b/test cases/common/167 not-found dependency/sub/meson.build
diff --git a/test cases/common/170 not-found dependency/subprojects/trivial/meson.build b/test cases/common/167 not-found dependency/subprojects/trivial/meson.build
index 8769c7008..8769c7008 100644
--- a/test cases/common/170 not-found dependency/subprojects/trivial/meson.build
+++ b/test cases/common/167 not-found dependency/subprojects/trivial/meson.build
diff --git a/test cases/common/170 not-found dependency/subprojects/trivial/trivial.c b/test cases/common/167 not-found dependency/subprojects/trivial/trivial.c
index 35b21e0ce..35b21e0ce 100644
--- a/test cases/common/170 not-found dependency/subprojects/trivial/trivial.c
+++ b/test cases/common/167 not-found dependency/subprojects/trivial/trivial.c
diff --git a/test cases/common/170 not-found dependency/testlib.c b/test cases/common/167 not-found dependency/testlib.c
index e69de29bb..e69de29bb 100644
--- a/test cases/common/170 not-found dependency/testlib.c
+++ b/test cases/common/167 not-found dependency/testlib.c
diff --git a/test cases/common/171 subdir if_found/meson.build b/test cases/common/168 subdir if_found/meson.build
index 2c640cfad..2c640cfad 100644
--- a/test cases/common/171 subdir if_found/meson.build
+++ b/test cases/common/168 subdir if_found/meson.build
diff --git a/test cases/common/171 subdir if_found/subdir/meson.build b/test cases/common/168 subdir if_found/subdir/meson.build
index 1030e2551..1030e2551 100644
--- a/test cases/common/171 subdir if_found/subdir/meson.build
+++ b/test cases/common/168 subdir if_found/subdir/meson.build
diff --git a/test cases/common/172 default options prefix dependent defaults/meson.build b/test cases/common/169 default options prefix dependent defaults/meson.build
index 9ca4ec552..9ca4ec552 100644
--- a/test cases/common/172 default options prefix dependent defaults/meson.build
+++ b/test cases/common/169 default options prefix dependent defaults/meson.build
diff --git a/test cases/common/19 comparison/meson.build b/test cases/common/17 comparison/meson.build
index fb641edb9..fb641edb9 100644
--- a/test cases/common/19 comparison/meson.build
+++ b/test cases/common/17 comparison/meson.build
diff --git a/test cases/common/19 comparison/prog.c b/test cases/common/17 comparison/prog.c
index 0314ff17b..0314ff17b 100644
--- a/test cases/common/19 comparison/prog.c
+++ b/test cases/common/17 comparison/prog.c
diff --git a/test cases/common/173 dependency factory/meson.build b/test cases/common/170 dependency factory/meson.build
index 1b8ed176b..1b8ed176b 100644
--- a/test cases/common/173 dependency factory/meson.build
+++ b/test cases/common/170 dependency factory/meson.build
diff --git a/test cases/common/174 get project license/bar.c b/test cases/common/171 get project license/bar.c
index 864869b4f..864869b4f 100644
--- a/test cases/common/174 get project license/bar.c
+++ b/test cases/common/171 get project license/bar.c
diff --git a/test cases/common/174 get project license/meson.build b/test cases/common/171 get project license/meson.build
index 37303e372..37303e372 100644
--- a/test cases/common/174 get project license/meson.build
+++ b/test cases/common/171 get project license/meson.build
diff --git a/test cases/common/175 yield/meson.build b/test cases/common/172 yield/meson.build
index 9b115696f..9b115696f 100644
--- a/test cases/common/175 yield/meson.build
+++ b/test cases/common/172 yield/meson.build
diff --git a/test cases/common/175 yield/meson_options.txt b/test cases/common/172 yield/meson_options.txt
index 9f58fbbc8..9f58fbbc8 100644
--- a/test cases/common/175 yield/meson_options.txt
+++ b/test cases/common/172 yield/meson_options.txt
diff --git a/test cases/common/175 yield/subprojects/sub/meson.build b/test cases/common/172 yield/subprojects/sub/meson.build
index 832c13cc2..832c13cc2 100644
--- a/test cases/common/175 yield/subprojects/sub/meson.build
+++ b/test cases/common/172 yield/subprojects/sub/meson.build
diff --git a/test cases/common/175 yield/subprojects/sub/meson_options.txt b/test cases/common/172 yield/subprojects/sub/meson_options.txt
index 101122eeb..101122eeb 100644
--- a/test cases/common/175 yield/subprojects/sub/meson_options.txt
+++ b/test cases/common/172 yield/subprojects/sub/meson_options.txt
diff --git a/test cases/common/176 subproject nested subproject dirs/contrib/subprojects/alpha/a.c b/test cases/common/173 subproject nested subproject dirs/contrib/subprojects/alpha/a.c
index 7ac3e5e57..7ac3e5e57 100644
--- a/test cases/common/176 subproject nested subproject dirs/contrib/subprojects/alpha/a.c
+++ b/test cases/common/173 subproject nested subproject dirs/contrib/subprojects/alpha/a.c
diff --git a/test cases/common/176 subproject nested subproject dirs/contrib/subprojects/alpha/meson.build b/test cases/common/173 subproject nested subproject dirs/contrib/subprojects/alpha/meson.build
index 12f656427..12f656427 100644
--- a/test cases/common/176 subproject nested subproject dirs/contrib/subprojects/alpha/meson.build
+++ b/test cases/common/173 subproject nested subproject dirs/contrib/subprojects/alpha/meson.build
diff --git a/test cases/common/176 subproject nested subproject dirs/contrib/subprojects/alpha/var/subprojects/wrap_files_might_be_here b/test cases/common/173 subproject nested subproject dirs/contrib/subprojects/alpha/var/subprojects/wrap_files_might_be_here
index 8d1c8b69c..8d1c8b69c 100644
--- a/test cases/common/176 subproject nested subproject dirs/contrib/subprojects/alpha/var/subprojects/wrap_files_might_be_here
+++ b/test cases/common/173 subproject nested subproject dirs/contrib/subprojects/alpha/var/subprojects/wrap_files_might_be_here
diff --git a/test cases/common/176 subproject nested subproject dirs/contrib/subprojects/beta/b.c b/test cases/common/173 subproject nested subproject dirs/contrib/subprojects/beta/b.c
index a95651bc0..a95651bc0 100644
--- a/test cases/common/176 subproject nested subproject dirs/contrib/subprojects/beta/b.c
+++ b/test cases/common/173 subproject nested subproject dirs/contrib/subprojects/beta/b.c
diff --git a/test cases/common/176 subproject nested subproject dirs/contrib/subprojects/beta/meson.build b/test cases/common/173 subproject nested subproject dirs/contrib/subprojects/beta/meson.build
index 1720d3e7c..1720d3e7c 100644
--- a/test cases/common/176 subproject nested subproject dirs/contrib/subprojects/beta/meson.build
+++ b/test cases/common/173 subproject nested subproject dirs/contrib/subprojects/beta/meson.build
diff --git a/test cases/common/176 subproject nested subproject dirs/meson.build b/test cases/common/173 subproject nested subproject dirs/meson.build
index 875eed350..875eed350 100644
--- a/test cases/common/176 subproject nested subproject dirs/meson.build
+++ b/test cases/common/173 subproject nested subproject dirs/meson.build
diff --git a/test cases/common/176 subproject nested subproject dirs/prog.c b/test cases/common/173 subproject nested subproject dirs/prog.c
index 394f139eb..394f139eb 100644
--- a/test cases/common/176 subproject nested subproject dirs/prog.c
+++ b/test cases/common/173 subproject nested subproject dirs/prog.c
diff --git a/test cases/common/177 preserve gendir/base.inp b/test cases/common/174 preserve gendir/base.inp
index df967b96a..df967b96a 100644
--- a/test cases/common/177 preserve gendir/base.inp
+++ b/test cases/common/174 preserve gendir/base.inp
diff --git a/test cases/common/177 preserve gendir/com/mesonbuild/subbie.inp b/test cases/common/174 preserve gendir/com/mesonbuild/subbie.inp
index df0f4e9ae..df0f4e9ae 100644
--- a/test cases/common/177 preserve gendir/com/mesonbuild/subbie.inp
+++ b/test cases/common/174 preserve gendir/com/mesonbuild/subbie.inp
diff --git a/test cases/common/177 preserve gendir/genprog.py b/test cases/common/174 preserve gendir/genprog.py
index 1e10998ee..1e10998ee 100755
--- a/test cases/common/177 preserve gendir/genprog.py
+++ b/test cases/common/174 preserve gendir/genprog.py
diff --git a/test cases/common/177 preserve gendir/meson.build b/test cases/common/174 preserve gendir/meson.build
index ce219f0d8..ce219f0d8 100644
--- a/test cases/common/177 preserve gendir/meson.build
+++ b/test cases/common/174 preserve gendir/meson.build
diff --git a/test cases/common/177 preserve gendir/testprog.c b/test cases/common/174 preserve gendir/testprog.c
index 46b460257..46b460257 100644
--- a/test cases/common/177 preserve gendir/testprog.c
+++ b/test cases/common/174 preserve gendir/testprog.c
diff --git a/test cases/common/178 source in dep/bar.cpp b/test cases/common/175 source in dep/bar.cpp
index bda8cb6ec..bda8cb6ec 100644
--- a/test cases/common/178 source in dep/bar.cpp
+++ b/test cases/common/175 source in dep/bar.cpp
diff --git a/test cases/common/178 source in dep/foo.c b/test cases/common/175 source in dep/foo.c
index 1ecfa8c79..1ecfa8c79 100644
--- a/test cases/common/178 source in dep/foo.c
+++ b/test cases/common/175 source in dep/foo.c
diff --git a/test cases/common/178 source in dep/generated/funname b/test cases/common/175 source in dep/generated/funname
index 79f3c867f..79f3c867f 100644
--- a/test cases/common/178 source in dep/generated/funname
+++ b/test cases/common/175 source in dep/generated/funname
diff --git a/test cases/common/178 source in dep/generated/genheader.py b/test cases/common/175 source in dep/generated/genheader.py
index eafc07545..eafc07545 100755
--- a/test cases/common/178 source in dep/generated/genheader.py
+++ b/test cases/common/175 source in dep/generated/genheader.py
diff --git a/test cases/common/178 source in dep/generated/main.c b/test cases/common/175 source in dep/generated/main.c
index 07e7c932e..07e7c932e 100644
--- a/test cases/common/178 source in dep/generated/main.c
+++ b/test cases/common/175 source in dep/generated/main.c
diff --git a/test cases/common/178 source in dep/generated/meson.build b/test cases/common/175 source in dep/generated/meson.build
index 286270901..286270901 100644
--- a/test cases/common/178 source in dep/generated/meson.build
+++ b/test cases/common/175 source in dep/generated/meson.build
diff --git a/test cases/common/178 source in dep/meson.build b/test cases/common/175 source in dep/meson.build
index 7111ba11f..7111ba11f 100644
--- a/test cases/common/178 source in dep/meson.build
+++ b/test cases/common/175 source in dep/meson.build
diff --git a/test cases/common/179 generator link whole/export.h b/test cases/common/176 generator link whole/export.h
index f4f6f451b..f4f6f451b 100644
--- a/test cases/common/179 generator link whole/export.h
+++ b/test cases/common/176 generator link whole/export.h
diff --git a/test cases/common/179 generator link whole/generator.py b/test cases/common/176 generator link whole/generator.py
index 0076b7499..0076b7499 100755
--- a/test cases/common/179 generator link whole/generator.py
+++ b/test cases/common/176 generator link whole/generator.py
diff --git a/test cases/common/179 generator link whole/main.c b/test cases/common/176 generator link whole/main.c
index acf871782..acf871782 100644
--- a/test cases/common/179 generator link whole/main.c
+++ b/test cases/common/176 generator link whole/main.c
diff --git a/test cases/common/179 generator link whole/meson.build b/test cases/common/176 generator link whole/meson.build
index 30ae9c62c..30ae9c62c 100644
--- a/test cases/common/179 generator link whole/meson.build
+++ b/test cases/common/176 generator link whole/meson.build
diff --git a/test cases/common/179 generator link whole/meson_test_function.tmpl b/test cases/common/176 generator link whole/meson_test_function.tmpl
index e69de29bb..e69de29bb 100644
--- a/test cases/common/179 generator link whole/meson_test_function.tmpl
+++ b/test cases/common/176 generator link whole/meson_test_function.tmpl
diff --git a/test cases/common/179 generator link whole/pull_meson_test_function.c b/test cases/common/176 generator link whole/pull_meson_test_function.c
index c54dda6d7..c54dda6d7 100644
--- a/test cases/common/179 generator link whole/pull_meson_test_function.c
+++ b/test cases/common/176 generator link whole/pull_meson_test_function.c
diff --git a/test cases/common/180 initial c_args/meson.build b/test cases/common/177 initial c_args/meson.build
index 169d2bd51..169d2bd51 100644
--- a/test cases/common/180 initial c_args/meson.build
+++ b/test cases/common/177 initial c_args/meson.build
diff --git a/test cases/common/180 initial c_args/test_args.txt b/test cases/common/177 initial c_args/test_args.txt
index 9a6da068a..9a6da068a 100644
--- a/test cases/common/180 initial c_args/test_args.txt
+++ b/test cases/common/177 initial c_args/test_args.txt
diff --git a/test cases/common/181 identical target name in subproject flat layout/foo.c b/test cases/common/178 identical target name in subproject flat layout/foo.c
index ed427899a..ed427899a 100644
--- a/test cases/common/181 identical target name in subproject flat layout/foo.c
+++ b/test cases/common/178 identical target name in subproject flat layout/foo.c
diff --git a/test cases/common/181 identical target name in subproject flat layout/main.c b/test cases/common/178 identical target name in subproject flat layout/main.c
index 6f02aeb82..6f02aeb82 100644
--- a/test cases/common/181 identical target name in subproject flat layout/main.c
+++ b/test cases/common/178 identical target name in subproject flat layout/main.c
diff --git a/test cases/common/181 identical target name in subproject flat layout/meson.build b/test cases/common/178 identical target name in subproject flat layout/meson.build
index d859fda3e..d859fda3e 100644
--- a/test cases/common/181 identical target name in subproject flat layout/meson.build
+++ b/test cases/common/178 identical target name in subproject flat layout/meson.build
diff --git a/test cases/common/181 identical target name in subproject flat layout/subprojects/subproj/foo.c b/test cases/common/178 identical target name in subproject flat layout/subprojects/subproj/foo.c
index f33429229..f33429229 100644
--- a/test cases/common/181 identical target name in subproject flat layout/subprojects/subproj/foo.c
+++ b/test cases/common/178 identical target name in subproject flat layout/subprojects/subproj/foo.c
diff --git a/test cases/common/181 identical target name in subproject flat layout/subprojects/subproj/meson.build b/test cases/common/178 identical target name in subproject flat layout/subprojects/subproj/meson.build
index c92719469..c92719469 100644
--- a/test cases/common/181 identical target name in subproject flat layout/subprojects/subproj/meson.build
+++ b/test cases/common/178 identical target name in subproject flat layout/subprojects/subproj/meson.build
diff --git a/test cases/common/182 as-needed/config.h b/test cases/common/179 as-needed/config.h
index b8fb60fe4..b8fb60fe4 100644
--- a/test cases/common/182 as-needed/config.h
+++ b/test cases/common/179 as-needed/config.h
diff --git a/test cases/common/182 as-needed/libA.cpp b/test cases/common/179 as-needed/libA.cpp
index 5f45bc077..5f45bc077 100644
--- a/test cases/common/182 as-needed/libA.cpp
+++ b/test cases/common/179 as-needed/libA.cpp
diff --git a/test cases/common/182 as-needed/libA.h b/test cases/common/179 as-needed/libA.h
index 8e76d22fa..8e76d22fa 100644
--- a/test cases/common/182 as-needed/libA.h
+++ b/test cases/common/179 as-needed/libA.h
diff --git a/test cases/common/182 as-needed/libB.cpp b/test cases/common/179 as-needed/libB.cpp
index a8723941b..a8723941b 100644
--- a/test cases/common/182 as-needed/libB.cpp
+++ b/test cases/common/179 as-needed/libB.cpp
diff --git a/test cases/common/182 as-needed/main.cpp b/test cases/common/179 as-needed/main.cpp
index 191d15c4d..191d15c4d 100644
--- a/test cases/common/182 as-needed/main.cpp
+++ b/test cases/common/179 as-needed/main.cpp
diff --git a/test cases/common/182 as-needed/meson.build b/test cases/common/179 as-needed/meson.build
index 3b54aaa02..3b54aaa02 100644
--- a/test cases/common/182 as-needed/meson.build
+++ b/test cases/common/179 as-needed/meson.build
diff --git a/test cases/common/20 array/func.c b/test cases/common/18 array/func.c
index 741237235..741237235 100644
--- a/test cases/common/20 array/func.c
+++ b/test cases/common/18 array/func.c
diff --git a/test cases/common/20 array/meson.build b/test cases/common/18 array/meson.build
index 0d1737488..0d1737488 100644
--- a/test cases/common/20 array/meson.build
+++ b/test cases/common/18 array/meson.build
diff --git a/test cases/common/20 array/prog.c b/test cases/common/18 array/prog.c
index ad58a0b3a..ad58a0b3a 100644
--- a/test cases/common/20 array/prog.c
+++ b/test cases/common/18 array/prog.c
diff --git a/test cases/common/183 ndebug if-release enabled/main.c b/test cases/common/180 ndebug if-release enabled/main.c
index 984ebcabe..984ebcabe 100644
--- a/test cases/common/183 ndebug if-release enabled/main.c
+++ b/test cases/common/180 ndebug if-release enabled/main.c
diff --git a/test cases/common/183 ndebug if-release enabled/meson.build b/test cases/common/180 ndebug if-release enabled/meson.build
index be263752a..be263752a 100644
--- a/test cases/common/183 ndebug if-release enabled/meson.build
+++ b/test cases/common/180 ndebug if-release enabled/meson.build
diff --git a/test cases/common/184 ndebug if-release disabled/main.c b/test cases/common/181 ndebug if-release disabled/main.c
index cb3ec3f65..cb3ec3f65 100644
--- a/test cases/common/184 ndebug if-release disabled/main.c
+++ b/test cases/common/181 ndebug if-release disabled/main.c
diff --git a/test cases/common/184 ndebug if-release disabled/meson.build b/test cases/common/181 ndebug if-release disabled/meson.build
index a9a79ea9b..a9a79ea9b 100644
--- a/test cases/common/184 ndebug if-release disabled/meson.build
+++ b/test cases/common/181 ndebug if-release disabled/meson.build
diff --git a/test cases/common/185 subproject version/meson.build b/test cases/common/182 subproject version/meson.build
index bd8fc0392..bd8fc0392 100644
--- a/test cases/common/185 subproject version/meson.build
+++ b/test cases/common/182 subproject version/meson.build
diff --git a/test cases/common/185 subproject version/subprojects/a/meson.build b/test cases/common/182 subproject version/subprojects/a/meson.build
index dae31300f..dae31300f 100644
--- a/test cases/common/185 subproject version/subprojects/a/meson.build
+++ b/test cases/common/182 subproject version/subprojects/a/meson.build
diff --git a/test cases/common/186 subdir_done/meson.build b/test cases/common/183 subdir_done/meson.build
index 457e613b1..457e613b1 100644
--- a/test cases/common/186 subdir_done/meson.build
+++ b/test cases/common/183 subdir_done/meson.build
diff --git a/test cases/common/187 bothlibraries/libfile.c b/test cases/common/184 bothlibraries/libfile.c
index 085ef3b87..085ef3b87 100644
--- a/test cases/common/187 bothlibraries/libfile.c
+++ b/test cases/common/184 bothlibraries/libfile.c
diff --git a/test cases/common/187 bothlibraries/main.c b/test cases/common/184 bothlibraries/main.c
index 03a8e02b8..03a8e02b8 100644
--- a/test cases/common/187 bothlibraries/main.c
+++ b/test cases/common/184 bothlibraries/main.c
diff --git a/test cases/common/187 bothlibraries/meson.build b/test cases/common/184 bothlibraries/meson.build
index 3a13d6259..3a13d6259 100644
--- a/test cases/common/187 bothlibraries/meson.build
+++ b/test cases/common/184 bothlibraries/meson.build
diff --git a/test cases/common/187 bothlibraries/mylib.h b/test cases/common/184 bothlibraries/mylib.h
index 1038a0142..1038a0142 100644
--- a/test cases/common/187 bothlibraries/mylib.h
+++ b/test cases/common/184 bothlibraries/mylib.h
diff --git a/test cases/common/188 escape and unicode/file.c.in b/test cases/common/185 escape and unicode/file.c.in
index 413ed4297..413ed4297 100644
--- a/test cases/common/188 escape and unicode/file.c.in
+++ b/test cases/common/185 escape and unicode/file.c.in
diff --git a/test cases/common/188 escape and unicode/file.py b/test cases/common/185 escape and unicode/file.py
index af67a0950..af67a0950 100644
--- a/test cases/common/188 escape and unicode/file.py
+++ b/test cases/common/185 escape and unicode/file.py
diff --git a/test cases/common/188 escape and unicode/find.py b/test cases/common/185 escape and unicode/find.py
index 34a3eb835..34a3eb835 100644
--- a/test cases/common/188 escape and unicode/find.py
+++ b/test cases/common/185 escape and unicode/find.py
diff --git a/test cases/common/188 escape and unicode/fun.c b/test cases/common/185 escape and unicode/fun.c
index 8eeb8ea00..8eeb8ea00 100644
--- a/test cases/common/188 escape and unicode/fun.c
+++ b/test cases/common/185 escape and unicode/fun.c
diff --git a/test cases/common/188 escape and unicode/main.c b/test cases/common/185 escape and unicode/main.c
index 0bcde169c..0bcde169c 100644
--- a/test cases/common/188 escape and unicode/main.c
+++ b/test cases/common/185 escape and unicode/main.c
diff --git a/test cases/common/188 escape and unicode/meson.build b/test cases/common/185 escape and unicode/meson.build
index 65377b6a3..65377b6a3 100644
--- a/test cases/common/188 escape and unicode/meson.build
+++ b/test cases/common/185 escape and unicode/meson.build
diff --git a/test cases/common/189 has link arg/meson.build b/test cases/common/186 has link arg/meson.build
index e166101ab..e166101ab 100644
--- a/test cases/common/189 has link arg/meson.build
+++ b/test cases/common/186 has link arg/meson.build
diff --git a/test cases/common/190 same target name flat layout/foo.c b/test cases/common/187 same target name flat layout/foo.c
index ed427899a..ed427899a 100644
--- a/test cases/common/190 same target name flat layout/foo.c
+++ b/test cases/common/187 same target name flat layout/foo.c
diff --git a/test cases/common/190 same target name flat layout/main.c b/test cases/common/187 same target name flat layout/main.c
index 6f02aeb82..6f02aeb82 100644
--- a/test cases/common/190 same target name flat layout/main.c
+++ b/test cases/common/187 same target name flat layout/main.c
diff --git a/test cases/common/190 same target name flat layout/meson.build b/test cases/common/187 same target name flat layout/meson.build
index a3c95fa25..a3c95fa25 100644
--- a/test cases/common/190 same target name flat layout/meson.build
+++ b/test cases/common/187 same target name flat layout/meson.build
diff --git a/test cases/common/190 same target name flat layout/subdir/foo.c b/test cases/common/187 same target name flat layout/subdir/foo.c
index f33429229..f33429229 100644
--- a/test cases/common/190 same target name flat layout/subdir/foo.c
+++ b/test cases/common/187 same target name flat layout/subdir/foo.c
diff --git a/test cases/common/190 same target name flat layout/subdir/meson.build b/test cases/common/187 same target name flat layout/subdir/meson.build
index 223a5ef90..223a5ef90 100644
--- a/test cases/common/190 same target name flat layout/subdir/meson.build
+++ b/test cases/common/187 same target name flat layout/subdir/meson.build
diff --git a/test cases/common/191 find override/meson.build b/test cases/common/188 find override/meson.build
index 3b8af8091..3b8af8091 100644
--- a/test cases/common/191 find override/meson.build
+++ b/test cases/common/188 find override/meson.build
diff --git a/test cases/common/191 find override/otherdir/main.c b/test cases/common/188 find override/otherdir/main.c
index 2cef67c8d..2cef67c8d 100644
--- a/test cases/common/191 find override/otherdir/main.c
+++ b/test cases/common/188 find override/otherdir/main.c
diff --git a/test cases/common/191 find override/otherdir/main2.c b/test cases/common/188 find override/otherdir/main2.c
index 6d716882c..6d716882c 100644
--- a/test cases/common/191 find override/otherdir/main2.c
+++ b/test cases/common/188 find override/otherdir/main2.c
diff --git a/test cases/common/191 find override/otherdir/meson.build b/test cases/common/188 find override/otherdir/meson.build
index dc41f5bf7..dc41f5bf7 100644
--- a/test cases/common/191 find override/otherdir/meson.build
+++ b/test cases/common/188 find override/otherdir/meson.build
diff --git a/test cases/common/191 find override/otherdir/source.desc b/test cases/common/188 find override/otherdir/source.desc
index 8b19c9c2f..8b19c9c2f 100644
--- a/test cases/common/191 find override/otherdir/source.desc
+++ b/test cases/common/188 find override/otherdir/source.desc
diff --git a/test cases/common/191 find override/otherdir/source2.desc b/test cases/common/188 find override/otherdir/source2.desc
index 965f868df..965f868df 100644
--- a/test cases/common/191 find override/otherdir/source2.desc
+++ b/test cases/common/188 find override/otherdir/source2.desc
diff --git a/test cases/common/191 find override/subdir/converter.py b/test cases/common/188 find override/subdir/converter.py
index ee2ff85a3..ee2ff85a3 100755
--- a/test cases/common/191 find override/subdir/converter.py
+++ b/test cases/common/188 find override/subdir/converter.py
diff --git a/test cases/common/191 find override/subdir/gencodegen.py.in b/test cases/common/188 find override/subdir/gencodegen.py.in
index 57d9c40b4..57d9c40b4 100755
--- a/test cases/common/191 find override/subdir/gencodegen.py.in
+++ b/test cases/common/188 find override/subdir/gencodegen.py.in
diff --git a/test cases/common/191 find override/subdir/meson.build b/test cases/common/188 find override/subdir/meson.build
index e5de34dde..e5de34dde 100644
--- a/test cases/common/191 find override/subdir/meson.build
+++ b/test cases/common/188 find override/subdir/meson.build
diff --git a/test cases/common/192 partial dependency/declare_dependency/headers/foo.c b/test cases/common/189 partial dependency/declare_dependency/headers/foo.c
index 215112ca5..215112ca5 100644
--- a/test cases/common/192 partial dependency/declare_dependency/headers/foo.c
+++ b/test cases/common/189 partial dependency/declare_dependency/headers/foo.c
diff --git a/test cases/common/192 partial dependency/declare_dependency/headers/foo.h b/test cases/common/189 partial dependency/declare_dependency/headers/foo.h
index 28c81c9d3..28c81c9d3 100644
--- a/test cases/common/192 partial dependency/declare_dependency/headers/foo.h
+++ b/test cases/common/189 partial dependency/declare_dependency/headers/foo.h
diff --git a/test cases/common/192 partial dependency/declare_dependency/main.c b/test cases/common/189 partial dependency/declare_dependency/main.c
index e9ed0329a..e9ed0329a 100644
--- a/test cases/common/192 partial dependency/declare_dependency/main.c
+++ b/test cases/common/189 partial dependency/declare_dependency/main.c
diff --git a/test cases/common/192 partial dependency/declare_dependency/meson.build b/test cases/common/189 partial dependency/declare_dependency/meson.build
index 86e26089d..86e26089d 100644
--- a/test cases/common/192 partial dependency/declare_dependency/meson.build
+++ b/test cases/common/189 partial dependency/declare_dependency/meson.build
diff --git a/test cases/common/192 partial dependency/declare_dependency/other.c b/test cases/common/189 partial dependency/declare_dependency/other.c
index b1e199e44..b1e199e44 100644
--- a/test cases/common/192 partial dependency/declare_dependency/other.c
+++ b/test cases/common/189 partial dependency/declare_dependency/other.c
diff --git a/test cases/common/192 partial dependency/meson.build b/test cases/common/189 partial dependency/meson.build
index e908487f1..e908487f1 100644
--- a/test cases/common/192 partial dependency/meson.build
+++ b/test cases/common/189 partial dependency/meson.build
diff --git a/test cases/common/21 includedir/include/func.h b/test cases/common/19 includedir/include/func.h
index 29ebd0bb6..29ebd0bb6 100644
--- a/test cases/common/21 includedir/include/func.h
+++ b/test cases/common/19 includedir/include/func.h
diff --git a/test cases/common/21 includedir/meson.build b/test cases/common/19 includedir/meson.build
index 17eec0e57..17eec0e57 100644
--- a/test cases/common/21 includedir/meson.build
+++ b/test cases/common/19 includedir/meson.build
diff --git a/test cases/common/21 includedir/src/func.c b/test cases/common/19 includedir/src/func.c
index 193edbbc9..193edbbc9 100644
--- a/test cases/common/21 includedir/src/func.c
+++ b/test cases/common/19 includedir/src/func.c
diff --git a/test cases/common/21 includedir/src/meson.build b/test cases/common/19 includedir/src/meson.build
index 87bd22489..87bd22489 100644
--- a/test cases/common/21 includedir/src/meson.build
+++ b/test cases/common/19 includedir/src/meson.build
diff --git a/test cases/common/21 includedir/src/prog.c b/test cases/common/19 includedir/src/prog.c
index c26b9b3c3..c26b9b3c3 100644
--- a/test cases/common/21 includedir/src/prog.c
+++ b/test cases/common/19 includedir/src/prog.c
diff --git a/test cases/common/193 openmp/main.c b/test cases/common/190 openmp/main.c
index cc81f4897..cc81f4897 100644
--- a/test cases/common/193 openmp/main.c
+++ b/test cases/common/190 openmp/main.c
diff --git a/test cases/common/193 openmp/main.cpp b/test cases/common/190 openmp/main.cpp
index b12be3fd8..b12be3fd8 100644
--- a/test cases/common/193 openmp/main.cpp
+++ b/test cases/common/190 openmp/main.cpp
diff --git a/test cases/common/193 openmp/main.f90 b/test cases/common/190 openmp/main.f90
index c062d8691..c062d8691 100644
--- a/test cases/common/193 openmp/main.f90
+++ b/test cases/common/190 openmp/main.f90
diff --git a/test cases/common/193 openmp/meson.build b/test cases/common/190 openmp/meson.build
index a05ca59d9..a05ca59d9 100644
--- a/test cases/common/193 openmp/meson.build
+++ b/test cases/common/190 openmp/meson.build
diff --git a/test cases/common/194 same target name/file.c b/test cases/common/191 same target name/file.c
index 6f1c172d6..6f1c172d6 100644
--- a/test cases/common/194 same target name/file.c
+++ b/test cases/common/191 same target name/file.c
diff --git a/test cases/common/194 same target name/meson.build b/test cases/common/191 same target name/meson.build
index 4e585d56e..4e585d56e 100644
--- a/test cases/common/194 same target name/meson.build
+++ b/test cases/common/191 same target name/meson.build
diff --git a/test cases/common/194 same target name/sub/file2.c b/test cases/common/191 same target name/sub/file2.c
index a5e453d2f..a5e453d2f 100644
--- a/test cases/common/194 same target name/sub/file2.c
+++ b/test cases/common/191 same target name/sub/file2.c
diff --git a/test cases/common/194 same target name/sub/meson.build b/test cases/common/191 same target name/sub/meson.build
index 610a4a3c7..610a4a3c7 100644
--- a/test cases/common/194 same target name/sub/meson.build
+++ b/test cases/common/191 same target name/sub/meson.build
diff --git a/test cases/common/195 test depends/gen.py b/test cases/common/192 test depends/gen.py
index ee4ed9818..ee4ed9818 100755
--- a/test cases/common/195 test depends/gen.py
+++ b/test cases/common/192 test depends/gen.py
diff --git a/test cases/common/195 test depends/main.c b/test cases/common/192 test depends/main.c
index 78f2de106..78f2de106 100644
--- a/test cases/common/195 test depends/main.c
+++ b/test cases/common/192 test depends/main.c
diff --git a/test cases/common/195 test depends/meson.build b/test cases/common/192 test depends/meson.build
index 888c45118..888c45118 100644
--- a/test cases/common/195 test depends/meson.build
+++ b/test cases/common/192 test depends/meson.build
diff --git a/test cases/common/195 test depends/test.py b/test cases/common/192 test depends/test.py
index 5b9f65c86..5b9f65c86 100755
--- a/test cases/common/195 test depends/test.py
+++ b/test cases/common/192 test depends/test.py
diff --git a/test cases/common/196 args flattening/meson.build b/test cases/common/193 args flattening/meson.build
index 6da2e8f25..6da2e8f25 100644
--- a/test cases/common/196 args flattening/meson.build
+++ b/test cases/common/193 args flattening/meson.build
diff --git a/test cases/common/197 dict/meson.build b/test cases/common/194 dict/meson.build
index 41eea3193..41eea3193 100644
--- a/test cases/common/197 dict/meson.build
+++ b/test cases/common/194 dict/meson.build
diff --git a/test cases/common/197 dict/prog.c b/test cases/common/194 dict/prog.c
index bf0999d4a..bf0999d4a 100644
--- a/test cases/common/197 dict/prog.c
+++ b/test cases/common/194 dict/prog.c
diff --git a/test cases/common/198 check header/meson.build b/test cases/common/195 check header/meson.build
index 7b343d7e3..7b343d7e3 100644
--- a/test cases/common/198 check header/meson.build
+++ b/test cases/common/195 check header/meson.build
diff --git a/test cases/common/198 check header/ouagadougou.h b/test cases/common/195 check header/ouagadougou.h
index 2f76c49cc..2f76c49cc 100644
--- a/test cases/common/198 check header/ouagadougou.h
+++ b/test cases/common/195 check header/ouagadougou.h
diff --git a/test cases/common/199 install_mode/config.h.in b/test cases/common/196 install_mode/config.h.in
index 14a155874..14a155874 100644
--- a/test cases/common/199 install_mode/config.h.in
+++ b/test cases/common/196 install_mode/config.h.in
diff --git a/test cases/common/199 install_mode/data_source.txt b/test cases/common/196 install_mode/data_source.txt
index 0c23cc0c3..0c23cc0c3 100644
--- a/test cases/common/199 install_mode/data_source.txt
+++ b/test cases/common/196 install_mode/data_source.txt
diff --git a/test cases/common/199 install_mode/foo.1 b/test cases/common/196 install_mode/foo.1
index 647c0970c..647c0970c 100644
--- a/test cases/common/199 install_mode/foo.1
+++ b/test cases/common/196 install_mode/foo.1
diff --git a/test cases/common/199 install_mode/installed_files.txt b/test cases/common/196 install_mode/installed_files.txt
index 724d9546e..724d9546e 100644
--- a/test cases/common/199 install_mode/installed_files.txt
+++ b/test cases/common/196 install_mode/installed_files.txt
diff --git a/test cases/common/199 install_mode/meson.build b/test cases/common/196 install_mode/meson.build
index 18a29483f..18a29483f 100644
--- a/test cases/common/199 install_mode/meson.build
+++ b/test cases/common/196 install_mode/meson.build
diff --git a/test cases/common/199 install_mode/rootdir.h b/test cases/common/196 install_mode/rootdir.h
index 72fb13220..72fb13220 100644
--- a/test cases/common/199 install_mode/rootdir.h
+++ b/test cases/common/196 install_mode/rootdir.h
diff --git a/test cases/common/199 install_mode/runscript.sh b/test cases/common/196 install_mode/runscript.sh
index 8bc5ca6ce..8bc5ca6ce 100644
--- a/test cases/common/199 install_mode/runscript.sh
+++ b/test cases/common/196 install_mode/runscript.sh
diff --git a/test cases/common/199 install_mode/stat.c b/test cases/common/196 install_mode/stat.c
index fa76a658f..fa76a658f 100644
--- a/test cases/common/199 install_mode/stat.c
+++ b/test cases/common/196 install_mode/stat.c
diff --git a/test cases/common/199 install_mode/sub1/second.dat b/test cases/common/196 install_mode/sub1/second.dat
index 48857a8b6..48857a8b6 100644
--- a/test cases/common/199 install_mode/sub1/second.dat
+++ b/test cases/common/196 install_mode/sub1/second.dat
diff --git a/test cases/common/199 install_mode/sub2/stub b/test cases/common/196 install_mode/sub2/stub
index e69de29bb..e69de29bb 100644
--- a/test cases/common/199 install_mode/sub2/stub
+++ b/test cases/common/196 install_mode/sub2/stub
diff --git a/test cases/common/199 install_mode/trivial.c b/test cases/common/196 install_mode/trivial.c
index 24ac454c3..24ac454c3 100644
--- a/test cases/common/199 install_mode/trivial.c
+++ b/test cases/common/196 install_mode/trivial.c
diff --git a/test cases/common/200 subproject array version/meson.build b/test cases/common/197 subproject array version/meson.build
index 0870bc498..0870bc498 100644
--- a/test cases/common/200 subproject array version/meson.build
+++ b/test cases/common/197 subproject array version/meson.build
diff --git a/test cases/common/200 subproject array version/subprojects/foo/meson.build b/test cases/common/197 subproject array version/subprojects/foo/meson.build
index f4ff53548..f4ff53548 100644
--- a/test cases/common/200 subproject array version/subprojects/foo/meson.build
+++ b/test cases/common/197 subproject array version/subprojects/foo/meson.build
diff --git a/test cases/common/201 feature option/meson.build b/test cases/common/198 feature option/meson.build
index ef3fa2285..ef3fa2285 100644
--- a/test cases/common/201 feature option/meson.build
+++ b/test cases/common/198 feature option/meson.build
diff --git a/test cases/common/201 feature option/meson_options.txt b/test cases/common/198 feature option/meson_options.txt
index 063a35f39..063a35f39 100644
--- a/test cases/common/201 feature option/meson_options.txt
+++ b/test cases/common/198 feature option/meson_options.txt
diff --git a/test cases/common/202 feature option disabled/meson.build b/test cases/common/199 feature option disabled/meson.build
index 1a831872a..1a831872a 100644
--- a/test cases/common/202 feature option disabled/meson.build
+++ b/test cases/common/199 feature option disabled/meson.build
diff --git a/test cases/common/202 feature option disabled/meson_options.txt b/test cases/common/199 feature option disabled/meson_options.txt
index 063a35f39..063a35f39 100644
--- a/test cases/common/202 feature option disabled/meson_options.txt
+++ b/test cases/common/199 feature option disabled/meson_options.txt
diff --git a/test cases/common/22 header in file list/header.h b/test cases/common/20 header in file list/header.h
index 354499acd..354499acd 100644
--- a/test cases/common/22 header in file list/header.h
+++ b/test cases/common/20 header in file list/header.h
diff --git a/test cases/common/22 header in file list/meson.build b/test cases/common/20 header in file list/meson.build
index 79eec8d68..79eec8d68 100644
--- a/test cases/common/22 header in file list/meson.build
+++ b/test cases/common/20 header in file list/meson.build
diff --git a/test cases/common/22 header in file list/prog.c b/test cases/common/20 header in file list/prog.c
index fbedab890..fbedab890 100644
--- a/test cases/common/22 header in file list/prog.c
+++ b/test cases/common/20 header in file list/prog.c
diff --git a/test cases/common/203 static threads/lib1.c b/test cases/common/200 static threads/lib1.c
index 1aa786c66..1aa786c66 100644
--- a/test cases/common/203 static threads/lib1.c
+++ b/test cases/common/200 static threads/lib1.c
diff --git a/test cases/common/203 static threads/lib2.c b/test cases/common/200 static threads/lib2.c
index e988814e2..e988814e2 100644
--- a/test cases/common/203 static threads/lib2.c
+++ b/test cases/common/200 static threads/lib2.c
diff --git a/test cases/common/203 static threads/meson.build b/test cases/common/200 static threads/meson.build
index 427920034..427920034 100644
--- a/test cases/common/203 static threads/meson.build
+++ b/test cases/common/200 static threads/meson.build
diff --git a/test cases/common/203 static threads/prog.c b/test cases/common/200 static threads/prog.c
index 14a7c760f..14a7c760f 100644
--- a/test cases/common/203 static threads/prog.c
+++ b/test cases/common/200 static threads/prog.c
diff --git a/test cases/common/205 generator in subdir/com/mesonbuild/genprog.py b/test cases/common/201 generator in subdir/com/mesonbuild/genprog.py
index 1e10998ee..1e10998ee 100644
--- a/test cases/common/205 generator in subdir/com/mesonbuild/genprog.py
+++ b/test cases/common/201 generator in subdir/com/mesonbuild/genprog.py
diff --git a/test cases/common/205 generator in subdir/com/mesonbuild/meson.build b/test cases/common/201 generator in subdir/com/mesonbuild/meson.build
index 4808743fe..4808743fe 100644
--- a/test cases/common/205 generator in subdir/com/mesonbuild/meson.build
+++ b/test cases/common/201 generator in subdir/com/mesonbuild/meson.build
diff --git a/test cases/common/205 generator in subdir/com/mesonbuild/subbie.inp b/test cases/common/201 generator in subdir/com/mesonbuild/subbie.inp
index df0f4e9ae..df0f4e9ae 100644
--- a/test cases/common/205 generator in subdir/com/mesonbuild/subbie.inp
+++ b/test cases/common/201 generator in subdir/com/mesonbuild/subbie.inp
diff --git a/test cases/common/205 generator in subdir/com/mesonbuild/testprog.c b/test cases/common/201 generator in subdir/com/mesonbuild/testprog.c
index 58867ad12..58867ad12 100644
--- a/test cases/common/205 generator in subdir/com/mesonbuild/testprog.c
+++ b/test cases/common/201 generator in subdir/com/mesonbuild/testprog.c
diff --git a/test cases/common/205 generator in subdir/meson.build b/test cases/common/201 generator in subdir/meson.build
index 9b8eb7c63..9b8eb7c63 100644
--- a/test cases/common/205 generator in subdir/meson.build
+++ b/test cases/common/201 generator in subdir/meson.build
diff --git a/test cases/common/23 global arg/meson.build b/test cases/common/21 global arg/meson.build
index d7fd4286a..d7fd4286a 100644
--- a/test cases/common/23 global arg/meson.build
+++ b/test cases/common/21 global arg/meson.build
diff --git a/test cases/common/23 global arg/prog.c b/test cases/common/21 global arg/prog.c
index ace5a0a5e..ace5a0a5e 100644
--- a/test cases/common/23 global arg/prog.c
+++ b/test cases/common/21 global arg/prog.c
diff --git a/test cases/common/23 global arg/prog.cc b/test cases/common/21 global arg/prog.cc
index 0ffd85e61..0ffd85e61 100644
--- a/test cases/common/23 global arg/prog.cc
+++ b/test cases/common/21 global arg/prog.cc
diff --git a/test cases/common/24 target arg/func.c b/test cases/common/22 target arg/func.c
index 9b3fe5d44..9b3fe5d44 100644
--- a/test cases/common/24 target arg/func.c
+++ b/test cases/common/22 target arg/func.c
diff --git a/test cases/common/24 target arg/func2.c b/test cases/common/22 target arg/func2.c
index d3e91a56c..d3e91a56c 100644
--- a/test cases/common/24 target arg/func2.c
+++ b/test cases/common/22 target arg/func2.c
diff --git a/test cases/common/24 target arg/meson.build b/test cases/common/22 target arg/meson.build
index 11ac006c3..11ac006c3 100644
--- a/test cases/common/24 target arg/meson.build
+++ b/test cases/common/22 target arg/meson.build
diff --git a/test cases/common/24 target arg/prog.cc b/test cases/common/22 target arg/prog.cc
index d1893ba3f..d1893ba3f 100644
--- a/test cases/common/24 target arg/prog.cc
+++ b/test cases/common/22 target arg/prog.cc
diff --git a/test cases/common/24 target arg/prog2.cc b/test cases/common/22 target arg/prog2.cc
index ef2fc4b37..ef2fc4b37 100644
--- a/test cases/common/24 target arg/prog2.cc
+++ b/test cases/common/22 target arg/prog2.cc
diff --git a/test cases/common/25 object extraction/lib.c b/test cases/common/23 object extraction/lib.c
index 652f4eb13..652f4eb13 100644
--- a/test cases/common/25 object extraction/lib.c
+++ b/test cases/common/23 object extraction/lib.c
diff --git a/test cases/common/25 object extraction/lib2.c b/test cases/common/23 object extraction/lib2.c
index c30dde237..c30dde237 100644
--- a/test cases/common/25 object extraction/lib2.c
+++ b/test cases/common/23 object extraction/lib2.c
diff --git a/test cases/common/25 object extraction/main.c b/test cases/common/23 object extraction/main.c
index 394f139eb..394f139eb 100644
--- a/test cases/common/25 object extraction/main.c
+++ b/test cases/common/23 object extraction/main.c
diff --git a/test cases/common/25 object extraction/meson.build b/test cases/common/23 object extraction/meson.build
index d99ec8444..d99ec8444 100644
--- a/test cases/common/25 object extraction/meson.build
+++ b/test cases/common/23 object extraction/meson.build
diff --git a/test cases/common/25 object extraction/src/lib.c b/test cases/common/23 object extraction/src/lib.c
index 652f4eb13..652f4eb13 100644
--- a/test cases/common/25 object extraction/src/lib.c
+++ b/test cases/common/23 object extraction/src/lib.c
diff --git a/test cases/common/26 endian/meson.build b/test cases/common/24 endian/meson.build
index 80186fef8..80186fef8 100644
--- a/test cases/common/26 endian/meson.build
+++ b/test cases/common/24 endian/meson.build
diff --git a/test cases/common/26 endian/prog.c b/test cases/common/24 endian/prog.c
index b2a10d081..b2a10d081 100644
--- a/test cases/common/26 endian/prog.c
+++ b/test cases/common/24 endian/prog.c
diff --git a/test cases/common/27 library versions/installed_files.txt b/test cases/common/25 library versions/installed_files.txt
index e10d1ddee..e10d1ddee 100644
--- a/test cases/common/27 library versions/installed_files.txt
+++ b/test cases/common/25 library versions/installed_files.txt
diff --git a/test cases/common/27 library versions/lib.c b/test cases/common/25 library versions/lib.c
index 67b6f4d00..67b6f4d00 100644
--- a/test cases/common/27 library versions/lib.c
+++ b/test cases/common/25 library versions/lib.c
diff --git a/test cases/common/27 library versions/meson.build b/test cases/common/25 library versions/meson.build
index 2e2bef769..2e2bef769 100644
--- a/test cases/common/27 library versions/meson.build
+++ b/test cases/common/25 library versions/meson.build
diff --git a/test cases/common/27 library versions/subdir/meson.build b/test cases/common/25 library versions/subdir/meson.build
index a83fdb5a9..a83fdb5a9 100644
--- a/test cases/common/27 library versions/subdir/meson.build
+++ b/test cases/common/25 library versions/subdir/meson.build
diff --git a/test cases/common/28 config subdir/include/config.h.in b/test cases/common/26 config subdir/include/config.h.in
index 4c3c62dbe..4c3c62dbe 100644
--- a/test cases/common/28 config subdir/include/config.h.in
+++ b/test cases/common/26 config subdir/include/config.h.in
diff --git a/test cases/common/28 config subdir/include/meson.build b/test cases/common/26 config subdir/include/meson.build
index f14111abe..f14111abe 100644
--- a/test cases/common/28 config subdir/include/meson.build
+++ b/test cases/common/26 config subdir/include/meson.build
diff --git a/test cases/common/28 config subdir/meson.build b/test cases/common/26 config subdir/meson.build
index 25f53dbfd..25f53dbfd 100644
--- a/test cases/common/28 config subdir/meson.build
+++ b/test cases/common/26 config subdir/meson.build
diff --git a/test cases/common/28 config subdir/src/meson.build b/test cases/common/26 config subdir/src/meson.build
index 97598a49f..97598a49f 100644
--- a/test cases/common/28 config subdir/src/meson.build
+++ b/test cases/common/26 config subdir/src/meson.build
diff --git a/test cases/common/28 config subdir/src/prog.c b/test cases/common/26 config subdir/src/prog.c
index 4c03c2024..4c03c2024 100644
--- a/test cases/common/28 config subdir/src/prog.c
+++ b/test cases/common/26 config subdir/src/prog.c
diff --git a/test cases/common/29 pipeline/input_src.dat b/test cases/common/27 pipeline/input_src.dat
index 741237235..741237235 100644
--- a/test cases/common/29 pipeline/input_src.dat
+++ b/test cases/common/27 pipeline/input_src.dat
diff --git a/test cases/common/29 pipeline/meson.build b/test cases/common/27 pipeline/meson.build
index 200a6d8f2..200a6d8f2 100644
--- a/test cases/common/29 pipeline/meson.build
+++ b/test cases/common/27 pipeline/meson.build
diff --git a/test cases/common/29 pipeline/prog.c b/test cases/common/27 pipeline/prog.c
index 175a90dde..175a90dde 100644
--- a/test cases/common/29 pipeline/prog.c
+++ b/test cases/common/27 pipeline/prog.c
diff --git a/test cases/common/29 pipeline/srcgen.c b/test cases/common/27 pipeline/srcgen.c
index ceb9eccee..ceb9eccee 100644
--- a/test cases/common/29 pipeline/srcgen.c
+++ b/test cases/common/27 pipeline/srcgen.c
diff --git a/test cases/common/30 pipeline/meson.build b/test cases/common/28 pipeline/meson.build
index 0a430bde1..0a430bde1 100644
--- a/test cases/common/30 pipeline/meson.build
+++ b/test cases/common/28 pipeline/meson.build
diff --git a/test cases/common/30 pipeline/src/input_src.dat b/test cases/common/28 pipeline/src/input_src.dat
index 354499acd..354499acd 100644
--- a/test cases/common/30 pipeline/src/input_src.dat
+++ b/test cases/common/28 pipeline/src/input_src.dat
diff --git a/test cases/common/30 pipeline/src/meson.build b/test cases/common/28 pipeline/src/meson.build
index 4e9ac116a..4e9ac116a 100644
--- a/test cases/common/30 pipeline/src/meson.build
+++ b/test cases/common/28 pipeline/src/meson.build
diff --git a/test cases/common/30 pipeline/src/prog.c b/test cases/common/28 pipeline/src/prog.c
index 29396b952..29396b952 100644
--- a/test cases/common/30 pipeline/src/prog.c
+++ b/test cases/common/28 pipeline/src/prog.c
diff --git a/test cases/common/30 pipeline/src/srcgen.c b/test cases/common/28 pipeline/src/srcgen.c
index 26761d225..26761d225 100644
--- a/test cases/common/30 pipeline/src/srcgen.c
+++ b/test cases/common/28 pipeline/src/srcgen.c
diff --git a/test cases/common/31 find program/meson.build b/test cases/common/29 find program/meson.build
index ba5386d9b..ba5386d9b 100644
--- a/test cases/common/31 find program/meson.build
+++ b/test cases/common/29 find program/meson.build
diff --git a/test cases/common/31 find program/source.in b/test cases/common/29 find program/source.in
index 5c2fa9bb6..5c2fa9bb6 100644
--- a/test cases/common/31 find program/source.in
+++ b/test cases/common/29 find program/source.in
diff --git a/test cases/common/32 multiline string/meson.build b/test cases/common/30 multiline string/meson.build
index 262cb15d3..262cb15d3 100644
--- a/test cases/common/32 multiline string/meson.build
+++ b/test cases/common/30 multiline string/meson.build
diff --git a/test cases/common/33 try compile/invalid.c b/test cases/common/31 try compile/invalid.c
index b623bf8ca..b623bf8ca 100644
--- a/test cases/common/33 try compile/invalid.c
+++ b/test cases/common/31 try compile/invalid.c
diff --git a/test cases/common/33 try compile/meson.build b/test cases/common/31 try compile/meson.build
index 09ca395be..09ca395be 100644
--- a/test cases/common/33 try compile/meson.build
+++ b/test cases/common/31 try compile/meson.build
diff --git a/test cases/common/33 try compile/valid.c b/test cases/common/31 try compile/valid.c
index 3757f5a6b..3757f5a6b 100644
--- a/test cases/common/33 try compile/valid.c
+++ b/test cases/common/31 try compile/valid.c
diff --git a/test cases/common/34 compiler id/meson.build b/test cases/common/32 compiler id/meson.build
index 2b5c44530..2b5c44530 100644
--- a/test cases/common/34 compiler id/meson.build
+++ b/test cases/common/32 compiler id/meson.build
diff --git a/test cases/common/35 sizeof/config.h.in b/test cases/common/33 sizeof/config.h.in
index a442e8a4e..a442e8a4e 100644
--- a/test cases/common/35 sizeof/config.h.in
+++ b/test cases/common/33 sizeof/config.h.in
diff --git a/test cases/common/35 sizeof/meson.build b/test cases/common/33 sizeof/meson.build
index 9de5b7816..9de5b7816 100644
--- a/test cases/common/35 sizeof/meson.build
+++ b/test cases/common/33 sizeof/meson.build
diff --git a/test cases/common/35 sizeof/prog.c.in b/test cases/common/33 sizeof/prog.c.in
index 85b12299c..85b12299c 100644
--- a/test cases/common/35 sizeof/prog.c.in
+++ b/test cases/common/33 sizeof/prog.c.in
diff --git a/test cases/common/36 define10/config.h.in b/test cases/common/34 define10/config.h.in
index dc7734637..dc7734637 100644
--- a/test cases/common/36 define10/config.h.in
+++ b/test cases/common/34 define10/config.h.in
diff --git a/test cases/common/36 define10/meson.build b/test cases/common/34 define10/meson.build
index a28e7e48d..a28e7e48d 100644
--- a/test cases/common/36 define10/meson.build
+++ b/test cases/common/34 define10/meson.build
diff --git a/test cases/common/36 define10/prog.c b/test cases/common/34 define10/prog.c
index 10e94f16b..10e94f16b 100644
--- a/test cases/common/36 define10/prog.c
+++ b/test cases/common/34 define10/prog.c
diff --git a/test cases/common/37 has header/meson.build b/test cases/common/35 has header/meson.build
index b53849c78..b53849c78 100644
--- a/test cases/common/37 has header/meson.build
+++ b/test cases/common/35 has header/meson.build
diff --git a/test cases/common/37 has header/ouagadougou.h b/test cases/common/35 has header/ouagadougou.h
index 2f76c49cc..2f76c49cc 100644
--- a/test cases/common/37 has header/ouagadougou.h
+++ b/test cases/common/35 has header/ouagadougou.h
diff --git a/test cases/common/38 run program/get-version.py b/test cases/common/36 run program/get-version.py
index a22d55998..a22d55998 100644
--- a/test cases/common/38 run program/get-version.py
+++ b/test cases/common/36 run program/get-version.py
diff --git a/test cases/common/38 run program/meson.build b/test cases/common/36 run program/meson.build
index a05cea3fb..a05cea3fb 100644
--- a/test cases/common/38 run program/meson.build
+++ b/test cases/common/36 run program/meson.build
diff --git a/test cases/common/38 run program/scripts/hello.bat b/test cases/common/36 run program/scripts/hello.bat
index cbc346bf7..cbc346bf7 100644
--- a/test cases/common/38 run program/scripts/hello.bat
+++ b/test cases/common/36 run program/scripts/hello.bat
diff --git a/test cases/common/38 run program/scripts/hello.sh b/test cases/common/36 run program/scripts/hello.sh
index 2a22daa88..2a22daa88 100755
--- a/test cases/common/38 run program/scripts/hello.sh
+++ b/test cases/common/36 run program/scripts/hello.sh
diff --git a/test cases/common/39 tryrun/error.c b/test cases/common/37 tryrun/error.c
index 80eeb5de2..80eeb5de2 100644
--- a/test cases/common/39 tryrun/error.c
+++ b/test cases/common/37 tryrun/error.c
diff --git a/test cases/common/39 tryrun/meson.build b/test cases/common/37 tryrun/meson.build
index c64446ff0..c64446ff0 100644
--- a/test cases/common/39 tryrun/meson.build
+++ b/test cases/common/37 tryrun/meson.build
diff --git a/test cases/common/39 tryrun/no_compile.c b/test cases/common/37 tryrun/no_compile.c
index 86b67acb1..86b67acb1 100644
--- a/test cases/common/39 tryrun/no_compile.c
+++ b/test cases/common/37 tryrun/no_compile.c
diff --git a/test cases/common/39 tryrun/ok.c b/test cases/common/37 tryrun/ok.c
index 4111c742c..4111c742c 100644
--- a/test cases/common/39 tryrun/ok.c
+++ b/test cases/common/37 tryrun/ok.c
diff --git a/test cases/common/40 logic ops/meson.build b/test cases/common/38 logic ops/meson.build
index 897054e74..897054e74 100644
--- a/test cases/common/40 logic ops/meson.build
+++ b/test cases/common/38 logic ops/meson.build
diff --git a/test cases/common/42 string operations/meson.build b/test cases/common/39 string operations/meson.build
index 65961428c..65961428c 100644
--- a/test cases/common/42 string operations/meson.build
+++ b/test cases/common/39 string operations/meson.build
diff --git a/test cases/common/43 has function/meson.build b/test cases/common/40 has function/meson.build
index eb30acd07..eb30acd07 100644
--- a/test cases/common/43 has function/meson.build
+++ b/test cases/common/40 has function/meson.build
diff --git a/test cases/common/44 has member/meson.build b/test cases/common/41 has member/meson.build
index 4e61956d9..4e61956d9 100644
--- a/test cases/common/44 has member/meson.build
+++ b/test cases/common/41 has member/meson.build
diff --git a/test cases/common/45 alignment/meson.build b/test cases/common/42 alignment/meson.build
index a9bd65b73..a9bd65b73 100644
--- a/test cases/common/45 alignment/meson.build
+++ b/test cases/common/42 alignment/meson.build
diff --git a/test cases/common/46 library chain/installed_files.txt b/test cases/common/43 library chain/installed_files.txt
index c7dab9f6f..c7dab9f6f 100644
--- a/test cases/common/46 library chain/installed_files.txt
+++ b/test cases/common/43 library chain/installed_files.txt
diff --git a/test cases/common/46 library chain/main.c b/test cases/common/43 library chain/main.c
index 7b015b712..7b015b712 100644
--- a/test cases/common/46 library chain/main.c
+++ b/test cases/common/43 library chain/main.c
diff --git a/test cases/common/46 library chain/meson.build b/test cases/common/43 library chain/meson.build
index 77528d7d0..77528d7d0 100644
--- a/test cases/common/46 library chain/meson.build
+++ b/test cases/common/43 library chain/meson.build
diff --git a/test cases/common/46 library chain/subdir/lib1.c b/test cases/common/43 library chain/subdir/lib1.c
index 499ef82bf..499ef82bf 100644
--- a/test cases/common/46 library chain/subdir/lib1.c
+++ b/test cases/common/43 library chain/subdir/lib1.c
diff --git a/test cases/common/46 library chain/subdir/meson.build b/test cases/common/43 library chain/subdir/meson.build
index ab71bda18..ab71bda18 100644
--- a/test cases/common/46 library chain/subdir/meson.build
+++ b/test cases/common/43 library chain/subdir/meson.build
diff --git a/test cases/common/46 library chain/subdir/subdir2/lib2.c b/test cases/common/43 library chain/subdir/subdir2/lib2.c
index 34fadf2a6..34fadf2a6 100644
--- a/test cases/common/46 library chain/subdir/subdir2/lib2.c
+++ b/test cases/common/43 library chain/subdir/subdir2/lib2.c
diff --git a/test cases/common/46 library chain/subdir/subdir2/meson.build b/test cases/common/43 library chain/subdir/subdir2/meson.build
index befd94db8..befd94db8 100644
--- a/test cases/common/46 library chain/subdir/subdir2/meson.build
+++ b/test cases/common/43 library chain/subdir/subdir2/meson.build
diff --git a/test cases/common/46 library chain/subdir/subdir3/lib3.c b/test cases/common/43 library chain/subdir/subdir3/lib3.c
index 7bd88afdd..7bd88afdd 100644
--- a/test cases/common/46 library chain/subdir/subdir3/lib3.c
+++ b/test cases/common/43 library chain/subdir/subdir3/lib3.c
diff --git a/test cases/common/46 library chain/subdir/subdir3/meson.build b/test cases/common/43 library chain/subdir/subdir3/meson.build
index 7bd249a29..7bd249a29 100644
--- a/test cases/common/46 library chain/subdir/subdir3/meson.build
+++ b/test cases/common/43 library chain/subdir/subdir3/meson.build
diff --git a/test cases/common/47 options/meson.build b/test cases/common/44 options/meson.build
index f177aa408..f177aa408 100644
--- a/test cases/common/47 options/meson.build
+++ b/test cases/common/44 options/meson.build
diff --git a/test cases/common/47 options/meson_options.txt b/test cases/common/44 options/meson_options.txt
index 4e1c8d810..4e1c8d810 100644
--- a/test cases/common/47 options/meson_options.txt
+++ b/test cases/common/44 options/meson_options.txt
diff --git a/test cases/common/48 test args/cmd_args.c b/test cases/common/45 test args/cmd_args.c
index 545b795c5..545b795c5 100644
--- a/test cases/common/48 test args/cmd_args.c
+++ b/test cases/common/45 test args/cmd_args.c
diff --git a/test cases/common/48 test args/copyfile.py b/test cases/common/45 test args/copyfile.py
index ff42ac359..ff42ac359 100644
--- a/test cases/common/48 test args/copyfile.py
+++ b/test cases/common/45 test args/copyfile.py
diff --git a/test cases/common/48 test args/env2vars.c b/test cases/common/45 test args/env2vars.c
index 19250a8d5..19250a8d5 100644
--- a/test cases/common/48 test args/env2vars.c
+++ b/test cases/common/45 test args/env2vars.c
diff --git a/test cases/common/48 test args/envvars.c b/test cases/common/45 test args/envvars.c
index 627e4138f..627e4138f 100644
--- a/test cases/common/48 test args/envvars.c
+++ b/test cases/common/45 test args/envvars.c
diff --git a/test cases/common/48 test args/meson.build b/test cases/common/45 test args/meson.build
index 81d34915a..81d34915a 100644
--- a/test cases/common/48 test args/meson.build
+++ b/test cases/common/45 test args/meson.build
diff --git a/test cases/common/48 test args/tester.c b/test cases/common/45 test args/tester.c
index 419277e5b..419277e5b 100644
--- a/test cases/common/48 test args/tester.c
+++ b/test cases/common/45 test args/tester.c
diff --git a/test cases/common/48 test args/tester.py b/test cases/common/45 test args/tester.py
index 0b4010ab9..0b4010ab9 100755
--- a/test cases/common/48 test args/tester.py
+++ b/test cases/common/45 test args/tester.py
diff --git a/test cases/common/48 test args/testfile.txt b/test cases/common/45 test args/testfile.txt
index 12f00e90b..12f00e90b 100644
--- a/test cases/common/48 test args/testfile.txt
+++ b/test cases/common/45 test args/testfile.txt
diff --git a/test cases/common/49 subproject/installed_files.txt b/test cases/common/46 subproject/installed_files.txt
index dc09fb727..dc09fb727 100644
--- a/test cases/common/49 subproject/installed_files.txt
+++ b/test cases/common/46 subproject/installed_files.txt
diff --git a/test cases/common/49 subproject/meson.build b/test cases/common/46 subproject/meson.build
index c6ec1160f..c6ec1160f 100644
--- a/test cases/common/49 subproject/meson.build
+++ b/test cases/common/46 subproject/meson.build
diff --git a/test cases/common/49 subproject/subprojects/sublib/include/subdefs.h b/test cases/common/46 subproject/subprojects/sublib/include/subdefs.h
index 681c7b890..681c7b890 100644
--- a/test cases/common/49 subproject/subprojects/sublib/include/subdefs.h
+++ b/test cases/common/46 subproject/subprojects/sublib/include/subdefs.h
diff --git a/test cases/common/49 subproject/subprojects/sublib/meson.build b/test cases/common/46 subproject/subprojects/sublib/meson.build
index acaf1bf38..acaf1bf38 100644
--- a/test cases/common/49 subproject/subprojects/sublib/meson.build
+++ b/test cases/common/46 subproject/subprojects/sublib/meson.build
diff --git a/test cases/common/49 subproject/subprojects/sublib/simpletest.c b/test cases/common/46 subproject/subprojects/sublib/simpletest.c
index 3801a40e9..3801a40e9 100644
--- a/test cases/common/49 subproject/subprojects/sublib/simpletest.c
+++ b/test cases/common/46 subproject/subprojects/sublib/simpletest.c
diff --git a/test cases/common/49 subproject/subprojects/sublib/sublib.c b/test cases/common/46 subproject/subprojects/sublib/sublib.c
index c13326b85..c13326b85 100644
--- a/test cases/common/49 subproject/subprojects/sublib/sublib.c
+++ b/test cases/common/46 subproject/subprojects/sublib/sublib.c
diff --git a/test cases/common/49 subproject/user.c b/test cases/common/46 subproject/user.c
index cfde532d8..cfde532d8 100644
--- a/test cases/common/49 subproject/user.c
+++ b/test cases/common/46 subproject/user.c
diff --git a/test cases/common/50 subproject options/meson.build b/test cases/common/47 subproject options/meson.build
index d4598b639..d4598b639 100644
--- a/test cases/common/50 subproject options/meson.build
+++ b/test cases/common/47 subproject options/meson.build
diff --git a/test cases/common/50 subproject options/meson_options.txt b/test cases/common/47 subproject options/meson_options.txt
index c295dddd6..c295dddd6 100644
--- a/test cases/common/50 subproject options/meson_options.txt
+++ b/test cases/common/47 subproject options/meson_options.txt
diff --git a/test cases/common/50 subproject options/subprojects/subproject/meson.build b/test cases/common/47 subproject options/subprojects/subproject/meson.build
index 5000b8643..5000b8643 100644
--- a/test cases/common/50 subproject options/subprojects/subproject/meson.build
+++ b/test cases/common/47 subproject options/subprojects/subproject/meson.build
diff --git a/test cases/common/50 subproject options/subprojects/subproject/meson_options.txt b/test cases/common/47 subproject options/subprojects/subproject/meson_options.txt
index ac78533e1..ac78533e1 100644
--- a/test cases/common/50 subproject options/subprojects/subproject/meson_options.txt
+++ b/test cases/common/47 subproject options/subprojects/subproject/meson_options.txt
diff --git a/test cases/common/51 pkgconfig-gen/dependencies/exposed.c b/test cases/common/48 pkgconfig-gen/dependencies/exposed.c
index 005202e67..005202e67 100644
--- a/test cases/common/51 pkgconfig-gen/dependencies/exposed.c
+++ b/test cases/common/48 pkgconfig-gen/dependencies/exposed.c
diff --git a/test cases/common/51 pkgconfig-gen/dependencies/internal.c b/test cases/common/48 pkgconfig-gen/dependencies/internal.c
index 1a41b11c8..1a41b11c8 100644
--- a/test cases/common/51 pkgconfig-gen/dependencies/internal.c
+++ b/test cases/common/48 pkgconfig-gen/dependencies/internal.c
diff --git a/test cases/common/51 pkgconfig-gen/dependencies/meson.build b/test cases/common/48 pkgconfig-gen/dependencies/meson.build
index 047e7e7eb..047e7e7eb 100644
--- a/test cases/common/51 pkgconfig-gen/dependencies/meson.build
+++ b/test cases/common/48 pkgconfig-gen/dependencies/meson.build
diff --git a/test cases/common/51 pkgconfig-gen/installed_files.txt b/test cases/common/48 pkgconfig-gen/installed_files.txt
index 3c44d28cf..3c44d28cf 100644
--- a/test cases/common/51 pkgconfig-gen/installed_files.txt
+++ b/test cases/common/48 pkgconfig-gen/installed_files.txt
diff --git a/test cases/common/51 pkgconfig-gen/meson.build b/test cases/common/48 pkgconfig-gen/meson.build
index 7e6c67037..7e6c67037 100644
--- a/test cases/common/51 pkgconfig-gen/meson.build
+++ b/test cases/common/48 pkgconfig-gen/meson.build
diff --git a/test cases/common/51 pkgconfig-gen/simple.c b/test cases/common/48 pkgconfig-gen/simple.c
index e8a6d8330..e8a6d8330 100644
--- a/test cases/common/51 pkgconfig-gen/simple.c
+++ b/test cases/common/48 pkgconfig-gen/simple.c
diff --git a/test cases/common/51 pkgconfig-gen/simple.h b/test cases/common/48 pkgconfig-gen/simple.h
index bb52e6d72..bb52e6d72 100644
--- a/test cases/common/51 pkgconfig-gen/simple.h
+++ b/test cases/common/48 pkgconfig-gen/simple.h
diff --git a/test cases/common/52 custom install dirs/datafile.cat b/test cases/common/49 custom install dirs/datafile.cat
index 53d81fc2a..53d81fc2a 100644
--- a/test cases/common/52 custom install dirs/datafile.cat
+++ b/test cases/common/49 custom install dirs/datafile.cat
diff --git a/test cases/common/52 custom install dirs/installed_files.txt b/test cases/common/49 custom install dirs/installed_files.txt
index 0cc533a9c..0cc533a9c 100644
--- a/test cases/common/52 custom install dirs/installed_files.txt
+++ b/test cases/common/49 custom install dirs/installed_files.txt
diff --git a/test cases/common/52 custom install dirs/meson.build b/test cases/common/49 custom install dirs/meson.build
index 494ff0ec2..494ff0ec2 100644
--- a/test cases/common/52 custom install dirs/meson.build
+++ b/test cases/common/49 custom install dirs/meson.build
diff --git a/test cases/common/52 custom install dirs/prog.1 b/test cases/common/49 custom install dirs/prog.1
index 08ef7da62..08ef7da62 100644
--- a/test cases/common/52 custom install dirs/prog.1
+++ b/test cases/common/49 custom install dirs/prog.1
diff --git a/test cases/common/52 custom install dirs/prog.c b/test cases/common/49 custom install dirs/prog.c
index 0f0061d2a..0f0061d2a 100644
--- a/test cases/common/52 custom install dirs/prog.c
+++ b/test cases/common/49 custom install dirs/prog.c
diff --git a/test cases/common/52 custom install dirs/sample.h b/test cases/common/49 custom install dirs/sample.h
index dc030dac1..dc030dac1 100644
--- a/test cases/common/52 custom install dirs/sample.h
+++ b/test cases/common/49 custom install dirs/sample.h
diff --git a/test cases/common/52 custom install dirs/subdir/datafile.dog b/test cases/common/49 custom install dirs/subdir/datafile.dog
index 7a5bcb765..7a5bcb765 100644
--- a/test cases/common/52 custom install dirs/subdir/datafile.dog
+++ b/test cases/common/49 custom install dirs/subdir/datafile.dog
diff --git a/test cases/common/53 subproject subproject/meson.build b/test cases/common/50 subproject subproject/meson.build
index f7df3611d..f7df3611d 100644
--- a/test cases/common/53 subproject subproject/meson.build
+++ b/test cases/common/50 subproject subproject/meson.build
diff --git a/test cases/common/53 subproject subproject/prog.c b/test cases/common/50 subproject subproject/prog.c
index 394f139eb..394f139eb 100644
--- a/test cases/common/53 subproject subproject/prog.c
+++ b/test cases/common/50 subproject subproject/prog.c
diff --git a/test cases/common/53 subproject subproject/subprojects/a/a.c b/test cases/common/50 subproject subproject/subprojects/a/a.c
index 7ac3e5e57..7ac3e5e57 100644
--- a/test cases/common/53 subproject subproject/subprojects/a/a.c
+++ b/test cases/common/50 subproject subproject/subprojects/a/a.c
diff --git a/test cases/common/53 subproject subproject/subprojects/a/meson.build b/test cases/common/50 subproject subproject/subprojects/a/meson.build
index f0dfc449e..f0dfc449e 100644
--- a/test cases/common/53 subproject subproject/subprojects/a/meson.build
+++ b/test cases/common/50 subproject subproject/subprojects/a/meson.build
diff --git a/test cases/common/53 subproject subproject/subprojects/b/b.c b/test cases/common/50 subproject subproject/subprojects/b/b.c
index a95651bc0..a95651bc0 100644
--- a/test cases/common/53 subproject subproject/subprojects/b/b.c
+++ b/test cases/common/50 subproject subproject/subprojects/b/b.c
diff --git a/test cases/common/53 subproject subproject/subprojects/b/meson.build b/test cases/common/50 subproject subproject/subprojects/b/meson.build
index e7af6067a..e7af6067a 100644
--- a/test cases/common/53 subproject subproject/subprojects/b/meson.build
+++ b/test cases/common/50 subproject subproject/subprojects/b/meson.build
diff --git a/test cases/common/54 same file name/d1/file.c b/test cases/common/51 same file name/d1/file.c
index 8084d7351..8084d7351 100644
--- a/test cases/common/54 same file name/d1/file.c
+++ b/test cases/common/51 same file name/d1/file.c
diff --git a/test cases/common/54 same file name/d2/file.c b/test cases/common/51 same file name/d2/file.c
index d1444a24c..d1444a24c 100644
--- a/test cases/common/54 same file name/d2/file.c
+++ b/test cases/common/51 same file name/d2/file.c
diff --git a/test cases/common/54 same file name/meson.build b/test cases/common/51 same file name/meson.build
index 3f351afc1..3f351afc1 100644
--- a/test cases/common/54 same file name/meson.build
+++ b/test cases/common/51 same file name/meson.build
diff --git a/test cases/common/54 same file name/prog.c b/test cases/common/51 same file name/prog.c
index 344128892..344128892 100644
--- a/test cases/common/54 same file name/prog.c
+++ b/test cases/common/51 same file name/prog.c
diff --git a/test cases/common/55 file grabber/a.c b/test cases/common/52 file grabber/a.c
index bee8ad7a1..bee8ad7a1 100644
--- a/test cases/common/55 file grabber/a.c
+++ b/test cases/common/52 file grabber/a.c
diff --git a/test cases/common/55 file grabber/b.c b/test cases/common/52 file grabber/b.c
index 0fdd16287..0fdd16287 100644
--- a/test cases/common/55 file grabber/b.c
+++ b/test cases/common/52 file grabber/b.c
diff --git a/test cases/common/55 file grabber/c.c b/test cases/common/52 file grabber/c.c
index 63f951cad..63f951cad 100644
--- a/test cases/common/55 file grabber/c.c
+++ b/test cases/common/52 file grabber/c.c
diff --git a/test cases/common/55 file grabber/grabber.bat b/test cases/common/52 file grabber/grabber.bat
index 86603145c..86603145c 100644
--- a/test cases/common/55 file grabber/grabber.bat
+++ b/test cases/common/52 file grabber/grabber.bat
diff --git a/test cases/common/55 file grabber/grabber.sh b/test cases/common/52 file grabber/grabber.sh
index 5e8f4b947..5e8f4b947 100755
--- a/test cases/common/55 file grabber/grabber.sh
+++ b/test cases/common/52 file grabber/grabber.sh
diff --git a/test cases/common/55 file grabber/grabber2.bat b/test cases/common/52 file grabber/grabber2.bat
index d1a3f98ba..d1a3f98ba 100644
--- a/test cases/common/55 file grabber/grabber2.bat
+++ b/test cases/common/52 file grabber/grabber2.bat
diff --git a/test cases/common/55 file grabber/meson.build b/test cases/common/52 file grabber/meson.build
index e332c0b1e..e332c0b1e 100644
--- a/test cases/common/55 file grabber/meson.build
+++ b/test cases/common/52 file grabber/meson.build
diff --git a/test cases/common/55 file grabber/prog.c b/test cases/common/52 file grabber/prog.c
index 3524f602f..3524f602f 100644
--- a/test cases/common/55 file grabber/prog.c
+++ b/test cases/common/52 file grabber/prog.c
diff --git a/test cases/common/55 file grabber/subdir/meson.build b/test cases/common/52 file grabber/subdir/meson.build
index 230d6f7de..230d6f7de 100644
--- a/test cases/common/55 file grabber/subdir/meson.build
+++ b/test cases/common/52 file grabber/subdir/meson.build
diff --git a/test cases/common/55 file grabber/subdir/suba.c b/test cases/common/52 file grabber/subdir/suba.c
index bee8ad7a1..bee8ad7a1 100644
--- a/test cases/common/55 file grabber/subdir/suba.c
+++ b/test cases/common/52 file grabber/subdir/suba.c
diff --git a/test cases/common/55 file grabber/subdir/subb.c b/test cases/common/52 file grabber/subdir/subb.c
index 0fdd16287..0fdd16287 100644
--- a/test cases/common/55 file grabber/subdir/subb.c
+++ b/test cases/common/52 file grabber/subdir/subb.c
diff --git a/test cases/common/55 file grabber/subdir/subc.c b/test cases/common/52 file grabber/subdir/subc.c
index 63f951cad..63f951cad 100644
--- a/test cases/common/55 file grabber/subdir/subc.c
+++ b/test cases/common/52 file grabber/subdir/subc.c
diff --git a/test cases/common/55 file grabber/subdir/subprog.c b/test cases/common/52 file grabber/subdir/subprog.c
index 3524f602f..3524f602f 100644
--- a/test cases/common/55 file grabber/subdir/subprog.c
+++ b/test cases/common/52 file grabber/subdir/subprog.c
diff --git a/test cases/common/56 custom target/data_source.txt b/test cases/common/53 custom target/data_source.txt
index 0c23cc0c3..0c23cc0c3 100644
--- a/test cases/common/56 custom target/data_source.txt
+++ b/test cases/common/53 custom target/data_source.txt
diff --git a/test cases/common/56 custom target/depfile/dep.py b/test cases/common/53 custom target/depfile/dep.py
index aff325b6c..aff325b6c 100755
--- a/test cases/common/56 custom target/depfile/dep.py
+++ b/test cases/common/53 custom target/depfile/dep.py
diff --git a/test cases/common/56 custom target/depfile/meson.build b/test cases/common/53 custom target/depfile/meson.build
index 46bca7405..46bca7405 100644
--- a/test cases/common/56 custom target/depfile/meson.build
+++ b/test cases/common/53 custom target/depfile/meson.build
diff --git a/test cases/common/56 custom target/installed_files.txt b/test cases/common/53 custom target/installed_files.txt
index d90a6b01c..d90a6b01c 100644
--- a/test cases/common/56 custom target/installed_files.txt
+++ b/test cases/common/53 custom target/installed_files.txt
diff --git a/test cases/common/56 custom target/meson.build b/test cases/common/53 custom target/meson.build
index 2e6f69cf9..2e6f69cf9 100644
--- a/test cases/common/56 custom target/meson.build
+++ b/test cases/common/53 custom target/meson.build
diff --git a/test cases/common/56 custom target/my_compiler.py b/test cases/common/53 custom target/my_compiler.py
index f46d23a91..f46d23a91 100755
--- a/test cases/common/56 custom target/my_compiler.py
+++ b/test cases/common/53 custom target/my_compiler.py
diff --git a/test cases/common/57 custom target chain/data_source.txt b/test cases/common/54 custom target chain/data_source.txt
index 0c23cc0c3..0c23cc0c3 100644
--- a/test cases/common/57 custom target chain/data_source.txt
+++ b/test cases/common/54 custom target chain/data_source.txt
diff --git a/test cases/common/57 custom target chain/installed_files.txt b/test cases/common/54 custom target chain/installed_files.txt
index 7feb0723b..7feb0723b 100644
--- a/test cases/common/57 custom target chain/installed_files.txt
+++ b/test cases/common/54 custom target chain/installed_files.txt
diff --git a/test cases/common/57 custom target chain/meson.build b/test cases/common/54 custom target chain/meson.build
index 138f795bd..138f795bd 100644
--- a/test cases/common/57 custom target chain/meson.build
+++ b/test cases/common/54 custom target chain/meson.build
diff --git a/test cases/common/57 custom target chain/my_compiler.py b/test cases/common/54 custom target chain/my_compiler.py
index 9cf4425f8..9cf4425f8 100755
--- a/test cases/common/57 custom target chain/my_compiler.py
+++ b/test cases/common/54 custom target chain/my_compiler.py
diff --git a/test cases/common/57 custom target chain/my_compiler2.py b/test cases/common/54 custom target chain/my_compiler2.py
index 0191f3faf..0191f3faf 100755
--- a/test cases/common/57 custom target chain/my_compiler2.py
+++ b/test cases/common/54 custom target chain/my_compiler2.py
diff --git a/test cases/common/57 custom target chain/usetarget/meson.build b/test cases/common/54 custom target chain/usetarget/meson.build
index 9aece8ce9..9aece8ce9 100644
--- a/test cases/common/57 custom target chain/usetarget/meson.build
+++ b/test cases/common/54 custom target chain/usetarget/meson.build
diff --git a/test cases/common/57 custom target chain/usetarget/myexe.c b/test cases/common/54 custom target chain/usetarget/myexe.c
index f9874fd7e..f9874fd7e 100644
--- a/test cases/common/57 custom target chain/usetarget/myexe.c
+++ b/test cases/common/54 custom target chain/usetarget/myexe.c
diff --git a/test cases/common/57 custom target chain/usetarget/subcomp.py b/test cases/common/54 custom target chain/usetarget/subcomp.py
index b5f6eb009..b5f6eb009 100755
--- a/test cases/common/57 custom target chain/usetarget/subcomp.py
+++ b/test cases/common/54 custom target chain/usetarget/subcomp.py
diff --git a/test cases/common/58 run target/check_exists.py b/test cases/common/55 run target/check_exists.py
index b6fc967eb..b6fc967eb 100755
--- a/test cases/common/58 run target/check_exists.py
+++ b/test cases/common/55 run target/check_exists.py
diff --git a/test cases/common/58 run target/configure.in b/test cases/common/55 run target/configure.in
index 0d42d0441..0d42d0441 100755
--- a/test cases/common/58 run target/configure.in
+++ b/test cases/common/55 run target/configure.in
diff --git a/test cases/common/58 run target/converter.py b/test cases/common/55 run target/converter.py
index 8dd31fe2f..8dd31fe2f 100644
--- a/test cases/common/58 run target/converter.py
+++ b/test cases/common/55 run target/converter.py
diff --git a/test cases/common/58 run target/fakeburner.py b/test cases/common/55 run target/fakeburner.py
index da3d0ac1e..da3d0ac1e 100755
--- a/test cases/common/58 run target/fakeburner.py
+++ b/test cases/common/55 run target/fakeburner.py
diff --git a/test cases/common/58 run target/helloprinter.c b/test cases/common/55 run target/helloprinter.c
index 4a6e0ac5d..4a6e0ac5d 100644
--- a/test cases/common/58 run target/helloprinter.c
+++ b/test cases/common/55 run target/helloprinter.c
diff --git a/test cases/common/58 run target/meson.build b/test cases/common/55 run target/meson.build
index 93a4ad0f2..93a4ad0f2 100644
--- a/test cases/common/58 run target/meson.build
+++ b/test cases/common/55 run target/meson.build
diff --git a/test cases/common/58 run target/scripts/script.sh b/test cases/common/55 run target/scripts/script.sh
index 0adf26315..0adf26315 100755
--- a/test cases/common/58 run target/scripts/script.sh
+++ b/test cases/common/55 run target/scripts/script.sh
diff --git a/test cases/common/59 object generator/meson.build b/test cases/common/56 object generator/meson.build
index e20da6f46..e20da6f46 100644
--- a/test cases/common/59 object generator/meson.build
+++ b/test cases/common/56 object generator/meson.build
diff --git a/test cases/common/59 object generator/obj_generator.py b/test cases/common/56 object generator/obj_generator.py
index a33872aac..a33872aac 100755
--- a/test cases/common/59 object generator/obj_generator.py
+++ b/test cases/common/56 object generator/obj_generator.py
diff --git a/test cases/common/59 object generator/prog.c b/test cases/common/56 object generator/prog.c
index 60459d6ed..60459d6ed 100644
--- a/test cases/common/59 object generator/prog.c
+++ b/test cases/common/56 object generator/prog.c
diff --git a/test cases/common/59 object generator/source.c b/test cases/common/56 object generator/source.c
index 7779b332c..7779b332c 100644
--- a/test cases/common/59 object generator/source.c
+++ b/test cases/common/56 object generator/source.c
diff --git a/test cases/common/59 object generator/source2.c b/test cases/common/56 object generator/source2.c
index 29aad40f3..29aad40f3 100644
--- a/test cases/common/59 object generator/source2.c
+++ b/test cases/common/56 object generator/source2.c
diff --git a/test cases/common/59 object generator/source3.c b/test cases/common/56 object generator/source3.c
index 1580f1ed4..1580f1ed4 100644
--- a/test cases/common/59 object generator/source3.c
+++ b/test cases/common/56 object generator/source3.c
diff --git a/test cases/common/60 install script/installed_files.txt b/test cases/common/57 install script/installed_files.txt
index 94c1fed2a..94c1fed2a 100644
--- a/test cases/common/60 install script/installed_files.txt
+++ b/test cases/common/57 install script/installed_files.txt
diff --git a/test cases/common/60 install script/meson.build b/test cases/common/57 install script/meson.build
index 6351518fb..6351518fb 100644
--- a/test cases/common/60 install script/meson.build
+++ b/test cases/common/57 install script/meson.build
diff --git a/test cases/common/60 install script/myinstall.py b/test cases/common/57 install script/myinstall.py
index 812561e0e..812561e0e 100644
--- a/test cases/common/60 install script/myinstall.py
+++ b/test cases/common/57 install script/myinstall.py
diff --git a/test cases/common/60 install script/no-installed-files b/test cases/common/57 install script/no-installed-files
index e69de29bb..e69de29bb 100644
--- a/test cases/common/60 install script/no-installed-files
+++ b/test cases/common/57 install script/no-installed-files
diff --git a/test cases/common/60 install script/prog.c b/test cases/common/57 install script/prog.c
index 06bc6b112..06bc6b112 100644
--- a/test cases/common/60 install script/prog.c
+++ b/test cases/common/57 install script/prog.c
diff --git a/test cases/common/60 install script/src/meson.build b/test cases/common/57 install script/src/meson.build
index b23574ac3..b23574ac3 100644
--- a/test cases/common/60 install script/src/meson.build
+++ b/test cases/common/57 install script/src/meson.build
diff --git a/test cases/common/60 install script/src/myinstall.py b/test cases/common/57 install script/src/myinstall.py
index 3b7ce37d4..3b7ce37d4 100644
--- a/test cases/common/60 install script/src/myinstall.py
+++ b/test cases/common/57 install script/src/myinstall.py
diff --git a/test cases/common/61 custom target source output/generator.py b/test cases/common/58 custom target source output/generator.py
index 3464b0a85..3464b0a85 100755
--- a/test cases/common/61 custom target source output/generator.py
+++ b/test cases/common/58 custom target source output/generator.py
diff --git a/test cases/common/61 custom target source output/main.c b/test cases/common/58 custom target source output/main.c
index 2813c398e..2813c398e 100644
--- a/test cases/common/61 custom target source output/main.c
+++ b/test cases/common/58 custom target source output/main.c
diff --git a/test cases/common/61 custom target source output/meson.build b/test cases/common/58 custom target source output/meson.build
index f9d039df0..f9d039df0 100644
--- a/test cases/common/61 custom target source output/meson.build
+++ b/test cases/common/58 custom target source output/meson.build
diff --git a/test cases/common/62 exe static shared/meson.build b/test cases/common/59 exe static shared/meson.build
index 288888284..288888284 100644
--- a/test cases/common/62 exe static shared/meson.build
+++ b/test cases/common/59 exe static shared/meson.build
diff --git a/test cases/common/62 exe static shared/prog.c b/test cases/common/59 exe static shared/prog.c
index 26603b694..26603b694 100644
--- a/test cases/common/62 exe static shared/prog.c
+++ b/test cases/common/59 exe static shared/prog.c
diff --git a/test cases/common/62 exe static shared/shlib2.c b/test cases/common/59 exe static shared/shlib2.c
index 12bc913d7..12bc913d7 100644
--- a/test cases/common/62 exe static shared/shlib2.c
+++ b/test cases/common/59 exe static shared/shlib2.c
diff --git a/test cases/common/62 exe static shared/stat.c b/test cases/common/59 exe static shared/stat.c
index 680ed92b3..680ed92b3 100644
--- a/test cases/common/62 exe static shared/stat.c
+++ b/test cases/common/59 exe static shared/stat.c
diff --git a/test cases/common/62 exe static shared/stat2.c b/test cases/common/59 exe static shared/stat2.c
index 4ae3775f7..4ae3775f7 100644
--- a/test cases/common/62 exe static shared/stat2.c
+++ b/test cases/common/59 exe static shared/stat2.c
diff --git a/test cases/common/62 exe static shared/subdir/exports.h b/test cases/common/59 exe static shared/subdir/exports.h
index c89ccb23b..c89ccb23b 100644
--- a/test cases/common/62 exe static shared/subdir/exports.h
+++ b/test cases/common/59 exe static shared/subdir/exports.h
diff --git a/test cases/common/62 exe static shared/subdir/meson.build b/test cases/common/59 exe static shared/subdir/meson.build
index 2b7393b4e..2b7393b4e 100644
--- a/test cases/common/62 exe static shared/subdir/meson.build
+++ b/test cases/common/59 exe static shared/subdir/meson.build
diff --git a/test cases/common/62 exe static shared/subdir/shlib.c b/test cases/common/59 exe static shared/subdir/shlib.c
index 002c83f92..002c83f92 100644
--- a/test cases/common/62 exe static shared/subdir/shlib.c
+++ b/test cases/common/59 exe static shared/subdir/shlib.c
diff --git a/test cases/common/63 array methods/meson.build b/test cases/common/60 array methods/meson.build
index cdda41dbf..cdda41dbf 100644
--- a/test cases/common/63 array methods/meson.build
+++ b/test cases/common/60 array methods/meson.build
diff --git a/test cases/common/64 custom header generator/input.def b/test cases/common/61 custom header generator/input.def
index 573541ac9..573541ac9 100644
--- a/test cases/common/64 custom header generator/input.def
+++ b/test cases/common/61 custom header generator/input.def
diff --git a/test cases/common/64 custom header generator/makeheader.py b/test cases/common/61 custom header generator/makeheader.py
index f15683447..f15683447 100644
--- a/test cases/common/64 custom header generator/makeheader.py
+++ b/test cases/common/61 custom header generator/makeheader.py
diff --git a/test cases/common/64 custom header generator/meson.build b/test cases/common/61 custom header generator/meson.build
index d43915a3c..d43915a3c 100644
--- a/test cases/common/64 custom header generator/meson.build
+++ b/test cases/common/61 custom header generator/meson.build
diff --git a/test cases/common/64 custom header generator/prog.c b/test cases/common/61 custom header generator/prog.c
index 184973a8a..184973a8a 100644
--- a/test cases/common/64 custom header generator/prog.c
+++ b/test cases/common/61 custom header generator/prog.c
diff --git a/test cases/common/64 custom header generator/somefile.txt b/test cases/common/61 custom header generator/somefile.txt
index e69de29bb..e69de29bb 100644
--- a/test cases/common/64 custom header generator/somefile.txt
+++ b/test cases/common/61 custom header generator/somefile.txt
diff --git a/test cases/common/65 multiple generators/data2.dat b/test cases/common/62 multiple generators/data2.dat
index 0cfbf0888..0cfbf0888 100644
--- a/test cases/common/65 multiple generators/data2.dat
+++ b/test cases/common/62 multiple generators/data2.dat
diff --git a/test cases/common/65 multiple generators/main.cpp b/test cases/common/62 multiple generators/main.cpp
index 527706355..527706355 100644
--- a/test cases/common/65 multiple generators/main.cpp
+++ b/test cases/common/62 multiple generators/main.cpp
diff --git a/test cases/common/65 multiple generators/meson.build b/test cases/common/62 multiple generators/meson.build
index 66f7fa9c1..66f7fa9c1 100644
--- a/test cases/common/65 multiple generators/meson.build
+++ b/test cases/common/62 multiple generators/meson.build
diff --git a/test cases/common/65 multiple generators/mygen.py b/test cases/common/62 multiple generators/mygen.py
index 99dc33136..99dc33136 100755
--- a/test cases/common/65 multiple generators/mygen.py
+++ b/test cases/common/62 multiple generators/mygen.py
diff --git a/test cases/common/65 multiple generators/subdir/data.dat b/test cases/common/62 multiple generators/subdir/data.dat
index d00491fd7..d00491fd7 100644
--- a/test cases/common/65 multiple generators/subdir/data.dat
+++ b/test cases/common/62 multiple generators/subdir/data.dat
diff --git a/test cases/common/65 multiple generators/subdir/meson.build b/test cases/common/62 multiple generators/subdir/meson.build
index 2456ecb6d..2456ecb6d 100644
--- a/test cases/common/65 multiple generators/subdir/meson.build
+++ b/test cases/common/62 multiple generators/subdir/meson.build
diff --git a/test cases/common/66 install subdir/installed_files.txt b/test cases/common/63 install subdir/installed_files.txt
index 3f561d5c4..3f561d5c4 100644
--- a/test cases/common/66 install subdir/installed_files.txt
+++ b/test cases/common/63 install subdir/installed_files.txt
diff --git a/test cases/common/66 install subdir/meson.build b/test cases/common/63 install subdir/meson.build
index 6f92efdb8..6f92efdb8 100644
--- a/test cases/common/66 install subdir/meson.build
+++ b/test cases/common/63 install subdir/meson.build
diff --git a/test cases/common/66 install subdir/nested_elided/sub/dircheck/nineth.dat b/test cases/common/63 install subdir/nested_elided/sub/dircheck/nineth.dat
index c4eaca780..c4eaca780 100644
--- a/test cases/common/66 install subdir/nested_elided/sub/dircheck/nineth.dat
+++ b/test cases/common/63 install subdir/nested_elided/sub/dircheck/nineth.dat
diff --git a/test cases/common/66 install subdir/nested_elided/sub/eighth.dat b/test cases/common/63 install subdir/nested_elided/sub/eighth.dat
index fa9b7b77f..fa9b7b77f 100644
--- a/test cases/common/66 install subdir/nested_elided/sub/eighth.dat
+++ b/test cases/common/63 install subdir/nested_elided/sub/eighth.dat
diff --git a/test cases/common/66 install subdir/sub/sub1/third.dat b/test cases/common/63 install subdir/sub/sub1/third.dat
index 5ccbc43c7..5ccbc43c7 100644
--- a/test cases/common/66 install subdir/sub/sub1/third.dat
+++ b/test cases/common/63 install subdir/sub/sub1/third.dat
diff --git a/test cases/common/66 install subdir/sub1/second.dat b/test cases/common/63 install subdir/sub1/second.dat
index 48857a8b6..48857a8b6 100644
--- a/test cases/common/66 install subdir/sub1/second.dat
+++ b/test cases/common/63 install subdir/sub1/second.dat
diff --git a/test cases/common/66 install subdir/sub2/dircheck/excluded-three.dat b/test cases/common/63 install subdir/sub2/dircheck/excluded-three.dat
index e69de29bb..e69de29bb 100644
--- a/test cases/common/66 install subdir/sub2/dircheck/excluded-three.dat
+++ b/test cases/common/63 install subdir/sub2/dircheck/excluded-three.dat
diff --git a/test cases/common/66 install subdir/sub2/excluded-three.dat b/test cases/common/63 install subdir/sub2/excluded-three.dat
index e69de29bb..e69de29bb 100644
--- a/test cases/common/66 install subdir/sub2/excluded-three.dat
+++ b/test cases/common/63 install subdir/sub2/excluded-three.dat
diff --git a/test cases/common/66 install subdir/sub2/excluded/two.dat b/test cases/common/63 install subdir/sub2/excluded/two.dat
index e69de29bb..e69de29bb 100644
--- a/test cases/common/66 install subdir/sub2/excluded/two.dat
+++ b/test cases/common/63 install subdir/sub2/excluded/two.dat
diff --git a/test cases/common/66 install subdir/sub2/one.dat b/test cases/common/63 install subdir/sub2/one.dat
index e69de29bb..e69de29bb 100644
--- a/test cases/common/66 install subdir/sub2/one.dat
+++ b/test cases/common/63 install subdir/sub2/one.dat
diff --git a/test cases/common/66 install subdir/sub_elided/dircheck/fifth.dat b/test cases/common/63 install subdir/sub_elided/dircheck/fifth.dat
index b6ca0098f..b6ca0098f 100644
--- a/test cases/common/66 install subdir/sub_elided/dircheck/fifth.dat
+++ b/test cases/common/63 install subdir/sub_elided/dircheck/fifth.dat
diff --git a/test cases/common/66 install subdir/sub_elided/fourth.dat b/test cases/common/63 install subdir/sub_elided/fourth.dat
index ca5f26a62..ca5f26a62 100644
--- a/test cases/common/66 install subdir/sub_elided/fourth.dat
+++ b/test cases/common/63 install subdir/sub_elided/fourth.dat
diff --git a/test cases/common/66 install subdir/subdir/meson.build b/test cases/common/63 install subdir/subdir/meson.build
index 0f81cdb8f..0f81cdb8f 100644
--- a/test cases/common/66 install subdir/subdir/meson.build
+++ b/test cases/common/63 install subdir/subdir/meson.build
diff --git a/test cases/common/66 install subdir/subdir/sub1/data1.dat b/test cases/common/63 install subdir/subdir/sub1/data1.dat
index d83c370e3..d83c370e3 100644
--- a/test cases/common/66 install subdir/subdir/sub1/data1.dat
+++ b/test cases/common/63 install subdir/subdir/sub1/data1.dat
diff --git a/test cases/common/66 install subdir/subdir/sub1/sub2/data2.dat b/test cases/common/63 install subdir/subdir/sub1/sub2/data2.dat
index 8ce1392b0..8ce1392b0 100644
--- a/test cases/common/66 install subdir/subdir/sub1/sub2/data2.dat
+++ b/test cases/common/63 install subdir/subdir/sub1/sub2/data2.dat
diff --git a/test cases/common/66 install subdir/subdir/sub_elided/dircheck/seventh.dat b/test cases/common/63 install subdir/subdir/sub_elided/dircheck/seventh.dat
index ea0b8dc5c..ea0b8dc5c 100644
--- a/test cases/common/66 install subdir/subdir/sub_elided/dircheck/seventh.dat
+++ b/test cases/common/63 install subdir/subdir/sub_elided/dircheck/seventh.dat
diff --git a/test cases/common/66 install subdir/subdir/sub_elided/sixth.dat b/test cases/common/63 install subdir/subdir/sub_elided/sixth.dat
index 140f07560..140f07560 100644
--- a/test cases/common/66 install subdir/subdir/sub_elided/sixth.dat
+++ b/test cases/common/63 install subdir/subdir/sub_elided/sixth.dat
diff --git a/test cases/common/67 foreach/installed_files.txt b/test cases/common/64 foreach/installed_files.txt
index 2930ff087..2930ff087 100644
--- a/test cases/common/67 foreach/installed_files.txt
+++ b/test cases/common/64 foreach/installed_files.txt
diff --git a/test cases/common/67 foreach/meson.build b/test cases/common/64 foreach/meson.build
index e633de887..e633de887 100644
--- a/test cases/common/67 foreach/meson.build
+++ b/test cases/common/64 foreach/meson.build
diff --git a/test cases/common/67 foreach/prog1.c b/test cases/common/64 foreach/prog1.c
index a5ef0f1b1..a5ef0f1b1 100644
--- a/test cases/common/67 foreach/prog1.c
+++ b/test cases/common/64 foreach/prog1.c
diff --git a/test cases/common/67 foreach/prog2.c b/test cases/common/64 foreach/prog2.c
index b9fddbebd..b9fddbebd 100644
--- a/test cases/common/67 foreach/prog2.c
+++ b/test cases/common/64 foreach/prog2.c
diff --git a/test cases/common/67 foreach/prog3.c b/test cases/common/64 foreach/prog3.c
index 56573967a..56573967a 100644
--- a/test cases/common/67 foreach/prog3.c
+++ b/test cases/common/64 foreach/prog3.c
diff --git a/test cases/common/68 number arithmetic/meson.build b/test cases/common/65 number arithmetic/meson.build
index e31d7e4e9..e31d7e4e9 100644
--- a/test cases/common/68 number arithmetic/meson.build
+++ b/test cases/common/65 number arithmetic/meson.build
diff --git a/test cases/common/69 string arithmetic/meson.build b/test cases/common/66 string arithmetic/meson.build
index 59567de49..59567de49 100644
--- a/test cases/common/69 string arithmetic/meson.build
+++ b/test cases/common/66 string arithmetic/meson.build
diff --git a/test cases/common/70 array arithmetic/meson.build b/test cases/common/67 array arithmetic/meson.build
index 8b8785afc..8b8785afc 100644
--- a/test cases/common/70 array arithmetic/meson.build
+++ b/test cases/common/67 array arithmetic/meson.build
diff --git a/test cases/common/71 arithmetic bidmas/meson.build b/test cases/common/68 arithmetic bidmas/meson.build
index c7334b48f..c7334b48f 100644
--- a/test cases/common/71 arithmetic bidmas/meson.build
+++ b/test cases/common/68 arithmetic bidmas/meson.build
diff --git a/test cases/common/72 build always/main.c b/test cases/common/69 build always/main.c
index f8d9ac971..f8d9ac971 100644
--- a/test cases/common/72 build always/main.c
+++ b/test cases/common/69 build always/main.c
diff --git a/test cases/common/72 build always/meson.build b/test cases/common/69 build always/meson.build
index f720c8943..f720c8943 100644
--- a/test cases/common/72 build always/meson.build
+++ b/test cases/common/69 build always/meson.build
diff --git a/test cases/common/72 build always/version.c.in b/test cases/common/69 build always/version.c.in
index 619e51786..619e51786 100644
--- a/test cases/common/72 build always/version.c.in
+++ b/test cases/common/69 build always/version.c.in
diff --git a/test cases/common/72 build always/version.h b/test cases/common/69 build always/version.h
index d3fe5c695..d3fe5c695 100644
--- a/test cases/common/72 build always/version.h
+++ b/test cases/common/69 build always/version.h
diff --git a/test cases/common/72 build always/version_gen.py b/test cases/common/69 build always/version_gen.py
index fbe2df93f..fbe2df93f 100755
--- a/test cases/common/72 build always/version_gen.py
+++ b/test cases/common/69 build always/version_gen.py
diff --git a/test cases/common/73 vcstag/meson.build b/test cases/common/70 vcstag/meson.build
index 7e5983aaa..7e5983aaa 100644
--- a/test cases/common/73 vcstag/meson.build
+++ b/test cases/common/70 vcstag/meson.build
diff --git a/test cases/common/73 vcstag/tagprog.c b/test cases/common/70 vcstag/tagprog.c
index 34146b43e..34146b43e 100644
--- a/test cases/common/73 vcstag/tagprog.c
+++ b/test cases/common/70 vcstag/tagprog.c
diff --git a/test cases/common/73 vcstag/vcstag.c.in b/test cases/common/70 vcstag/vcstag.c.in
index 09192d90d..09192d90d 100644
--- a/test cases/common/73 vcstag/vcstag.c.in
+++ b/test cases/common/70 vcstag/vcstag.c.in
diff --git a/test cases/common/74 modules/meson.build b/test cases/common/71 modules/meson.build
index e9750cd97..e9750cd97 100644
--- a/test cases/common/74 modules/meson.build
+++ b/test cases/common/71 modules/meson.build
diff --git a/test cases/common/75 should fail/failing.c b/test cases/common/72 should fail/failing.c
index adada8def..adada8def 100644
--- a/test cases/common/75 should fail/failing.c
+++ b/test cases/common/72 should fail/failing.c
diff --git a/test cases/common/75 should fail/meson.build b/test cases/common/72 should fail/meson.build
index dffbbb381..dffbbb381 100644
--- a/test cases/common/75 should fail/meson.build
+++ b/test cases/common/72 should fail/meson.build
diff --git a/test cases/common/76 configure file in custom target/inc/confdata.in b/test cases/common/73 configure file in custom target/inc/confdata.in
index e44cdea20..e44cdea20 100644
--- a/test cases/common/76 configure file in custom target/inc/confdata.in
+++ b/test cases/common/73 configure file in custom target/inc/confdata.in
diff --git a/test cases/common/76 configure file in custom target/inc/meson.build b/test cases/common/73 configure file in custom target/inc/meson.build
index 05d2dcb8a..05d2dcb8a 100644
--- a/test cases/common/76 configure file in custom target/inc/meson.build
+++ b/test cases/common/73 configure file in custom target/inc/meson.build
diff --git a/test cases/common/76 configure file in custom target/meson.build b/test cases/common/73 configure file in custom target/meson.build
index 0a850a1a6..0a850a1a6 100644
--- a/test cases/common/76 configure file in custom target/meson.build
+++ b/test cases/common/73 configure file in custom target/meson.build
diff --git a/test cases/common/76 configure file in custom target/src/meson.build b/test cases/common/73 configure file in custom target/src/meson.build
index e0ab9ebb2..e0ab9ebb2 100644
--- a/test cases/common/76 configure file in custom target/src/meson.build
+++ b/test cases/common/73 configure file in custom target/src/meson.build
diff --git a/test cases/common/76 configure file in custom target/src/mycompiler.py b/test cases/common/73 configure file in custom target/src/mycompiler.py
index b00c862db..b00c862db 100644
--- a/test cases/common/76 configure file in custom target/src/mycompiler.py
+++ b/test cases/common/73 configure file in custom target/src/mycompiler.py
diff --git a/test cases/common/77 external test program/meson.build b/test cases/common/74 external test program/meson.build
index d18ddcde5..d18ddcde5 100644
--- a/test cases/common/77 external test program/meson.build
+++ b/test cases/common/74 external test program/meson.build
diff --git a/test cases/common/77 external test program/mytest.py b/test cases/common/74 external test program/mytest.py
index 9947773f7..9947773f7 100755
--- a/test cases/common/77 external test program/mytest.py
+++ b/test cases/common/74 external test program/mytest.py
diff --git a/test cases/common/78 ctarget dependency/gen1.py b/test cases/common/75 ctarget dependency/gen1.py
index 0fa6ea1eb..0fa6ea1eb 100755
--- a/test cases/common/78 ctarget dependency/gen1.py
+++ b/test cases/common/75 ctarget dependency/gen1.py
diff --git a/test cases/common/78 ctarget dependency/gen2.py b/test cases/common/75 ctarget dependency/gen2.py
index b087b02cc..b087b02cc 100755
--- a/test cases/common/78 ctarget dependency/gen2.py
+++ b/test cases/common/75 ctarget dependency/gen2.py
diff --git a/test cases/common/78 ctarget dependency/input.dat b/test cases/common/75 ctarget dependency/input.dat
index 7af91e29a..7af91e29a 100644
--- a/test cases/common/78 ctarget dependency/input.dat
+++ b/test cases/common/75 ctarget dependency/input.dat
diff --git a/test cases/common/78 ctarget dependency/meson.build b/test cases/common/75 ctarget dependency/meson.build
index cd11951b2..cd11951b2 100644
--- a/test cases/common/78 ctarget dependency/meson.build
+++ b/test cases/common/75 ctarget dependency/meson.build
diff --git a/test cases/common/79 shared subproject/a.c b/test cases/common/76 shared subproject/a.c
index 6ed96fa05..6ed96fa05 100644
--- a/test cases/common/79 shared subproject/a.c
+++ b/test cases/common/76 shared subproject/a.c
diff --git a/test cases/common/79 shared subproject/meson.build b/test cases/common/76 shared subproject/meson.build
index 6803d519d..6803d519d 100644
--- a/test cases/common/79 shared subproject/meson.build
+++ b/test cases/common/76 shared subproject/meson.build
diff --git a/test cases/common/79 shared subproject/subprojects/B/b.c b/test cases/common/76 shared subproject/subprojects/B/b.c
index a1f3a5147..a1f3a5147 100644
--- a/test cases/common/79 shared subproject/subprojects/B/b.c
+++ b/test cases/common/76 shared subproject/subprojects/B/b.c
diff --git a/test cases/common/79 shared subproject/subprojects/B/meson.build b/test cases/common/76 shared subproject/subprojects/B/meson.build
index 280c60ce2..280c60ce2 100644
--- a/test cases/common/79 shared subproject/subprojects/B/meson.build
+++ b/test cases/common/76 shared subproject/subprojects/B/meson.build
diff --git a/test cases/common/79 shared subproject/subprojects/C/c.c b/test cases/common/76 shared subproject/subprojects/C/c.c
index eebfb9fba..eebfb9fba 100644
--- a/test cases/common/79 shared subproject/subprojects/C/c.c
+++ b/test cases/common/76 shared subproject/subprojects/C/c.c
diff --git a/test cases/common/79 shared subproject/subprojects/C/meson.build b/test cases/common/76 shared subproject/subprojects/C/meson.build
index abf0b1e26..abf0b1e26 100644
--- a/test cases/common/79 shared subproject/subprojects/C/meson.build
+++ b/test cases/common/76 shared subproject/subprojects/C/meson.build
diff --git a/test cases/common/80 shared subproject 2/a.c b/test cases/common/77 shared subproject 2/a.c
index 6ed96fa05..6ed96fa05 100644
--- a/test cases/common/80 shared subproject 2/a.c
+++ b/test cases/common/77 shared subproject 2/a.c
diff --git a/test cases/common/80 shared subproject 2/meson.build b/test cases/common/77 shared subproject 2/meson.build
index 064732597..064732597 100644
--- a/test cases/common/80 shared subproject 2/meson.build
+++ b/test cases/common/77 shared subproject 2/meson.build
diff --git a/test cases/common/80 shared subproject 2/subprojects/B/b.c b/test cases/common/77 shared subproject 2/subprojects/B/b.c
index 4c94ee95f..4c94ee95f 100644
--- a/test cases/common/80 shared subproject 2/subprojects/B/b.c
+++ b/test cases/common/77 shared subproject 2/subprojects/B/b.c
diff --git a/test cases/common/80 shared subproject 2/subprojects/B/meson.build b/test cases/common/77 shared subproject 2/subprojects/B/meson.build
index 280c60ce2..280c60ce2 100644
--- a/test cases/common/80 shared subproject 2/subprojects/B/meson.build
+++ b/test cases/common/77 shared subproject 2/subprojects/B/meson.build
diff --git a/test cases/common/80 shared subproject 2/subprojects/C/c.c b/test cases/common/77 shared subproject 2/subprojects/C/c.c
index eebfb9fba..eebfb9fba 100644
--- a/test cases/common/80 shared subproject 2/subprojects/C/c.c
+++ b/test cases/common/77 shared subproject 2/subprojects/C/c.c
diff --git a/test cases/common/80 shared subproject 2/subprojects/C/meson.build b/test cases/common/77 shared subproject 2/subprojects/C/meson.build
index abf0b1e26..abf0b1e26 100644
--- a/test cases/common/80 shared subproject 2/subprojects/C/meson.build
+++ b/test cases/common/77 shared subproject 2/subprojects/C/meson.build
diff --git a/test cases/common/81 file object/lib.c b/test cases/common/78 file object/lib.c
index 6f1c172d6..6f1c172d6 100644
--- a/test cases/common/81 file object/lib.c
+++ b/test cases/common/78 file object/lib.c
diff --git a/test cases/common/81 file object/meson.build b/test cases/common/78 file object/meson.build
index c3ecb7be9..c3ecb7be9 100644
--- a/test cases/common/81 file object/meson.build
+++ b/test cases/common/78 file object/meson.build
diff --git a/test cases/common/81 file object/prog.c b/test cases/common/78 file object/prog.c
index 884d678c5..884d678c5 100644
--- a/test cases/common/81 file object/prog.c
+++ b/test cases/common/78 file object/prog.c
diff --git a/test cases/common/81 file object/subdir1/lib.c b/test cases/common/78 file object/subdir1/lib.c
index bc1e7b0a1..bc1e7b0a1 100644
--- a/test cases/common/81 file object/subdir1/lib.c
+++ b/test cases/common/78 file object/subdir1/lib.c
diff --git a/test cases/common/81 file object/subdir1/meson.build b/test cases/common/78 file object/subdir1/meson.build
index f5066f00f..f5066f00f 100644
--- a/test cases/common/81 file object/subdir1/meson.build
+++ b/test cases/common/78 file object/subdir1/meson.build
diff --git a/test cases/common/81 file object/subdir1/prog.c b/test cases/common/78 file object/subdir1/prog.c
index 37ccf7294..37ccf7294 100644
--- a/test cases/common/81 file object/subdir1/prog.c
+++ b/test cases/common/78 file object/subdir1/prog.c
diff --git a/test cases/common/81 file object/subdir2/lib.c b/test cases/common/78 file object/subdir2/lib.c
index cfef4d074..cfef4d074 100644
--- a/test cases/common/81 file object/subdir2/lib.c
+++ b/test cases/common/78 file object/subdir2/lib.c
diff --git a/test cases/common/81 file object/subdir2/meson.build b/test cases/common/78 file object/subdir2/meson.build
index 588651019..588651019 100644
--- a/test cases/common/81 file object/subdir2/meson.build
+++ b/test cases/common/78 file object/subdir2/meson.build
diff --git a/test cases/common/81 file object/subdir2/prog.c b/test cases/common/78 file object/subdir2/prog.c
index 3a90b0a93..3a90b0a93 100644
--- a/test cases/common/81 file object/subdir2/prog.c
+++ b/test cases/common/78 file object/subdir2/prog.c
diff --git a/test cases/common/82 custom subproject dir/a.c b/test cases/common/79 custom subproject dir/a.c
index 6ed96fa05..6ed96fa05 100644
--- a/test cases/common/82 custom subproject dir/a.c
+++ b/test cases/common/79 custom subproject dir/a.c
diff --git a/test cases/common/82 custom subproject dir/custom_subproject_dir/B/b.c b/test cases/common/79 custom subproject dir/custom_subproject_dir/B/b.c
index 4c94ee95f..4c94ee95f 100644
--- a/test cases/common/82 custom subproject dir/custom_subproject_dir/B/b.c
+++ b/test cases/common/79 custom subproject dir/custom_subproject_dir/B/b.c
diff --git a/test cases/common/82 custom subproject dir/custom_subproject_dir/B/meson.build b/test cases/common/79 custom subproject dir/custom_subproject_dir/B/meson.build
index 280c60ce2..280c60ce2 100644
--- a/test cases/common/82 custom subproject dir/custom_subproject_dir/B/meson.build
+++ b/test cases/common/79 custom subproject dir/custom_subproject_dir/B/meson.build
diff --git a/test cases/common/82 custom subproject dir/custom_subproject_dir/C/c.c b/test cases/common/79 custom subproject dir/custom_subproject_dir/C/c.c
index eebfb9fba..eebfb9fba 100644
--- a/test cases/common/82 custom subproject dir/custom_subproject_dir/C/c.c
+++ b/test cases/common/79 custom subproject dir/custom_subproject_dir/C/c.c
diff --git a/test cases/common/82 custom subproject dir/custom_subproject_dir/C/meson.build b/test cases/common/79 custom subproject dir/custom_subproject_dir/C/meson.build
index abf0b1e26..abf0b1e26 100644
--- a/test cases/common/82 custom subproject dir/custom_subproject_dir/C/meson.build
+++ b/test cases/common/79 custom subproject dir/custom_subproject_dir/C/meson.build
diff --git a/test cases/common/82 custom subproject dir/meson.build b/test cases/common/79 custom subproject dir/meson.build
index d9ba649b1..d9ba649b1 100644
--- a/test cases/common/82 custom subproject dir/meson.build
+++ b/test cases/common/79 custom subproject dir/meson.build
diff --git a/test cases/common/83 has type/meson.build b/test cases/common/80 has type/meson.build
index de8dbc834..de8dbc834 100644
--- a/test cases/common/83 has type/meson.build
+++ b/test cases/common/80 has type/meson.build
diff --git a/test cases/common/84 extract from nested subdir/meson.build b/test cases/common/81 extract from nested subdir/meson.build
index 3a42806f0..3a42806f0 100644
--- a/test cases/common/84 extract from nested subdir/meson.build
+++ b/test cases/common/81 extract from nested subdir/meson.build
diff --git a/test cases/common/84 extract from nested subdir/src/first/lib_first.c b/test cases/common/81 extract from nested subdir/src/first/lib_first.c
index 30049063f..30049063f 100644
--- a/test cases/common/84 extract from nested subdir/src/first/lib_first.c
+++ b/test cases/common/81 extract from nested subdir/src/first/lib_first.c
diff --git a/test cases/common/84 extract from nested subdir/src/first/meson.build b/test cases/common/81 extract from nested subdir/src/first/meson.build
index b97aef44e..b97aef44e 100644
--- a/test cases/common/84 extract from nested subdir/src/first/meson.build
+++ b/test cases/common/81 extract from nested subdir/src/first/meson.build
diff --git a/test cases/common/84 extract from nested subdir/src/meson.build b/test cases/common/81 extract from nested subdir/src/meson.build
index 3f5ec3200..3f5ec3200 100644
--- a/test cases/common/84 extract from nested subdir/src/meson.build
+++ b/test cases/common/81 extract from nested subdir/src/meson.build
diff --git a/test cases/common/84 extract from nested subdir/tst/first/exe_first.c b/test cases/common/81 extract from nested subdir/tst/first/exe_first.c
index f6c1f7471..f6c1f7471 100644
--- a/test cases/common/84 extract from nested subdir/tst/first/exe_first.c
+++ b/test cases/common/81 extract from nested subdir/tst/first/exe_first.c
diff --git a/test cases/common/84 extract from nested subdir/tst/first/meson.build b/test cases/common/81 extract from nested subdir/tst/first/meson.build
index a6fa7da1b..a6fa7da1b 100644
--- a/test cases/common/84 extract from nested subdir/tst/first/meson.build
+++ b/test cases/common/81 extract from nested subdir/tst/first/meson.build
diff --git a/test cases/common/84 extract from nested subdir/tst/meson.build b/test cases/common/81 extract from nested subdir/tst/meson.build
index 3f5ec3200..3f5ec3200 100644
--- a/test cases/common/84 extract from nested subdir/tst/meson.build
+++ b/test cases/common/81 extract from nested subdir/tst/meson.build
diff --git a/test cases/common/85 internal dependency/meson.build b/test cases/common/82 internal dependency/meson.build
index 6faedb09e..6faedb09e 100644
--- a/test cases/common/85 internal dependency/meson.build
+++ b/test cases/common/82 internal dependency/meson.build
diff --git a/test cases/common/85 internal dependency/proj1/include/proj1.h b/test cases/common/82 internal dependency/proj1/include/proj1.h
index ded6f75c8..ded6f75c8 100644
--- a/test cases/common/85 internal dependency/proj1/include/proj1.h
+++ b/test cases/common/82 internal dependency/proj1/include/proj1.h
diff --git a/test cases/common/85 internal dependency/proj1/meson.build b/test cases/common/82 internal dependency/proj1/meson.build
index 422021edb..422021edb 100644
--- a/test cases/common/85 internal dependency/proj1/meson.build
+++ b/test cases/common/82 internal dependency/proj1/meson.build
diff --git a/test cases/common/85 internal dependency/proj1/proj1f1.c b/test cases/common/82 internal dependency/proj1/proj1f1.c
index 9077f4fa3..9077f4fa3 100644
--- a/test cases/common/85 internal dependency/proj1/proj1f1.c
+++ b/test cases/common/82 internal dependency/proj1/proj1f1.c
diff --git a/test cases/common/85 internal dependency/proj1/proj1f2.c b/test cases/common/82 internal dependency/proj1/proj1f2.c
index 374ee4eb7..374ee4eb7 100644
--- a/test cases/common/85 internal dependency/proj1/proj1f2.c
+++ b/test cases/common/82 internal dependency/proj1/proj1f2.c
diff --git a/test cases/common/85 internal dependency/proj1/proj1f3.c b/test cases/common/82 internal dependency/proj1/proj1f3.c
index 8c8fca4bd..8c8fca4bd 100644
--- a/test cases/common/85 internal dependency/proj1/proj1f3.c
+++ b/test cases/common/82 internal dependency/proj1/proj1f3.c
diff --git a/test cases/common/85 internal dependency/src/main.c b/test cases/common/82 internal dependency/src/main.c
index 7d50b05bc..7d50b05bc 100644
--- a/test cases/common/85 internal dependency/src/main.c
+++ b/test cases/common/82 internal dependency/src/main.c
diff --git a/test cases/common/85 internal dependency/src/meson.build b/test cases/common/82 internal dependency/src/meson.build
index 89f99abd1..89f99abd1 100644
--- a/test cases/common/85 internal dependency/src/meson.build
+++ b/test cases/common/82 internal dependency/src/meson.build
diff --git a/test cases/common/86 same basename/exe1.c b/test cases/common/83 same basename/exe1.c
index 175a90dde..175a90dde 100644
--- a/test cases/common/86 same basename/exe1.c
+++ b/test cases/common/83 same basename/exe1.c
diff --git a/test cases/common/86 same basename/exe2.c b/test cases/common/83 same basename/exe2.c
index 56b04ccb1..56b04ccb1 100644
--- a/test cases/common/86 same basename/exe2.c
+++ b/test cases/common/83 same basename/exe2.c
diff --git a/test cases/common/86 same basename/lib.c b/test cases/common/83 same basename/lib.c
index 6fd432e50..6fd432e50 100644
--- a/test cases/common/86 same basename/lib.c
+++ b/test cases/common/83 same basename/lib.c
diff --git a/test cases/common/86 same basename/meson.build b/test cases/common/83 same basename/meson.build
index 856c536c0..856c536c0 100644
--- a/test cases/common/86 same basename/meson.build
+++ b/test cases/common/83 same basename/meson.build
diff --git a/test cases/common/86 same basename/sharedsub/meson.build b/test cases/common/83 same basename/sharedsub/meson.build
index 29654a94d..29654a94d 100644
--- a/test cases/common/86 same basename/sharedsub/meson.build
+++ b/test cases/common/83 same basename/sharedsub/meson.build
diff --git a/test cases/common/86 same basename/staticsub/meson.build b/test cases/common/83 same basename/staticsub/meson.build
index 5e5242e06..5e5242e06 100644
--- a/test cases/common/86 same basename/staticsub/meson.build
+++ b/test cases/common/83 same basename/staticsub/meson.build
diff --git a/test cases/common/87 declare dep/entity/entity.h b/test cases/common/84 declare dep/entity/entity.h
index c695b141f..c695b141f 100644
--- a/test cases/common/87 declare dep/entity/entity.h
+++ b/test cases/common/84 declare dep/entity/entity.h
diff --git a/test cases/common/87 declare dep/entity/entity1.c b/test cases/common/84 declare dep/entity/entity1.c
index 204eb8b40..204eb8b40 100644
--- a/test cases/common/87 declare dep/entity/entity1.c
+++ b/test cases/common/84 declare dep/entity/entity1.c
diff --git a/test cases/common/87 declare dep/entity/entity2.c b/test cases/common/84 declare dep/entity/entity2.c
index f34f546f3..f34f546f3 100644
--- a/test cases/common/87 declare dep/entity/entity2.c
+++ b/test cases/common/84 declare dep/entity/entity2.c
diff --git a/test cases/common/87 declare dep/entity/meson.build b/test cases/common/84 declare dep/entity/meson.build
index 3bfe13cd8..3bfe13cd8 100644
--- a/test cases/common/87 declare dep/entity/meson.build
+++ b/test cases/common/84 declare dep/entity/meson.build
diff --git a/test cases/common/87 declare dep/main.c b/test cases/common/84 declare dep/main.c
index 4ad9d2a9a..4ad9d2a9a 100644
--- a/test cases/common/87 declare dep/main.c
+++ b/test cases/common/84 declare dep/main.c
diff --git a/test cases/common/87 declare dep/meson.build b/test cases/common/84 declare dep/meson.build
index e427defaf..e427defaf 100644
--- a/test cases/common/87 declare dep/meson.build
+++ b/test cases/common/84 declare dep/meson.build
diff --git a/test cases/common/88 extract all/extractor.h b/test cases/common/85 extract all/extractor.h
index d0917a11b..d0917a11b 100644
--- a/test cases/common/88 extract all/extractor.h
+++ b/test cases/common/85 extract all/extractor.h
diff --git a/test cases/common/88 extract all/four.c b/test cases/common/85 extract all/four.c
index 5ca6696d9..5ca6696d9 100644
--- a/test cases/common/88 extract all/four.c
+++ b/test cases/common/85 extract all/four.c
diff --git a/test cases/common/88 extract all/meson.build b/test cases/common/85 extract all/meson.build
index 4f08a4fa6..4f08a4fa6 100644
--- a/test cases/common/88 extract all/meson.build
+++ b/test cases/common/85 extract all/meson.build
diff --git a/test cases/common/88 extract all/one.c b/test cases/common/85 extract all/one.c
index cfb01571d..cfb01571d 100644
--- a/test cases/common/88 extract all/one.c
+++ b/test cases/common/85 extract all/one.c
diff --git a/test cases/common/88 extract all/prog.c b/test cases/common/85 extract all/prog.c
index 57a4c64dc..57a4c64dc 100644
--- a/test cases/common/88 extract all/prog.c
+++ b/test cases/common/85 extract all/prog.c
diff --git a/test cases/common/88 extract all/three.c b/test cases/common/85 extract all/three.c
index c41004651..c41004651 100644
--- a/test cases/common/88 extract all/three.c
+++ b/test cases/common/85 extract all/three.c
diff --git a/test cases/common/88 extract all/two.c b/test cases/common/85 extract all/two.c
index 3ece5121f..3ece5121f 100644
--- a/test cases/common/88 extract all/two.c
+++ b/test cases/common/85 extract all/two.c
diff --git a/test cases/common/89 add language/meson.build b/test cases/common/86 add language/meson.build
index d9bc0fa2b..d9bc0fa2b 100644
--- a/test cases/common/89 add language/meson.build
+++ b/test cases/common/86 add language/meson.build
diff --git a/test cases/common/89 add language/prog.c b/test cases/common/86 add language/prog.c
index 9b5685f42..9b5685f42 100644
--- a/test cases/common/89 add language/prog.c
+++ b/test cases/common/86 add language/prog.c
diff --git a/test cases/common/89 add language/prog.cc b/test cases/common/86 add language/prog.cc
index 03647dde4..03647dde4 100644
--- a/test cases/common/89 add language/prog.cc
+++ b/test cases/common/86 add language/prog.cc
diff --git a/test cases/common/90 identical target name in subproject/bar.c b/test cases/common/87 identical target name in subproject/bar.c
index 864869b4f..864869b4f 100644
--- a/test cases/common/90 identical target name in subproject/bar.c
+++ b/test cases/common/87 identical target name in subproject/bar.c
diff --git a/test cases/common/90 identical target name in subproject/meson.build b/test cases/common/87 identical target name in subproject/meson.build
index e804d3cda..e804d3cda 100644
--- a/test cases/common/90 identical target name in subproject/meson.build
+++ b/test cases/common/87 identical target name in subproject/meson.build
diff --git a/test cases/common/90 identical target name in subproject/subprojects/foo/bar.c b/test cases/common/87 identical target name in subproject/subprojects/foo/bar.c
index 106005ef4..106005ef4 100644
--- a/test cases/common/90 identical target name in subproject/subprojects/foo/bar.c
+++ b/test cases/common/87 identical target name in subproject/subprojects/foo/bar.c
diff --git a/test cases/common/90 identical target name in subproject/subprojects/foo/meson.build b/test cases/common/87 identical target name in subproject/subprojects/foo/meson.build
index 3f2233775..3f2233775 100644
--- a/test cases/common/90 identical target name in subproject/subprojects/foo/meson.build
+++ b/test cases/common/87 identical target name in subproject/subprojects/foo/meson.build
diff --git a/test cases/common/91 plusassign/meson.build b/test cases/common/88 plusassign/meson.build
index ac477e740..ac477e740 100644
--- a/test cases/common/91 plusassign/meson.build
+++ b/test cases/common/88 plusassign/meson.build
diff --git a/test cases/common/92 skip subdir/meson.build b/test cases/common/89 skip subdir/meson.build
index 30ede0ea2..30ede0ea2 100644
--- a/test cases/common/92 skip subdir/meson.build
+++ b/test cases/common/89 skip subdir/meson.build
diff --git a/test cases/common/92 skip subdir/subdir1/meson.build b/test cases/common/89 skip subdir/subdir1/meson.build
index 51cb003e1..51cb003e1 100644
--- a/test cases/common/92 skip subdir/subdir1/meson.build
+++ b/test cases/common/89 skip subdir/subdir1/meson.build
diff --git a/test cases/common/92 skip subdir/subdir1/subdir2/meson.build b/test cases/common/89 skip subdir/subdir1/subdir2/meson.build
index e37cad6b6..e37cad6b6 100644
--- a/test cases/common/92 skip subdir/subdir1/subdir2/meson.build
+++ b/test cases/common/89 skip subdir/subdir1/subdir2/meson.build
diff --git a/test cases/common/93 private include/meson.build b/test cases/common/90 private include/meson.build
index 2485fbf74..2485fbf74 100644
--- a/test cases/common/93 private include/meson.build
+++ b/test cases/common/90 private include/meson.build
diff --git a/test cases/common/93 private include/stlib/compiler.py b/test cases/common/90 private include/stlib/compiler.py
index 98dbe46fa..98dbe46fa 100755
--- a/test cases/common/93 private include/stlib/compiler.py
+++ b/test cases/common/90 private include/stlib/compiler.py
diff --git a/test cases/common/93 private include/stlib/foo1.def b/test cases/common/90 private include/stlib/foo1.def
index e69de29bb..e69de29bb 100644
--- a/test cases/common/93 private include/stlib/foo1.def
+++ b/test cases/common/90 private include/stlib/foo1.def
diff --git a/test cases/common/93 private include/stlib/foo2.def b/test cases/common/90 private include/stlib/foo2.def
index e69de29bb..e69de29bb 100644
--- a/test cases/common/93 private include/stlib/foo2.def
+++ b/test cases/common/90 private include/stlib/foo2.def
diff --git a/test cases/common/93 private include/stlib/meson.build b/test cases/common/90 private include/stlib/meson.build
index 8d70650d8..8d70650d8 100644
--- a/test cases/common/93 private include/stlib/meson.build
+++ b/test cases/common/90 private include/stlib/meson.build
diff --git a/test cases/common/93 private include/user/libuser.c b/test cases/common/90 private include/user/libuser.c
index a74a973a0..a74a973a0 100644
--- a/test cases/common/93 private include/user/libuser.c
+++ b/test cases/common/90 private include/user/libuser.c
diff --git a/test cases/common/93 private include/user/meson.build b/test cases/common/90 private include/user/meson.build
index ab88b1dbd..ab88b1dbd 100644
--- a/test cases/common/93 private include/user/meson.build
+++ b/test cases/common/90 private include/user/meson.build
diff --git a/test cases/common/94 default options/meson.build b/test cases/common/91 default options/meson.build
index 9f45df072..9f45df072 100644
--- a/test cases/common/94 default options/meson.build
+++ b/test cases/common/91 default options/meson.build
diff --git a/test cases/common/95 dep fallback/gensrc.py b/test cases/common/92 dep fallback/gensrc.py
index ff42ac359..ff42ac359 100644
--- a/test cases/common/95 dep fallback/gensrc.py
+++ b/test cases/common/92 dep fallback/gensrc.py
diff --git a/test cases/common/95 dep fallback/meson.build b/test cases/common/92 dep fallback/meson.build
index a96520e21..a96520e21 100644
--- a/test cases/common/95 dep fallback/meson.build
+++ b/test cases/common/92 dep fallback/meson.build
diff --git a/test cases/common/95 dep fallback/subprojects/boblib/bob.c b/test cases/common/92 dep fallback/subprojects/boblib/bob.c
index ae0f394d5..ae0f394d5 100644
--- a/test cases/common/95 dep fallback/subprojects/boblib/bob.c
+++ b/test cases/common/92 dep fallback/subprojects/boblib/bob.c
diff --git a/test cases/common/95 dep fallback/subprojects/boblib/bob.h b/test cases/common/92 dep fallback/subprojects/boblib/bob.h
index f874ae7c1..f874ae7c1 100644
--- a/test cases/common/95 dep fallback/subprojects/boblib/bob.h
+++ b/test cases/common/92 dep fallback/subprojects/boblib/bob.h
diff --git a/test cases/common/95 dep fallback/subprojects/boblib/genbob.py b/test cases/common/92 dep fallback/subprojects/boblib/genbob.py
index 34af7790e..34af7790e 100644
--- a/test cases/common/95 dep fallback/subprojects/boblib/genbob.py
+++ b/test cases/common/92 dep fallback/subprojects/boblib/genbob.py
diff --git a/test cases/common/95 dep fallback/subprojects/boblib/meson.build b/test cases/common/92 dep fallback/subprojects/boblib/meson.build
index bb250e42f..bb250e42f 100644
--- a/test cases/common/95 dep fallback/subprojects/boblib/meson.build
+++ b/test cases/common/92 dep fallback/subprojects/boblib/meson.build
diff --git a/test cases/common/95 dep fallback/subprojects/dummylib/meson.build b/test cases/common/92 dep fallback/subprojects/dummylib/meson.build
index 3ad33e7b9..3ad33e7b9 100644
--- a/test cases/common/95 dep fallback/subprojects/dummylib/meson.build
+++ b/test cases/common/92 dep fallback/subprojects/dummylib/meson.build
diff --git a/test cases/common/95 dep fallback/tester.c b/test cases/common/92 dep fallback/tester.c
index e6651d961..e6651d961 100644
--- a/test cases/common/95 dep fallback/tester.c
+++ b/test cases/common/92 dep fallback/tester.c
diff --git a/test cases/common/96 default library/ef.cpp b/test cases/common/93 default library/ef.cpp
index 34784f88a..34784f88a 100644
--- a/test cases/common/96 default library/ef.cpp
+++ b/test cases/common/93 default library/ef.cpp
diff --git a/test cases/common/96 default library/ef.h b/test cases/common/93 default library/ef.h
index 21704b557..21704b557 100644
--- a/test cases/common/96 default library/ef.h
+++ b/test cases/common/93 default library/ef.h
diff --git a/test cases/common/96 default library/eftest.cpp b/test cases/common/93 default library/eftest.cpp
index 4d4412d75..4d4412d75 100644
--- a/test cases/common/96 default library/eftest.cpp
+++ b/test cases/common/93 default library/eftest.cpp
diff --git a/test cases/common/96 default library/meson.build b/test cases/common/93 default library/meson.build
index 903cfe40a..903cfe40a 100644
--- a/test cases/common/96 default library/meson.build
+++ b/test cases/common/93 default library/meson.build
diff --git a/test cases/common/97 selfbuilt custom/data.dat b/test cases/common/94 selfbuilt custom/data.dat
index 83fd1d90d..83fd1d90d 100644
--- a/test cases/common/97 selfbuilt custom/data.dat
+++ b/test cases/common/94 selfbuilt custom/data.dat
diff --git a/test cases/common/97 selfbuilt custom/mainprog.cpp b/test cases/common/94 selfbuilt custom/mainprog.cpp
index dcf9d20e8..dcf9d20e8 100644
--- a/test cases/common/97 selfbuilt custom/mainprog.cpp
+++ b/test cases/common/94 selfbuilt custom/mainprog.cpp
diff --git a/test cases/common/97 selfbuilt custom/meson.build b/test cases/common/94 selfbuilt custom/meson.build
index e5da27ef9..e5da27ef9 100644
--- a/test cases/common/97 selfbuilt custom/meson.build
+++ b/test cases/common/94 selfbuilt custom/meson.build
diff --git a/test cases/common/97 selfbuilt custom/tool.cpp b/test cases/common/94 selfbuilt custom/tool.cpp
index 6a28dd800..6a28dd800 100644
--- a/test cases/common/97 selfbuilt custom/tool.cpp
+++ b/test cases/common/94 selfbuilt custom/tool.cpp
diff --git a/test cases/common/98 gen extra/meson.build b/test cases/common/95 gen extra/meson.build
index cbbdceb2e..cbbdceb2e 100644
--- a/test cases/common/98 gen extra/meson.build
+++ b/test cases/common/95 gen extra/meson.build
diff --git a/test cases/common/98 gen extra/name.dat b/test cases/common/95 gen extra/name.dat
index caf5b1caf..caf5b1caf 100644
--- a/test cases/common/98 gen extra/name.dat
+++ b/test cases/common/95 gen extra/name.dat
diff --git a/test cases/common/98 gen extra/name.l b/test cases/common/95 gen extra/name.l
index 3adda4f7b..3adda4f7b 100644
--- a/test cases/common/98 gen extra/name.l
+++ b/test cases/common/95 gen extra/name.l
diff --git a/test cases/common/98 gen extra/plain.c b/test cases/common/95 gen extra/plain.c
index 3845aee51..3845aee51 100644
--- a/test cases/common/98 gen extra/plain.c
+++ b/test cases/common/95 gen extra/plain.c
diff --git a/test cases/common/98 gen extra/srcgen.py b/test cases/common/95 gen extra/srcgen.py
index 8988cd92f..8988cd92f 100755
--- a/test cases/common/98 gen extra/srcgen.py
+++ b/test cases/common/95 gen extra/srcgen.py
diff --git a/test cases/common/98 gen extra/srcgen2.py b/test cases/common/95 gen extra/srcgen2.py
index 9cdf12d59..9cdf12d59 100644
--- a/test cases/common/98 gen extra/srcgen2.py
+++ b/test cases/common/95 gen extra/srcgen2.py
diff --git a/test cases/common/98 gen extra/srcgen3.py b/test cases/common/95 gen extra/srcgen3.py
index b7371143a..b7371143a 100644
--- a/test cases/common/98 gen extra/srcgen3.py
+++ b/test cases/common/95 gen extra/srcgen3.py
diff --git a/test cases/common/98 gen extra/upper.c b/test cases/common/95 gen extra/upper.c
index 44f8ad73d..44f8ad73d 100644
--- a/test cases/common/98 gen extra/upper.c
+++ b/test cases/common/95 gen extra/upper.c
diff --git a/test cases/common/99 benchmark/delayer.c b/test cases/common/96 benchmark/delayer.c
index cfcedad7c..cfcedad7c 100644
--- a/test cases/common/99 benchmark/delayer.c
+++ b/test cases/common/96 benchmark/delayer.c
diff --git a/test cases/common/99 benchmark/meson.build b/test cases/common/96 benchmark/meson.build
index 9d583d2e1..9d583d2e1 100644
--- a/test cases/common/99 benchmark/meson.build
+++ b/test cases/common/96 benchmark/meson.build
diff --git a/test cases/common/100 test workdir/meson.build b/test cases/common/97 test workdir/meson.build
index 1323a17a9..1323a17a9 100644
--- a/test cases/common/100 test workdir/meson.build
+++ b/test cases/common/97 test workdir/meson.build
diff --git a/test cases/common/100 test workdir/opener.c b/test cases/common/97 test workdir/opener.c
index 43c53ce02..43c53ce02 100644
--- a/test cases/common/100 test workdir/opener.c
+++ b/test cases/common/97 test workdir/opener.c
diff --git a/test cases/common/101 suites/exe1.c b/test cases/common/98 suites/exe1.c
index 23894c0f9..23894c0f9 100644
--- a/test cases/common/101 suites/exe1.c
+++ b/test cases/common/98 suites/exe1.c
diff --git a/test cases/common/101 suites/exe2.c b/test cases/common/98 suites/exe2.c
index ec88e20fd..ec88e20fd 100644
--- a/test cases/common/101 suites/exe2.c
+++ b/test cases/common/98 suites/exe2.c
diff --git a/test cases/common/101 suites/meson.build b/test cases/common/98 suites/meson.build
index 057e0594d..057e0594d 100644
--- a/test cases/common/101 suites/meson.build
+++ b/test cases/common/98 suites/meson.build
diff --git a/test cases/common/101 suites/subprojects/sub/meson.build b/test cases/common/98 suites/subprojects/sub/meson.build
index 697d95f1c..697d95f1c 100644
--- a/test cases/common/101 suites/subprojects/sub/meson.build
+++ b/test cases/common/98 suites/subprojects/sub/meson.build
diff --git a/test cases/common/101 suites/subprojects/sub/sub1.c b/test cases/common/98 suites/subprojects/sub/sub1.c
index 3409e48df..3409e48df 100644
--- a/test cases/common/101 suites/subprojects/sub/sub1.c
+++ b/test cases/common/98 suites/subprojects/sub/sub1.c
diff --git a/test cases/common/101 suites/subprojects/sub/sub2.c b/test cases/common/98 suites/subprojects/sub/sub2.c
index 1a64a2a15..1a64a2a15 100644
--- a/test cases/common/101 suites/subprojects/sub/sub2.c
+++ b/test cases/common/98 suites/subprojects/sub/sub2.c
diff --git a/test cases/common/102 threads/meson.build b/test cases/common/99 threads/meson.build
index 1fbb15ac7..1fbb15ac7 100644
--- a/test cases/common/102 threads/meson.build
+++ b/test cases/common/99 threads/meson.build
diff --git a/test cases/common/102 threads/threadprog.c b/test cases/common/99 threads/threadprog.c
index 47a5d1805..47a5d1805 100644
--- a/test cases/common/102 threads/threadprog.c
+++ b/test cases/common/99 threads/threadprog.c
diff --git a/test cases/common/102 threads/threadprog.cpp b/test cases/common/99 threads/threadprog.cpp
index 6fd747f89..6fd747f89 100644
--- a/test cases/common/102 threads/threadprog.cpp
+++ b/test cases/common/99 threads/threadprog.cpp
diff --git a/test cases/unit/35 mixed command line args/meson.build b/test cases/unit/36 mixed command line args/meson.build
index af5cdc790..af5cdc790 100644
--- a/test cases/unit/35 mixed command line args/meson.build
+++ b/test cases/unit/36 mixed command line args/meson.build
diff --git a/test cases/unit/35 mixed command line args/meson_options.txt b/test cases/unit/36 mixed command line args/meson_options.txt
index 5a4bc22bf..5a4bc22bf 100644
--- a/test cases/unit/35 mixed command line args/meson_options.txt
+++ b/test cases/unit/36 mixed command line args/meson_options.txt
diff --git a/test cases/unit/36 pkgconfig format/meson.build b/test cases/unit/37 pkgconfig format/meson.build
index ea00f5df4..ea00f5df4 100644
--- a/test cases/unit/36 pkgconfig format/meson.build
+++ b/test cases/unit/37 pkgconfig format/meson.build
diff --git a/test cases/unit/36 pkgconfig format/somelib.c b/test cases/unit/37 pkgconfig format/somelib.c
index 0558024b3..0558024b3 100644
--- a/test cases/unit/36 pkgconfig format/somelib.c
+++ b/test cases/unit/37 pkgconfig format/somelib.c
diff --git a/test cases/unit/36 pkgconfig format/someret.c b/test cases/unit/37 pkgconfig format/someret.c
index 69f429928..69f429928 100644
--- a/test cases/unit/36 pkgconfig format/someret.c
+++ b/test cases/unit/37 pkgconfig format/someret.c
diff --git a/test cases/unit/37 python extmodule/blaster.py b/test cases/unit/38 python extmodule/blaster.py
index 163b6d426..163b6d426 100755
--- a/test cases/unit/37 python extmodule/blaster.py
+++ b/test cases/unit/38 python extmodule/blaster.py
diff --git a/test cases/unit/37 python extmodule/ext/meson.build b/test cases/unit/38 python extmodule/ext/meson.build
index b13bb326f..b13bb326f 100644
--- a/test cases/unit/37 python extmodule/ext/meson.build
+++ b/test cases/unit/38 python extmodule/ext/meson.build
diff --git a/test cases/unit/37 python extmodule/ext/tachyon_module.c b/test cases/unit/38 python extmodule/ext/tachyon_module.c
index 68eda5380..68eda5380 100644
--- a/test cases/unit/37 python extmodule/ext/tachyon_module.c
+++ b/test cases/unit/38 python extmodule/ext/tachyon_module.c
diff --git a/test cases/unit/37 python extmodule/meson.build b/test cases/unit/38 python extmodule/meson.build
index 479865482..479865482 100644
--- a/test cases/unit/37 python extmodule/meson.build
+++ b/test cases/unit/38 python extmodule/meson.build
diff --git a/test cases/unit/37 python extmodule/meson_options.txt b/test cases/unit/38 python extmodule/meson_options.txt
index b8f645d09..b8f645d09 100644
--- a/test cases/unit/37 python extmodule/meson_options.txt
+++ b/test cases/unit/38 python extmodule/meson_options.txt
diff --git a/test cases/unit/38 external, internal library rpath/built library/bar.c b/test cases/unit/39 external, internal library rpath/built library/bar.c
index 4f5662ebd..4f5662ebd 100644
--- a/test cases/unit/38 external, internal library rpath/built library/bar.c
+++ b/test cases/unit/39 external, internal library rpath/built library/bar.c
diff --git a/test cases/unit/38 external, internal library rpath/built library/meson.build b/test cases/unit/39 external, internal library rpath/built library/meson.build
index 2b422f438..2b422f438 100644
--- a/test cases/unit/38 external, internal library rpath/built library/meson.build
+++ b/test cases/unit/39 external, internal library rpath/built library/meson.build
diff --git a/test cases/unit/38 external, internal library rpath/built library/meson_options.txt b/test cases/unit/39 external, internal library rpath/built library/meson_options.txt
index aa1d2ec9b..aa1d2ec9b 100644
--- a/test cases/unit/38 external, internal library rpath/built library/meson_options.txt
+++ b/test cases/unit/39 external, internal library rpath/built library/meson_options.txt
diff --git a/test cases/unit/38 external, internal library rpath/built library/prog.c b/test cases/unit/39 external, internal library rpath/built library/prog.c
index e3d4cf63f..e3d4cf63f 100644
--- a/test cases/unit/38 external, internal library rpath/built library/prog.c
+++ b/test cases/unit/39 external, internal library rpath/built library/prog.c
diff --git a/test cases/unit/38 external, internal library rpath/external library/faa.c b/test cases/unit/39 external, internal library rpath/external library/faa.c
index 473357516..473357516 100644
--- a/test cases/unit/38 external, internal library rpath/external library/faa.c
+++ b/test cases/unit/39 external, internal library rpath/external library/faa.c
diff --git a/test cases/unit/38 external, internal library rpath/external library/foo.c b/test cases/unit/39 external, internal library rpath/external library/foo.c
index a34e4a885..a34e4a885 100644
--- a/test cases/unit/38 external, internal library rpath/external library/foo.c
+++ b/test cases/unit/39 external, internal library rpath/external library/foo.c
diff --git a/test cases/unit/38 external, internal library rpath/external library/meson.build b/test cases/unit/39 external, internal library rpath/external library/meson.build
index 6dcc97e79..6dcc97e79 100644
--- a/test cases/unit/38 external, internal library rpath/external library/meson.build
+++ b/test cases/unit/39 external, internal library rpath/external library/meson.build
diff --git a/test cases/unit/39 featurenew subprojects/meson.build b/test cases/unit/40 featurenew subprojects/meson.build
index 27898cd79..27898cd79 100644
--- a/test cases/unit/39 featurenew subprojects/meson.build
+++ b/test cases/unit/40 featurenew subprojects/meson.build
diff --git a/test cases/unit/39 featurenew subprojects/subprojects/bar/meson.build b/test cases/unit/40 featurenew subprojects/subprojects/bar/meson.build
index 712a125f7..712a125f7 100644
--- a/test cases/unit/39 featurenew subprojects/subprojects/bar/meson.build
+++ b/test cases/unit/40 featurenew subprojects/subprojects/bar/meson.build
diff --git a/test cases/unit/39 featurenew subprojects/subprojects/foo/meson.build b/test cases/unit/40 featurenew subprojects/subprojects/foo/meson.build
index 0ef4472bd..0ef4472bd 100644
--- a/test cases/unit/39 featurenew subprojects/subprojects/foo/meson.build
+++ b/test cases/unit/40 featurenew subprojects/subprojects/foo/meson.build
diff --git a/test cases/unit/40 rpath order/meson.build b/test cases/unit/41 rpath order/meson.build
index a722894e5..a722894e5 100644
--- a/test cases/unit/40 rpath order/meson.build
+++ b/test cases/unit/41 rpath order/meson.build
diff --git a/test cases/unit/40 rpath order/myexe.c b/test cases/unit/41 rpath order/myexe.c
index 03b2213bb..03b2213bb 100644
--- a/test cases/unit/40 rpath order/myexe.c
+++ b/test cases/unit/41 rpath order/myexe.c
diff --git a/test cases/unit/40 rpath order/subprojects/sub1/lib.c b/test cases/unit/41 rpath order/subprojects/sub1/lib.c
index e69de29bb..e69de29bb 100644
--- a/test cases/unit/40 rpath order/subprojects/sub1/lib.c
+++ b/test cases/unit/41 rpath order/subprojects/sub1/lib.c
diff --git a/test cases/unit/40 rpath order/subprojects/sub1/meson.build b/test cases/unit/41 rpath order/subprojects/sub1/meson.build
index 4dd5d0843..4dd5d0843 100644
--- a/test cases/unit/40 rpath order/subprojects/sub1/meson.build
+++ b/test cases/unit/41 rpath order/subprojects/sub1/meson.build
diff --git a/test cases/unit/40 rpath order/subprojects/sub2/lib.c b/test cases/unit/41 rpath order/subprojects/sub2/lib.c
index e69de29bb..e69de29bb 100644
--- a/test cases/unit/40 rpath order/subprojects/sub2/lib.c
+++ b/test cases/unit/41 rpath order/subprojects/sub2/lib.c
diff --git a/test cases/unit/40 rpath order/subprojects/sub2/meson.build b/test cases/unit/41 rpath order/subprojects/sub2/meson.build
index bc3510db3..bc3510db3 100644
--- a/test cases/unit/40 rpath order/subprojects/sub2/meson.build
+++ b/test cases/unit/41 rpath order/subprojects/sub2/meson.build
diff --git a/test cases/unit/41 dep order/lib1.c b/test cases/unit/42 dep order/lib1.c
index e69de29bb..e69de29bb 100644
--- a/test cases/unit/41 dep order/lib1.c
+++ b/test cases/unit/42 dep order/lib1.c
diff --git a/test cases/unit/41 dep order/lib2.c b/test cases/unit/42 dep order/lib2.c
index e69de29bb..e69de29bb 100644
--- a/test cases/unit/41 dep order/lib2.c
+++ b/test cases/unit/42 dep order/lib2.c
diff --git a/test cases/unit/41 dep order/meson.build b/test cases/unit/42 dep order/meson.build
index 17cf9dfba..17cf9dfba 100644
--- a/test cases/unit/41 dep order/meson.build
+++ b/test cases/unit/42 dep order/meson.build
diff --git a/test cases/unit/41 dep order/myexe.c b/test cases/unit/42 dep order/myexe.c
index 8f4c045ee..8f4c045ee 100644
--- a/test cases/unit/41 dep order/myexe.c
+++ b/test cases/unit/42 dep order/myexe.c
diff --git a/test cases/unit/42 promote wrap/meson.build b/test cases/unit/43 promote wrap/meson.build
index 066cf36cf..066cf36cf 100644
--- a/test cases/unit/42 promote wrap/meson.build
+++ b/test cases/unit/43 promote wrap/meson.build
diff --git a/test cases/unit/42 promote wrap/subprojects/s1/meson.build b/test cases/unit/43 promote wrap/subprojects/s1/meson.build
index 3d1f5bc35..3d1f5bc35 100644
--- a/test cases/unit/42 promote wrap/subprojects/s1/meson.build
+++ b/test cases/unit/43 promote wrap/subprojects/s1/meson.build
diff --git a/test cases/unit/42 promote wrap/subprojects/s1/subprojects/ambiguous/meson.build b/test cases/unit/43 promote wrap/subprojects/s1/subprojects/ambiguous/meson.build
index 296adff4c..296adff4c 100644
--- a/test cases/unit/42 promote wrap/subprojects/s1/subprojects/ambiguous/meson.build
+++ b/test cases/unit/43 promote wrap/subprojects/s1/subprojects/ambiguous/meson.build
diff --git a/test cases/unit/42 promote wrap/subprojects/s2/meson.build b/test cases/unit/43 promote wrap/subprojects/s2/meson.build
index b5db63429..b5db63429 100644
--- a/test cases/unit/42 promote wrap/subprojects/s2/meson.build
+++ b/test cases/unit/43 promote wrap/subprojects/s2/meson.build
diff --git a/test cases/unit/42 promote wrap/subprojects/s2/subprojects/ambiguous.wrap b/test cases/unit/43 promote wrap/subprojects/s2/subprojects/ambiguous.wrap
index 09ba4e87f..09ba4e87f 100644
--- a/test cases/unit/42 promote wrap/subprojects/s2/subprojects/ambiguous.wrap
+++ b/test cases/unit/43 promote wrap/subprojects/s2/subprojects/ambiguous.wrap
diff --git a/test cases/windows/17 gui app/console_prog.c b/test cases/windows/16 gui app/console_prog.c
index 11b7fad8e..11b7fad8e 100644
--- a/test cases/windows/17 gui app/console_prog.c
+++ b/test cases/windows/16 gui app/console_prog.c
diff --git a/test cases/windows/17 gui app/dummy.c b/test cases/windows/16 gui app/dummy.c
index e69de29bb..e69de29bb 100644
--- a/test cases/windows/17 gui app/dummy.c
+++ b/test cases/windows/16 gui app/dummy.c
diff --git a/test cases/windows/17 gui app/gui_app_tester.py b/test cases/windows/16 gui app/gui_app_tester.py
index 9cba806f0..9cba806f0 100644
--- a/test cases/windows/17 gui app/gui_app_tester.py
+++ b/test cases/windows/16 gui app/gui_app_tester.py
diff --git a/test cases/windows/17 gui app/gui_prog.c b/test cases/windows/16 gui app/gui_prog.c
index 4bc688a35..4bc688a35 100644
--- a/test cases/windows/17 gui app/gui_prog.c
+++ b/test cases/windows/16 gui app/gui_prog.c
diff --git a/test cases/windows/17 gui app/meson.build b/test cases/windows/16 gui app/meson.build
index 243521834..243521834 100644
--- a/test cases/windows/17 gui app/meson.build
+++ b/test cases/windows/16 gui app/meson.build