1015 files changed, 69 insertions, 69 deletions

diff --git a/run_project_tests.py b/run_project_tests.py
index a161525..88d6a57 100755
--- a/run_project_tests.py
+++ b/run_project_tests.py
@@ -334,7 +334,7 @@ def pass_libdir_to_test(dirname):
         return False
     if '38 libdir must be inside prefix' in dirname:
         return False
-    if '196 install_mode' in dirname:
+    if '195 install_mode' in dirname:
         return False
     return True
 
diff --git a/run_unittests.py b/run_unittests.py
index 0bd2c02..0116827 100755
--- a/run_unittests.py
+++ b/run_unittests.py
@@ -1540,7 +1540,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, '91 default options')
+        testdir = os.path.join(self.common_test_dir, '90 default options')
         self.init(testdir, default_args=False)
         opts = self.introspect('--buildoptions')
         for opt in opts:
@@ -1570,7 +1570,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, '91 default options')
+        testdir = os.path.join(self.common_test_dir, '90 default options')
         prefix = '/someabs'
         libdir = 'libdir'
         extra_args = ['--prefix=' + prefix,
@@ -1652,7 +1652,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, '169 default options prefix dependent defaults')
+        testdir = os.path.join(self.common_test_dir, '168 default options prefix dependent defaults')
         expected = {
             '':
             {'prefix':         '/usr',
@@ -1755,7 +1755,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, '55 run target')
+        testdir = os.path.join(self.common_test_dir, '54 run target')
         self.init(testdir)
         self.run_target('check_exists')
 
@@ -1779,7 +1779,7 @@ class AllPlatformTests(BasePlatformTests):
         Test that the Meson introspection API also contains subdir install information
         https://github.com/mesonbuild/meson/issues/5556
         '''
-        testdir = os.path.join(self.common_test_dir, '63 install subdir')
+        testdir = os.path.join(self.common_test_dir, '62 install subdir')
         self.init(testdir)
         intro = self.introspect('--installed')
         expected = {
@@ -1812,7 +1812,7 @@ class AllPlatformTests(BasePlatformTests):
         '''
         if self.backend is not Backend.ninja:
             raise unittest.SkipTest('{!r} backend can\'t install files'.format(self.backend.name))
-        testdir = os.path.join(self.common_test_dir, '145 custom target multiple outputs')
+        testdir = os.path.join(self.common_test_dir, '144 custom target multiple outputs')
         self.init(testdir)
         intro = self.introspect('--targets')
         if intro[0]['type'] == 'executable':
@@ -1842,7 +1842,7 @@ class AllPlatformTests(BasePlatformTests):
         '''
         Test that env ops prepend/append do not stack, and that this usage issues a warning
         '''
-        testdir = os.path.join(self.unit_test_dir, '59 test env doesn\'t stack')
+        testdir = os.path.join(self.unit_test_dir, '63 test env does not stack')
         out = self.init(testdir)
         self.assertRegex(out, r'WARNING: Overriding.*TEST_VAR_APPEND')
         self.assertRegex(out, r'WARNING: Overriding.*TEST_VAR_PREPEND')
@@ -1992,7 +1992,7 @@ class AllPlatformTests(BasePlatformTests):
         self.assertFailedTestCount(2, 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, '134 build by default')
+        testdir = os.path.join(self.common_test_dir, '133 build by default')
         self.init(testdir)
         self.build()
         genfile1 = os.path.join(self.builddir, 'generated1.dat')
@@ -2009,7 +2009,7 @@ class AllPlatformTests(BasePlatformTests):
         self.assertPathExists(exe2)
 
     def test_internal_include_order(self):
-        testdir = os.path.join(self.common_test_dir, '135 include order')
+        testdir = os.path.join(self.common_test_dir, '134 include order')
         self.init(testdir)
         execmd = fxecmd = None
         for cmd in self.get_compdb():
@@ -2187,7 +2187,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, '138 c cpp and asm')
+        testdir = os.path.join(self.common_test_dir, '137 c cpp and asm')
         # Skip if building with MSVC
         env = get_fake_env(testdir, self.builddir, self.prefix)
         if env.detect_c_compiler(MachineChoice.HOST).get_id() == 'msvc':
@@ -2257,7 +2257,7 @@ class AllPlatformTests(BasePlatformTests):
         Test that preprocessor compiler checks read CPPFLAGS and also CFLAGS but
         not LDFLAGS.
         '''
-        testdir = os.path.join(self.common_test_dir, '137 get define')
+        testdir = os.path.join(self.common_test_dir, '136 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
@@ -2272,7 +2272,7 @@ class AllPlatformTests(BasePlatformTests):
             self.init(testdir, extra_args=['-D{}={}'.format(define, value)], override_envvars=env)
 
     def test_custom_target_exe_data_deterministic(self):
-        testdir = os.path.join(self.common_test_dir, '114 custom target capture')
+        testdir = os.path.join(self.common_test_dir, '113 custom target capture')
         self.init(testdir)
         meson_exe_dat1 = glob(os.path.join(self.privatedir, 'meson_exe*.dat'))
         self.wipe()
@@ -2301,7 +2301,7 @@ class AllPlatformTests(BasePlatformTests):
         ExternalProgram, and any File objects on the command-line cause
         a rebuild.
         '''
-        testdir = os.path.join(self.common_test_dir, '61 custom header generator')
+        testdir = os.path.join(self.common_test_dir, '60 custom header generator')
         self.init(testdir)
         self.build()
         # Immediately rebuilding should not do anything
@@ -2316,7 +2316,7 @@ class AllPlatformTests(BasePlatformTests):
         Test that changes to generator programs in the source tree cause
         a rebuild.
         '''
-        testdir = os.path.join(self.common_test_dir, '95 gen extra')
+        testdir = os.path.join(self.common_test_dir, '94 gen extra')
         self.init(testdir)
         self.build()
         # Immediately rebuilding should not do anything
@@ -2434,7 +2434,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, '43 library chain')
+        testdir = os.path.join(self.common_test_dir, '42 library chain')
         self.init(testdir)
         self.build()
         for each in ('prog', 'subdir/liblib1.so', ):
@@ -2470,10 +2470,10 @@ int main(int argc, char **argv) {
 
     def test_all_forbidden_targets_tested(self):
         '''
-        Test that all forbidden targets are tested in the '155 reserved targets'
+        Test that all forbidden targets are tested in the '154 reserved targets'
         test. Needs to be a unit test because it accesses Meson internals.
         '''
-        testdir = os.path.join(self.common_test_dir, '155 reserved targets')
+        testdir = os.path.join(self.common_test_dir, '154 reserved targets')
         targets = mesonbuild.coredata.forbidden_target_names
         # We don't actually define a target with this name
         targets.pop('build.ninja')
@@ -2646,7 +2646,7 @@ int main(int argc, char **argv) {
 
     @skipIfNoPkgconfig
     def test_pkgconfig_gen_escaping(self):
-        testdir = os.path.join(self.common_test_dir, '48 pkgconfig-gen')
+        testdir = os.path.join(self.common_test_dir, '47 pkgconfig-gen')
         prefix = '/usr/with spaces'
         libdir = 'lib'
         self.init(testdir, extra_args=['--prefix=' + prefix,
@@ -2749,7 +2749,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, '44 options')
+        testdir = os.path.join(self.common_test_dir, '43 options')
         self.init(testdir)
         self.opt_has('free_array_opt', [])
         self.setconf('-Dfree_array_opt=foo,bar', will_build=False)
@@ -2910,7 +2910,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, '178 identical target name in subproject flat layout')
+        testdir = os.path.join(self.common_test_dir, '177 identical target name in subproject flat layout')
         self.init(testdir, extra_args=['--layout=flat'])
         self.build()
 
@@ -2919,7 +2919,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, '187 same target name flat layout')
+        testdir = os.path.join(self.common_test_dir, '186 same target name flat layout')
         self.init(testdir, extra_args=['--layout=flat'])
         self.build()
 
@@ -3181,7 +3181,7 @@ recommended as it is not supported on some platforms''')
             pass
 
     def test_warning_level_0(self):
-        testdir = os.path.join(self.common_test_dir, '215 warning level 0')
+        testdir = os.path.join(self.common_test_dir, '214 warning level 0')
 
         # Verify default values when passing no args
         self.init(testdir)
@@ -3368,7 +3368,7 @@ recommended as it is not supported on some platforms''')
         self.run_tests()
 
     def test_wipe_from_builddir(self):
-        testdir = os.path.join(self.common_test_dir, '162 custom target subdir depend files')
+        testdir = os.path.join(self.common_test_dir, '161 custom target subdir depend files')
         self.init(testdir)
         self.__reconfigure()
 
@@ -3403,21 +3403,21 @@ recommended as it is not supported on some platforms''')
         self.assertEqual('81d46d1@@target2-id@other', target_id)
 
     def test_introspect_projectinfo_without_configured_build(self):
-        testfile = os.path.join(self.common_test_dir, '36 run program', 'meson.build')
+        testfile = os.path.join(self.common_test_dir, '35 run program', 'meson.build')
         res = self.introspect_directory(testfile, '--projectinfo')
         self.assertEqual(set(res['buildsystem_files']), set(['meson.build']))
         self.assertEqual(res['version'], 'undefined')
         self.assertEqual(res['descriptive_name'], 'run command')
         self.assertEqual(res['subprojects'], [])
 
-        testfile = os.path.join(self.common_test_dir, '44 options', 'meson.build')
+        testfile = os.path.join(self.common_test_dir, '43 options', 'meson.build')
         res = self.introspect_directory(testfile, '--projectinfo')
         self.assertEqual(set(res['buildsystem_files']), set(['meson_options.txt', 'meson.build']))
         self.assertEqual(res['version'], 'undefined')
         self.assertEqual(res['descriptive_name'], 'options')
         self.assertEqual(res['subprojects'], [])
 
-        testfile = os.path.join(self.common_test_dir, '47 subproject options', 'meson.build')
+        testfile = os.path.join(self.common_test_dir, '46 subproject options', 'meson.build')
         res = self.introspect_directory(testfile, '--projectinfo')
         self.assertEqual(set(res['buildsystem_files']), set(['meson_options.txt', 'meson.build']))
         self.assertEqual(res['version'], 'undefined')
@@ -3430,7 +3430,7 @@ recommended as it is not supported on some platforms''')
         self.assertEqual(res['subprojects'][0]['descriptive_name'], 'subproject')
 
     def test_introspect_projectinfo_subprojects(self):
-        testdir = os.path.join(self.common_test_dir, '103 subproject subdir')
+        testdir = os.path.join(self.common_test_dir, '102 subproject subdir')
         self.init(testdir)
         res = self.introspect('--projectinfo')
         expected = {
@@ -3448,7 +3448,7 @@ recommended as it is not supported on some platforms''')
         self.assertDictEqual(res, expected)
 
     def test_introspection_target_subproject(self):
-        testdir = os.path.join(self.common_test_dir, '46 subproject')
+        testdir = os.path.join(self.common_test_dir, '45 subproject')
         self.init(testdir)
         res = self.introspect('--targets')
 
@@ -3463,14 +3463,14 @@ recommended as it is not supported on some platforms''')
             self.assertEqual(entry['subproject'], expected[name])
 
     def test_introspect_projectinfo_subproject_dir(self):
-        testdir = os.path.join(self.common_test_dir, '79 custom subproject dir')
+        testdir = os.path.join(self.common_test_dir, '78 custom subproject dir')
         self.init(testdir)
         res = self.introspect('--projectinfo')
 
         self.assertEqual(res['subproject_dir'], 'custom_subproject_dir')
 
     def test_introspect_projectinfo_subproject_dir_from_source(self):
-        testfile = os.path.join(self.common_test_dir, '79 custom subproject dir', 'meson.build')
+        testfile = os.path.join(self.common_test_dir, '78 custom subproject dir', 'meson.build')
         res = self.introspect_directory(testfile, '--projectinfo')
 
         self.assertEqual(res['subproject_dir'], 'custom_subproject_dir')
@@ -3479,7 +3479,7 @@ recommended as it is not supported on some platforms''')
     def test_clang_format(self):
         if self.backend is not Backend.ninja:
             raise unittest.SkipTest('Clang-format is for now only supported on Ninja, not {}'.format(self.backend.name))
-        testdir = os.path.join(self.unit_test_dir, '53 clang-format')
+        testdir = os.path.join(self.unit_test_dir, '54 clang-format')
         testfile = os.path.join(testdir, 'prog.c')
         badfile = os.path.join(testdir, 'prog_orig_c')
         goodfile = os.path.join(testdir, 'prog_expected_c')
@@ -3504,7 +3504,7 @@ recommended as it is not supported on some platforms''')
                 os.unlink(testheader)
 
     def test_introspect_buildoptions_without_configured_build(self):
-        testdir = os.path.join(self.unit_test_dir, '56 introspect buildoptions')
+        testdir = os.path.join(self.unit_test_dir, '59 introspect buildoptions')
         testfile = os.path.join(testdir, 'meson.build')
         res_nb = self.introspect_directory(testfile, ['--buildoptions'] + self.meson_args)
         self.init(testdir, default_args=False)
@@ -3513,7 +3513,7 @@ recommended as it is not supported on some platforms''')
         self.assertListEqual(res_nb, res_wb)
 
     def test_introspect_json_dump(self):
-        testdir = os.path.join(self.unit_test_dir, '55 introspection')
+        testdir = os.path.join(self.unit_test_dir, '57 introspection')
         self.init(testdir)
         infodir = os.path.join(self.builddir, 'meson-info')
         self.assertPathExists(infodir)
@@ -3663,7 +3663,7 @@ recommended as it is not supported on some platforms''')
         self.assertDictEqual(targets_to_find, {})
 
     def test_introspect_file_dump_equals_all(self):
-        testdir = os.path.join(self.unit_test_dir, '55 introspection')
+        testdir = os.path.join(self.unit_test_dir, '57 introspection')
         self.init(testdir)
         res_all = self.introspect('--all')
         res_file = {}
@@ -3690,7 +3690,7 @@ recommended as it is not supported on some platforms''')
         self.assertEqual(res_all, res_file)
 
     def test_introspect_meson_info(self):
-        testdir = os.path.join(self.unit_test_dir, '55 introspection')
+        testdir = os.path.join(self.unit_test_dir, '57 introspection')
         introfile = os.path.join(self.builddir, 'meson-info', 'meson-info.json')
         self.init(testdir)
         self.assertPathExists(introfile)
@@ -3704,7 +3704,7 @@ recommended as it is not supported on some platforms''')
         self.assertEqual(res1['build_files_updated'], True)
 
     def test_introspect_config_update(self):
-        testdir = os.path.join(self.unit_test_dir, '55 introspection')
+        testdir = os.path.join(self.unit_test_dir, '57 introspection')
         introfile = os.path.join(self.builddir, 'meson-info', 'intro-buildoptions.json')
         self.init(testdir)
         self.assertPathExists(introfile)
@@ -3730,7 +3730,7 @@ recommended as it is not supported on some platforms''')
         self.assertListEqual(res1, res2)
 
     def test_introspect_targets_from_source(self):
-        testdir = os.path.join(self.unit_test_dir, '55 introspection')
+        testdir = os.path.join(self.unit_test_dir, '57 introspection')
         testfile = os.path.join(testdir, 'meson.build')
         introfile = os.path.join(self.builddir, 'meson-info', 'intro-targets.json')
         self.init(testdir)
@@ -3761,7 +3761,7 @@ recommended as it is not supported on some platforms''')
         self.assertListEqual(res_nb, res_wb)
 
     def test_introspect_dependencies_from_source(self):
-        testdir = os.path.join(self.unit_test_dir, '55 introspection')
+        testdir = os.path.join(self.unit_test_dir, '57 introspection')
         testfile = os.path.join(testdir, 'meson.build')
         res_nb = self.introspect_directory(testfile, ['--scan-dependencies'] + self.meson_args)
         expected = [
@@ -3807,19 +3807,19 @@ recommended as it is not supported on some platforms''')
 
     @skip_if_no_cmake
     def test_cmake_prefix_path(self):
-        testdir = os.path.join(self.unit_test_dir, '60 cmake_prefix_path')
+        testdir = os.path.join(self.unit_test_dir, '64 cmake_prefix_path')
         self.init(testdir, extra_args=['-Dcmake_prefix_path=' + os.path.join(testdir, 'prefix')])
 
     @skip_if_no_cmake
     def test_cmake_parser(self):
-        testdir = os.path.join(self.unit_test_dir, '61 cmake parser')
+        testdir = os.path.join(self.unit_test_dir, '65 cmake parser')
         self.init(testdir, extra_args=['-Dcmake_prefix_path=' + os.path.join(testdir, 'prefix')])
 
     def test_alias_target(self):
         if self.backend is Backend.vs:
             # FIXME: This unit test is broken with vs backend, needs investigation
             raise unittest.SkipTest('Skipping alias_target test with {} backend'.format(self.backend.name))
-        testdir = os.path.join(self.unit_test_dir, '62 alias target')
+        testdir = os.path.join(self.unit_test_dir, '66 alias target')
         self.init(testdir)
         self.build()
         self.assertPathDoesNotExist(os.path.join(self.builddir, 'prog' + exe_suffix))
@@ -4287,7 +4287,7 @@ class DarwinTests(BasePlatformTests):
         '''
         Same as above, just for shared_module()
         '''
-        testdir = os.path.join(self.common_test_dir, '153 shared module resolving symbol in executable')
+        testdir = os.path.join(self.common_test_dir, '152 shared module resolving symbol in executable')
         # Ensure that it builds even with bitcode enabled
         self.init(testdir, extra_args='-Db_bitcode=true')
         self.build()
@@ -4393,7 +4393,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, '48 pkgconfig-gen')
+        testdir = os.path.join(self.common_test_dir, '47 pkgconfig-gen')
         self.init(testdir)
         env = get_fake_env(testdir, self.builddir, self.prefix)
         kwargs = {'required': True, 'silent': True}
@@ -4409,12 +4409,12 @@ class LinuxlikeTests(BasePlatformTests):
         '''
         Test that generated pkg-config files correctly handle dependencies
         '''
-        testdir = os.path.join(self.common_test_dir, '48 pkgconfig-gen')
+        testdir = os.path.join(self.common_test_dir, '47 pkgconfig-gen')
         self.init(testdir)
         privatedir1 = self.privatedir
 
         self.new_builddir()
-        testdir = os.path.join(self.common_test_dir, '48 pkgconfig-gen', 'dependencies')
+        testdir = os.path.join(self.common_test_dir, '47 pkgconfig-gen', 'dependencies')
         self.init(testdir, override_envvars={'PKG_CONFIG_LIBDIR': privatedir1})
         privatedir2 = self.privatedir
 
@@ -4611,7 +4611,7 @@ class LinuxlikeTests(BasePlatformTests):
         Test that compiler check flags override all other flags. This can't be
         an ordinary test case because it needs the environment to be set.
         '''
-        testdir = os.path.join(self.common_test_dir, '40 has function')
+        testdir = os.path.join(self.common_test_dir, '39 has function')
         env = get_fake_env(testdir, self.builddir, self.prefix)
         cpp = env.detect_cpp_compiler(MachineChoice.HOST)
         Oflag = '-O3'
@@ -4628,7 +4628,7 @@ class LinuxlikeTests(BasePlatformTests):
             if cmd[0] == 'ccache':
                 cmd = cmd[1:]
             # Verify that -I flags from the `args` kwarg are first
-            # This is set in the '40 has function' test case
+            # This is set in the '39 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')]
@@ -4716,7 +4716,7 @@ class LinuxlikeTests(BasePlatformTests):
         self._test_stds_impl(testdir, cpp, 'cpp')
 
     def test_unity_subproj(self):
-        testdir = os.path.join(self.common_test_dir, '46 subproject')
+        testdir = os.path.join(self.common_test_dir, '45 subproject')
         self.init(testdir, extra_args='--unity=subprojects')
         simpletest_id = Target.construct_id_from_path('subprojects/sublib', 'simpletest', '@exe')
         self.assertPathExists(os.path.join(self.builddir, 'subprojects/sublib', simpletest_id, 'simpletest-unity.c'))
@@ -4765,7 +4765,7 @@ class LinuxlikeTests(BasePlatformTests):
 
         self.wipe()
         # Test directory modes
-        testdir = os.path.join(self.common_test_dir, '63 install subdir')
+        testdir = os.path.join(self.common_test_dir, '62 install subdir')
         self.init(testdir)
         self.install()
 
@@ -4782,7 +4782,7 @@ class LinuxlikeTests(BasePlatformTests):
         '''
         Test that files are installed with correct permissions using install_mode.
         '''
-        testdir = os.path.join(self.common_test_dir, '196 install_mode')
+        testdir = os.path.join(self.common_test_dir, '195 install_mode')
         self.init(testdir)
         self.build()
         self.install()
@@ -5146,7 +5146,7 @@ endian = 'little'
 
     @skipIfNoPkgconfig
     def test_pkgconfig_relative_paths(self):
-        testdir = os.path.join(self.unit_test_dir, '58 pkgconfig relative paths')
+        testdir = os.path.join(self.unit_test_dir, '62 pkgconfig relative paths')
         pkg_dir = os.path.join(testdir, 'pkgconfig')
         self.assertTrue(os.path.exists(os.path.join(pkg_dir, 'librelativepath.pc')))
 
@@ -5211,7 +5211,7 @@ endian = 'little'
         '''
         Test that libraries are listed before their dependencies.
         '''
-        testdir = os.path.join(self.unit_test_dir, '52 pkgconfig static link order')
+        testdir = os.path.join(self.unit_test_dir, '53 pkgconfig static link order')
         self.init(testdir)
         myenv = os.environ.copy()
         myenv['PKG_CONFIG_PATH'] = self.privatedir
@@ -5255,7 +5255,7 @@ endian = 'little'
         '''
         Test that we produce the correct dependencies when a program is overridden with an executable.
         '''
-        testdir = os.path.join(self.common_test_dir, '202 override with exe')
+        testdir = os.path.join(self.common_test_dir, '201 override with exe')
         self.init(testdir)
         with open(os.path.join(self.builddir, 'build.ninja')) as bfile:
             for line in bfile:
@@ -5345,17 +5345,17 @@ endian = 'little'
             os.chdir(curdir)
 
     def test_install_subdir_symlinks(self):
-        self.install_subdir_invalid_symlinks('63 install subdir', os.path.join('sub', 'sub1'))
+        self.install_subdir_invalid_symlinks('62 install subdir', os.path.join('sub', 'sub1'))
 
     def test_install_subdir_symlinks_with_default_umask(self):
-        self.install_subdir_invalid_symlinks('196 install_mode', 'sub2')
+        self.install_subdir_invalid_symlinks('195 install_mode', 'sub2')
 
     def test_install_subdir_symlinks_with_default_umask_and_mode(self):
-        self.install_subdir_invalid_symlinks('196 install_mode', 'sub1')
+        self.install_subdir_invalid_symlinks('195 install_mode', 'sub1')
 
     @skipIfNoPkgconfigDep('gmodule-2.0')
     def test_ldflag_dedup(self):
-        testdir = os.path.join(self.unit_test_dir, '51 ldflagdedup')
+        testdir = os.path.join(self.unit_test_dir, '52 ldflagdedup')
         if is_cygwin() or is_osx():
             raise unittest.SkipTest('Not applicable on Cygwin or OSX.')
         self.init(testdir)
@@ -5368,7 +5368,7 @@ endian = 'little'
         self.assertEqual(max_count, 1, 'Export dynamic incorrectly deduplicated.')
 
     def test_compiler_libs_static_dedup(self):
-        testdir = os.path.join(self.unit_test_dir, '55 dedup compiler libs')
+        testdir = os.path.join(self.unit_test_dir, '56 dedup compiler libs')
         self.init(testdir)
         build_ninja = os.path.join(self.builddir, 'build.ninja')
         with open(build_ninja, 'r', encoding='utf-8') as f:
@@ -5382,7 +5382,7 @@ endian = 'little'
 
     @skipIfNoPkgconfig
     def test_pkg_config_option(self):
-        testdir = os.path.join(self.unit_test_dir, '55 pkg_config_path option')
+        testdir = os.path.join(self.unit_test_dir, '58 pkg_config_path option')
         self.init(testdir, extra_args=[
             '-Dbuild.pkg_config_path=' + os.path.join(testdir, 'build_extra_path'),
             '-Dpkg_config_path=' + os.path.join(testdir, 'host_extra_path'),
@@ -5390,14 +5390,14 @@ endian = 'little'
 
     def test_std_remains(self):
         # C_std defined in project options must be in effect also when native compiling.
-        testdir = os.path.join(self.unit_test_dir, '50 std remains')
+        testdir = os.path.join(self.unit_test_dir, '51 std remains')
         self.init(testdir)
         compdb = self.get_compdb()
         self.assertRegex(compdb[0]['command'], '-std=c99')
         self.build()
 
     def test_identity_cross(self):
-        testdir = os.path.join(self.unit_test_dir, '58 identity cross')
+        testdir = os.path.join(self.unit_test_dir, '61 identity cross')
         crossfile = tempfile.NamedTemporaryFile(mode='w')
         env = {'CC': '"' + os.path.join(testdir, 'build_wrapper.py') + '"'}
         crossfile.write('''[binaries]
@@ -5461,7 +5461,7 @@ class LinuxCrossArmTests(BasePlatformTests):
 
     def test_std_remains(self):
         # C_std defined in project options must be in effect also when cross compiling.
-        testdir = os.path.join(self.unit_test_dir, '50 std remains')
+        testdir = os.path.join(self.unit_test_dir, '51 std remains')
         self.init(testdir)
         compdb = self.get_compdb()
         self.assertRegex(compdb[0]['command'], '-std=c99')
@@ -5519,7 +5519,7 @@ class LinuxCrossMingwTests(BasePlatformTests):
 
     @skipIfNoPkgconfig
     def test_cross_pkg_config_option(self):
-        testdir = os.path.join(self.unit_test_dir, '55 pkg_config_path option')
+        testdir = os.path.join(self.unit_test_dir, '58 pkg_config_path option')
         self.init(testdir, extra_args=[
             '-Dbuild.pkg_config_path=' + os.path.join(testdir, 'build_extra_path'),
             '-Dpkg_config_path=' + os.path.join(testdir, 'host_extra_path'),
@@ -6216,12 +6216,12 @@ class NativeFileTests(BasePlatformTests):
         self.assertEqual(compiler.version, '1.2345')
 
     def test_native_file_dirs(self):
-        testcase = os.path.join(self.unit_test_dir, '57 native file override')
+        testcase = os.path.join(self.unit_test_dir, '60 native file override')
         self.init(testcase, default_args=False,
                   extra_args=['--native-file', os.path.join(testcase, 'nativefile')])
 
     def test_native_file_dirs_overriden(self):
-        testcase = os.path.join(self.unit_test_dir, '57 native file override')
+        testcase = os.path.join(self.unit_test_dir, '60 native file override')
         self.init(testcase, default_args=False,
                   extra_args=['--native-file', os.path.join(testcase, 'nativefile'),
                               '-Ddef_libdir=liblib', '-Dlibdir=liblib'])
@@ -6251,7 +6251,7 @@ class CrossFileTests(BasePlatformTests):
     """
 
     def test_cross_file_dirs(self):
-        testcase = os.path.join(self.unit_test_dir, '57 native file override')
+        testcase = os.path.join(self.unit_test_dir, '60 native file override')
         self.init(testcase, default_args=False,
                   extra_args=['--native-file', os.path.join(testcase, 'nativefile'),
                               '--cross-file', os.path.join(testcase, 'crossfile'),
@@ -6269,7 +6269,7 @@ class CrossFileTests(BasePlatformTests):
                               '-Ddef_sysconfdir=sysconfbar'])
 
     def test_cross_file_dirs_overriden(self):
-        testcase = os.path.join(self.unit_test_dir, '57 native file override')
+        testcase = os.path.join(self.unit_test_dir, '60 native file override')
         self.init(testcase, default_args=False,
                   extra_args=['--native-file', os.path.join(testcase, 'nativefile'),
                               '--cross-file', os.path.join(testcase, 'crossfile'),
@@ -6288,7 +6288,7 @@ class CrossFileTests(BasePlatformTests):
 
     def test_cross_file_dirs_chain(self):
         # crossfile2 overrides crossfile overrides nativefile
-        testcase = os.path.join(self.unit_test_dir, '57 native file override')
+        testcase = os.path.join(self.unit_test_dir, '60 native file override')
         self.init(testcase, default_args=False,
                   extra_args=['--native-file', os.path.join(testcase, 'nativefile'),
                               '--cross-file', os.path.join(testcase, 'crossfile'),
diff --git a/test cases/cmake/10 generator expressions/main.cpp b/test cases/cmake/10 header only/main.cpp
index 315c0f7..315c0f7 100644
--- a/test cases/cmake/10 generator expressions/main.cpp
+++ b/test cases/cmake/10 header only/main.cpp
diff --git a/test cases/cmake/10 generator expressions/meson.build b/test cases/cmake/10 header only/meson.build
index ca08a3f..ca08a3f 100644
--- a/test cases/cmake/10 generator expressions/meson.build
+++ b/test cases/cmake/10 header only/meson.build
diff --git a/test cases/cmake/9 header only/subprojects/cmMod/CMakeLists.txt b/test cases/cmake/10 header only/subprojects/cmMod/CMakeLists.txt
index f5d9a47..f5d9a47 100644
--- a/test cases/cmake/9 header only/subprojects/cmMod/CMakeLists.txt
+++ b/test cases/cmake/10 header only/subprojects/cmMod/CMakeLists.txt
diff --git a/test cases/cmake/9 header only/subprojects/cmMod/include/cmMod.hpp b/test cases/cmake/10 header only/subprojects/cmMod/include/cmMod.hpp
index 7ea72f7..7ea72f7 100644
--- a/test cases/cmake/9 header only/subprojects/cmMod/include/cmMod.hpp
+++ b/test cases/cmake/10 header only/subprojects/cmMod/include/cmMod.hpp
diff --git a/test cases/cmake/10 cmake_module_path/cmake/FindSomethingLikePython.cmake b/test cases/cmake/11 cmake_module_path/cmake/FindSomethingLikePython.cmake
index 4a189bf..4a189bf 100644
--- a/test cases/cmake/10 cmake_module_path/cmake/FindSomethingLikePython.cmake
+++ b/test cases/cmake/11 cmake_module_path/cmake/FindSomethingLikePython.cmake
diff --git a/test cases/cmake/10 cmake_module_path/meson.build b/test cases/cmake/11 cmake_module_path/meson.build
index 2259268..2259268 100644
--- a/test cases/cmake/10 cmake_module_path/meson.build
+++ b/test cases/cmake/11 cmake_module_path/meson.build
diff --git a/test cases/cmake/9 header only/main.cpp b/test cases/cmake/12 generator expressions/main.cpp
index 315c0f7..315c0f7 100644
--- a/test cases/cmake/9 header only/main.cpp
+++ b/test cases/cmake/12 generator expressions/main.cpp
diff --git a/test cases/cmake/9 header only/meson.build b/test cases/cmake/12 generator expressions/meson.build
index ca08a3f..ca08a3f 100644
--- a/test cases/cmake/9 header only/meson.build
+++ b/test cases/cmake/12 generator expressions/meson.build
diff --git a/test cases/cmake/10 generator expressions/subprojects/cmMod/CMakeLists.txt b/test cases/cmake/12 generator expressions/subprojects/cmMod/CMakeLists.txt
index dc4f9e4..dc4f9e4 100644
--- a/test cases/cmake/10 generator expressions/subprojects/cmMod/CMakeLists.txt
+++ b/test cases/cmake/12 generator expressions/subprojects/cmMod/CMakeLists.txt
diff --git a/test cases/cmake/10 generator expressions/subprojects/cmMod/include/cmMod.hpp b/test cases/cmake/12 generator expressions/subprojects/cmMod/include/cmMod.hpp
index 1f00107..1f00107 100644
--- a/test cases/cmake/10 generator expressions/subprojects/cmMod/include/cmMod.hpp
+++ b/test cases/cmake/12 generator expressions/subprojects/cmMod/include/cmMod.hpp
diff --git a/test cases/common/101 stringdef/meson.build b/test cases/common/100 stringdef/meson.build
index 3f9170e..3f9170e 100644
--- a/test cases/common/101 stringdef/meson.build
+++ b/test cases/common/100 stringdef/meson.build
diff --git a/test cases/common/101 stringdef/stringdef.c b/test cases/common/100 stringdef/stringdef.c
index 69ea656..69ea656 100644
--- a/test cases/common/101 stringdef/stringdef.c
+++ b/test cases/common/100 stringdef/stringdef.c
diff --git a/test cases/common/102 find program path/meson.build b/test cases/common/101 find program path/meson.build
index 0a81249..0a81249 100644
--- a/test cases/common/102 find program path/meson.build
+++ b/test cases/common/101 find program path/meson.build
diff --git a/test cases/common/102 find program path/program.py b/test cases/common/101 find program path/program.py
index 2ebc564..2ebc564 100755
--- a/test cases/common/102 find program path/program.py
+++ b/test cases/common/101 find program path/program.py
diff --git a/test cases/common/103 subproject subdir/meson.build b/test cases/common/102 subproject subdir/meson.build
index ec9fad1..ec9fad1 100644
--- a/test cases/common/103 subproject subdir/meson.build
+++ b/test cases/common/102 subproject subdir/meson.build
diff --git a/test cases/common/103 subproject subdir/prog.c b/test cases/common/102 subproject subdir/prog.c
index cf6f425..cf6f425 100644
--- a/test cases/common/103 subproject subdir/prog.c
+++ b/test cases/common/102 subproject subdir/prog.c
diff --git a/test cases/common/103 subproject subdir/subprojects/sub/lib/meson.build b/test cases/common/102 subproject subdir/subprojects/sub/lib/meson.build
index 731d22b..731d22b 100644
--- a/test cases/common/103 subproject subdir/subprojects/sub/lib/meson.build
+++ b/test cases/common/102 subproject subdir/subprojects/sub/lib/meson.build
diff --git a/test cases/common/103 subproject subdir/subprojects/sub/lib/sub.c b/test cases/common/102 subproject subdir/subprojects/sub/lib/sub.c
index 068a5b8..068a5b8 100644
--- a/test cases/common/103 subproject subdir/subprojects/sub/lib/sub.c
+++ b/test cases/common/102 subproject subdir/subprojects/sub/lib/sub.c
diff --git a/test cases/common/103 subproject subdir/subprojects/sub/lib/sub.h b/test cases/common/102 subproject subdir/subprojects/sub/lib/sub.h
index f1ab0e1..f1ab0e1 100644
--- a/test cases/common/103 subproject subdir/subprojects/sub/lib/sub.h
+++ b/test cases/common/102 subproject subdir/subprojects/sub/lib/sub.h
diff --git a/test cases/common/103 subproject subdir/subprojects/sub/meson.build b/test cases/common/102 subproject subdir/subprojects/sub/meson.build
index bf69c25..bf69c25 100644
--- a/test cases/common/103 subproject subdir/subprojects/sub/meson.build
+++ b/test cases/common/102 subproject subdir/subprojects/sub/meson.build
diff --git a/test cases/common/104 postconf/meson.build b/test cases/common/103 postconf/meson.build
index 12b3c5b..12b3c5b 100644
--- a/test cases/common/104 postconf/meson.build
+++ b/test cases/common/103 postconf/meson.build
diff --git a/test cases/common/104 postconf/postconf.py b/test cases/common/103 postconf/postconf.py
index 950c706..950c706 100644
--- a/test cases/common/104 postconf/postconf.py
+++ b/test cases/common/103 postconf/postconf.py
diff --git a/test cases/common/104 postconf/prog.c b/test cases/common/103 postconf/prog.c
index 1e5d4cb..1e5d4cb 100644
--- a/test cases/common/104 postconf/prog.c
+++ b/test cases/common/103 postconf/prog.c
diff --git a/test cases/common/104 postconf/raw.dat b/test cases/common/103 postconf/raw.dat
index ec63514..ec63514 100644
--- a/test cases/common/104 postconf/raw.dat
+++ b/test cases/common/103 postconf/raw.dat
diff --git a/test cases/common/105 postconf with args/meson.build b/test cases/common/104 postconf with args/meson.build
index 8510c5b..8510c5b 100644
--- a/test cases/common/105 postconf with args/meson.build
+++ b/test cases/common/104 postconf with args/meson.build
diff --git a/test cases/common/105 postconf with args/postconf.py b/test cases/common/104 postconf with args/postconf.py
index cef7f79..cef7f79 100644
--- a/test cases/common/105 postconf with args/postconf.py
+++ b/test cases/common/104 postconf with args/postconf.py
diff --git a/test cases/common/105 postconf with args/prog.c b/test cases/common/104 postconf with args/prog.c
index 0e63a8c..0e63a8c 100644
--- a/test cases/common/105 postconf with args/prog.c
+++ b/test cases/common/104 postconf with args/prog.c
diff --git a/test cases/common/105 postconf with args/raw.dat b/test cases/common/104 postconf with args/raw.dat
index ec63514..ec63514 100644
--- a/test cases/common/105 postconf with args/raw.dat
+++ b/test cases/common/104 postconf with args/raw.dat
diff --git a/test cases/common/106 testframework options/meson.build b/test cases/common/105 testframework options/meson.build
index 2773730..2773730 100644
--- a/test cases/common/106 testframework options/meson.build
+++ b/test cases/common/105 testframework options/meson.build
diff --git a/test cases/common/106 testframework options/meson_options.txt b/test cases/common/105 testframework options/meson_options.txt
index 653dd75..653dd75 100644
--- a/test cases/common/106 testframework options/meson_options.txt
+++ b/test cases/common/105 testframework options/meson_options.txt
diff --git a/test cases/common/106 testframework options/test_args.txt b/test cases/common/105 testframework options/test_args.txt
index a667e3a..a667e3a 100644
--- a/test cases/common/106 testframework options/test_args.txt
+++ b/test cases/common/105 testframework options/test_args.txt
diff --git a/test cases/common/107 extract same name/lib.c b/test cases/common/106 extract same name/lib.c
index 6bdeda7..6bdeda7 100644
--- a/test cases/common/107 extract same name/lib.c
+++ b/test cases/common/106 extract same name/lib.c
diff --git a/test cases/common/107 extract same name/main.c b/test cases/common/106 extract same name/main.c
index dc57dd5..dc57dd5 100644
--- a/test cases/common/107 extract same name/main.c
+++ b/test cases/common/106 extract same name/main.c
diff --git a/test cases/common/107 extract same name/meson.build b/test cases/common/106 extract same name/meson.build
index 0bfbb4d..0bfbb4d 100644
--- a/test cases/common/107 extract same name/meson.build
+++ b/test cases/common/106 extract same name/meson.build
diff --git a/test cases/common/107 extract same name/src/lib.c b/test cases/common/106 extract same name/src/lib.c
index 68e6ab9..68e6ab9 100644
--- a/test cases/common/107 extract same name/src/lib.c
+++ b/test cases/common/106 extract same name/src/lib.c
diff --git a/test cases/common/108 has header symbol/meson.build b/test cases/common/107 has header symbol/meson.build
index 54cedce..54cedce 100644
--- a/test cases/common/108 has header symbol/meson.build
+++ b/test cases/common/107 has header symbol/meson.build
diff --git a/test cases/common/109 has arg/meson.build b/test cases/common/108 has arg/meson.build
index ba07311..ba07311 100644
--- a/test cases/common/109 has arg/meson.build
+++ b/test cases/common/108 has arg/meson.build
diff --git a/test cases/common/110 generatorcustom/catter.py b/test cases/common/109 generatorcustom/catter.py
index 198fa98..198fa98 100755
--- a/test cases/common/110 generatorcustom/catter.py
+++ b/test cases/common/109 generatorcustom/catter.py
diff --git a/test cases/common/110 generatorcustom/gen.py b/test cases/common/109 generatorcustom/gen.py
index c1e34ed..c1e34ed 100755
--- a/test cases/common/110 generatorcustom/gen.py
+++ b/test cases/common/109 generatorcustom/gen.py
diff --git a/test cases/common/110 generatorcustom/main.c b/test cases/common/109 generatorcustom/main.c
index 04abcf6..04abcf6 100644
--- a/test cases/common/110 generatorcustom/main.c
+++ b/test cases/common/109 generatorcustom/main.c
diff --git a/test cases/common/110 generatorcustom/meson.build b/test cases/common/109 generatorcustom/meson.build
index 17d27e5..17d27e5 100644
--- a/test cases/common/110 generatorcustom/meson.build
+++ b/test cases/common/109 generatorcustom/meson.build
diff --git a/test cases/common/110 generatorcustom/res1.txt b/test cases/common/109 generatorcustom/res1.txt
index 6487c56..6487c56 100644
--- a/test cases/common/110 generatorcustom/res1.txt
+++ b/test cases/common/109 generatorcustom/res1.txt
diff --git a/test cases/common/110 generatorcustom/res2.txt b/test cases/common/109 generatorcustom/res2.txt
index 0a8879d..0a8879d 100644
--- a/test cases/common/110 generatorcustom/res2.txt
+++ b/test cases/common/109 generatorcustom/res2.txt
diff --git a/test cases/common/111 multiple dir configure file/meson.build b/test cases/common/110 multiple dir configure file/meson.build
index a4615fa..a4615fa 100644
--- a/test cases/common/111 multiple dir configure file/meson.build
+++ b/test cases/common/110 multiple dir configure file/meson.build
diff --git a/test cases/common/111 multiple dir configure file/subdir/foo.txt b/test cases/common/110 multiple dir configure file/subdir/foo.txt
index e69de29..e69de29 100644
--- a/test cases/common/111 multiple dir configure file/subdir/foo.txt
+++ b/test cases/common/110 multiple dir configure file/subdir/foo.txt
diff --git a/test cases/common/111 multiple dir configure file/subdir/meson.build b/test cases/common/110 multiple dir configure file/subdir/meson.build
index 503df96..503df96 100644
--- a/test cases/common/111 multiple dir configure file/subdir/meson.build
+++ b/test cases/common/110 multiple dir configure file/subdir/meson.build
diff --git a/test cases/common/111 multiple dir configure file/subdir/someinput.in b/test cases/common/110 multiple dir configure file/subdir/someinput.in
index e69de29..e69de29 100644
--- a/test cases/common/111 multiple dir configure file/subdir/someinput.in
+++ b/test cases/common/110 multiple dir configure file/subdir/someinput.in
diff --git a/test cases/common/112 spaces backslash/asm output/meson.build b/test cases/common/111 spaces backslash/asm output/meson.build
index b5f13f5..b5f13f5 100644
--- a/test cases/common/112 spaces backslash/asm output/meson.build
+++ b/test cases/common/111 spaces backslash/asm output/meson.build
diff --git a/test cases/common/112 spaces backslash/comparer-end-notstring.c b/test cases/common/111 spaces backslash/comparer-end-notstring.c
index 65bf8bc..65bf8bc 100644
--- a/test cases/common/112 spaces backslash/comparer-end-notstring.c
+++ b/test cases/common/111 spaces backslash/comparer-end-notstring.c
diff --git a/test cases/common/112 spaces backslash/comparer-end.c b/test cases/common/111 spaces backslash/comparer-end.c
index fef25a5..fef25a5 100644
--- a/test cases/common/112 spaces backslash/comparer-end.c
+++ b/test cases/common/111 spaces backslash/comparer-end.c
diff --git a/test cases/common/112 spaces backslash/comparer.c b/test cases/common/111 spaces backslash/comparer.c
index 937cb47..937cb47 100644
--- a/test cases/common/112 spaces backslash/comparer.c
+++ b/test cases/common/111 spaces backslash/comparer.c
diff --git a/test cases/common/112 spaces backslash/include/comparer.h b/test cases/common/111 spaces backslash/include/comparer.h
index 624d96c..624d96c 100644
--- a/test cases/common/112 spaces backslash/include/comparer.h
+++ b/test cases/common/111 spaces backslash/include/comparer.h
diff --git a/test cases/common/112 spaces backslash/meson.build b/test cases/common/111 spaces backslash/meson.build
index d590494..d590494 100644
--- a/test cases/common/112 spaces backslash/meson.build
+++ b/test cases/common/111 spaces backslash/meson.build
diff --git a/test cases/common/113 ternary/meson.build b/test cases/common/112 ternary/meson.build
index 7539d56..7539d56 100644
--- a/test cases/common/113 ternary/meson.build
+++ b/test cases/common/112 ternary/meson.build
diff --git a/test cases/common/114 custom target capture/data_source.txt b/test cases/common/113 custom target capture/data_source.txt
index 0c23cc0..0c23cc0 100644
--- a/test cases/common/114 custom target capture/data_source.txt
+++ b/test cases/common/113 custom target capture/data_source.txt
diff --git a/test cases/common/114 custom target capture/installed_files.txt b/test cases/common/113 custom target capture/installed_files.txt
index d90a6b0..d90a6b0 100644
--- a/test cases/common/114 custom target capture/installed_files.txt
+++ b/test cases/common/113 custom target capture/installed_files.txt
diff --git a/test cases/common/114 custom target capture/meson.build b/test cases/common/113 custom target capture/meson.build
index 58a69ca..58a69ca 100644
--- a/test cases/common/114 custom target capture/meson.build
+++ b/test cases/common/113 custom target capture/meson.build
diff --git a/test cases/common/114 custom target capture/my_compiler.py b/test cases/common/113 custom target capture/my_compiler.py
index b60722a..b60722a 100755
--- a/test cases/common/114 custom target capture/my_compiler.py
+++ b/test cases/common/113 custom target capture/my_compiler.py
diff --git a/test cases/common/115 allgenerate/converter.py b/test cases/common/114 allgenerate/converter.py
index f8e2ca0..f8e2ca0 100755
--- a/test cases/common/115 allgenerate/converter.py
+++ b/test cases/common/114 allgenerate/converter.py
diff --git a/test cases/common/115 allgenerate/foobar.cpp.in b/test cases/common/114 allgenerate/foobar.cpp.in
index c64f3b5..c64f3b5 100644
--- a/test cases/common/115 allgenerate/foobar.cpp.in
+++ b/test cases/common/114 allgenerate/foobar.cpp.in
diff --git a/test cases/common/115 allgenerate/meson.build b/test cases/common/114 allgenerate/meson.build
index 049e849..049e849 100644
--- a/test cases/common/115 allgenerate/meson.build
+++ b/test cases/common/114 allgenerate/meson.build
diff --git a/test cases/common/116 pathjoin/meson.build b/test cases/common/115 pathjoin/meson.build
index d3957dd..d3957dd 100644
--- a/test cases/common/116 pathjoin/meson.build
+++ b/test cases/common/115 pathjoin/meson.build
diff --git a/test cases/common/117 subdir subproject/meson.build b/test cases/common/116 subdir subproject/meson.build
index 54ecfe0..54ecfe0 100644
--- a/test cases/common/117 subdir subproject/meson.build
+++ b/test cases/common/116 subdir subproject/meson.build
diff --git a/test cases/common/117 subdir subproject/prog/meson.build b/test cases/common/116 subdir subproject/prog/meson.build
index 360b5f5..360b5f5 100644
--- a/test cases/common/117 subdir subproject/prog/meson.build
+++ b/test cases/common/116 subdir subproject/prog/meson.build
diff --git a/test cases/common/117 subdir subproject/prog/prog.c b/test cases/common/116 subdir subproject/prog/prog.c
index cf6f425..cf6f425 100644
--- a/test cases/common/117 subdir subproject/prog/prog.c
+++ b/test cases/common/116 subdir subproject/prog/prog.c
diff --git a/test cases/common/117 subdir subproject/subprojects/sub/meson.build b/test cases/common/116 subdir subproject/subprojects/sub/meson.build
index 94e9eec..94e9eec 100644
--- a/test cases/common/117 subdir subproject/subprojects/sub/meson.build
+++ b/test cases/common/116 subdir subproject/subprojects/sub/meson.build
diff --git a/test cases/common/117 subdir subproject/subprojects/sub/sub.c b/test cases/common/116 subdir subproject/subprojects/sub/sub.c
index 068a5b8..068a5b8 100644
--- a/test cases/common/117 subdir subproject/subprojects/sub/sub.c
+++ b/test cases/common/116 subdir subproject/subprojects/sub/sub.c
diff --git a/test cases/common/117 subdir subproject/subprojects/sub/sub.h b/test cases/common/116 subdir subproject/subprojects/sub/sub.h
index f1ab0e1..f1ab0e1 100644
--- a/test cases/common/117 subdir subproject/subprojects/sub/sub.h
+++ b/test cases/common/116 subdir subproject/subprojects/sub/sub.h
diff --git a/test cases/common/118 interpreter copy mutable var on assignment/meson.build b/test cases/common/117 interpreter copy mutable var on assignment/meson.build
index 8b15357..8b15357 100644
--- a/test cases/common/118 interpreter copy mutable var on assignment/meson.build
+++ b/test cases/common/117 interpreter copy mutable var on assignment/meson.build
diff --git a/test cases/common/119 skip/meson.build b/test cases/common/118 skip/meson.build
index 1adedb6..1adedb6 100644
--- a/test cases/common/119 skip/meson.build
+++ b/test cases/common/118 skip/meson.build
diff --git a/test cases/common/120 subproject project arguments/exe.c b/test cases/common/119 subproject project arguments/exe.c
index d6440f0..d6440f0 100644
--- a/test cases/common/120 subproject project arguments/exe.c
+++ b/test cases/common/119 subproject project arguments/exe.c
diff --git a/test cases/common/120 subproject project arguments/exe.cpp b/test cases/common/119 subproject project arguments/exe.cpp
index 8471c6f..8471c6f 100644
--- a/test cases/common/120 subproject project arguments/exe.cpp
+++ b/test cases/common/119 subproject project arguments/exe.cpp
diff --git a/test cases/common/120 subproject project arguments/meson.build b/test cases/common/119 subproject project arguments/meson.build
index 90d4c05..90d4c05 100644
--- a/test cases/common/120 subproject project arguments/meson.build
+++ b/test cases/common/119 subproject project arguments/meson.build
diff --git a/test cases/common/120 subproject project arguments/subprojects/subexe/meson.build b/test cases/common/119 subproject project arguments/subprojects/subexe/meson.build
index ef141dc..ef141dc 100644
--- a/test cases/common/120 subproject project arguments/subprojects/subexe/meson.build
+++ b/test cases/common/119 subproject project arguments/subprojects/subexe/meson.build
diff --git a/test cases/common/120 subproject project arguments/subprojects/subexe/subexe.c b/test cases/common/119 subproject project arguments/subprojects/subexe/subexe.c
index f748afc..f748afc 100644
--- a/test cases/common/120 subproject project arguments/subprojects/subexe/subexe.c
+++ b/test cases/common/119 subproject project arguments/subprojects/subexe/subexe.c
diff --git a/test cases/common/121 test skip/meson.build b/test cases/common/120 test skip/meson.build
index 568527f..568527f 100644
--- a/test cases/common/121 test skip/meson.build
+++ b/test cases/common/120 test skip/meson.build
diff --git a/test cases/common/121 test skip/test_skip.c b/test cases/common/120 test skip/test_skip.c
index db26681..db26681 100644
--- a/test cases/common/121 test skip/test_skip.c
+++ b/test cases/common/120 test skip/test_skip.c
diff --git a/test cases/common/122 shared module/installed_files.txt b/test cases/common/121 shared module/installed_files.txt
index d46527c..d46527c 100644
--- a/test cases/common/122 shared module/installed_files.txt
+++ b/test cases/common/121 shared module/installed_files.txt
diff --git a/test cases/common/122 shared module/meson.build b/test cases/common/121 shared module/meson.build
index 5d7fed9..5d7fed9 100644
--- a/test cases/common/122 shared module/meson.build
+++ b/test cases/common/121 shared module/meson.build
diff --git a/test cases/common/122 shared module/module.c b/test cases/common/121 shared module/module.c
index 9c8774d..9c8774d 100644
--- a/test cases/common/122 shared module/module.c
+++ b/test cases/common/121 shared module/module.c
diff --git a/test cases/common/122 shared module/nosyms.c b/test cases/common/121 shared module/nosyms.c
index 3432b1c..3432b1c 100644
--- a/test cases/common/122 shared module/nosyms.c
+++ b/test cases/common/121 shared module/nosyms.c
diff --git a/test cases/common/122 shared module/prog.c b/test cases/common/121 shared module/prog.c
index 8b56d93..8b56d93 100644
--- a/test cases/common/122 shared module/prog.c
+++ b/test cases/common/121 shared module/prog.c
diff --git a/test cases/common/122 shared module/runtime.c b/test cases/common/121 shared module/runtime.c
index 03bde86..03bde86 100644
--- a/test cases/common/122 shared module/runtime.c
+++ b/test cases/common/121 shared module/runtime.c
diff --git a/test cases/common/123 llvm ir and assembly/main.c b/test cases/common/122 llvm ir and assembly/main.c
index 97fe723..97fe723 100644
--- a/test cases/common/123 llvm ir and assembly/main.c
+++ b/test cases/common/122 llvm ir and assembly/main.c
diff --git a/test cases/common/123 llvm ir and assembly/main.cpp b/test cases/common/122 llvm ir and assembly/main.cpp
index f2c7de3..f2c7de3 100644
--- a/test cases/common/123 llvm ir and assembly/main.cpp
+++ b/test cases/common/122 llvm ir and assembly/main.cpp
diff --git a/test cases/common/123 llvm ir and assembly/meson.build b/test cases/common/122 llvm ir and assembly/meson.build
index 3cc7d5e..3cc7d5e 100644
--- a/test cases/common/123 llvm ir and assembly/meson.build
+++ b/test cases/common/122 llvm ir and assembly/meson.build
diff --git a/test cases/common/123 llvm ir and assembly/square-arm.S b/test cases/common/122 llvm ir and assembly/square-arm.S
index 4dd4467..4dd4467 100644
--- a/test cases/common/123 llvm ir and assembly/square-arm.S
+++ b/test cases/common/122 llvm ir and assembly/square-arm.S
diff --git a/test cases/common/123 llvm ir and assembly/square-x86.S b/test cases/common/122 llvm ir and assembly/square-x86.S
index 18284c1..18284c1 100644
--- a/test cases/common/123 llvm ir and assembly/square-x86.S
+++ b/test cases/common/122 llvm ir and assembly/square-x86.S
diff --git a/test cases/common/123 llvm ir and assembly/square-x86_64.S b/test cases/common/122 llvm ir and assembly/square-x86_64.S
index 5678d00..5678d00 100644
--- a/test cases/common/123 llvm ir and assembly/square-x86_64.S
+++ b/test cases/common/122 llvm ir and assembly/square-x86_64.S
diff --git a/test cases/common/123 llvm ir and assembly/square.ll b/test cases/common/122 llvm ir and assembly/square.ll
index 7c321aa..7c321aa 100644
--- a/test cases/common/123 llvm ir and assembly/square.ll
+++ b/test cases/common/122 llvm ir and assembly/square.ll
diff --git a/test cases/common/123 llvm ir and assembly/symbol-underscore.h b/test cases/common/122 llvm ir and assembly/symbol-underscore.h
index d0f3ef9..d0f3ef9 100644
--- a/test cases/common/123 llvm ir and assembly/symbol-underscore.h
+++ b/test cases/common/122 llvm ir and assembly/symbol-underscore.h
diff --git a/test cases/common/124 cpp and asm/meson.build b/test cases/common/123 cpp and asm/meson.build
index cf064d0..cf064d0 100644
--- a/test cases/common/124 cpp and asm/meson.build
+++ b/test cases/common/123 cpp and asm/meson.build
diff --git a/test cases/common/124 cpp and asm/retval-arm.S b/test cases/common/123 cpp and asm/retval-arm.S
index a892362..a892362 100644
--- a/test cases/common/124 cpp and asm/retval-arm.S
+++ b/test cases/common/123 cpp and asm/retval-arm.S
diff --git a/test cases/common/124 cpp and asm/retval-x86.S b/test cases/common/123 cpp and asm/retval-x86.S
index f9e8190..f9e8190 100644
--- a/test cases/common/124 cpp and asm/retval-x86.S
+++ b/test cases/common/123 cpp and asm/retval-x86.S
diff --git a/test cases/common/124 cpp and asm/retval-x86_64.S b/test cases/common/123 cpp and asm/retval-x86_64.S
index 1a5f3eb..1a5f3eb 100644
--- a/test cases/common/124 cpp and asm/retval-x86_64.S
+++ b/test cases/common/123 cpp and asm/retval-x86_64.S
diff --git a/test cases/common/124 cpp and asm/symbol-underscore.h b/test cases/common/123 cpp and asm/symbol-underscore.h
index d0f3ef9..d0f3ef9 100644
--- a/test cases/common/124 cpp and asm/symbol-underscore.h
+++ b/test cases/common/123 cpp and asm/symbol-underscore.h
diff --git a/test cases/common/124 cpp and asm/trivial.cc b/test cases/common/123 cpp and asm/trivial.cc
index d2928c0..d2928c0 100644
--- a/test cases/common/124 cpp and asm/trivial.cc
+++ b/test cases/common/123 cpp and asm/trivial.cc
diff --git a/test cases/common/125 extract all shared library/extractor.h b/test cases/common/124 extract all shared library/extractor.h
index d0917a1..d0917a1 100644
--- a/test cases/common/125 extract all shared library/extractor.h
+++ b/test cases/common/124 extract all shared library/extractor.h
diff --git a/test cases/common/125 extract all shared library/four.c b/test cases/common/124 extract all shared library/four.c
index 5ca6696..5ca6696 100644
--- a/test cases/common/125 extract all shared library/four.c
+++ b/test cases/common/124 extract all shared library/four.c
diff --git a/test cases/common/125 extract all shared library/func1234.def b/test cases/common/124 extract all shared library/func1234.def
index d62c08d..d62c08d 100644
--- a/test cases/common/125 extract all shared library/func1234.def
+++ b/test cases/common/124 extract all shared library/func1234.def
diff --git a/test cases/common/125 extract all shared library/meson.build b/test cases/common/124 extract all shared library/meson.build
index 7c24fde..7c24fde 100644
--- a/test cases/common/125 extract all shared library/meson.build
+++ b/test cases/common/124 extract all shared library/meson.build
diff --git a/test cases/common/125 extract all shared library/one.c b/test cases/common/124 extract all shared library/one.c
index cfb0157..cfb0157 100644
--- a/test cases/common/125 extract all shared library/one.c
+++ b/test cases/common/124 extract all shared library/one.c
diff --git a/test cases/common/125 extract all shared library/prog.c b/test cases/common/124 extract all shared library/prog.c
index 57a4c64..57a4c64 100644
--- a/test cases/common/125 extract all shared library/prog.c
+++ b/test cases/common/124 extract all shared library/prog.c
diff --git a/test cases/common/125 extract all shared library/three.c b/test cases/common/124 extract all shared library/three.c
index c410046..c410046 100644
--- a/test cases/common/125 extract all shared library/three.c
+++ b/test cases/common/124 extract all shared library/three.c
diff --git a/test cases/common/125 extract all shared library/two.c b/test cases/common/124 extract all shared library/two.c
index 3ece512..3ece512 100644
--- a/test cases/common/125 extract all shared library/two.c
+++ b/test cases/common/124 extract all shared library/two.c
diff --git a/test cases/common/126 object only target/installed_files.txt b/test cases/common/125 object only target/installed_files.txt
index 5e796b0..5e796b0 100644
--- a/test cases/common/126 object only target/installed_files.txt
+++ b/test cases/common/125 object only target/installed_files.txt
diff --git a/test cases/common/126 object only target/meson.build b/test cases/common/125 object only target/meson.build
index d83a658..d83a658 100644
--- a/test cases/common/126 object only target/meson.build
+++ b/test cases/common/125 object only target/meson.build
diff --git a/test cases/common/126 object only target/obj_generator.py b/test cases/common/125 object only target/obj_generator.py
index a33872a..a33872a 100755
--- a/test cases/common/126 object only target/obj_generator.py
+++ b/test cases/common/125 object only target/obj_generator.py
diff --git a/test cases/common/126 object only target/prog.c b/test cases/common/125 object only target/prog.c
index 60459d6..60459d6 100644
--- a/test cases/common/126 object only target/prog.c
+++ b/test cases/common/125 object only target/prog.c
diff --git a/test cases/common/126 object only target/source.c b/test cases/common/125 object only target/source.c
index 7779b33..7779b33 100644
--- a/test cases/common/126 object only target/source.c
+++ b/test cases/common/125 object only target/source.c
diff --git a/test cases/common/126 object only target/source2.c b/test cases/common/125 object only target/source2.c
index 29aad40..29aad40 100644
--- a/test cases/common/126 object only target/source2.c
+++ b/test cases/common/125 object only target/source2.c
diff --git a/test cases/common/126 object only target/source2.def b/test cases/common/125 object only target/source2.def
index a993ab8..a993ab8 100644
--- a/test cases/common/126 object only target/source2.def
+++ b/test cases/common/125 object only target/source2.def
diff --git a/test cases/common/126 object only target/source3.c b/test cases/common/125 object only target/source3.c
index 1580f1e..1580f1e 100644
--- a/test cases/common/126 object only target/source3.c
+++ b/test cases/common/125 object only target/source3.c
diff --git a/test cases/common/127 no buildincdir/include/header.h b/test cases/common/126 no buildincdir/include/header.h
index add1850..add1850 100644
--- a/test cases/common/127 no buildincdir/include/header.h
+++ b/test cases/common/126 no buildincdir/include/header.h
diff --git a/test cases/common/127 no buildincdir/meson.build b/test cases/common/126 no buildincdir/meson.build
index 53f1a7f..53f1a7f 100644
--- a/test cases/common/127 no buildincdir/meson.build
+++ b/test cases/common/126 no buildincdir/meson.build
diff --git a/test cases/common/127 no buildincdir/prog.c b/test cases/common/126 no buildincdir/prog.c
index 800f0d6..800f0d6 100644
--- a/test cases/common/127 no buildincdir/prog.c
+++ b/test cases/common/126 no buildincdir/prog.c
diff --git a/test cases/common/128 custom target directory install/docgen.py b/test cases/common/127 custom target directory install/docgen.py
index 245f370..245f370 100644
--- a/test cases/common/128 custom target directory install/docgen.py
+++ b/test cases/common/127 custom target directory install/docgen.py
diff --git a/test cases/common/128 custom target directory install/installed_files.txt b/test cases/common/127 custom target directory install/installed_files.txt
index bcf20e0..bcf20e0 100644
--- a/test cases/common/128 custom target directory install/installed_files.txt
+++ b/test cases/common/127 custom target directory install/installed_files.txt
diff --git a/test cases/common/128 custom target directory install/meson.build b/test cases/common/127 custom target directory install/meson.build
index ada9ae1..ada9ae1 100644
--- a/test cases/common/128 custom target directory install/meson.build
+++ b/test cases/common/127 custom target directory install/meson.build
diff --git a/test cases/common/129 dependency file generation/main .c b/test cases/common/128 dependency file generation/main .c
index 0fb4389..0fb4389 100644
--- a/test cases/common/129 dependency file generation/main .c
+++ b/test cases/common/128 dependency file generation/main .c
diff --git a/test cases/common/129 dependency file generation/meson.build b/test cases/common/128 dependency file generation/meson.build
index b5ee47b..b5ee47b 100644
--- a/test cases/common/129 dependency file generation/meson.build
+++ b/test cases/common/128 dependency file generation/meson.build
diff --git a/test cases/common/130 configure file in generator/inc/confdata.in b/test cases/common/129 configure file in generator/inc/confdata.in
index e44cdea..e44cdea 100644
--- a/test cases/common/130 configure file in generator/inc/confdata.in
+++ b/test cases/common/129 configure file in generator/inc/confdata.in
diff --git a/test cases/common/130 configure file in generator/inc/meson.build b/test cases/common/129 configure file in generator/inc/meson.build
index 05d2dcb..05d2dcb 100644
--- a/test cases/common/130 configure file in generator/inc/meson.build
+++ b/test cases/common/129 configure file in generator/inc/meson.build
diff --git a/test cases/common/130 configure file in generator/meson.build b/test cases/common/129 configure file in generator/meson.build
index e1c26b6..e1c26b6 100644
--- a/test cases/common/130 configure file in generator/meson.build
+++ b/test cases/common/129 configure file in generator/meson.build
diff --git a/test cases/common/130 configure file in generator/src/gen.py b/test cases/common/129 configure file in generator/src/gen.py
index 99b7cdd..99b7cdd 100755
--- a/test cases/common/130 configure file in generator/src/gen.py
+++ b/test cases/common/129 configure file in generator/src/gen.py
diff --git a/test cases/common/130 configure file in generator/src/main.c b/test cases/common/129 configure file in generator/src/main.c
index 54f4f57..54f4f57 100644
--- a/test cases/common/130 configure file in generator/src/main.c
+++ b/test cases/common/129 configure file in generator/src/main.c
diff --git a/test cases/common/130 configure file in generator/src/meson.build b/test cases/common/129 configure file in generator/src/meson.build
index 2fb804e..2fb804e 100644
--- a/test cases/common/130 configure file in generator/src/meson.build
+++ b/test cases/common/129 configure file in generator/src/meson.build
diff --git a/test cases/common/130 configure file in generator/src/source b/test cases/common/129 configure file in generator/src/source
index 4099407..4099407 100644
--- a/test cases/common/130 configure file in generator/src/source
+++ b/test cases/common/129 configure file in generator/src/source
diff --git a/test cases/common/131 generated llvm ir/copyfile.py b/test cases/common/130 generated llvm ir/copyfile.py
index ff42ac3..ff42ac3 100644
--- a/test cases/common/131 generated llvm ir/copyfile.py
+++ b/test cases/common/130 generated llvm ir/copyfile.py
diff --git a/test cases/common/131 generated llvm ir/main.c b/test cases/common/130 generated llvm ir/main.c
index 97fe723..97fe723 100644
--- a/test cases/common/131 generated llvm ir/main.c
+++ b/test cases/common/130 generated llvm ir/main.c
diff --git a/test cases/common/131 generated llvm ir/meson.build b/test cases/common/130 generated llvm ir/meson.build
index 111cdc0..111cdc0 100644
--- a/test cases/common/131 generated llvm ir/meson.build
+++ b/test cases/common/130 generated llvm ir/meson.build
diff --git a/test cases/common/131 generated llvm ir/square.ll.in b/test cases/common/130 generated llvm ir/square.ll.in
index 7c321aa..7c321aa 100644
--- a/test cases/common/131 generated llvm ir/square.ll.in
+++ b/test cases/common/130 generated llvm ir/square.ll.in
diff --git a/test cases/common/132 generated assembly/copyfile.py b/test cases/common/131 generated assembly/copyfile.py
index ff42ac3..ff42ac3 100644
--- a/test cases/common/132 generated assembly/copyfile.py
+++ b/test cases/common/131 generated assembly/copyfile.py
diff --git a/test cases/common/132 generated assembly/main.c b/test cases/common/131 generated assembly/main.c
index b669cba..b669cba 100644
--- a/test cases/common/132 generated assembly/main.c
+++ b/test cases/common/131 generated assembly/main.c
diff --git a/test cases/common/132 generated assembly/meson.build b/test cases/common/131 generated assembly/meson.build
index 2837747..2837747 100644
--- a/test cases/common/132 generated assembly/meson.build
+++ b/test cases/common/131 generated assembly/meson.build
diff --git a/test cases/common/132 generated assembly/square-arm.S.in b/test cases/common/131 generated assembly/square-arm.S.in
index d2fb7ac..d2fb7ac 100644
--- a/test cases/common/132 generated assembly/square-arm.S.in
+++ b/test cases/common/131 generated assembly/square-arm.S.in
diff --git a/test cases/common/132 generated assembly/square-x86.S.in b/test cases/common/131 generated assembly/square-x86.S.in
index ee77b81..ee77b81 100644
--- a/test cases/common/132 generated assembly/square-x86.S.in
+++ b/test cases/common/131 generated assembly/square-x86.S.in
diff --git a/test cases/common/132 generated assembly/square-x86_64.S.in b/test cases/common/131 generated assembly/square-x86_64.S.in
index 856af13..856af13 100644
--- a/test cases/common/132 generated assembly/square-x86_64.S.in
+++ b/test cases/common/131 generated assembly/square-x86_64.S.in
diff --git a/test cases/common/132 generated assembly/symbol-underscore.h b/test cases/common/131 generated assembly/symbol-underscore.h
index d0f3ef9..d0f3ef9 100644
--- a/test cases/common/132 generated assembly/symbol-underscore.h
+++ b/test cases/common/131 generated assembly/symbol-underscore.h
diff --git a/test cases/common/133 build by default targets in tests/main.c b/test cases/common/132 build by default targets in tests/main.c
index 63a62a1..63a62a1 100644
--- a/test cases/common/133 build by default targets in tests/main.c
+++ b/test cases/common/132 build by default targets in tests/main.c
diff --git a/test cases/common/133 build by default targets in tests/meson.build b/test cases/common/132 build by default targets in tests/meson.build
index 5cc5055..5cc5055 100644
--- a/test cases/common/133 build by default targets in tests/meson.build
+++ b/test cases/common/132 build by default targets in tests/meson.build
diff --git a/test cases/common/133 build by default targets in tests/write_file.py b/test cases/common/132 build by default targets in tests/write_file.py
index ff9c224..ff9c224 100644
--- a/test cases/common/133 build by default targets in tests/write_file.py
+++ b/test cases/common/132 build by default targets in tests/write_file.py
diff --git a/test cases/common/134 build by default/checkexists.py b/test cases/common/133 build by default/checkexists.py
index 6664f72..6664f72 100644
--- a/test cases/common/134 build by default/checkexists.py
+++ b/test cases/common/133 build by default/checkexists.py
diff --git a/test cases/common/134 build by default/foo.c b/test cases/common/133 build by default/foo.c
index ca97916..ca97916 100644
--- a/test cases/common/134 build by default/foo.c
+++ b/test cases/common/133 build by default/foo.c
diff --git a/test cases/common/134 build by default/meson.build b/test cases/common/133 build by default/meson.build
index b28b634..b28b634 100644
--- a/test cases/common/134 build by default/meson.build
+++ b/test cases/common/133 build by default/meson.build
diff --git a/test cases/common/134 build by default/mygen.py b/test cases/common/133 build by default/mygen.py
index 5a74153..5a74153 100644
--- a/test cases/common/134 build by default/mygen.py
+++ b/test cases/common/133 build by default/mygen.py
diff --git a/test cases/common/134 build by default/source.txt b/test cases/common/133 build by default/source.txt
index 3573f4b..3573f4b 100644
--- a/test cases/common/134 build by default/source.txt
+++ b/test cases/common/133 build by default/source.txt
diff --git a/test cases/common/135 include order/ctsub/copyfile.py b/test cases/common/134 include order/ctsub/copyfile.py
index ff42ac3..ff42ac3 100644
--- a/test cases/common/135 include order/ctsub/copyfile.py
+++ b/test cases/common/134 include order/ctsub/copyfile.py
diff --git a/test cases/common/135 include order/ctsub/emptyfile.c b/test cases/common/134 include order/ctsub/emptyfile.c
index e69de29..e69de29 100644
--- a/test cases/common/135 include order/ctsub/emptyfile.c
+++ b/test cases/common/134 include order/ctsub/emptyfile.c
diff --git a/test cases/common/135 include order/ctsub/main.h b/test cases/common/134 include order/ctsub/main.h
index 9d9acf3..9d9acf3 100644
--- a/test cases/common/135 include order/ctsub/main.h
+++ b/test cases/common/134 include order/ctsub/main.h
diff --git a/test cases/common/135 include order/ctsub/meson.build b/test cases/common/134 include order/ctsub/meson.build
index a242e07..a242e07 100644
--- a/test cases/common/135 include order/ctsub/meson.build
+++ b/test cases/common/134 include order/ctsub/meson.build
diff --git a/test cases/common/135 include order/inc1/hdr.h b/test cases/common/134 include order/inc1/hdr.h
index 9d755a8..9d755a8 100644
--- a/test cases/common/135 include order/inc1/hdr.h
+++ b/test cases/common/134 include order/inc1/hdr.h
diff --git a/test cases/common/135 include order/inc2/hdr.h b/test cases/common/134 include order/inc2/hdr.h
index 2ebcaca..2ebcaca 100644
--- a/test cases/common/135 include order/inc2/hdr.h
+++ b/test cases/common/134 include order/inc2/hdr.h
diff --git a/test cases/common/135 include order/meson.build b/test cases/common/134 include order/meson.build
index 9f275b8..9f275b8 100644
--- a/test cases/common/135 include order/meson.build
+++ b/test cases/common/134 include order/meson.build
diff --git a/test cases/common/135 include order/ordertest.c b/test cases/common/134 include order/ordertest.c
index 0d9173f..0d9173f 100644
--- a/test cases/common/135 include order/ordertest.c
+++ b/test cases/common/134 include order/ordertest.c
diff --git a/test cases/common/135 include order/sub1/main.h b/test cases/common/134 include order/sub1/main.h
index acf4a35..acf4a35 100644
--- a/test cases/common/135 include order/sub1/main.h
+++ b/test cases/common/134 include order/sub1/main.h
diff --git a/test cases/common/135 include order/sub1/meson.build b/test cases/common/134 include order/sub1/meson.build
index 9672945..9672945 100644
--- a/test cases/common/135 include order/sub1/meson.build
+++ b/test cases/common/134 include order/sub1/meson.build
diff --git a/test cases/common/135 include order/sub1/some.c b/test cases/common/134 include order/sub1/some.c
index 1ab0db4..1ab0db4 100644
--- a/test cases/common/135 include order/sub1/some.c
+++ b/test cases/common/134 include order/sub1/some.c
diff --git a/test cases/common/135 include order/sub1/some.h b/test cases/common/134 include order/sub1/some.h
index 6479492..6479492 100644
--- a/test cases/common/135 include order/sub1/some.h
+++ b/test cases/common/134 include order/sub1/some.h
diff --git a/test cases/common/135 include order/sub2/main.h b/test cases/common/134 include order/sub2/main.h
index b9c0da9..b9c0da9 100644
--- a/test cases/common/135 include order/sub2/main.h
+++ b/test cases/common/134 include order/sub2/main.h
diff --git a/test cases/common/135 include order/sub2/meson.build b/test cases/common/134 include order/sub2/meson.build
index b1e6190..b1e6190 100644
--- a/test cases/common/135 include order/sub2/meson.build
+++ b/test cases/common/134 include order/sub2/meson.build
diff --git a/test cases/common/135 include order/sub3/main.h b/test cases/common/134 include order/sub3/main.h
index 1ab7231..1ab7231 100644
--- a/test cases/common/135 include order/sub3/main.h
+++ b/test cases/common/134 include order/sub3/main.h
diff --git a/test cases/common/135 include order/sub3/meson.build b/test cases/common/134 include order/sub3/meson.build
index 0bd3906..0bd3906 100644
--- a/test cases/common/135 include order/sub3/meson.build
+++ b/test cases/common/134 include order/sub3/meson.build
diff --git a/test cases/common/135 include order/sub4/main.c b/test cases/common/134 include order/sub4/main.c
index 0b25eed..0b25eed 100644
--- a/test cases/common/135 include order/sub4/main.c
+++ b/test cases/common/134 include order/sub4/main.c
diff --git a/test cases/common/135 include order/sub4/main.h b/test cases/common/134 include order/sub4/main.h
index 194d7fe..194d7fe 100644
--- a/test cases/common/135 include order/sub4/main.h
+++ b/test cases/common/134 include order/sub4/main.h
diff --git a/test cases/common/135 include order/sub4/meson.build b/test cases/common/134 include order/sub4/meson.build
index c01edaa..c01edaa 100644
--- a/test cases/common/135 include order/sub4/meson.build
+++ b/test cases/common/134 include order/sub4/meson.build
diff --git a/test cases/common/136 override options/four.c b/test cases/common/135 override options/four.c
index 54f8491..54f8491 100644
--- a/test cases/common/136 override options/four.c
+++ b/test cases/common/135 override options/four.c
diff --git a/test cases/common/136 override options/meson.build b/test cases/common/135 override options/meson.build
index 4dd8d79..4dd8d79 100644
--- a/test cases/common/136 override options/meson.build
+++ b/test cases/common/135 override options/meson.build
diff --git a/test cases/common/136 override options/one.c b/test cases/common/135 override options/one.c
index 14fe9d6..14fe9d6 100644
--- a/test cases/common/136 override options/one.c
+++ b/test cases/common/135 override options/one.c
diff --git a/test cases/common/136 override options/three.c b/test cases/common/135 override options/three.c
index 305a575..305a575 100644
--- a/test cases/common/136 override options/three.c
+++ b/test cases/common/135 override options/three.c
diff --git a/test cases/common/136 override options/two.c b/test cases/common/135 override options/two.c
index 04b1d3f..04b1d3f 100644
--- a/test cases/common/136 override options/two.c
+++ b/test cases/common/135 override options/two.c
diff --git a/test cases/common/137 get define/concat.h b/test cases/common/136 get define/concat.h
index 6eb3e5e..6eb3e5e 100644
--- a/test cases/common/137 get define/concat.h
+++ b/test cases/common/136 get define/concat.h
diff --git a/test cases/common/137 get define/meson.build b/test cases/common/136 get define/meson.build
index c3364b9..c3364b9 100644
--- a/test cases/common/137 get define/meson.build
+++ b/test cases/common/136 get define/meson.build
diff --git a/test cases/common/137 get define/meson_options.txt b/test cases/common/136 get define/meson_options.txt
index 7d34a2e..7d34a2e 100644
--- a/test cases/common/137 get define/meson_options.txt
+++ b/test cases/common/136 get define/meson_options.txt
diff --git a/test cases/common/138 c cpp and asm/main.c b/test cases/common/137 c cpp and asm/main.c
index 8976723..8976723 100644
--- a/test cases/common/138 c cpp and asm/main.c
+++ b/test cases/common/137 c cpp and asm/main.c
diff --git a/test cases/common/138 c cpp and asm/main.cpp b/test cases/common/137 c cpp and asm/main.cpp
index c089870..c089870 100644
--- a/test cases/common/138 c cpp and asm/main.cpp
+++ b/test cases/common/137 c cpp and asm/main.cpp
diff --git a/test cases/common/138 c cpp and asm/meson.build b/test cases/common/137 c cpp and asm/meson.build
index ca820e2..ca820e2 100644
--- a/test cases/common/138 c cpp and asm/meson.build
+++ b/test cases/common/137 c cpp and asm/meson.build
diff --git a/test cases/common/138 c cpp and asm/retval-arm.S b/test cases/common/137 c cpp and asm/retval-arm.S
index a892362..a892362 100644
--- a/test cases/common/138 c cpp and asm/retval-arm.S
+++ b/test cases/common/137 c cpp and asm/retval-arm.S
diff --git a/test cases/common/138 c cpp and asm/retval-x86.S b/test cases/common/137 c cpp and asm/retval-x86.S
index 3cb0237..3cb0237 100644
--- a/test cases/common/138 c cpp and asm/retval-x86.S
+++ b/test cases/common/137 c cpp and asm/retval-x86.S
diff --git a/test cases/common/138 c cpp and asm/retval-x86_64.S b/test cases/common/137 c cpp and asm/retval-x86_64.S
index 1a5f3eb..1a5f3eb 100644
--- a/test cases/common/138 c cpp and asm/retval-x86_64.S
+++ b/test cases/common/137 c cpp and asm/retval-x86_64.S
diff --git a/test cases/common/138 c cpp and asm/somelib.c b/test cases/common/137 c cpp and asm/somelib.c
index e585b8e..e585b8e 100644
--- a/test cases/common/138 c cpp and asm/somelib.c
+++ b/test cases/common/137 c cpp and asm/somelib.c
diff --git a/test cases/common/138 c cpp and asm/symbol-underscore.h b/test cases/common/137 c cpp and asm/symbol-underscore.h
index d0f3ef9..d0f3ef9 100644
--- a/test cases/common/138 c cpp and asm/symbol-underscore.h
+++ b/test cases/common/137 c cpp and asm/symbol-underscore.h
diff --git a/test cases/common/139 compute int/config.h.in b/test cases/common/138 compute int/config.h.in
index 0de63ab..0de63ab 100644
--- a/test cases/common/139 compute int/config.h.in
+++ b/test cases/common/138 compute int/config.h.in
diff --git a/test cases/common/139 compute int/foobar.h b/test cases/common/138 compute int/foobar.h
index fd3cb5e..fd3cb5e 100644
--- a/test cases/common/139 compute int/foobar.h
+++ b/test cases/common/138 compute int/foobar.h
diff --git a/test cases/common/139 compute int/meson.build b/test cases/common/138 compute int/meson.build
index 22bd266..22bd266 100644
--- a/test cases/common/139 compute int/meson.build
+++ b/test cases/common/138 compute int/meson.build
diff --git a/test cases/common/139 compute int/prog.c.in b/test cases/common/138 compute int/prog.c.in
index ff1ad55..ff1ad55 100644
--- a/test cases/common/139 compute int/prog.c.in
+++ b/test cases/common/138 compute int/prog.c.in
diff --git a/test cases/common/140 custom target object output/meson.build b/test cases/common/139 custom target object output/meson.build
index ede165b..ede165b 100644
--- a/test cases/common/140 custom target object output/meson.build
+++ b/test cases/common/139 custom target object output/meson.build
diff --git a/test cases/common/140 custom target object output/obj_generator.py b/test cases/common/139 custom target object output/obj_generator.py
index a33872a..a33872a 100644
--- a/test cases/common/140 custom target object output/obj_generator.py
+++ b/test cases/common/139 custom target object output/obj_generator.py
diff --git a/test cases/common/140 custom target object output/objdir/meson.build b/test cases/common/139 custom target object output/objdir/meson.build
index 0d7f6c2..0d7f6c2 100644
--- a/test cases/common/140 custom target object output/objdir/meson.build
+++ b/test cases/common/139 custom target object output/objdir/meson.build
diff --git a/test cases/common/140 custom target object output/objdir/source.c b/test cases/common/139 custom target object output/objdir/source.c
index 7779b33..7779b33 100644
--- a/test cases/common/140 custom target object output/objdir/source.c
+++ b/test cases/common/139 custom target object output/objdir/source.c
diff --git a/test cases/common/140 custom target object output/progdir/meson.build b/test cases/common/139 custom target object output/progdir/meson.build
index 4216c24..4216c24 100644
--- a/test cases/common/140 custom target object output/progdir/meson.build
+++ b/test cases/common/139 custom target object output/progdir/meson.build
diff --git a/test cases/common/140 custom target object output/progdir/prog.c b/test cases/common/139 custom target object output/progdir/prog.c
index c1ece33..c1ece33 100644
--- a/test cases/common/140 custom target object output/progdir/prog.c
+++ b/test cases/common/139 custom target object output/progdir/prog.c
diff --git a/test cases/common/141 empty build file/meson.build b/test cases/common/140 empty build file/meson.build
index 73d0397..73d0397 100644
--- a/test cases/common/141 empty build file/meson.build
+++ b/test cases/common/140 empty build file/meson.build
diff --git a/test cases/common/141 empty build file/subdir/meson.build b/test cases/common/140 empty build file/subdir/meson.build
index e69de29..e69de29 100644
--- a/test cases/common/141 empty build file/subdir/meson.build
+++ b/test cases/common/140 empty build file/subdir/meson.build
diff --git a/test cases/common/142 whole archive/exe/meson.build b/test cases/common/141 whole archive/exe/meson.build
index 91d298d..91d298d 100644
--- a/test cases/common/142 whole archive/exe/meson.build
+++ b/test cases/common/141 whole archive/exe/meson.build
diff --git a/test cases/common/142 whole archive/exe2/meson.build b/test cases/common/141 whole archive/exe2/meson.build
index 9184864..9184864 100644
--- a/test cases/common/142 whole archive/exe2/meson.build
+++ b/test cases/common/141 whole archive/exe2/meson.build
diff --git a/test cases/common/142 whole archive/exe3/meson.build b/test cases/common/141 whole archive/exe3/meson.build
index 82cf57e..82cf57e 100644
--- a/test cases/common/142 whole archive/exe3/meson.build
+++ b/test cases/common/141 whole archive/exe3/meson.build
diff --git a/test cases/common/142 whole archive/exe4/meson.build b/test cases/common/141 whole archive/exe4/meson.build
index 0781250..0781250 100644
--- a/test cases/common/142 whole archive/exe4/meson.build
+++ b/test cases/common/141 whole archive/exe4/meson.build
diff --git a/test cases/common/142 whole archive/func1.c b/test cases/common/141 whole archive/func1.c
index b2690a0..b2690a0 100644
--- a/test cases/common/142 whole archive/func1.c
+++ b/test cases/common/141 whole archive/func1.c
diff --git a/test cases/common/142 whole archive/func2.c b/test cases/common/141 whole archive/func2.c
index 9e287a4..9e287a4 100644
--- a/test cases/common/142 whole archive/func2.c
+++ b/test cases/common/141 whole archive/func2.c
diff --git a/test cases/common/142 whole archive/meson.build b/test cases/common/141 whole archive/meson.build
index 012df33..012df33 100644
--- a/test cases/common/142 whole archive/meson.build
+++ b/test cases/common/141 whole archive/meson.build
diff --git a/test cases/common/142 whole archive/mylib.h b/test cases/common/141 whole archive/mylib.h
index 813cc67..813cc67 100644
--- a/test cases/common/142 whole archive/mylib.h
+++ b/test cases/common/141 whole archive/mylib.h
diff --git a/test cases/common/142 whole archive/prog.c b/test cases/common/141 whole archive/prog.c
index 9111ad4..9111ad4 100644
--- a/test cases/common/142 whole archive/prog.c
+++ b/test cases/common/141 whole archive/prog.c
diff --git a/test cases/common/142 whole archive/sh_func2_dep_func1/meson.build b/test cases/common/141 whole archive/sh_func2_dep_func1/meson.build
index 92baca6..92baca6 100644
--- a/test cases/common/142 whole archive/sh_func2_dep_func1/meson.build
+++ b/test cases/common/141 whole archive/sh_func2_dep_func1/meson.build
diff --git a/test cases/common/142 whole archive/sh_func2_linked_func1/meson.build b/test cases/common/141 whole archive/sh_func2_linked_func1/meson.build
index 2858f65..2858f65 100644
--- a/test cases/common/142 whole archive/sh_func2_linked_func1/meson.build
+++ b/test cases/common/141 whole archive/sh_func2_linked_func1/meson.build
diff --git a/test cases/common/142 whole archive/sh_func2_transdep_func1/meson.build b/test cases/common/141 whole archive/sh_func2_transdep_func1/meson.build
index 0703077..0703077 100644
--- a/test cases/common/142 whole archive/sh_func2_transdep_func1/meson.build
+++ b/test cases/common/141 whole archive/sh_func2_transdep_func1/meson.build
diff --git a/test cases/common/142 whole archive/sh_only_link_whole/meson.build b/test cases/common/141 whole archive/sh_only_link_whole/meson.build
index 64baabd..64baabd 100644
--- a/test cases/common/142 whole archive/sh_only_link_whole/meson.build
+++ b/test cases/common/141 whole archive/sh_only_link_whole/meson.build
diff --git a/test cases/common/142 whole archive/st_func1/meson.build b/test cases/common/141 whole archive/st_func1/meson.build
index c84d781..c84d781 100644
--- a/test cases/common/142 whole archive/st_func1/meson.build
+++ b/test cases/common/141 whole archive/st_func1/meson.build
diff --git a/test cases/common/142 whole archive/st_func2/meson.build b/test cases/common/141 whole archive/st_func2/meson.build
index 2732f96..2732f96 100644
--- a/test cases/common/142 whole archive/st_func2/meson.build
+++ b/test cases/common/141 whole archive/st_func2/meson.build
diff --git a/test cases/common/143 C and CPP link/dummy.c b/test cases/common/142 C and CPP link/dummy.c
index e69de29..e69de29 100644
--- a/test cases/common/143 C and CPP link/dummy.c
+++ b/test cases/common/142 C and CPP link/dummy.c
diff --git a/test cases/common/143 C and CPP link/foo.c b/test cases/common/142 C and CPP link/foo.c
index 77c7e39..77c7e39 100644
--- a/test cases/common/143 C and CPP link/foo.c
+++ b/test cases/common/142 C and CPP link/foo.c
diff --git a/test cases/common/143 C and CPP link/foo.cpp b/test cases/common/142 C and CPP link/foo.cpp
index 9db7fb2..9db7fb2 100644
--- a/test cases/common/143 C and CPP link/foo.cpp
+++ b/test cases/common/142 C and CPP link/foo.cpp
diff --git a/test cases/common/143 C and CPP link/foo.h b/test cases/common/142 C and CPP link/foo.h
index 1ed8ce9..1ed8ce9 100644
--- a/test cases/common/143 C and CPP link/foo.h
+++ b/test cases/common/142 C and CPP link/foo.h
diff --git a/test cases/common/143 C and CPP link/foo.hpp b/test cases/common/142 C and CPP link/foo.hpp
index e47f01d..e47f01d 100644
--- a/test cases/common/143 C and CPP link/foo.hpp
+++ b/test cases/common/142 C and CPP link/foo.hpp
diff --git a/test cases/common/143 C and CPP link/foobar.c b/test cases/common/142 C and CPP link/foobar.c
index 27928bf..27928bf 100644
--- a/test cases/common/143 C and CPP link/foobar.c
+++ b/test cases/common/142 C and CPP link/foobar.c
diff --git a/test cases/common/143 C and CPP link/foobar.h b/test cases/common/142 C and CPP link/foobar.h
index 6dcb096..6dcb096 100644
--- a/test cases/common/143 C and CPP link/foobar.h
+++ b/test cases/common/142 C and CPP link/foobar.h
diff --git a/test cases/common/143 C and CPP link/meson.build b/test cases/common/142 C and CPP link/meson.build
index a93a981..a93a981 100644
--- a/test cases/common/143 C and CPP link/meson.build
+++ b/test cases/common/142 C and CPP link/meson.build
diff --git a/test cases/common/143 C and CPP link/sub.c b/test cases/common/142 C and CPP link/sub.c
index 7c078f8..7c078f8 100644
--- a/test cases/common/143 C and CPP link/sub.c
+++ b/test cases/common/142 C and CPP link/sub.c
diff --git a/test cases/common/143 C and CPP link/sub.h b/test cases/common/142 C and CPP link/sub.h
index 5b02e17..5b02e17 100644
--- a/test cases/common/143 C and CPP link/sub.h
+++ b/test cases/common/142 C and CPP link/sub.h
diff --git a/test cases/common/144 mesonintrospect from scripts/check_env.py b/test cases/common/143 mesonintrospect from scripts/check_env.py
index 2d46d88..2d46d88 100644
--- a/test cases/common/144 mesonintrospect from scripts/check_env.py
+++ b/test cases/common/143 mesonintrospect from scripts/check_env.py
diff --git a/test cases/common/144 mesonintrospect from scripts/check_introspection.py b/test cases/common/143 mesonintrospect from scripts/check_introspection.py
index 851a415..851a415 100644
--- a/test cases/common/144 mesonintrospect from scripts/check_introspection.py
+++ b/test cases/common/143 mesonintrospect from scripts/check_introspection.py
diff --git a/test cases/common/144 mesonintrospect from scripts/meson.build b/test cases/common/143 mesonintrospect from scripts/meson.build
index 1117672..1117672 100644
--- a/test cases/common/144 mesonintrospect from scripts/meson.build
+++ b/test cases/common/143 mesonintrospect from scripts/meson.build
diff --git a/test cases/common/145 custom target multiple outputs/generator.py b/test cases/common/144 custom target multiple outputs/generator.py
index 39dbd11..39dbd11 100755
--- a/test cases/common/145 custom target multiple outputs/generator.py
+++ b/test cases/common/144 custom target multiple outputs/generator.py
diff --git a/test cases/common/145 custom target multiple outputs/installed_files.txt b/test cases/common/144 custom target multiple outputs/installed_files.txt
index 21e1249..21e1249 100644
--- a/test cases/common/145 custom target multiple outputs/installed_files.txt
+++ b/test cases/common/144 custom target multiple outputs/installed_files.txt
diff --git a/test cases/common/145 custom target multiple outputs/meson.build b/test cases/common/144 custom target multiple outputs/meson.build
index 6412864..6412864 100644
--- a/test cases/common/145 custom target multiple outputs/meson.build
+++ b/test cases/common/144 custom target multiple outputs/meson.build
diff --git a/test cases/common/146 special characters/check_quoting.py b/test cases/common/145 special characters/check_quoting.py
index d6e50ea..d6e50ea 100644
--- a/test cases/common/146 special characters/check_quoting.py
+++ b/test cases/common/145 special characters/check_quoting.py
diff --git a/test cases/common/146 special characters/installed_files.txt b/test cases/common/145 special characters/installed_files.txt
index f677881..f677881 100644
--- a/test cases/common/146 special characters/installed_files.txt
+++ b/test cases/common/145 special characters/installed_files.txt
diff --git a/test cases/common/146 special characters/meson.build b/test cases/common/145 special characters/meson.build
index ecba650..ecba650 100644
--- a/test cases/common/146 special characters/meson.build
+++ b/test cases/common/145 special characters/meson.build
diff --git a/test cases/common/147 nested links/meson.build b/test cases/common/146 nested links/meson.build
index 0821b03..0821b03 100644
--- a/test cases/common/147 nested links/meson.build
+++ b/test cases/common/146 nested links/meson.build
diff --git a/test cases/common/147 nested links/xephyr.c b/test cases/common/146 nested links/xephyr.c
index 33c14ce..33c14ce 100644
--- a/test cases/common/147 nested links/xephyr.c
+++ b/test cases/common/146 nested links/xephyr.c
diff --git a/test cases/common/148 list of file sources/foo b/test cases/common/147 list of file sources/foo
index 7b57bd2..7b57bd2 100644
--- a/test cases/common/148 list of file sources/foo
+++ b/test cases/common/147 list of file sources/foo
diff --git a/test cases/common/148 list of file sources/gen.py b/test cases/common/147 list of file sources/gen.py
index 2337d3d..2337d3d 100644
--- a/test cases/common/148 list of file sources/gen.py
+++ b/test cases/common/147 list of file sources/gen.py
diff --git a/test cases/common/148 list of file sources/meson.build b/test cases/common/147 list of file sources/meson.build
index 819509d..819509d 100644
--- a/test cases/common/148 list of file sources/meson.build
+++ b/test cases/common/147 list of file sources/meson.build
diff --git a/test cases/common/149 link depends custom target/foo.c b/test cases/common/148 link depends custom target/foo.c
index 8700a9e..8700a9e 100644
--- a/test cases/common/149 link depends custom target/foo.c
+++ b/test cases/common/148 link depends custom target/foo.c
diff --git a/test cases/common/149 link depends custom target/make_file.py b/test cases/common/148 link depends custom target/make_file.py
index ceb6e19..ceb6e19 100755
--- a/test cases/common/149 link depends custom target/make_file.py
+++ b/test cases/common/148 link depends custom target/make_file.py
diff --git a/test cases/common/149 link depends custom target/meson.build b/test cases/common/148 link depends custom target/meson.build
index ee7a865..ee7a865 100644
--- a/test cases/common/149 link depends custom target/meson.build
+++ b/test cases/common/148 link depends custom target/meson.build
diff --git a/test cases/common/150 recursive linking/3rdorderdeps/lib.c.in b/test cases/common/149 recursive linking/3rdorderdeps/lib.c.in
index 461f859..461f859 100644
--- a/test cases/common/150 recursive linking/3rdorderdeps/lib.c.in
+++ b/test cases/common/149 recursive linking/3rdorderdeps/lib.c.in
diff --git a/test cases/common/150 recursive linking/3rdorderdeps/main.c.in b/test cases/common/149 recursive linking/3rdorderdeps/main.c.in
index 8155f35..8155f35 100644
--- a/test cases/common/150 recursive linking/3rdorderdeps/main.c.in
+++ b/test cases/common/149 recursive linking/3rdorderdeps/main.c.in
diff --git a/test cases/common/150 recursive linking/3rdorderdeps/meson.build b/test cases/common/149 recursive linking/3rdorderdeps/meson.build
index d4ef745..d4ef745 100644
--- a/test cases/common/150 recursive linking/3rdorderdeps/meson.build
+++ b/test cases/common/149 recursive linking/3rdorderdeps/meson.build
diff --git a/test cases/common/150 recursive linking/circular/lib1.c b/test cases/common/149 recursive linking/circular/lib1.c
index 38889cf..38889cf 100644
--- a/test cases/common/150 recursive linking/circular/lib1.c
+++ b/test cases/common/149 recursive linking/circular/lib1.c
diff --git a/test cases/common/150 recursive linking/circular/lib2.c b/test cases/common/149 recursive linking/circular/lib2.c
index 31cd37c..31cd37c 100644
--- a/test cases/common/150 recursive linking/circular/lib2.c
+++ b/test cases/common/149 recursive linking/circular/lib2.c
diff --git a/test cases/common/150 recursive linking/circular/lib3.c b/test cases/common/149 recursive linking/circular/lib3.c
index 67d473a..67d473a 100644
--- a/test cases/common/150 recursive linking/circular/lib3.c
+++ b/test cases/common/149 recursive linking/circular/lib3.c
diff --git a/test cases/common/150 recursive linking/circular/main.c b/test cases/common/149 recursive linking/circular/main.c
index 5f797a5..5f797a5 100644
--- a/test cases/common/150 recursive linking/circular/main.c
+++ b/test cases/common/149 recursive linking/circular/main.c
diff --git a/test cases/common/150 recursive linking/circular/meson.build b/test cases/common/149 recursive linking/circular/meson.build
index b7a70a8..b7a70a8 100644
--- a/test cases/common/150 recursive linking/circular/meson.build
+++ b/test cases/common/149 recursive linking/circular/meson.build
diff --git a/test cases/common/150 recursive linking/circular/prop1.c b/test cases/common/149 recursive linking/circular/prop1.c
index 4e571f5..4e571f5 100644
--- a/test cases/common/150 recursive linking/circular/prop1.c
+++ b/test cases/common/149 recursive linking/circular/prop1.c
diff --git a/test cases/common/150 recursive linking/circular/prop2.c b/test cases/common/149 recursive linking/circular/prop2.c
index ceabba0..ceabba0 100644
--- a/test cases/common/150 recursive linking/circular/prop2.c
+++ b/test cases/common/149 recursive linking/circular/prop2.c
diff --git a/test cases/common/150 recursive linking/circular/prop3.c b/test cases/common/149 recursive linking/circular/prop3.c
index 246206c..246206c 100644
--- a/test cases/common/150 recursive linking/circular/prop3.c
+++ b/test cases/common/149 recursive linking/circular/prop3.c
diff --git a/test cases/common/150 recursive linking/edge-cases/libsto.c b/test cases/common/149 recursive linking/edge-cases/libsto.c
index 93f46a8..93f46a8 100644
--- a/test cases/common/150 recursive linking/edge-cases/libsto.c
+++ b/test cases/common/149 recursive linking/edge-cases/libsto.c
diff --git a/test cases/common/150 recursive linking/edge-cases/meson.build b/test cases/common/149 recursive linking/edge-cases/meson.build
index 6a46266..6a46266 100644
--- a/test cases/common/150 recursive linking/edge-cases/meson.build
+++ b/test cases/common/149 recursive linking/edge-cases/meson.build
diff --git a/test cases/common/150 recursive linking/edge-cases/shstmain.c b/test cases/common/149 recursive linking/edge-cases/shstmain.c
index b44c55f..b44c55f 100644
--- a/test cases/common/150 recursive linking/edge-cases/shstmain.c
+++ b/test cases/common/149 recursive linking/edge-cases/shstmain.c
diff --git a/test cases/common/150 recursive linking/edge-cases/stobuilt.c b/test cases/common/149 recursive linking/edge-cases/stobuilt.c
index 9cc15bc..9cc15bc 100644
--- a/test cases/common/150 recursive linking/edge-cases/stobuilt.c
+++ b/test cases/common/149 recursive linking/edge-cases/stobuilt.c
diff --git a/test cases/common/150 recursive linking/edge-cases/stomain.c b/test cases/common/149 recursive linking/edge-cases/stomain.c
index 90208a7..90208a7 100644
--- a/test cases/common/150 recursive linking/edge-cases/stomain.c
+++ b/test cases/common/149 recursive linking/edge-cases/stomain.c
diff --git a/test cases/common/150 recursive linking/lib.h b/test cases/common/149 recursive linking/lib.h
index b54bf36..b54bf36 100644
--- a/test cases/common/150 recursive linking/lib.h
+++ b/test cases/common/149 recursive linking/lib.h
diff --git a/test cases/common/150 recursive linking/main.c b/test cases/common/149 recursive linking/main.c
index 0851611..0851611 100644
--- a/test cases/common/150 recursive linking/main.c
+++ b/test cases/common/149 recursive linking/main.c
diff --git a/test cases/common/150 recursive linking/meson.build b/test cases/common/149 recursive linking/meson.build
index 2ca7151..2ca7151 100644
--- a/test cases/common/150 recursive linking/meson.build
+++ b/test cases/common/149 recursive linking/meson.build
diff --git a/test cases/common/150 recursive linking/shnodep/lib.c b/test cases/common/149 recursive linking/shnodep/lib.c
index a3b7993..a3b7993 100644
--- a/test cases/common/150 recursive linking/shnodep/lib.c
+++ b/test cases/common/149 recursive linking/shnodep/lib.c
diff --git a/test cases/common/150 recursive linking/shnodep/meson.build b/test cases/common/149 recursive linking/shnodep/meson.build
index 66cfd9b..66cfd9b 100644
--- a/test cases/common/150 recursive linking/shnodep/meson.build
+++ b/test cases/common/149 recursive linking/shnodep/meson.build
diff --git a/test cases/common/150 recursive linking/shshdep/lib.c b/test cases/common/149 recursive linking/shshdep/lib.c
index 715d120..715d120 100644
--- a/test cases/common/150 recursive linking/shshdep/lib.c
+++ b/test cases/common/149 recursive linking/shshdep/lib.c
diff --git a/test cases/common/150 recursive linking/shshdep/meson.build b/test cases/common/149 recursive linking/shshdep/meson.build
index 020b481..020b481 100644
--- a/test cases/common/150 recursive linking/shshdep/meson.build
+++ b/test cases/common/149 recursive linking/shshdep/meson.build
diff --git a/test cases/common/150 recursive linking/shstdep/lib.c b/test cases/common/149 recursive linking/shstdep/lib.c
index 5da8d0b..5da8d0b 100644
--- a/test cases/common/150 recursive linking/shstdep/lib.c
+++ b/test cases/common/149 recursive linking/shstdep/lib.c
diff --git a/test cases/common/150 recursive linking/shstdep/meson.build b/test cases/common/149 recursive linking/shstdep/meson.build
index 008f9f8..008f9f8 100644
--- a/test cases/common/150 recursive linking/shstdep/meson.build
+++ b/test cases/common/149 recursive linking/shstdep/meson.build
diff --git a/test cases/common/150 recursive linking/stnodep/lib.c b/test cases/common/149 recursive linking/stnodep/lib.c
index 4bc50be..4bc50be 100644
--- a/test cases/common/150 recursive linking/stnodep/lib.c
+++ b/test cases/common/149 recursive linking/stnodep/lib.c
diff --git a/test cases/common/150 recursive linking/stnodep/meson.build b/test cases/common/149 recursive linking/stnodep/meson.build
index 77f7129..77f7129 100644
--- a/test cases/common/150 recursive linking/stnodep/meson.build
+++ b/test cases/common/149 recursive linking/stnodep/meson.build
diff --git a/test cases/common/150 recursive linking/stshdep/lib.c b/test cases/common/149 recursive linking/stshdep/lib.c
index 3cfa12b..3cfa12b 100644
--- a/test cases/common/150 recursive linking/stshdep/lib.c
+++ b/test cases/common/149 recursive linking/stshdep/lib.c
diff --git a/test cases/common/150 recursive linking/stshdep/meson.build b/test cases/common/149 recursive linking/stshdep/meson.build
index 0967c1c..0967c1c 100644
--- a/test cases/common/150 recursive linking/stshdep/meson.build
+++ b/test cases/common/149 recursive linking/stshdep/meson.build
diff --git a/test cases/common/150 recursive linking/ststdep/lib.c b/test cases/common/149 recursive linking/ststdep/lib.c
index fca8706..fca8706 100644
--- a/test cases/common/150 recursive linking/ststdep/lib.c
+++ b/test cases/common/149 recursive linking/ststdep/lib.c
diff --git a/test cases/common/150 recursive linking/ststdep/meson.build b/test cases/common/149 recursive linking/ststdep/meson.build
index 3602442..3602442 100644
--- a/test cases/common/150 recursive linking/ststdep/meson.build
+++ b/test cases/common/149 recursive linking/ststdep/meson.build
diff --git a/test cases/common/151 library at root/lib.c b/test cases/common/150 library at root/lib.c
index a5b3dc3..a5b3dc3 100644
--- a/test cases/common/151 library at root/lib.c
+++ b/test cases/common/150 library at root/lib.c
diff --git a/test cases/common/151 library at root/main/main.c b/test cases/common/150 library at root/main/main.c
index c4e1b4e..c4e1b4e 100644
--- a/test cases/common/151 library at root/main/main.c
+++ b/test cases/common/150 library at root/main/main.c
diff --git a/test cases/common/151 library at root/main/meson.build b/test cases/common/150 library at root/main/meson.build
index 557378a..557378a 100644
--- a/test cases/common/151 library at root/main/meson.build
+++ b/test cases/common/150 library at root/main/meson.build
diff --git a/test cases/common/151 library at root/meson.build b/test cases/common/150 library at root/meson.build
index bfdd869..bfdd869 100644
--- a/test cases/common/151 library at root/meson.build
+++ b/test cases/common/150 library at root/meson.build
diff --git a/test cases/common/152 simd/fallback.c b/test cases/common/151 simd/fallback.c
index ab435f4..ab435f4 100644
--- a/test cases/common/152 simd/fallback.c
+++ b/test cases/common/151 simd/fallback.c
diff --git a/test cases/common/152 simd/include/simdheader.h b/test cases/common/151 simd/include/simdheader.h
index 6515e41..6515e41 100644
--- a/test cases/common/152 simd/include/simdheader.h
+++ b/test cases/common/151 simd/include/simdheader.h
diff --git a/test cases/common/152 simd/meson.build b/test cases/common/151 simd/meson.build
index 2628a12..2628a12 100644
--- a/test cases/common/152 simd/meson.build
+++ b/test cases/common/151 simd/meson.build
diff --git a/test cases/common/152 simd/simd_avx.c b/test cases/common/151 simd/simd_avx.c
index 1c84dae..1c84dae 100644
--- a/test cases/common/152 simd/simd_avx.c
+++ b/test cases/common/151 simd/simd_avx.c
diff --git a/test cases/common/152 simd/simd_avx2.c b/test cases/common/151 simd/simd_avx2.c
index 15297eb..15297eb 100644
--- a/test cases/common/152 simd/simd_avx2.c
+++ b/test cases/common/151 simd/simd_avx2.c
diff --git a/test cases/common/152 simd/simd_mmx.c b/test cases/common/151 simd/simd_mmx.c
index 528ed3c..528ed3c 100644
--- a/test cases/common/152 simd/simd_mmx.c
+++ b/test cases/common/151 simd/simd_mmx.c
diff --git a/test cases/common/152 simd/simd_neon.c b/test cases/common/151 simd/simd_neon.c
index 2082099..2082099 100644
--- a/test cases/common/152 simd/simd_neon.c
+++ b/test cases/common/151 simd/simd_neon.c
diff --git a/test cases/common/152 simd/simd_sse.c b/test cases/common/151 simd/simd_sse.c
index 3c9fe62..3c9fe62 100644
--- a/test cases/common/152 simd/simd_sse.c
+++ b/test cases/common/151 simd/simd_sse.c
diff --git a/test cases/common/152 simd/simd_sse2.c b/test cases/common/151 simd/simd_sse2.c
index 271022e..271022e 100644
--- a/test cases/common/152 simd/simd_sse2.c
+++ b/test cases/common/151 simd/simd_sse2.c
diff --git a/test cases/common/152 simd/simd_sse3.c b/test cases/common/151 simd/simd_sse3.c
index 89c2f8b..89c2f8b 100644
--- a/test cases/common/152 simd/simd_sse3.c
+++ b/test cases/common/151 simd/simd_sse3.c
diff --git a/test cases/common/152 simd/simd_sse41.c b/test cases/common/151 simd/simd_sse41.c
index 859fb43..859fb43 100644
--- a/test cases/common/152 simd/simd_sse41.c
+++ b/test cases/common/151 simd/simd_sse41.c
diff --git a/test cases/common/152 simd/simd_sse42.c b/test cases/common/151 simd/simd_sse42.c
index edd6e5b..edd6e5b 100644
--- a/test cases/common/152 simd/simd_sse42.c
+++ b/test cases/common/151 simd/simd_sse42.c
diff --git a/test cases/common/152 simd/simd_ssse3.c b/test cases/common/151 simd/simd_ssse3.c
index 0156f77..0156f77 100644
--- a/test cases/common/152 simd/simd_ssse3.c
+++ b/test cases/common/151 simd/simd_ssse3.c
diff --git a/test cases/common/152 simd/simdchecker.c b/test cases/common/151 simd/simdchecker.c
index cd6fe4f..cd6fe4f 100644
--- a/test cases/common/152 simd/simdchecker.c
+++ b/test cases/common/151 simd/simdchecker.c
diff --git a/test cases/common/152 simd/simdfuncs.h b/test cases/common/151 simd/simdfuncs.h
index c5e1658..c5e1658 100644
--- a/test cases/common/152 simd/simdfuncs.h
+++ b/test cases/common/151 simd/simdfuncs.h
diff --git a/test cases/common/153 shared module resolving symbol in executable/meson.build b/test cases/common/152 shared module resolving symbol in executable/meson.build
index 282a4d2..282a4d2 100644
--- a/test cases/common/153 shared module resolving symbol in executable/meson.build
+++ b/test cases/common/152 shared module resolving symbol in executable/meson.build
diff --git a/test cases/common/153 shared module resolving symbol in executable/module.c b/test cases/common/152 shared module resolving symbol in executable/module.c
index 64374d5..64374d5 100644
--- a/test cases/common/153 shared module resolving symbol in executable/module.c
+++ b/test cases/common/152 shared module resolving symbol in executable/module.c
diff --git a/test cases/common/153 shared module resolving symbol in executable/prog.c b/test cases/common/152 shared module resolving symbol in executable/prog.c
index 746c192..746c192 100644
--- a/test cases/common/153 shared module resolving symbol in executable/prog.c
+++ b/test cases/common/152 shared module resolving symbol in executable/prog.c
diff --git a/test cases/common/154 dotinclude/dotproc.c b/test cases/common/153 dotinclude/dotproc.c
index 5e65f7b..5e65f7b 100644
--- a/test cases/common/154 dotinclude/dotproc.c
+++ b/test cases/common/153 dotinclude/dotproc.c
diff --git a/test cases/common/154 dotinclude/meson.build b/test cases/common/153 dotinclude/meson.build
index e0c2cd7..e0c2cd7 100644
--- a/test cases/common/154 dotinclude/meson.build
+++ b/test cases/common/153 dotinclude/meson.build
diff --git a/test cases/common/154 dotinclude/stdio.h b/test cases/common/153 dotinclude/stdio.h
index b6bd09f..b6bd09f 100644
--- a/test cases/common/154 dotinclude/stdio.h
+++ b/test cases/common/153 dotinclude/stdio.h
diff --git a/test cases/common/155 reserved targets/all/meson.build b/test cases/common/154 reserved targets/all/meson.build
index adee882..adee882 100644
--- a/test cases/common/155 reserved targets/all/meson.build
+++ b/test cases/common/154 reserved targets/all/meson.build
diff --git a/test cases/common/155 reserved targets/benchmark/meson.build b/test cases/common/154 reserved targets/benchmark/meson.build
index 242cc23..242cc23 100644
--- a/test cases/common/155 reserved targets/benchmark/meson.build
+++ b/test cases/common/154 reserved targets/benchmark/meson.build
diff --git a/test cases/common/155 reserved targets/clean-ctlist/meson.build b/test cases/common/154 reserved targets/clean-ctlist/meson.build
index 75eb207..75eb207 100644
--- a/test cases/common/155 reserved targets/clean-ctlist/meson.build
+++ b/test cases/common/154 reserved targets/clean-ctlist/meson.build
diff --git a/test cases/common/155 reserved targets/clean-gcda/meson.build b/test cases/common/154 reserved targets/clean-gcda/meson.build
index 488a527..488a527 100644
--- a/test cases/common/155 reserved targets/clean-gcda/meson.build
+++ b/test cases/common/154 reserved targets/clean-gcda/meson.build
diff --git a/test cases/common/155 reserved targets/clean-gcno/meson.build b/test cases/common/154 reserved targets/clean-gcno/meson.build
index eec789a..eec789a 100644
--- a/test cases/common/155 reserved targets/clean-gcno/meson.build
+++ b/test cases/common/154 reserved targets/clean-gcno/meson.build
diff --git a/test cases/common/155 reserved targets/clean/meson.build b/test cases/common/154 reserved targets/clean/meson.build
index 4e27b6c..4e27b6c 100644
--- a/test cases/common/155 reserved targets/clean/meson.build
+++ b/test cases/common/154 reserved targets/clean/meson.build
diff --git a/test cases/common/155 reserved targets/coverage-html/meson.build b/test cases/common/154 reserved targets/coverage-html/meson.build
index 10a4cc8..10a4cc8 100644
--- a/test cases/common/155 reserved targets/coverage-html/meson.build
+++ b/test cases/common/154 reserved targets/coverage-html/meson.build
diff --git a/test cases/common/155 reserved targets/coverage-text/meson.build b/test cases/common/154 reserved targets/coverage-text/meson.build
index 21dcae5..21dcae5 100644
--- a/test cases/common/155 reserved targets/coverage-text/meson.build
+++ b/test cases/common/154 reserved targets/coverage-text/meson.build
diff --git a/test cases/common/155 reserved targets/coverage-xml/meson.build b/test cases/common/154 reserved targets/coverage-xml/meson.build
index 44d7bfb..44d7bfb 100644
--- a/test cases/common/155 reserved targets/coverage-xml/meson.build
+++ b/test cases/common/154 reserved targets/coverage-xml/meson.build
diff --git a/test cases/common/155 reserved targets/coverage/meson.build b/test cases/common/154 reserved targets/coverage/meson.build
index b401055..b401055 100644
--- a/test cases/common/155 reserved targets/coverage/meson.build
+++ b/test cases/common/154 reserved targets/coverage/meson.build
diff --git a/test cases/common/155 reserved targets/dist/meson.build b/test cases/common/154 reserved targets/dist/meson.build
index 951bbb4..951bbb4 100644
--- a/test cases/common/155 reserved targets/dist/meson.build
+++ b/test cases/common/154 reserved targets/dist/meson.build
diff --git a/test cases/common/155 reserved targets/distcheck/meson.build b/test cases/common/154 reserved targets/distcheck/meson.build
index 12b9328..12b9328 100644
--- a/test cases/common/155 reserved targets/distcheck/meson.build
+++ b/test cases/common/154 reserved targets/distcheck/meson.build
diff --git a/test cases/common/155 reserved targets/install/meson.build b/test cases/common/154 reserved targets/install/meson.build
index 4839901..4839901 100644
--- a/test cases/common/155 reserved targets/install/meson.build
+++ b/test cases/common/154 reserved targets/install/meson.build
diff --git a/test cases/common/155 reserved targets/meson.build b/test cases/common/154 reserved targets/meson.build
index 24fd937..24fd937 100644
--- a/test cases/common/155 reserved targets/meson.build
+++ b/test cases/common/154 reserved targets/meson.build
diff --git a/test cases/common/155 reserved targets/phony/meson.build b/test cases/common/154 reserved targets/phony/meson.build
index 6710fc1..6710fc1 100644
--- a/test cases/common/155 reserved targets/phony/meson.build
+++ b/test cases/common/154 reserved targets/phony/meson.build
diff --git a/test cases/common/155 reserved targets/reconfigure/meson.build b/test cases/common/154 reserved targets/reconfigure/meson.build
index c3ea3da..c3ea3da 100644
--- a/test cases/common/155 reserved targets/reconfigure/meson.build
+++ b/test cases/common/154 reserved targets/reconfigure/meson.build
diff --git a/test cases/common/155 reserved targets/runtarget/meson.build b/test cases/common/154 reserved targets/runtarget/meson.build
index 52c371b..52c371b 100644
--- a/test cases/common/155 reserved targets/runtarget/meson.build
+++ b/test cases/common/154 reserved targets/runtarget/meson.build
diff --git a/test cases/common/155 reserved targets/scan-build/meson.build b/test cases/common/154 reserved targets/scan-build/meson.build
index 1002053..1002053 100644
--- a/test cases/common/155 reserved targets/scan-build/meson.build
+++ b/test cases/common/154 reserved targets/scan-build/meson.build
diff --git a/test cases/common/155 reserved targets/test.c b/test cases/common/154 reserved targets/test.c
index 0fb4389..0fb4389 100644
--- a/test cases/common/155 reserved targets/test.c
+++ b/test cases/common/154 reserved targets/test.c
diff --git a/test cases/common/155 reserved targets/test/meson.build b/test cases/common/154 reserved targets/test/meson.build
index 4ab123c..4ab123c 100644
--- a/test cases/common/155 reserved targets/test/meson.build
+++ b/test cases/common/154 reserved targets/test/meson.build
diff --git a/test cases/common/155 reserved targets/uninstall/meson.build b/test cases/common/154 reserved targets/uninstall/meson.build
index 21c6ca6..21c6ca6 100644
--- a/test cases/common/155 reserved targets/uninstall/meson.build
+++ b/test cases/common/154 reserved targets/uninstall/meson.build
diff --git a/test cases/common/156 duplicate source names/dir1/file.c b/test cases/common/155 duplicate source names/dir1/file.c
index 094e187..094e187 100644
--- a/test cases/common/156 duplicate source names/dir1/file.c
+++ b/test cases/common/155 duplicate source names/dir1/file.c
diff --git a/test cases/common/156 duplicate source names/dir1/meson.build b/test cases/common/155 duplicate source names/dir1/meson.build
index 00bc85d..00bc85d 100644
--- a/test cases/common/156 duplicate source names/dir1/meson.build
+++ b/test cases/common/155 duplicate source names/dir1/meson.build
diff --git a/test cases/common/156 duplicate source names/dir2/dir1/file.c b/test cases/common/155 duplicate source names/dir2/dir1/file.c
index 5aac8e5..5aac8e5 100644
--- a/test cases/common/156 duplicate source names/dir2/dir1/file.c
+++ b/test cases/common/155 duplicate source names/dir2/dir1/file.c
diff --git a/test cases/common/156 duplicate source names/dir2/file.c b/test cases/common/155 duplicate source names/dir2/file.c
index 6cf8d66..6cf8d66 100644
--- a/test cases/common/156 duplicate source names/dir2/file.c
+++ b/test cases/common/155 duplicate source names/dir2/file.c
diff --git a/test cases/common/156 duplicate source names/dir2/meson.build b/test cases/common/155 duplicate source names/dir2/meson.build
index f116a02..f116a02 100644
--- a/test cases/common/156 duplicate source names/dir2/meson.build
+++ b/test cases/common/155 duplicate source names/dir2/meson.build
diff --git a/test cases/common/156 duplicate source names/dir3/dir1/file.c b/test cases/common/155 duplicate source names/dir3/dir1/file.c
index 04667c2..04667c2 100644
--- a/test cases/common/156 duplicate source names/dir3/dir1/file.c
+++ b/test cases/common/155 duplicate source names/dir3/dir1/file.c
diff --git a/test cases/common/156 duplicate source names/dir3/file.c b/test cases/common/155 duplicate source names/dir3/file.c
index d16d0a8..d16d0a8 100644
--- a/test cases/common/156 duplicate source names/dir3/file.c
+++ b/test cases/common/155 duplicate source names/dir3/file.c
diff --git a/test cases/common/156 duplicate source names/dir3/meson.build b/test cases/common/155 duplicate source names/dir3/meson.build
index 70ddbf2..70ddbf2 100644
--- a/test cases/common/156 duplicate source names/dir3/meson.build
+++ b/test cases/common/155 duplicate source names/dir3/meson.build
diff --git a/test cases/common/156 duplicate source names/meson.build b/test cases/common/155 duplicate source names/meson.build
index cac5194..cac5194 100644
--- a/test cases/common/156 duplicate source names/meson.build
+++ b/test cases/common/155 duplicate source names/meson.build
diff --git a/test cases/common/157 index customtarget/check_args.py b/test cases/common/156 index customtarget/check_args.py
index 8663a6f..8663a6f 100644
--- a/test cases/common/157 index customtarget/check_args.py
+++ b/test cases/common/156 index customtarget/check_args.py
diff --git a/test cases/common/157 index customtarget/gen_sources.py b/test cases/common/156 index customtarget/gen_sources.py
index 0bdb529..0bdb529 100644
--- a/test cases/common/157 index customtarget/gen_sources.py
+++ b/test cases/common/156 index customtarget/gen_sources.py
diff --git a/test cases/common/157 index customtarget/lib.c b/test cases/common/156 index customtarget/lib.c
index 17117d5..17117d5 100644
--- a/test cases/common/157 index customtarget/lib.c
+++ b/test cases/common/156 index customtarget/lib.c
diff --git a/test cases/common/157 index customtarget/meson.build b/test cases/common/156 index customtarget/meson.build
index 27d28b5..27d28b5 100644
--- a/test cases/common/157 index customtarget/meson.build
+++ b/test cases/common/156 index customtarget/meson.build
diff --git a/test cases/common/157 index customtarget/subdir/foo.c b/test cases/common/156 index customtarget/subdir/foo.c
index c620a11..c620a11 100644
--- a/test cases/common/157 index customtarget/subdir/foo.c
+++ b/test cases/common/156 index customtarget/subdir/foo.c
diff --git a/test cases/common/157 index customtarget/subdir/meson.build b/test cases/common/156 index customtarget/subdir/meson.build
index 47bcd32..47bcd32 100644
--- a/test cases/common/157 index customtarget/subdir/meson.build
+++ b/test cases/common/156 index customtarget/subdir/meson.build
diff --git a/test cases/common/158 wrap file should not failed/meson.build b/test cases/common/157 wrap file should not failed/meson.build
index f4ec2a8..f4ec2a8 100644
--- a/test cases/common/158 wrap file should not failed/meson.build
+++ b/test cases/common/157 wrap file should not failed/meson.build
diff --git a/test cases/common/158 wrap file should not failed/src/meson.build b/test cases/common/157 wrap file should not failed/src/meson.build
index 69f666d..69f666d 100644
--- a/test cases/common/158 wrap file should not failed/src/meson.build
+++ b/test cases/common/157 wrap file should not failed/src/meson.build
diff --git a/test cases/common/158 wrap file should not failed/src/subprojects/foo/prog2.c b/test cases/common/157 wrap file should not failed/src/subprojects/foo/prog2.c
index 56f61a8..56f61a8 100644
--- a/test cases/common/158 wrap file should not failed/src/subprojects/foo/prog2.c
+++ b/test cases/common/157 wrap file should not failed/src/subprojects/foo/prog2.c
diff --git a/test cases/common/158 wrap file should not failed/src/subprojects/prog.c b/test cases/common/157 wrap file should not failed/src/subprojects/prog.c
index 56f61a8..56f61a8 100644
--- a/test cases/common/158 wrap file should not failed/src/subprojects/prog.c
+++ b/test cases/common/157 wrap file should not failed/src/subprojects/prog.c
diff --git a/test cases/common/158 wrap file should not failed/subprojects/foo.wrap b/test cases/common/157 wrap file should not failed/subprojects/foo.wrap
index 90d6d40..90d6d40 100644
--- a/test cases/common/158 wrap file should not failed/subprojects/foo.wrap
+++ b/test cases/common/157 wrap file should not failed/subprojects/foo.wrap
diff --git a/test cases/common/158 wrap file should not failed/subprojects/packagecache/foo-1.0-patch.tar.xz b/test cases/common/157 wrap file should not failed/subprojects/packagecache/foo-1.0-patch.tar.xz
index 26d2927..26d2927 100644
--- a/test cases/common/158 wrap file should not failed/subprojects/packagecache/foo-1.0-patch.tar.xz
+++ b/test cases/common/157 wrap file should not failed/subprojects/packagecache/foo-1.0-patch.tar.xz
diff --git a/test cases/common/158 wrap file should not failed/subprojects/packagecache/foo-1.0.tar.xz b/test cases/common/157 wrap file should not failed/subprojects/packagecache/foo-1.0.tar.xz
index 2647ef9..2647ef9 100644
--- a/test cases/common/158 wrap file should not failed/subprojects/packagecache/foo-1.0.tar.xz
+++ b/test cases/common/157 wrap file should not failed/subprojects/packagecache/foo-1.0.tar.xz
diff --git a/test cases/common/158 wrap file should not failed/subprojects/packagecache/zlib-1.2.8-8-wrap.zip b/test cases/common/157 wrap file should not failed/subprojects/packagecache/zlib-1.2.8-8-wrap.zip
index 421376d..421376d 100644
--- a/test cases/common/158 wrap file should not failed/subprojects/packagecache/zlib-1.2.8-8-wrap.zip
+++ b/test cases/common/157 wrap file should not failed/subprojects/packagecache/zlib-1.2.8-8-wrap.zip
diff --git a/test cases/common/158 wrap file should not failed/subprojects/packagecache/zlib-1.2.8.tar.gz b/test cases/common/157 wrap file should not failed/subprojects/packagecache/zlib-1.2.8.tar.gz
index 421376d..421376d 100644
--- a/test cases/common/158 wrap file should not failed/subprojects/packagecache/zlib-1.2.8.tar.gz
+++ b/test cases/common/157 wrap file should not failed/subprojects/packagecache/zlib-1.2.8.tar.gz
diff --git a/test cases/common/158 wrap file should not failed/subprojects/zlib-1.2.8/foo.c b/test cases/common/157 wrap file should not failed/subprojects/zlib-1.2.8/foo.c
index 019f2ba..019f2ba 100644
--- a/test cases/common/158 wrap file should not failed/subprojects/zlib-1.2.8/foo.c
+++ b/test cases/common/157 wrap file should not failed/subprojects/zlib-1.2.8/foo.c
diff --git a/test cases/common/158 wrap file should not failed/subprojects/zlib-1.2.8/meson.build b/test cases/common/157 wrap file should not failed/subprojects/zlib-1.2.8/meson.build
index 8d8008e..8d8008e 100644
--- a/test cases/common/158 wrap file should not failed/subprojects/zlib-1.2.8/meson.build
+++ b/test cases/common/157 wrap file should not failed/subprojects/zlib-1.2.8/meson.build
diff --git a/test cases/common/158 wrap file should not failed/subprojects/zlib.wrap b/test cases/common/157 wrap file should not failed/subprojects/zlib.wrap
index 6d5896f..6d5896f 100644
--- a/test cases/common/158 wrap file should not failed/subprojects/zlib.wrap
+++ b/test cases/common/157 wrap file should not failed/subprojects/zlib.wrap
diff --git a/test cases/common/159 includedir subproj/meson.build b/test cases/common/158 includedir subproj/meson.build
index b3de5af..b3de5af 100644
--- a/test cases/common/159 includedir subproj/meson.build
+++ b/test cases/common/158 includedir subproj/meson.build
diff --git a/test cases/common/159 includedir subproj/prog.c b/test cases/common/158 includedir subproj/prog.c
index 772681e..772681e 100644
--- a/test cases/common/159 includedir subproj/prog.c
+++ b/test cases/common/158 includedir subproj/prog.c
diff --git a/test cases/common/159 includedir subproj/subprojects/inctest/include/incfile.h b/test cases/common/158 includedir subproj/subprojects/inctest/include/incfile.h
index ec740da..ec740da 100644
--- a/test cases/common/159 includedir subproj/subprojects/inctest/include/incfile.h
+++ b/test cases/common/158 includedir subproj/subprojects/inctest/include/incfile.h
diff --git a/test cases/common/159 includedir subproj/subprojects/inctest/meson.build b/test cases/common/158 includedir subproj/subprojects/inctest/meson.build
index 74aabcb..74aabcb 100644
--- a/test cases/common/159 includedir subproj/subprojects/inctest/meson.build
+++ b/test cases/common/158 includedir subproj/subprojects/inctest/meson.build
diff --git a/test cases/common/160 subproject dir name collision/a.c b/test cases/common/159 subproject dir name collision/a.c
index 6ed96fa..6ed96fa 100644
--- a/test cases/common/160 subproject dir name collision/a.c
+++ b/test cases/common/159 subproject dir name collision/a.c
diff --git a/test cases/common/160 subproject dir name collision/custom_subproject_dir/B/b.c b/test cases/common/159 subproject dir name collision/custom_subproject_dir/B/b.c
index 4c94ee9..4c94ee9 100644
--- a/test cases/common/160 subproject dir name collision/custom_subproject_dir/B/b.c
+++ b/test cases/common/159 subproject dir name collision/custom_subproject_dir/B/b.c
diff --git a/test cases/common/160 subproject dir name collision/custom_subproject_dir/B/meson.build b/test cases/common/159 subproject dir name collision/custom_subproject_dir/B/meson.build
index 280c60c..280c60c 100644
--- a/test cases/common/160 subproject dir name collision/custom_subproject_dir/B/meson.build
+++ b/test cases/common/159 subproject dir name collision/custom_subproject_dir/B/meson.build
diff --git a/test cases/common/160 subproject dir name collision/custom_subproject_dir/C/c.c b/test cases/common/159 subproject dir name collision/custom_subproject_dir/C/c.c
index eebfb9f..eebfb9f 100644
--- a/test cases/common/160 subproject dir name collision/custom_subproject_dir/C/c.c
+++ b/test cases/common/159 subproject dir name collision/custom_subproject_dir/C/c.c
diff --git a/test cases/common/160 subproject dir name collision/custom_subproject_dir/C/meson.build b/test cases/common/159 subproject dir name collision/custom_subproject_dir/C/meson.build
index abf0b1e..abf0b1e 100644
--- a/test cases/common/160 subproject dir name collision/custom_subproject_dir/C/meson.build
+++ b/test cases/common/159 subproject dir name collision/custom_subproject_dir/C/meson.build
diff --git a/test cases/common/160 subproject dir name collision/meson.build b/test cases/common/159 subproject dir name collision/meson.build
index 5531217..5531217 100644
--- a/test cases/common/160 subproject dir name collision/meson.build
+++ b/test cases/common/159 subproject dir name collision/meson.build
diff --git a/test cases/common/160 subproject dir name collision/other_subdir/custom_subproject_dir/other.c b/test cases/common/159 subproject dir name collision/other_subdir/custom_subproject_dir/other.c
index 0c27f84..0c27f84 100644
--- a/test cases/common/160 subproject dir name collision/other_subdir/custom_subproject_dir/other.c
+++ b/test cases/common/159 subproject dir name collision/other_subdir/custom_subproject_dir/other.c
diff --git a/test cases/common/160 subproject dir name collision/other_subdir/meson.build b/test cases/common/159 subproject dir name collision/other_subdir/meson.build
index 90cb67a..90cb67a 100644
--- a/test cases/common/160 subproject dir name collision/other_subdir/meson.build
+++ b/test cases/common/159 subproject dir name collision/other_subdir/meson.build
diff --git a/test cases/common/161 config tool variable/meson.build b/test cases/common/160 config tool variable/meson.build
index 9584117..9584117 100644
--- a/test cases/common/161 config tool variable/meson.build
+++ b/test cases/common/160 config tool variable/meson.build
diff --git a/test cases/common/162 custom target subdir depend files/copyfile.py b/test cases/common/161 custom target subdir depend files/copyfile.py
index ff42ac3..ff42ac3 100644
--- a/test cases/common/162 custom target subdir depend files/copyfile.py
+++ b/test cases/common/161 custom target subdir depend files/copyfile.py
diff --git a/test cases/common/162 custom target subdir depend files/meson.build b/test cases/common/161 custom target subdir depend files/meson.build
index 44f5c71..44f5c71 100644
--- a/test cases/common/162 custom target subdir depend files/meson.build
+++ b/test cases/common/161 custom target subdir depend files/meson.build
diff --git a/test cases/common/162 custom target subdir depend files/subdir/dep.dat b/test cases/common/161 custom target subdir depend files/subdir/dep.dat
index 5daee49..5daee49 100644
--- a/test cases/common/162 custom target subdir depend files/subdir/dep.dat
+++ b/test cases/common/161 custom target subdir depend files/subdir/dep.dat
diff --git a/test cases/common/162 custom target subdir depend files/subdir/foo.c.in b/test cases/common/161 custom target subdir depend files/subdir/foo.c.in
index d53846f..d53846f 100644
--- a/test cases/common/162 custom target subdir depend files/subdir/foo.c.in
+++ b/test cases/common/161 custom target subdir depend files/subdir/foo.c.in
diff --git a/test cases/common/162 custom target subdir depend files/subdir/meson.build b/test cases/common/161 custom target subdir depend files/subdir/meson.build
index f9d31c4..f9d31c4 100644
--- a/test cases/common/162 custom target subdir depend files/subdir/meson.build
+++ b/test cases/common/161 custom target subdir depend files/subdir/meson.build
diff --git a/test cases/common/163 external program shebang parsing/input.txt b/test cases/common/162 external program shebang parsing/input.txt
index 40e30d4..40e30d4 100644
--- a/test cases/common/163 external program shebang parsing/input.txt
+++ b/test cases/common/162 external program shebang parsing/input.txt
diff --git a/test cases/common/163 external program shebang parsing/main.c b/test cases/common/162 external program shebang parsing/main.c
index a90206b..a90206b 100644
--- a/test cases/common/163 external program shebang parsing/main.c
+++ b/test cases/common/162 external program shebang parsing/main.c
diff --git a/test cases/common/163 external program shebang parsing/meson.build b/test cases/common/162 external program shebang parsing/meson.build
index c1cc5af..c1cc5af 100644
--- a/test cases/common/163 external program shebang parsing/meson.build
+++ b/test cases/common/162 external program shebang parsing/meson.build
diff --git a/test cases/common/163 external program shebang parsing/script.int.in b/test cases/common/162 external program shebang parsing/script.int.in
index 77ff909..77ff909 100644
--- a/test cases/common/163 external program shebang parsing/script.int.in
+++ b/test cases/common/162 external program shebang parsing/script.int.in
diff --git a/test cases/common/164 disabler/meson.build b/test cases/common/163 disabler/meson.build
index 9437ace..9437ace 100644
--- a/test cases/common/164 disabler/meson.build
+++ b/test cases/common/163 disabler/meson.build
diff --git a/test cases/common/165 array option/meson.build b/test cases/common/164 array option/meson.build
index 034b9a5..034b9a5 100644
--- a/test cases/common/165 array option/meson.build
+++ b/test cases/common/164 array option/meson.build
diff --git a/test cases/common/165 array option/meson_options.txt b/test cases/common/164 array option/meson_options.txt
index 7ed0ac1..7ed0ac1 100644
--- a/test cases/common/165 array option/meson_options.txt
+++ b/test cases/common/164 array option/meson_options.txt
diff --git a/test cases/common/166 custom target template substitution/checkcopy.py b/test cases/common/165 custom target template substitution/checkcopy.py
index ab9f436..ab9f436 100644
--- a/test cases/common/166 custom target template substitution/checkcopy.py
+++ b/test cases/common/165 custom target template substitution/checkcopy.py
diff --git a/test cases/common/166 custom target template substitution/foo.c.in b/test cases/common/165 custom target template substitution/foo.c.in
index d53846f..d53846f 100644
--- a/test cases/common/166 custom target template substitution/foo.c.in
+++ b/test cases/common/165 custom target template substitution/foo.c.in
diff --git a/test cases/common/166 custom target template substitution/meson.build b/test cases/common/165 custom target template substitution/meson.build
index 737408e..737408e 100644
--- a/test cases/common/166 custom target template substitution/meson.build
+++ b/test cases/common/165 custom target template substitution/meson.build
diff --git a/test cases/common/167 not-found dependency/meson.build b/test cases/common/166 not-found dependency/meson.build
index 02072b6..02072b6 100644
--- a/test cases/common/167 not-found dependency/meson.build
+++ b/test cases/common/166 not-found dependency/meson.build
diff --git a/test cases/common/167 not-found dependency/sub/meson.build b/test cases/common/166 not-found dependency/sub/meson.build
index 2a33cae..2a33cae 100644
--- a/test cases/common/167 not-found dependency/sub/meson.build
+++ b/test cases/common/166 not-found dependency/sub/meson.build
diff --git a/test cases/common/167 not-found dependency/subprojects/trivial/meson.build b/test cases/common/166 not-found dependency/subprojects/trivial/meson.build
index 8769c70..8769c70 100644
--- a/test cases/common/167 not-found dependency/subprojects/trivial/meson.build
+++ b/test cases/common/166 not-found dependency/subprojects/trivial/meson.build
diff --git a/test cases/common/167 not-found dependency/subprojects/trivial/trivial.c b/test cases/common/166 not-found dependency/subprojects/trivial/trivial.c
index 35b21e0..35b21e0 100644
--- a/test cases/common/167 not-found dependency/subprojects/trivial/trivial.c
+++ b/test cases/common/166 not-found dependency/subprojects/trivial/trivial.c
diff --git a/test cases/common/167 not-found dependency/testlib.c b/test cases/common/166 not-found dependency/testlib.c
index e69de29..e69de29 100644
--- a/test cases/common/167 not-found dependency/testlib.c
+++ b/test cases/common/166 not-found dependency/testlib.c
diff --git a/test cases/common/168 subdir if_found/meson.build b/test cases/common/167 subdir if_found/meson.build
index 2c640cf..2c640cf 100644
--- a/test cases/common/168 subdir if_found/meson.build
+++ b/test cases/common/167 subdir if_found/meson.build
diff --git a/test cases/common/168 subdir if_found/subdir/meson.build b/test cases/common/167 subdir if_found/subdir/meson.build
index 1030e25..1030e25 100644
--- a/test cases/common/168 subdir if_found/subdir/meson.build
+++ b/test cases/common/167 subdir if_found/subdir/meson.build
diff --git a/test cases/common/169 default options prefix dependent defaults/meson.build b/test cases/common/168 default options prefix dependent defaults/meson.build
index 9ca4ec5..9ca4ec5 100644
--- a/test cases/common/169 default options prefix dependent defaults/meson.build
+++ b/test cases/common/168 default options prefix dependent defaults/meson.build
diff --git a/test cases/common/170 dependency factory/meson.build b/test cases/common/169 dependency factory/meson.build
index 2de0f0e..2de0f0e 100644
--- a/test cases/common/170 dependency factory/meson.build
+++ b/test cases/common/169 dependency factory/meson.build
diff --git a/test cases/common/171 get project license/bar.c b/test cases/common/170 get project license/bar.c
index 864869b..864869b 100644
--- a/test cases/common/171 get project license/bar.c
+++ b/test cases/common/170 get project license/bar.c
diff --git a/test cases/common/171 get project license/meson.build b/test cases/common/170 get project license/meson.build
index 37303e3..37303e3 100644
--- a/test cases/common/171 get project license/meson.build
+++ b/test cases/common/170 get project license/meson.build
diff --git a/test cases/common/172 yield/meson.build b/test cases/common/171 yield/meson.build
index 9b11569..9b11569 100644
--- a/test cases/common/172 yield/meson.build
+++ b/test cases/common/171 yield/meson.build
diff --git a/test cases/common/172 yield/meson_options.txt b/test cases/common/171 yield/meson_options.txt
index 9f58fbb..9f58fbb 100644
--- a/test cases/common/172 yield/meson_options.txt
+++ b/test cases/common/171 yield/meson_options.txt
diff --git a/test cases/common/172 yield/subprojects/sub/meson.build b/test cases/common/171 yield/subprojects/sub/meson.build
index 832c13c..832c13c 100644
--- a/test cases/common/172 yield/subprojects/sub/meson.build
+++ b/test cases/common/171 yield/subprojects/sub/meson.build
diff --git a/test cases/common/172 yield/subprojects/sub/meson_options.txt b/test cases/common/171 yield/subprojects/sub/meson_options.txt
index 101122e..101122e 100644
--- a/test cases/common/172 yield/subprojects/sub/meson_options.txt
+++ b/test cases/common/171 yield/subprojects/sub/meson_options.txt
diff --git a/test cases/common/173 subproject nested subproject dirs/contrib/subprojects/alpha/a.c b/test cases/common/172 subproject nested subproject dirs/contrib/subprojects/alpha/a.c
index 7ac3e5e..7ac3e5e 100644
--- a/test cases/common/173 subproject nested subproject dirs/contrib/subprojects/alpha/a.c
+++ b/test cases/common/172 subproject nested subproject dirs/contrib/subprojects/alpha/a.c
diff --git a/test cases/common/173 subproject nested subproject dirs/contrib/subprojects/alpha/meson.build b/test cases/common/172 subproject nested subproject dirs/contrib/subprojects/alpha/meson.build
index 12f6564..12f6564 100644
--- a/test cases/common/173 subproject nested subproject dirs/contrib/subprojects/alpha/meson.build
+++ b/test cases/common/172 subproject nested subproject dirs/contrib/subprojects/alpha/meson.build
diff --git a/test cases/common/173 subproject nested subproject dirs/contrib/subprojects/alpha/var/subprojects/wrap_files_might_be_here b/test cases/common/172 subproject nested subproject dirs/contrib/subprojects/alpha/var/subprojects/wrap_files_might_be_here
index 8d1c8b6..8d1c8b6 100644
--- a/test cases/common/173 subproject nested subproject dirs/contrib/subprojects/alpha/var/subprojects/wrap_files_might_be_here
+++ b/test cases/common/172 subproject nested subproject dirs/contrib/subprojects/alpha/var/subprojects/wrap_files_might_be_here
diff --git a/test cases/common/173 subproject nested subproject dirs/contrib/subprojects/beta/b.c b/test cases/common/172 subproject nested subproject dirs/contrib/subprojects/beta/b.c
index a95651b..a95651b 100644
--- a/test cases/common/173 subproject nested subproject dirs/contrib/subprojects/beta/b.c
+++ b/test cases/common/172 subproject nested subproject dirs/contrib/subprojects/beta/b.c
diff --git a/test cases/common/173 subproject nested subproject dirs/contrib/subprojects/beta/meson.build b/test cases/common/172 subproject nested subproject dirs/contrib/subprojects/beta/meson.build
index 1720d3e..1720d3e 100644
--- a/test cases/common/173 subproject nested subproject dirs/contrib/subprojects/beta/meson.build
+++ b/test cases/common/172 subproject nested subproject dirs/contrib/subprojects/beta/meson.build
diff --git a/test cases/common/173 subproject nested subproject dirs/meson.build b/test cases/common/172 subproject nested subproject dirs/meson.build
index 875eed3..875eed3 100644
--- a/test cases/common/173 subproject nested subproject dirs/meson.build
+++ b/test cases/common/172 subproject nested subproject dirs/meson.build
diff --git a/test cases/common/173 subproject nested subproject dirs/prog.c b/test cases/common/172 subproject nested subproject dirs/prog.c
index 394f139..394f139 100644
--- a/test cases/common/173 subproject nested subproject dirs/prog.c
+++ b/test cases/common/172 subproject nested subproject dirs/prog.c
diff --git a/test cases/common/174 preserve gendir/base.inp b/test cases/common/173 preserve gendir/base.inp
index df967b9..df967b9 100644
--- a/test cases/common/174 preserve gendir/base.inp
+++ b/test cases/common/173 preserve gendir/base.inp
diff --git a/test cases/common/174 preserve gendir/com/mesonbuild/subbie.inp b/test cases/common/173 preserve gendir/com/mesonbuild/subbie.inp
index df0f4e9..df0f4e9 100644
--- a/test cases/common/174 preserve gendir/com/mesonbuild/subbie.inp
+++ b/test cases/common/173 preserve gendir/com/mesonbuild/subbie.inp
diff --git a/test cases/common/174 preserve gendir/genprog.py b/test cases/common/173 preserve gendir/genprog.py
index 1e10998..1e10998 100755
--- a/test cases/common/174 preserve gendir/genprog.py
+++ b/test cases/common/173 preserve gendir/genprog.py
diff --git a/test cases/common/174 preserve gendir/meson.build b/test cases/common/173 preserve gendir/meson.build
index ce219f0..ce219f0 100644
--- a/test cases/common/174 preserve gendir/meson.build
+++ b/test cases/common/173 preserve gendir/meson.build
diff --git a/test cases/common/174 preserve gendir/testprog.c b/test cases/common/173 preserve gendir/testprog.c
index 46b4602..46b4602 100644
--- a/test cases/common/174 preserve gendir/testprog.c
+++ b/test cases/common/173 preserve gendir/testprog.c
diff --git a/test cases/common/175 source in dep/bar.cpp b/test cases/common/174 source in dep/bar.cpp
index bda8cb6..bda8cb6 100644
--- a/test cases/common/175 source in dep/bar.cpp
+++ b/test cases/common/174 source in dep/bar.cpp
diff --git a/test cases/common/175 source in dep/foo.c b/test cases/common/174 source in dep/foo.c
index 1ecfa8c..1ecfa8c 100644
--- a/test cases/common/175 source in dep/foo.c
+++ b/test cases/common/174 source in dep/foo.c
diff --git a/test cases/common/175 source in dep/generated/funname b/test cases/common/174 source in dep/generated/funname
index 79f3c86..79f3c86 100644
--- a/test cases/common/175 source in dep/generated/funname
+++ b/test cases/common/174 source in dep/generated/funname
diff --git a/test cases/common/175 source in dep/generated/genheader.py b/test cases/common/174 source in dep/generated/genheader.py
index eafc075..eafc075 100755
--- a/test cases/common/175 source in dep/generated/genheader.py
+++ b/test cases/common/174 source in dep/generated/genheader.py
diff --git a/test cases/common/175 source in dep/generated/main.c b/test cases/common/174 source in dep/generated/main.c
index 07e7c93..07e7c93 100644
--- a/test cases/common/175 source in dep/generated/main.c
+++ b/test cases/common/174 source in dep/generated/main.c
diff --git a/test cases/common/175 source in dep/generated/meson.build b/test cases/common/174 source in dep/generated/meson.build
index 2862709..2862709 100644
--- a/test cases/common/175 source in dep/generated/meson.build
+++ b/test cases/common/174 source in dep/generated/meson.build
diff --git a/test cases/common/175 source in dep/meson.build b/test cases/common/174 source in dep/meson.build
index 7111ba1..7111ba1 100644
--- a/test cases/common/175 source in dep/meson.build
+++ b/test cases/common/174 source in dep/meson.build
diff --git a/test cases/common/176 generator link whole/export.h b/test cases/common/175 generator link whole/export.h
index f4f6f45..f4f6f45 100644
--- a/test cases/common/176 generator link whole/export.h
+++ b/test cases/common/175 generator link whole/export.h
diff --git a/test cases/common/176 generator link whole/generator.py b/test cases/common/175 generator link whole/generator.py
index 0076b74..0076b74 100755
--- a/test cases/common/176 generator link whole/generator.py
+++ b/test cases/common/175 generator link whole/generator.py
diff --git a/test cases/common/176 generator link whole/main.c b/test cases/common/175 generator link whole/main.c
index acf8717..acf8717 100644
--- a/test cases/common/176 generator link whole/main.c
+++ b/test cases/common/175 generator link whole/main.c
diff --git a/test cases/common/176 generator link whole/meson.build b/test cases/common/175 generator link whole/meson.build
index 30ae9c6..30ae9c6 100644
--- a/test cases/common/176 generator link whole/meson.build
+++ b/test cases/common/175 generator link whole/meson.build
diff --git a/test cases/common/176 generator link whole/meson_test_function.tmpl b/test cases/common/175 generator link whole/meson_test_function.tmpl
index e69de29..e69de29 100644
--- a/test cases/common/176 generator link whole/meson_test_function.tmpl
+++ b/test cases/common/175 generator link whole/meson_test_function.tmpl
diff --git a/test cases/common/176 generator link whole/pull_meson_test_function.c b/test cases/common/175 generator link whole/pull_meson_test_function.c
index c54dda6..c54dda6 100644
--- a/test cases/common/176 generator link whole/pull_meson_test_function.c
+++ b/test cases/common/175 generator link whole/pull_meson_test_function.c
diff --git a/test cases/common/177 initial c_args/meson.build b/test cases/common/176 initial c_args/meson.build
index 638f8c2..638f8c2 100644
--- a/test cases/common/177 initial c_args/meson.build
+++ b/test cases/common/176 initial c_args/meson.build
diff --git a/test cases/common/177 initial c_args/test_args.txt b/test cases/common/176 initial c_args/test_args.txt
index 166e481..166e481 100644
--- a/test cases/common/177 initial c_args/test_args.txt
+++ b/test cases/common/176 initial c_args/test_args.txt
diff --git a/test cases/common/178 identical target name in subproject flat layout/foo.c b/test cases/common/177 identical target name in subproject flat layout/foo.c
index ed42789..ed42789 100644
--- a/test cases/common/178 identical target name in subproject flat layout/foo.c
+++ b/test cases/common/177 identical target name in subproject flat layout/foo.c
diff --git a/test cases/common/178 identical target name in subproject flat layout/main.c b/test cases/common/177 identical target name in subproject flat layout/main.c
index 6f02aeb..6f02aeb 100644
--- a/test cases/common/178 identical target name in subproject flat layout/main.c
+++ b/test cases/common/177 identical target name in subproject flat layout/main.c
diff --git a/test cases/common/178 identical target name in subproject flat layout/meson.build b/test cases/common/177 identical target name in subproject flat layout/meson.build
index d859fda..d859fda 100644
--- a/test cases/common/178 identical target name in subproject flat layout/meson.build
+++ b/test cases/common/177 identical target name in subproject flat layout/meson.build
diff --git a/test cases/common/178 identical target name in subproject flat layout/subprojects/subproj/foo.c b/test cases/common/177 identical target name in subproject flat layout/subprojects/subproj/foo.c
index f334292..f334292 100644
--- a/test cases/common/178 identical target name in subproject flat layout/subprojects/subproj/foo.c
+++ b/test cases/common/177 identical target name in subproject flat layout/subprojects/subproj/foo.c
diff --git a/test cases/common/178 identical target name in subproject flat layout/subprojects/subproj/meson.build b/test cases/common/177 identical target name in subproject flat layout/subprojects/subproj/meson.build
index c927194..c927194 100644
--- a/test cases/common/178 identical target name in subproject flat layout/subprojects/subproj/meson.build
+++ b/test cases/common/177 identical target name in subproject flat layout/subprojects/subproj/meson.build
diff --git a/test cases/common/179 as-needed/config.h b/test cases/common/178 as-needed/config.h
index b8fb60f..b8fb60f 100644
--- a/test cases/common/179 as-needed/config.h
+++ b/test cases/common/178 as-needed/config.h
diff --git a/test cases/common/179 as-needed/libA.cpp b/test cases/common/178 as-needed/libA.cpp
index 5f45bc0..5f45bc0 100644
--- a/test cases/common/179 as-needed/libA.cpp
+++ b/test cases/common/178 as-needed/libA.cpp
diff --git a/test cases/common/179 as-needed/libA.h b/test cases/common/178 as-needed/libA.h
index 8e76d22..8e76d22 100644
--- a/test cases/common/179 as-needed/libA.h
+++ b/test cases/common/178 as-needed/libA.h
diff --git a/test cases/common/179 as-needed/libB.cpp b/test cases/common/178 as-needed/libB.cpp
index a872394..a872394 100644
--- a/test cases/common/179 as-needed/libB.cpp
+++ b/test cases/common/178 as-needed/libB.cpp
diff --git a/test cases/common/179 as-needed/main.cpp b/test cases/common/178 as-needed/main.cpp
index 191d15c..191d15c 100644
--- a/test cases/common/179 as-needed/main.cpp
+++ b/test cases/common/178 as-needed/main.cpp
diff --git a/test cases/common/179 as-needed/meson.build b/test cases/common/178 as-needed/meson.build
index 3b54aaa..3b54aaa 100644
--- a/test cases/common/179 as-needed/meson.build
+++ b/test cases/common/178 as-needed/meson.build
diff --git a/test cases/common/180 ndebug if-release enabled/main.c b/test cases/common/179 ndebug if-release enabled/main.c
index 984ebca..984ebca 100644
--- a/test cases/common/180 ndebug if-release enabled/main.c
+++ b/test cases/common/179 ndebug if-release enabled/main.c
diff --git a/test cases/common/180 ndebug if-release enabled/meson.build b/test cases/common/179 ndebug if-release enabled/meson.build
index be26375..be26375 100644
--- a/test cases/common/180 ndebug if-release enabled/meson.build
+++ b/test cases/common/179 ndebug if-release enabled/meson.build
diff --git a/test cases/common/181 ndebug if-release disabled/main.c b/test cases/common/180 ndebug if-release disabled/main.c
index cb3ec3f..cb3ec3f 100644
--- a/test cases/common/181 ndebug if-release disabled/main.c
+++ b/test cases/common/180 ndebug if-release disabled/main.c
diff --git a/test cases/common/181 ndebug if-release disabled/meson.build b/test cases/common/180 ndebug if-release disabled/meson.build
index a9a79ea..a9a79ea 100644
--- a/test cases/common/181 ndebug if-release disabled/meson.build
+++ b/test cases/common/180 ndebug if-release disabled/meson.build
diff --git a/test cases/common/182 subproject version/meson.build b/test cases/common/181 subproject version/meson.build
index bd8fc03..bd8fc03 100644
--- a/test cases/common/182 subproject version/meson.build
+++ b/test cases/common/181 subproject version/meson.build
diff --git a/test cases/common/182 subproject version/subprojects/a/meson.build b/test cases/common/181 subproject version/subprojects/a/meson.build
index dae3130..dae3130 100644
--- a/test cases/common/182 subproject version/subprojects/a/meson.build
+++ b/test cases/common/181 subproject version/subprojects/a/meson.build
diff --git a/test cases/common/183 subdir_done/meson.build b/test cases/common/182 subdir_done/meson.build
index 457e613..457e613 100644
--- a/test cases/common/183 subdir_done/meson.build
+++ b/test cases/common/182 subdir_done/meson.build
diff --git a/test cases/common/184 bothlibraries/libfile.c b/test cases/common/183 bothlibraries/libfile.c
index 085ef3b..085ef3b 100644
--- a/test cases/common/184 bothlibraries/libfile.c
+++ b/test cases/common/183 bothlibraries/libfile.c
diff --git a/test cases/common/184 bothlibraries/main.c b/test cases/common/183 bothlibraries/main.c
index 03a8e02..03a8e02 100644
--- a/test cases/common/184 bothlibraries/main.c
+++ b/test cases/common/183 bothlibraries/main.c
diff --git a/test cases/common/184 bothlibraries/meson.build b/test cases/common/183 bothlibraries/meson.build
index 0bfba76..0bfba76 100644
--- a/test cases/common/184 bothlibraries/meson.build
+++ b/test cases/common/183 bothlibraries/meson.build
diff --git a/test cases/common/184 bothlibraries/mylib.h b/test cases/common/183 bothlibraries/mylib.h
index 1038a01..1038a01 100644
--- a/test cases/common/184 bothlibraries/mylib.h
+++ b/test cases/common/183 bothlibraries/mylib.h
diff --git a/test cases/common/185 escape and unicode/file.c.in b/test cases/common/184 escape and unicode/file.c.in
index 413ed42..413ed42 100644
--- a/test cases/common/185 escape and unicode/file.c.in
+++ b/test cases/common/184 escape and unicode/file.c.in
diff --git a/test cases/common/185 escape and unicode/file.py b/test cases/common/184 escape and unicode/file.py
index 40fa7ca..40fa7ca 100644
--- a/test cases/common/185 escape and unicode/file.py
+++ b/test cases/common/184 escape and unicode/file.py
diff --git a/test cases/common/185 escape and unicode/find.py b/test cases/common/184 escape and unicode/find.py
index 34a3eb8..34a3eb8 100644
--- a/test cases/common/185 escape and unicode/find.py
+++ b/test cases/common/184 escape and unicode/find.py
diff --git a/test cases/common/185 escape and unicode/fun.c b/test cases/common/184 escape and unicode/fun.c
index 8eeb8ea..8eeb8ea 100644
--- a/test cases/common/185 escape and unicode/fun.c
+++ b/test cases/common/184 escape and unicode/fun.c
diff --git a/test cases/common/185 escape and unicode/main.c b/test cases/common/184 escape and unicode/main.c
index 0bcde16..0bcde16 100644
--- a/test cases/common/185 escape and unicode/main.c
+++ b/test cases/common/184 escape and unicode/main.c
diff --git a/test cases/common/185 escape and unicode/meson.build b/test cases/common/184 escape and unicode/meson.build
index e4fe628..e4fe628 100644
--- a/test cases/common/185 escape and unicode/meson.build
+++ b/test cases/common/184 escape and unicode/meson.build
diff --git a/test cases/common/186 has link arg/meson.build b/test cases/common/185 has link arg/meson.build
index 10f2218..10f2218 100644
--- a/test cases/common/186 has link arg/meson.build
+++ b/test cases/common/185 has link arg/meson.build
diff --git a/test cases/common/187 same target name flat layout/foo.c b/test cases/common/186 same target name flat layout/foo.c
index ed42789..ed42789 100644
--- a/test cases/common/187 same target name flat layout/foo.c
+++ b/test cases/common/186 same target name flat layout/foo.c
diff --git a/test cases/common/187 same target name flat layout/main.c b/test cases/common/186 same target name flat layout/main.c
index 6f02aeb..6f02aeb 100644
--- a/test cases/common/187 same target name flat layout/main.c
+++ b/test cases/common/186 same target name flat layout/main.c
diff --git a/test cases/common/187 same target name flat layout/meson.build b/test cases/common/186 same target name flat layout/meson.build
index a3c95fa..a3c95fa 100644
--- a/test cases/common/187 same target name flat layout/meson.build
+++ b/test cases/common/186 same target name flat layout/meson.build
diff --git a/test cases/common/187 same target name flat layout/subdir/foo.c b/test cases/common/186 same target name flat layout/subdir/foo.c
index f334292..f334292 100644
--- a/test cases/common/187 same target name flat layout/subdir/foo.c
+++ b/test cases/common/186 same target name flat layout/subdir/foo.c
diff --git a/test cases/common/187 same target name flat layout/subdir/meson.build b/test cases/common/186 same target name flat layout/subdir/meson.build
index 223a5ef..223a5ef 100644
--- a/test cases/common/187 same target name flat layout/subdir/meson.build
+++ b/test cases/common/186 same target name flat layout/subdir/meson.build
diff --git a/test cases/common/188 find override/meson.build b/test cases/common/187 find override/meson.build
index 3b8af80..3b8af80 100644
--- a/test cases/common/188 find override/meson.build
+++ b/test cases/common/187 find override/meson.build
diff --git a/test cases/common/188 find override/otherdir/main.c b/test cases/common/187 find override/otherdir/main.c
index 2cef67c..2cef67c 100644
--- a/test cases/common/188 find override/otherdir/main.c
+++ b/test cases/common/187 find override/otherdir/main.c
diff --git a/test cases/common/188 find override/otherdir/main2.c b/test cases/common/187 find override/otherdir/main2.c
index 6d71688..6d71688 100644
--- a/test cases/common/188 find override/otherdir/main2.c
+++ b/test cases/common/187 find override/otherdir/main2.c
diff --git a/test cases/common/188 find override/otherdir/meson.build b/test cases/common/187 find override/otherdir/meson.build
index dc41f5b..dc41f5b 100644
--- a/test cases/common/188 find override/otherdir/meson.build
+++ b/test cases/common/187 find override/otherdir/meson.build
diff --git a/test cases/common/188 find override/otherdir/source.desc b/test cases/common/187 find override/otherdir/source.desc
index 8b19c9c..8b19c9c 100644
--- a/test cases/common/188 find override/otherdir/source.desc
+++ b/test cases/common/187 find override/otherdir/source.desc
diff --git a/test cases/common/188 find override/otherdir/source2.desc b/test cases/common/187 find override/otherdir/source2.desc
index 965f868..965f868 100644
--- a/test cases/common/188 find override/otherdir/source2.desc
+++ b/test cases/common/187 find override/otherdir/source2.desc
diff --git a/test cases/common/188 find override/subdir/converter.py b/test cases/common/187 find override/subdir/converter.py
index ee2ff85..ee2ff85 100755
--- a/test cases/common/188 find override/subdir/converter.py
+++ b/test cases/common/187 find override/subdir/converter.py
diff --git a/test cases/common/188 find override/subdir/gencodegen.py.in b/test cases/common/187 find override/subdir/gencodegen.py.in
index 57d9c40..57d9c40 100755
--- a/test cases/common/188 find override/subdir/gencodegen.py.in
+++ b/test cases/common/187 find override/subdir/gencodegen.py.in
diff --git a/test cases/common/188 find override/subdir/meson.build b/test cases/common/187 find override/subdir/meson.build
index e5de34d..e5de34d 100644
--- a/test cases/common/188 find override/subdir/meson.build
+++ b/test cases/common/187 find override/subdir/meson.build
diff --git a/test cases/common/189 partial dependency/declare_dependency/headers/foo.c b/test cases/common/188 partial dependency/declare_dependency/headers/foo.c
index 215112c..215112c 100644
--- a/test cases/common/189 partial dependency/declare_dependency/headers/foo.c
+++ b/test cases/common/188 partial dependency/declare_dependency/headers/foo.c
diff --git a/test cases/common/189 partial dependency/declare_dependency/headers/foo.h b/test cases/common/188 partial dependency/declare_dependency/headers/foo.h
index 28c81c9..28c81c9 100644
--- a/test cases/common/189 partial dependency/declare_dependency/headers/foo.h
+++ b/test cases/common/188 partial dependency/declare_dependency/headers/foo.h
diff --git a/test cases/common/189 partial dependency/declare_dependency/main.c b/test cases/common/188 partial dependency/declare_dependency/main.c
index e9ed032..e9ed032 100644
--- a/test cases/common/189 partial dependency/declare_dependency/main.c
+++ b/test cases/common/188 partial dependency/declare_dependency/main.c
diff --git a/test cases/common/189 partial dependency/declare_dependency/meson.build b/test cases/common/188 partial dependency/declare_dependency/meson.build
index 3783f66..3783f66 100644
--- a/test cases/common/189 partial dependency/declare_dependency/meson.build
+++ b/test cases/common/188 partial dependency/declare_dependency/meson.build
diff --git a/test cases/common/189 partial dependency/declare_dependency/other.c b/test cases/common/188 partial dependency/declare_dependency/other.c
index b1e199e..b1e199e 100644
--- a/test cases/common/189 partial dependency/declare_dependency/other.c
+++ b/test cases/common/188 partial dependency/declare_dependency/other.c
diff --git a/test cases/common/189 partial dependency/meson.build b/test cases/common/188 partial dependency/meson.build
index e908487..e908487 100644
--- a/test cases/common/189 partial dependency/meson.build
+++ b/test cases/common/188 partial dependency/meson.build
diff --git a/test cases/common/190 openmp/main.c b/test cases/common/189 openmp/main.c
index cc81f48..cc81f48 100644
--- a/test cases/common/190 openmp/main.c
+++ b/test cases/common/189 openmp/main.c
diff --git a/test cases/common/190 openmp/main.cpp b/test cases/common/189 openmp/main.cpp
index b12be3f..b12be3f 100644
--- a/test cases/common/190 openmp/main.cpp
+++ b/test cases/common/189 openmp/main.cpp
diff --git a/test cases/common/190 openmp/main.f90 b/test cases/common/189 openmp/main.f90
index d80f90f..d80f90f 100644
--- a/test cases/common/190 openmp/main.f90
+++ b/test cases/common/189 openmp/main.f90
diff --git a/test cases/common/190 openmp/meson.build b/test cases/common/189 openmp/meson.build
index a1154c2..a1154c2 100644
--- a/test cases/common/190 openmp/meson.build
+++ b/test cases/common/189 openmp/meson.build
diff --git a/test cases/common/191 same target name/file.c b/test cases/common/190 same target name/file.c
index 6f1c172..6f1c172 100644
--- a/test cases/common/191 same target name/file.c
+++ b/test cases/common/190 same target name/file.c
diff --git a/test cases/common/191 same target name/meson.build b/test cases/common/190 same target name/meson.build
index 4e585d5..4e585d5 100644
--- a/test cases/common/191 same target name/meson.build
+++ b/test cases/common/190 same target name/meson.build
diff --git a/test cases/common/191 same target name/sub/file2.c b/test cases/common/190 same target name/sub/file2.c
index a5e453d..a5e453d 100644
--- a/test cases/common/191 same target name/sub/file2.c
+++ b/test cases/common/190 same target name/sub/file2.c
diff --git a/test cases/common/191 same target name/sub/meson.build b/test cases/common/190 same target name/sub/meson.build
index 610a4a3..610a4a3 100644
--- a/test cases/common/191 same target name/sub/meson.build
+++ b/test cases/common/190 same target name/sub/meson.build
diff --git a/test cases/common/192 test depends/gen.py b/test cases/common/191 test depends/gen.py
index ee4ed98..ee4ed98 100755
--- a/test cases/common/192 test depends/gen.py
+++ b/test cases/common/191 test depends/gen.py
diff --git a/test cases/common/192 test depends/main.c b/test cases/common/191 test depends/main.c
index 78f2de1..78f2de1 100644
--- a/test cases/common/192 test depends/main.c
+++ b/test cases/common/191 test depends/main.c
diff --git a/test cases/common/192 test depends/meson.build b/test cases/common/191 test depends/meson.build
index 888c451..888c451 100644
--- a/test cases/common/192 test depends/meson.build
+++ b/test cases/common/191 test depends/meson.build
diff --git a/test cases/common/192 test depends/test.py b/test cases/common/191 test depends/test.py
index 5b9f65c..5b9f65c 100755
--- a/test cases/common/192 test depends/test.py
+++ b/test cases/common/191 test depends/test.py
diff --git a/test cases/common/193 args flattening/meson.build b/test cases/common/192 args flattening/meson.build
index 6da2e8f..6da2e8f 100644
--- a/test cases/common/193 args flattening/meson.build
+++ b/test cases/common/192 args flattening/meson.build
diff --git a/test cases/common/194 dict/meson.build b/test cases/common/193 dict/meson.build
index 41eea31..41eea31 100644
--- a/test cases/common/194 dict/meson.build
+++ b/test cases/common/193 dict/meson.build
diff --git a/test cases/common/194 dict/prog.c b/test cases/common/193 dict/prog.c
index bf0999d..bf0999d 100644
--- a/test cases/common/194 dict/prog.c
+++ b/test cases/common/193 dict/prog.c
diff --git a/test cases/common/195 check header/meson.build b/test cases/common/194 check header/meson.build
index f2f7fa5..f2f7fa5 100644
--- a/test cases/common/195 check header/meson.build
+++ b/test cases/common/194 check header/meson.build
diff --git a/test cases/common/195 check header/ouagadougou.h b/test cases/common/194 check header/ouagadougou.h
index 2f76c49..2f76c49 100644
--- a/test cases/common/195 check header/ouagadougou.h
+++ b/test cases/common/194 check header/ouagadougou.h
diff --git a/test cases/common/196 install_mode/config.h.in b/test cases/common/195 install_mode/config.h.in
index 14a1558..14a1558 100644
--- a/test cases/common/196 install_mode/config.h.in
+++ b/test cases/common/195 install_mode/config.h.in
diff --git a/test cases/common/196 install_mode/data_source.txt b/test cases/common/195 install_mode/data_source.txt
index 0c23cc0..0c23cc0 100644
--- a/test cases/common/196 install_mode/data_source.txt
+++ b/test cases/common/195 install_mode/data_source.txt
diff --git a/test cases/common/196 install_mode/foo.1 b/test cases/common/195 install_mode/foo.1
index 647c097..647c097 100644
--- a/test cases/common/196 install_mode/foo.1
+++ b/test cases/common/195 install_mode/foo.1
diff --git a/test cases/common/196 install_mode/installed_files.txt b/test cases/common/195 install_mode/installed_files.txt
index 4bd2211..4bd2211 100644
--- a/test cases/common/196 install_mode/installed_files.txt
+++ b/test cases/common/195 install_mode/installed_files.txt
diff --git a/test cases/common/196 install_mode/meson.build b/test cases/common/195 install_mode/meson.build
index cae1e91..cae1e91 100644
--- a/test cases/common/196 install_mode/meson.build
+++ b/test cases/common/195 install_mode/meson.build
diff --git a/test cases/common/196 install_mode/rootdir.h b/test cases/common/195 install_mode/rootdir.h
index 72fb132..72fb132 100644
--- a/test cases/common/196 install_mode/rootdir.h
+++ b/test cases/common/195 install_mode/rootdir.h
diff --git a/test cases/common/196 install_mode/runscript.sh b/test cases/common/195 install_mode/runscript.sh
index 8bc5ca6..8bc5ca6 100644
--- a/test cases/common/196 install_mode/runscript.sh
+++ b/test cases/common/195 install_mode/runscript.sh
diff --git a/test cases/common/196 install_mode/stat.c b/test cases/common/195 install_mode/stat.c
index fa76a65..fa76a65 100644
--- a/test cases/common/196 install_mode/stat.c
+++ b/test cases/common/195 install_mode/stat.c
diff --git a/test cases/common/196 install_mode/sub1/second.dat b/test cases/common/195 install_mode/sub1/second.dat
index 48857a8..48857a8 100644
--- a/test cases/common/196 install_mode/sub1/second.dat
+++ b/test cases/common/195 install_mode/sub1/second.dat
diff --git a/test cases/common/196 install_mode/sub2/stub b/test cases/common/195 install_mode/sub2/stub
index e69de29..e69de29 100644
--- a/test cases/common/196 install_mode/sub2/stub
+++ b/test cases/common/195 install_mode/sub2/stub
diff --git a/test cases/common/196 install_mode/trivial.c b/test cases/common/195 install_mode/trivial.c
index 24ac454..24ac454 100644
--- a/test cases/common/196 install_mode/trivial.c
+++ b/test cases/common/195 install_mode/trivial.c
diff --git a/test cases/common/197 subproject array version/meson.build b/test cases/common/196 subproject array version/meson.build
index 0870bc4..0870bc4 100644
--- a/test cases/common/197 subproject array version/meson.build
+++ b/test cases/common/196 subproject array version/meson.build
diff --git a/test cases/common/197 subproject array version/subprojects/foo/meson.build b/test cases/common/196 subproject array version/subprojects/foo/meson.build
index f4ff535..f4ff535 100644
--- a/test cases/common/197 subproject array version/subprojects/foo/meson.build
+++ b/test cases/common/196 subproject array version/subprojects/foo/meson.build
diff --git a/test cases/common/198 feature option/meson.build b/test cases/common/197 feature option/meson.build
index ef3fa22..ef3fa22 100644
--- a/test cases/common/198 feature option/meson.build
+++ b/test cases/common/197 feature option/meson.build
diff --git a/test cases/common/198 feature option/meson_options.txt b/test cases/common/197 feature option/meson_options.txt
index 063a35f..063a35f 100644
--- a/test cases/common/198 feature option/meson_options.txt
+++ b/test cases/common/197 feature option/meson_options.txt
diff --git a/test cases/common/199 feature option disabled/meson.build b/test cases/common/198 feature option disabled/meson.build
index 1a83187..1a83187 100644
--- a/test cases/common/199 feature option disabled/meson.build
+++ b/test cases/common/198 feature option disabled/meson.build
diff --git a/test cases/common/199 feature option disabled/meson_options.txt b/test cases/common/198 feature option disabled/meson_options.txt
index 063a35f..063a35f 100644
--- a/test cases/common/199 feature option disabled/meson_options.txt
+++ b/test cases/common/198 feature option disabled/meson_options.txt
diff --git a/test cases/common/200 static threads/lib1.c b/test cases/common/199 static threads/lib1.c
index 1aa786c..1aa786c 100644
--- a/test cases/common/200 static threads/lib1.c
+++ b/test cases/common/199 static threads/lib1.c
diff --git a/test cases/common/200 static threads/lib2.c b/test cases/common/199 static threads/lib2.c
index e988814..e988814 100644
--- a/test cases/common/200 static threads/lib2.c
+++ b/test cases/common/199 static threads/lib2.c
diff --git a/test cases/common/200 static threads/meson.build b/test cases/common/199 static threads/meson.build
index 4279200..4279200 100644
--- a/test cases/common/200 static threads/meson.build
+++ b/test cases/common/199 static threads/meson.build
diff --git a/test cases/common/200 static threads/prog.c b/test cases/common/199 static threads/prog.c
index 14a7c76..14a7c76 100644
--- a/test cases/common/200 static threads/prog.c
+++ b/test cases/common/199 static threads/prog.c
diff --git a/test cases/common/201 generator in subdir/com/mesonbuild/genprog.py b/test cases/common/200 generator in subdir/com/mesonbuild/genprog.py
index 1e10998..1e10998 100644
--- a/test cases/common/201 generator in subdir/com/mesonbuild/genprog.py
+++ b/test cases/common/200 generator in subdir/com/mesonbuild/genprog.py
diff --git a/test cases/common/201 generator in subdir/com/mesonbuild/meson.build b/test cases/common/200 generator in subdir/com/mesonbuild/meson.build
index 4808743..4808743 100644
--- a/test cases/common/201 generator in subdir/com/mesonbuild/meson.build
+++ b/test cases/common/200 generator in subdir/com/mesonbuild/meson.build
diff --git a/test cases/common/201 generator in subdir/com/mesonbuild/subbie.inp b/test cases/common/200 generator in subdir/com/mesonbuild/subbie.inp
index df0f4e9..df0f4e9 100644
--- a/test cases/common/201 generator in subdir/com/mesonbuild/subbie.inp
+++ b/test cases/common/200 generator in subdir/com/mesonbuild/subbie.inp
diff --git a/test cases/common/201 generator in subdir/com/mesonbuild/testprog.c b/test cases/common/200 generator in subdir/com/mesonbuild/testprog.c
index 58867ad..58867ad 100644
--- a/test cases/common/201 generator in subdir/com/mesonbuild/testprog.c
+++ b/test cases/common/200 generator in subdir/com/mesonbuild/testprog.c
diff --git a/test cases/common/201 generator in subdir/meson.build b/test cases/common/200 generator in subdir/meson.build
index 9b8eb7c..9b8eb7c 100644
--- a/test cases/common/201 generator in subdir/meson.build
+++ b/test cases/common/200 generator in subdir/meson.build
diff --git a/test cases/common/202 override with exe/main2.input b/test cases/common/201 override with exe/main2.input
index e69de29..e69de29 100644
--- a/test cases/common/202 override with exe/main2.input
+++ b/test cases/common/201 override with exe/main2.input
diff --git a/test cases/common/202 override with exe/meson.build b/test cases/common/201 override with exe/meson.build
index 81f6c02..81f6c02 100644
--- a/test cases/common/202 override with exe/meson.build
+++ b/test cases/common/201 override with exe/meson.build
diff --git a/test cases/common/202 override with exe/subprojects/sub/foobar.c b/test cases/common/201 override with exe/subprojects/sub/foobar.c
index 030ac49..030ac49 100644
--- a/test cases/common/202 override with exe/subprojects/sub/foobar.c
+++ b/test cases/common/201 override with exe/subprojects/sub/foobar.c
diff --git a/test cases/common/202 override with exe/subprojects/sub/meson.build b/test cases/common/201 override with exe/subprojects/sub/meson.build
index 1f186da..1f186da 100644
--- a/test cases/common/202 override with exe/subprojects/sub/meson.build
+++ b/test cases/common/201 override with exe/subprojects/sub/meson.build
diff --git a/test cases/common/203 subproject with features/meson.build b/test cases/common/202 subproject with features/meson.build
index 5bdfefb..5bdfefb 100644
--- a/test cases/common/203 subproject with features/meson.build
+++ b/test cases/common/202 subproject with features/meson.build
diff --git a/test cases/common/203 subproject with features/meson_options.txt b/test cases/common/202 subproject with features/meson_options.txt
index a46e5fb..a46e5fb 100644
--- a/test cases/common/203 subproject with features/meson_options.txt
+++ b/test cases/common/202 subproject with features/meson_options.txt
diff --git a/test cases/common/203 subproject with features/nothing.c b/test cases/common/202 subproject with features/nothing.c
index 77750c2..77750c2 100644
--- a/test cases/common/203 subproject with features/nothing.c
+++ b/test cases/common/202 subproject with features/nothing.c
diff --git a/test cases/common/203 subproject with features/subprojects/auto_sub_with_missing_dep/meson.build b/test cases/common/202 subproject with features/subprojects/auto_sub_with_missing_dep/meson.build
index fa6b011..fa6b011 100644
--- a/test cases/common/203 subproject with features/subprojects/auto_sub_with_missing_dep/meson.build
+++ b/test cases/common/202 subproject with features/subprojects/auto_sub_with_missing_dep/meson.build
diff --git a/test cases/common/203 subproject with features/subprojects/disabled_sub/lib/meson.build b/test cases/common/202 subproject with features/subprojects/disabled_sub/lib/meson.build
index 933001a..933001a 100644
--- a/test cases/common/203 subproject with features/subprojects/disabled_sub/lib/meson.build
+++ b/test cases/common/202 subproject with features/subprojects/disabled_sub/lib/meson.build
diff --git a/test cases/common/203 subproject with features/subprojects/disabled_sub/lib/sub.c b/test cases/common/202 subproject with features/subprojects/disabled_sub/lib/sub.c
index 068a5b8..068a5b8 100644
--- a/test cases/common/203 subproject with features/subprojects/disabled_sub/lib/sub.c
+++ b/test cases/common/202 subproject with features/subprojects/disabled_sub/lib/sub.c
diff --git a/test cases/common/203 subproject with features/subprojects/disabled_sub/lib/sub.h b/test cases/common/202 subproject with features/subprojects/disabled_sub/lib/sub.h
index f1ab0e1..f1ab0e1 100644
--- a/test cases/common/203 subproject with features/subprojects/disabled_sub/lib/sub.h
+++ b/test cases/common/202 subproject with features/subprojects/disabled_sub/lib/sub.h
diff --git a/test cases/common/203 subproject with features/subprojects/disabled_sub/meson.build b/test cases/common/202 subproject with features/subprojects/disabled_sub/meson.build
index 65fef03..65fef03 100644
--- a/test cases/common/203 subproject with features/subprojects/disabled_sub/meson.build
+++ b/test cases/common/202 subproject with features/subprojects/disabled_sub/meson.build
diff --git a/test cases/common/203 subproject with features/subprojects/sub/lib/meson.build b/test cases/common/202 subproject with features/subprojects/sub/lib/meson.build
index 731d22b..731d22b 100644
--- a/test cases/common/203 subproject with features/subprojects/sub/lib/meson.build
+++ b/test cases/common/202 subproject with features/subprojects/sub/lib/meson.build
diff --git a/test cases/common/203 subproject with features/subprojects/sub/lib/sub.c b/test cases/common/202 subproject with features/subprojects/sub/lib/sub.c
index ed78306..ed78306 100644
--- a/test cases/common/203 subproject with features/subprojects/sub/lib/sub.c
+++ b/test cases/common/202 subproject with features/subprojects/sub/lib/sub.c
diff --git a/test cases/common/203 subproject with features/subprojects/sub/lib/sub.h b/test cases/common/202 subproject with features/subprojects/sub/lib/sub.h
index f1ab0e1..f1ab0e1 100644
--- a/test cases/common/203 subproject with features/subprojects/sub/lib/sub.h
+++ b/test cases/common/202 subproject with features/subprojects/sub/lib/sub.h
diff --git a/test cases/common/203 subproject with features/subprojects/sub/meson.build b/test cases/common/202 subproject with features/subprojects/sub/meson.build
index 31882ac..31882ac 100644
--- a/test cases/common/203 subproject with features/subprojects/sub/meson.build
+++ b/test cases/common/202 subproject with features/subprojects/sub/meson.build
diff --git a/test cases/common/204 function attributes/meson.build b/test cases/common/203 function attributes/meson.build
index 58ac7c8..58ac7c8 100644
--- a/test cases/common/204 function attributes/meson.build
+++ b/test cases/common/203 function attributes/meson.build
diff --git a/test cases/common/205 broken subproject/meson.build b/test cases/common/204 broken subproject/meson.build
index e3a6cae..e3a6cae 100644
--- a/test cases/common/205 broken subproject/meson.build
+++ b/test cases/common/204 broken subproject/meson.build
diff --git a/test cases/common/205 broken subproject/subprojects/broken/broken.c b/test cases/common/204 broken subproject/subprojects/broken/broken.c
index a9fc4b1..a9fc4b1 100644
--- a/test cases/common/205 broken subproject/subprojects/broken/broken.c
+++ b/test cases/common/204 broken subproject/subprojects/broken/broken.c
diff --git a/test cases/common/205 broken subproject/subprojects/broken/meson.build b/test cases/common/204 broken subproject/subprojects/broken/meson.build
index 2d64fde..2d64fde 100644
--- a/test cases/common/205 broken subproject/subprojects/broken/meson.build
+++ b/test cases/common/204 broken subproject/subprojects/broken/meson.build
diff --git a/test cases/common/206 argument syntax/meson.build b/test cases/common/205 argument syntax/meson.build
index b97ca74..b97ca74 100644
--- a/test cases/common/206 argument syntax/meson.build
+++ b/test cases/common/205 argument syntax/meson.build
diff --git a/test cases/common/207 install name_prefix name_suffix/installed_files.txt b/test cases/common/206 install name_prefix name_suffix/installed_files.txt
index 240a8be..240a8be 100644
--- a/test cases/common/207 install name_prefix name_suffix/installed_files.txt
+++ b/test cases/common/206 install name_prefix name_suffix/installed_files.txt
diff --git a/test cases/common/207 install name_prefix name_suffix/libfile.c b/test cases/common/206 install name_prefix name_suffix/libfile.c
index 44f7667..44f7667 100644
--- a/test cases/common/207 install name_prefix name_suffix/libfile.c
+++ b/test cases/common/206 install name_prefix name_suffix/libfile.c
diff --git a/test cases/common/207 install name_prefix name_suffix/meson.build b/test cases/common/206 install name_prefix name_suffix/meson.build
index 4539999..4539999 100644
--- a/test cases/common/207 install name_prefix name_suffix/meson.build
+++ b/test cases/common/206 install name_prefix name_suffix/meson.build
diff --git a/test cases/common/208 kwarg entry/inc/prog.h b/test cases/common/207 kwarg entry/inc/prog.h
index 665521d..665521d 100644
--- a/test cases/common/208 kwarg entry/inc/prog.h
+++ b/test cases/common/207 kwarg entry/inc/prog.h
diff --git a/test cases/common/208 kwarg entry/installed_files.txt b/test cases/common/207 kwarg entry/installed_files.txt
index 5e796b0..5e796b0 100644
--- a/test cases/common/208 kwarg entry/installed_files.txt
+++ b/test cases/common/207 kwarg entry/installed_files.txt
diff --git a/test cases/common/208 kwarg entry/meson.build b/test cases/common/207 kwarg entry/meson.build
index 564ec37..564ec37 100644
--- a/test cases/common/208 kwarg entry/meson.build
+++ b/test cases/common/207 kwarg entry/meson.build
diff --git a/test cases/common/208 kwarg entry/prog.c b/test cases/common/207 kwarg entry/prog.c
index 0c57f66..0c57f66 100644
--- a/test cases/common/208 kwarg entry/prog.c
+++ b/test cases/common/207 kwarg entry/prog.c
diff --git a/test cases/common/209 custom target build by default/docgen.py b/test cases/common/208 custom target build by default/docgen.py
index f343f21..f343f21 100644
--- a/test cases/common/209 custom target build by default/docgen.py
+++ b/test cases/common/208 custom target build by default/docgen.py
diff --git a/test cases/common/209 custom target build by default/installed_files.txt b/test cases/common/208 custom target build by default/installed_files.txt
index e69de29..e69de29 100644
--- a/test cases/common/209 custom target build by default/installed_files.txt
+++ b/test cases/common/208 custom target build by default/installed_files.txt
diff --git a/test cases/common/209 custom target build by default/meson.build b/test cases/common/208 custom target build by default/meson.build
index 7c81aa2..7c81aa2 100644
--- a/test cases/common/209 custom target build by default/meson.build
+++ b/test cases/common/208 custom target build by default/meson.build
diff --git a/test cases/common/210 find_library and headers/foo.h b/test cases/common/209 find_library and headers/foo.h
index 014e06e..014e06e 100644
--- a/test cases/common/210 find_library and headers/foo.h
+++ b/test cases/common/209 find_library and headers/foo.h
diff --git a/test cases/common/210 find_library and headers/meson.build b/test cases/common/209 find_library and headers/meson.build
index bcd71f1..bcd71f1 100644
--- a/test cases/common/210 find_library and headers/meson.build
+++ b/test cases/common/209 find_library and headers/meson.build
diff --git a/test cases/common/211 line continuation/meson.build b/test cases/common/210 line continuation/meson.build
index 16c72f9..16c72f9 100644
--- a/test cases/common/211 line continuation/meson.build
+++ b/test cases/common/210 line continuation/meson.build
diff --git a/test cases/common/212 cmake module/cmake_project/CMakeLists.txt b/test cases/common/211 cmake module/cmake_project/CMakeLists.txt
index cd91584..cd91584 100644
--- a/test cases/common/212 cmake module/cmake_project/CMakeLists.txt
+++ b/test cases/common/211 cmake module/cmake_project/CMakeLists.txt
diff --git a/test cases/common/212 cmake module/installed_files.txt b/test cases/common/211 cmake module/installed_files.txt
index f8b11f0..f8b11f0 100644
--- a/test cases/common/212 cmake module/installed_files.txt
+++ b/test cases/common/211 cmake module/installed_files.txt
diff --git a/test cases/common/212 cmake module/meson.build b/test cases/common/211 cmake module/meson.build
index 68f9993..68f9993 100644
--- a/test cases/common/212 cmake module/meson.build
+++ b/test cases/common/211 cmake module/meson.build
diff --git a/test cases/common/212 cmake module/projectConfig.cmake.in b/test cases/common/211 cmake module/projectConfig.cmake.in
index fa3dfca..fa3dfca 100644
--- a/test cases/common/212 cmake module/projectConfig.cmake.in
+++ b/test cases/common/211 cmake module/projectConfig.cmake.in
diff --git a/test cases/common/213 native file path override/installed_files.txt b/test cases/common/212 native file path override/installed_files.txt
index 0044d40..0044d40 100644
--- a/test cases/common/213 native file path override/installed_files.txt
+++ b/test cases/common/212 native file path override/installed_files.txt
diff --git a/test cases/common/213 native file path override/main.cpp b/test cases/common/212 native file path override/main.cpp
index d65cab2..d65cab2 100644
--- a/test cases/common/213 native file path override/main.cpp
+++ b/test cases/common/212 native file path override/main.cpp
diff --git a/test cases/common/213 native file path override/meson.build b/test cases/common/212 native file path override/meson.build
index 142ca1c..142ca1c 100644
--- a/test cases/common/213 native file path override/meson.build
+++ b/test cases/common/212 native file path override/meson.build
diff --git a/test cases/common/213 native file path override/nativefile.ini b/test cases/common/212 native file path override/nativefile.ini
index 1c295c7..1c295c7 100644
--- a/test cases/common/213 native file path override/nativefile.ini
+++ b/test cases/common/212 native file path override/nativefile.ini
diff --git a/test cases/common/214 tap tests/meson.build b/test cases/common/213 tap tests/meson.build
index 58529a7..58529a7 100644
--- a/test cases/common/214 tap tests/meson.build
+++ b/test cases/common/213 tap tests/meson.build
diff --git a/test cases/common/214 tap tests/tester.c b/test cases/common/213 tap tests/tester.c
index ac582e7..ac582e7 100644
--- a/test cases/common/214 tap tests/tester.c
+++ b/test cases/common/213 tap tests/tester.c
diff --git a/test cases/common/215 warning level 0/main.cpp b/test cases/common/214 warning level 0/main.cpp
index 954d9ce..954d9ce 100644
--- a/test cases/common/215 warning level 0/main.cpp
+++ b/test cases/common/214 warning level 0/main.cpp
diff --git a/test cases/common/215 warning level 0/meson.build b/test cases/common/214 warning level 0/meson.build
index f2bd339..f2bd339 100644
--- a/test cases/common/215 warning level 0/meson.build
+++ b/test cases/common/214 warning level 0/meson.build
diff --git a/test cases/common/216 link custom/custom_stlib.py b/test cases/common/215 link custom/custom_stlib.py
index 80334ed..80334ed 100755
--- a/test cases/common/216 link custom/custom_stlib.py
+++ b/test cases/common/215 link custom/custom_stlib.py
diff --git a/test cases/common/216 link custom/meson.build b/test cases/common/215 link custom/meson.build
index c8d3a6d..c8d3a6d 100644
--- a/test cases/common/216 link custom/meson.build
+++ b/test cases/common/215 link custom/meson.build
diff --git a/test cases/common/216 link custom/prog.c b/test cases/common/215 link custom/prog.c
index eaede6d..eaede6d 100644
--- a/test cases/common/216 link custom/prog.c
+++ b/test cases/common/215 link custom/prog.c
diff --git a/test cases/common/217 link custom_i single from multiple/generate_conflicting_stlibs.py b/test cases/common/216 link custom_i single from multiple/generate_conflicting_stlibs.py
index 42d6631..42d6631 100644
--- a/test cases/common/217 link custom_i single from multiple/generate_conflicting_stlibs.py
+++ b/test cases/common/216 link custom_i single from multiple/generate_conflicting_stlibs.py
diff --git a/test cases/common/217 link custom_i single from multiple/meson.build b/test cases/common/216 link custom_i single from multiple/meson.build
index eee1fe1..eee1fe1 100644
--- a/test cases/common/217 link custom_i single from multiple/meson.build
+++ b/test cases/common/216 link custom_i single from multiple/meson.build
diff --git a/test cases/common/217 link custom_i single from multiple/prog.c b/test cases/common/216 link custom_i single from multiple/prog.c
index 8013034..8013034 100644
--- a/test cases/common/217 link custom_i single from multiple/prog.c
+++ b/test cases/common/216 link custom_i single from multiple/prog.c
diff --git a/test cases/common/218 link custom_i multiple from multiple/generate_stlibs.py b/test cases/common/217 link custom_i multiple from multiple/generate_stlibs.py
index 5292006..5292006 100644
--- a/test cases/common/218 link custom_i multiple from multiple/generate_stlibs.py
+++ b/test cases/common/217 link custom_i multiple from multiple/generate_stlibs.py
diff --git a/test cases/common/218 link custom_i multiple from multiple/meson.build b/test cases/common/217 link custom_i multiple from multiple/meson.build
index e5236e5..e5236e5 100644
--- a/test cases/common/218 link custom_i multiple from multiple/meson.build
+++ b/test cases/common/217 link custom_i multiple from multiple/meson.build
diff --git a/test cases/common/218 link custom_i multiple from multiple/prog.c b/test cases/common/217 link custom_i multiple from multiple/prog.c
index 51effe6..51effe6 100644
--- a/test cases/common/218 link custom_i multiple from multiple/prog.c
+++ b/test cases/common/217 link custom_i multiple from multiple/prog.c
diff --git a/test cases/common/219 dependency get_variable method/meson.build b/test cases/common/218 dependency get_variable method/meson.build
index 92b8704..92b8704 100644
--- a/test cases/common/219 dependency get_variable method/meson.build
+++ b/test cases/common/218 dependency get_variable method/meson.build
diff --git a/test cases/common/220 source set configuration_data/a.c b/test cases/common/219 source set configuration_data/a.c
index 0570dff..0570dff 100644
--- a/test cases/common/220 source set configuration_data/a.c
+++ b/test cases/common/219 source set configuration_data/a.c
diff --git a/test cases/common/220 source set configuration_data/all.h b/test cases/common/219 source set configuration_data/all.h
index 728a7f6..728a7f6 100644
--- a/test cases/common/220 source set configuration_data/all.h
+++ b/test cases/common/219 source set configuration_data/all.h
diff --git a/test cases/common/220 source set configuration_data/f.c b/test cases/common/219 source set configuration_data/f.c
index a50ecda..a50ecda 100644
--- a/test cases/common/220 source set configuration_data/f.c
+++ b/test cases/common/219 source set configuration_data/f.c
diff --git a/test cases/common/220 source set configuration_data/g.c b/test cases/common/219 source set configuration_data/g.c
index 4a6f253..4a6f253 100644
--- a/test cases/common/220 source set configuration_data/g.c
+++ b/test cases/common/219 source set configuration_data/g.c
diff --git a/test cases/common/220 source set configuration_data/meson.build b/test cases/common/219 source set configuration_data/meson.build
index 104f39d..104f39d 100644
--- a/test cases/common/220 source set configuration_data/meson.build
+++ b/test cases/common/219 source set configuration_data/meson.build
diff --git a/test cases/common/220 source set configuration_data/nope.c b/test cases/common/219 source set configuration_data/nope.c
index 0ce1d3b..0ce1d3b 100644
--- a/test cases/common/220 source set configuration_data/nope.c
+++ b/test cases/common/219 source set configuration_data/nope.c
diff --git a/test cases/common/220 source set configuration_data/subdir/b.c b/test cases/common/219 source set configuration_data/subdir/b.c
index 31c3789..31c3789 100644
--- a/test cases/common/220 source set configuration_data/subdir/b.c
+++ b/test cases/common/219 source set configuration_data/subdir/b.c
diff --git a/test cases/common/220 source set configuration_data/subdir/meson.build b/test cases/common/219 source set configuration_data/subdir/meson.build
index b497de5..b497de5 100644
--- a/test cases/common/220 source set configuration_data/subdir/meson.build
+++ b/test cases/common/219 source set configuration_data/subdir/meson.build
diff --git a/test cases/common/221 source set dictionary/a.c b/test cases/common/220 source set dictionary/a.c
index 0570dff..0570dff 100644
--- a/test cases/common/221 source set dictionary/a.c
+++ b/test cases/common/220 source set dictionary/a.c
diff --git a/test cases/common/221 source set dictionary/all.h b/test cases/common/220 source set dictionary/all.h
index 728a7f6..728a7f6 100644
--- a/test cases/common/221 source set dictionary/all.h
+++ b/test cases/common/220 source set dictionary/all.h
diff --git a/test cases/common/221 source set dictionary/f.c b/test cases/common/220 source set dictionary/f.c
index a50ecda..a50ecda 100644
--- a/test cases/common/221 source set dictionary/f.c
+++ b/test cases/common/220 source set dictionary/f.c
diff --git a/test cases/common/221 source set dictionary/g.c b/test cases/common/220 source set dictionary/g.c
index 4a6f253..4a6f253 100644
--- a/test cases/common/221 source set dictionary/g.c
+++ b/test cases/common/220 source set dictionary/g.c
diff --git a/test cases/common/221 source set dictionary/meson.build b/test cases/common/220 source set dictionary/meson.build
index 9a34507..9a34507 100644
--- a/test cases/common/221 source set dictionary/meson.build
+++ b/test cases/common/220 source set dictionary/meson.build
diff --git a/test cases/common/221 source set dictionary/nope.c b/test cases/common/220 source set dictionary/nope.c
index 0ce1d3b..0ce1d3b 100644
--- a/test cases/common/221 source set dictionary/nope.c
+++ b/test cases/common/220 source set dictionary/nope.c
diff --git a/test cases/common/221 source set dictionary/subdir/b.c b/test cases/common/220 source set dictionary/subdir/b.c
index 31c3789..31c3789 100644
--- a/test cases/common/221 source set dictionary/subdir/b.c
+++ b/test cases/common/220 source set dictionary/subdir/b.c
diff --git a/test cases/common/221 source set dictionary/subdir/meson.build b/test cases/common/220 source set dictionary/subdir/meson.build
index b497de5..b497de5 100644
--- a/test cases/common/221 source set dictionary/subdir/meson.build
+++ b/test cases/common/220 source set dictionary/subdir/meson.build
diff --git a/test cases/common/222 source set custom target/a.c b/test cases/common/221 source set custom target/a.c
index 39a3b6b..39a3b6b 100644
--- a/test cases/common/222 source set custom target/a.c
+++ b/test cases/common/221 source set custom target/a.c
diff --git a/test cases/common/222 source set custom target/all.h b/test cases/common/221 source set custom target/all.h
index 5885e32..5885e32 100644
--- a/test cases/common/222 source set custom target/all.h
+++ b/test cases/common/221 source set custom target/all.h
diff --git a/test cases/common/222 source set custom target/cp.py b/test cases/common/221 source set custom target/cp.py
index cb09cf3..cb09cf3 100644
--- a/test cases/common/222 source set custom target/cp.py
+++ b/test cases/common/221 source set custom target/cp.py
diff --git a/test cases/common/222 source set custom target/f.c b/test cases/common/221 source set custom target/f.c
index a50ecda..a50ecda 100644
--- a/test cases/common/222 source set custom target/f.c
+++ b/test cases/common/221 source set custom target/f.c
diff --git a/test cases/common/222 source set custom target/g.c b/test cases/common/221 source set custom target/g.c
index 7098584..7098584 100644
--- a/test cases/common/222 source set custom target/g.c
+++ b/test cases/common/221 source set custom target/g.c
diff --git a/test cases/common/222 source set custom target/meson.build b/test cases/common/221 source set custom target/meson.build
index fe6e6e1..fe6e6e1 100644
--- a/test cases/common/222 source set custom target/meson.build
+++ b/test cases/common/221 source set custom target/meson.build
diff --git a/test cases/common/223 source set realistic example/boards/arm/aarch64.cc b/test cases/common/222 source set realistic example/boards/arm/aarch64.cc
index 386c771..386c771 100644
--- a/test cases/common/223 source set realistic example/boards/arm/aarch64.cc
+++ b/test cases/common/222 source set realistic example/boards/arm/aarch64.cc
diff --git a/test cases/common/223 source set realistic example/boards/arm/arm.cc b/test cases/common/222 source set realistic example/boards/arm/arm.cc
index b463ebe..b463ebe 100644
--- a/test cases/common/223 source set realistic example/boards/arm/arm.cc
+++ b/test cases/common/222 source set realistic example/boards/arm/arm.cc
diff --git a/test cases/common/223 source set realistic example/boards/arm/arm.h b/test cases/common/222 source set realistic example/boards/arm/arm.h
index 4dd6b69..4dd6b69 100644
--- a/test cases/common/223 source set realistic example/boards/arm/arm.h
+++ b/test cases/common/222 source set realistic example/boards/arm/arm.h
diff --git a/test cases/common/223 source set realistic example/boards/arm/arm32.cc b/test cases/common/222 source set realistic example/boards/arm/arm32.cc
index 72a2427..72a2427 100644
--- a/test cases/common/223 source set realistic example/boards/arm/arm32.cc
+++ b/test cases/common/222 source set realistic example/boards/arm/arm32.cc
diff --git a/test cases/common/223 source set realistic example/boards/arm/versatilepb.cc b/test cases/common/222 source set realistic example/boards/arm/versatilepb.cc
index 3d1a9fe..3d1a9fe 100644
--- a/test cases/common/223 source set realistic example/boards/arm/versatilepb.cc
+++ b/test cases/common/222 source set realistic example/boards/arm/versatilepb.cc
diff --git a/test cases/common/223 source set realistic example/boards/arm/virt.cc b/test cases/common/222 source set realistic example/boards/arm/virt.cc
index 6f9a1ca..6f9a1ca 100644
--- a/test cases/common/223 source set realistic example/boards/arm/virt.cc
+++ b/test cases/common/222 source set realistic example/boards/arm/virt.cc
diff --git a/test cases/common/223 source set realistic example/boards/arm/xlnx_zcu102.cc b/test cases/common/222 source set realistic example/boards/arm/xlnx_zcu102.cc
index 8921e00..8921e00 100644
--- a/test cases/common/223 source set realistic example/boards/arm/xlnx_zcu102.cc
+++ b/test cases/common/222 source set realistic example/boards/arm/xlnx_zcu102.cc
diff --git a/test cases/common/223 source set realistic example/boards/meson.build b/test cases/common/222 source set realistic example/boards/meson.build
index 41ead4c..41ead4c 100644
--- a/test cases/common/223 source set realistic example/boards/meson.build
+++ b/test cases/common/222 source set realistic example/boards/meson.build
diff --git a/test cases/common/223 source set realistic example/boards/x86/pc.cc b/test cases/common/222 source set realistic example/boards/x86/pc.cc
index 04ec392..04ec392 100644
--- a/test cases/common/223 source set realistic example/boards/x86/pc.cc
+++ b/test cases/common/222 source set realistic example/boards/x86/pc.cc
diff --git a/test cases/common/223 source set realistic example/common.h b/test cases/common/222 source set realistic example/common.h
index 6e325c7..6e325c7 100644
--- a/test cases/common/223 source set realistic example/common.h
+++ b/test cases/common/222 source set realistic example/common.h
diff --git a/test cases/common/223 source set realistic example/config/aarch64 b/test cases/common/222 source set realistic example/config/aarch64
index 55b90eb..55b90eb 100644
--- a/test cases/common/223 source set realistic example/config/aarch64
+++ b/test cases/common/222 source set realistic example/config/aarch64
diff --git a/test cases/common/223 source set realistic example/config/arm b/test cases/common/222 source set realistic example/config/arm
index d3f7ac7..d3f7ac7 100644
--- a/test cases/common/223 source set realistic example/config/arm
+++ b/test cases/common/222 source set realistic example/config/arm
diff --git a/test cases/common/223 source set realistic example/config/x86 b/test cases/common/222 source set realistic example/config/x86
index 6caa3e2..6caa3e2 100644
--- a/test cases/common/223 source set realistic example/config/x86
+++ b/test cases/common/222 source set realistic example/config/x86
diff --git a/test cases/common/223 source set realistic example/devices/meson.build b/test cases/common/222 source set realistic example/devices/meson.build
index 68ee68e..68ee68e 100644
--- a/test cases/common/223 source set realistic example/devices/meson.build
+++ b/test cases/common/222 source set realistic example/devices/meson.build
diff --git a/test cases/common/223 source set realistic example/devices/virtio-mmio.cc b/test cases/common/222 source set realistic example/devices/virtio-mmio.cc
index 5dab97e..5dab97e 100644
--- a/test cases/common/223 source set realistic example/devices/virtio-mmio.cc
+++ b/test cases/common/222 source set realistic example/devices/virtio-mmio.cc
diff --git a/test cases/common/223 source set realistic example/devices/virtio-pci.cc b/test cases/common/222 source set realistic example/devices/virtio-pci.cc
index 7df7a82..7df7a82 100644
--- a/test cases/common/223 source set realistic example/devices/virtio-pci.cc
+++ b/test cases/common/222 source set realistic example/devices/virtio-pci.cc
diff --git a/test cases/common/223 source set realistic example/devices/virtio.cc b/test cases/common/222 source set realistic example/devices/virtio.cc
index fc51275..fc51275 100644
--- a/test cases/common/223 source set realistic example/devices/virtio.cc
+++ b/test cases/common/222 source set realistic example/devices/virtio.cc
diff --git a/test cases/common/223 source set realistic example/devices/virtio.h b/test cases/common/222 source set realistic example/devices/virtio.h
index a157731..a157731 100644
--- a/test cases/common/223 source set realistic example/devices/virtio.h
+++ b/test cases/common/222 source set realistic example/devices/virtio.h
diff --git a/test cases/common/223 source set realistic example/main.cc b/test cases/common/222 source set realistic example/main.cc
index 97afab1..97afab1 100644
--- a/test cases/common/223 source set realistic example/main.cc
+++ b/test cases/common/222 source set realistic example/main.cc
diff --git a/test cases/common/223 source set realistic example/meson.build b/test cases/common/222 source set realistic example/meson.build
index 2a9475a..2a9475a 100644
--- a/test cases/common/223 source set realistic example/meson.build
+++ b/test cases/common/222 source set realistic example/meson.build
diff --git a/test cases/common/223 source set realistic example/not-found.cc b/test cases/common/222 source set realistic example/not-found.cc
index 955a7a2..955a7a2 100644
--- a/test cases/common/223 source set realistic example/not-found.cc
+++ b/test cases/common/222 source set realistic example/not-found.cc
diff --git a/test cases/common/223 source set realistic example/was-found.cc b/test cases/common/222 source set realistic example/was-found.cc
index f1eaf1e..f1eaf1e 100644
--- a/test cases/common/223 source set realistic example/was-found.cc
+++ b/test cases/common/222 source set realistic example/was-found.cc
diff --git a/test cases/common/223 source set realistic example/zlib.cc b/test cases/common/222 source set realistic example/zlib.cc
index 909d744..909d744 100644
--- a/test cases/common/223 source set realistic example/zlib.cc
+++ b/test cases/common/222 source set realistic example/zlib.cc
diff --git a/test cases/common/29 find program/meson.build b/test cases/common/28 find program/meson.build
index 983b7b4..983b7b4 100644
--- a/test cases/common/29 find program/meson.build
+++ b/test cases/common/28 find program/meson.build
diff --git a/test cases/common/29 find program/print-version-with-prefix.py b/test cases/common/28 find program/print-version-with-prefix.py
index 520e0ba..520e0ba 100644
--- a/test cases/common/29 find program/print-version-with-prefix.py
+++ b/test cases/common/28 find program/print-version-with-prefix.py
diff --git a/test cases/common/29 find program/print-version.py b/test cases/common/28 find program/print-version.py
index 4a78e5b..4a78e5b 100644
--- a/test cases/common/29 find program/print-version.py
+++ b/test cases/common/28 find program/print-version.py
diff --git a/test cases/common/29 find program/source.in b/test cases/common/28 find program/source.in
index 5c2fa9b..5c2fa9b 100644
--- a/test cases/common/29 find program/source.in
+++ b/test cases/common/28 find program/source.in
diff --git a/test cases/common/30 multiline string/meson.build b/test cases/common/29 multiline string/meson.build
index 262cb15..262cb15 100644
--- a/test cases/common/30 multiline string/meson.build
+++ b/test cases/common/29 multiline string/meson.build
diff --git a/test cases/common/31 try compile/invalid.c b/test cases/common/30 try compile/invalid.c
index b623bf8..b623bf8 100644
--- a/test cases/common/31 try compile/invalid.c
+++ b/test cases/common/30 try compile/invalid.c
diff --git a/test cases/common/31 try compile/meson.build b/test cases/common/30 try compile/meson.build
index 09ca395..09ca395 100644
--- a/test cases/common/31 try compile/meson.build
+++ b/test cases/common/30 try compile/meson.build
diff --git a/test cases/common/31 try compile/valid.c b/test cases/common/30 try compile/valid.c
index 3757f5a..3757f5a 100644
--- a/test cases/common/31 try compile/valid.c
+++ b/test cases/common/30 try compile/valid.c
diff --git a/test cases/common/32 compiler id/meson.build b/test cases/common/31 compiler id/meson.build
index 2b5c445..2b5c445 100644
--- a/test cases/common/32 compiler id/meson.build
+++ b/test cases/common/31 compiler id/meson.build
diff --git a/test cases/common/33 sizeof/config.h.in b/test cases/common/32 sizeof/config.h.in
index a442e8a..a442e8a 100644
--- a/test cases/common/33 sizeof/config.h.in
+++ b/test cases/common/32 sizeof/config.h.in
diff --git a/test cases/common/33 sizeof/meson.build b/test cases/common/32 sizeof/meson.build
index 9de5b78..9de5b78 100644
--- a/test cases/common/33 sizeof/meson.build
+++ b/test cases/common/32 sizeof/meson.build
diff --git a/test cases/common/33 sizeof/prog.c.in b/test cases/common/32 sizeof/prog.c.in
index 85b1229..85b1229 100644
--- a/test cases/common/33 sizeof/prog.c.in
+++ b/test cases/common/32 sizeof/prog.c.in
diff --git a/test cases/common/34 define10/config.h.in b/test cases/common/33 define10/config.h.in
index dc77346..dc77346 100644
--- a/test cases/common/34 define10/config.h.in
+++ b/test cases/common/33 define10/config.h.in
diff --git a/test cases/common/34 define10/meson.build b/test cases/common/33 define10/meson.build
index a28e7e4..a28e7e4 100644
--- a/test cases/common/34 define10/meson.build
+++ b/test cases/common/33 define10/meson.build
diff --git a/test cases/common/34 define10/prog.c b/test cases/common/33 define10/prog.c
index 10e94f1..10e94f1 100644
--- a/test cases/common/34 define10/prog.c
+++ b/test cases/common/33 define10/prog.c
diff --git a/test cases/common/35 has header/meson.build b/test cases/common/34 has header/meson.build
index b53849c..b53849c 100644
--- a/test cases/common/35 has header/meson.build
+++ b/test cases/common/34 has header/meson.build
diff --git a/test cases/common/35 has header/ouagadougou.h b/test cases/common/34 has header/ouagadougou.h
index 2f76c49..2f76c49 100644
--- a/test cases/common/35 has header/ouagadougou.h
+++ b/test cases/common/34 has header/ouagadougou.h
diff --git a/test cases/common/36 run program/get-version.py b/test cases/common/35 run program/get-version.py
index a22d559..a22d559 100644
--- a/test cases/common/36 run program/get-version.py
+++ b/test cases/common/35 run program/get-version.py
diff --git a/test cases/common/36 run program/meson.build b/test cases/common/35 run program/meson.build
index 93897e3..93897e3 100644
--- a/test cases/common/36 run program/meson.build
+++ b/test cases/common/35 run program/meson.build
diff --git a/test cases/common/36 run program/scripts/hello.bat b/test cases/common/35 run program/scripts/hello.bat
index cbc346b..cbc346b 100644
--- a/test cases/common/36 run program/scripts/hello.bat
+++ b/test cases/common/35 run program/scripts/hello.bat
diff --git a/test cases/common/36 run program/scripts/hello.sh b/test cases/common/35 run program/scripts/hello.sh
index 2a22daa..2a22daa 100755
--- a/test cases/common/36 run program/scripts/hello.sh
+++ b/test cases/common/35 run program/scripts/hello.sh
diff --git a/test cases/common/37 tryrun/error.c b/test cases/common/36 tryrun/error.c
index 80eeb5d..80eeb5d 100644
--- a/test cases/common/37 tryrun/error.c
+++ b/test cases/common/36 tryrun/error.c
diff --git a/test cases/common/37 tryrun/meson.build b/test cases/common/36 tryrun/meson.build
index c64446f..c64446f 100644
--- a/test cases/common/37 tryrun/meson.build
+++ b/test cases/common/36 tryrun/meson.build
diff --git a/test cases/common/37 tryrun/no_compile.c b/test cases/common/36 tryrun/no_compile.c
index 86b67ac..86b67ac 100644
--- a/test cases/common/37 tryrun/no_compile.c
+++ b/test cases/common/36 tryrun/no_compile.c
diff --git a/test cases/common/37 tryrun/ok.c b/test cases/common/36 tryrun/ok.c
index 4111c74..4111c74 100644
--- a/test cases/common/37 tryrun/ok.c
+++ b/test cases/common/36 tryrun/ok.c
diff --git a/test cases/common/38 logic ops/meson.build b/test cases/common/37 logic ops/meson.build
index 897054e..897054e 100644
--- a/test cases/common/38 logic ops/meson.build
+++ b/test cases/common/37 logic ops/meson.build
diff --git a/test cases/common/39 string operations/meson.build b/test cases/common/38 string operations/meson.build
index 6596142..6596142 100644
--- a/test cases/common/39 string operations/meson.build
+++ b/test cases/common/38 string operations/meson.build
diff --git a/test cases/common/40 has function/meson.build b/test cases/common/39 has function/meson.build
index 539f313..539f313 100644
--- a/test cases/common/40 has function/meson.build
+++ b/test cases/common/39 has function/meson.build
diff --git a/test cases/common/41 has member/meson.build b/test cases/common/40 has member/meson.build
index 4e61956..4e61956 100644
--- a/test cases/common/41 has member/meson.build
+++ b/test cases/common/40 has member/meson.build
diff --git a/test cases/common/42 alignment/meson.build b/test cases/common/41 alignment/meson.build
index a9bd65b..a9bd65b 100644
--- a/test cases/common/42 alignment/meson.build
+++ b/test cases/common/41 alignment/meson.build
diff --git a/test cases/common/43 library chain/installed_files.txt b/test cases/common/42 library chain/installed_files.txt
index 5e796b0..5e796b0 100644
--- a/test cases/common/43 library chain/installed_files.txt
+++ b/test cases/common/42 library chain/installed_files.txt
diff --git a/test cases/common/43 library chain/main.c b/test cases/common/42 library chain/main.c
index 7b015b7..7b015b7 100644
--- a/test cases/common/43 library chain/main.c
+++ b/test cases/common/42 library chain/main.c
diff --git a/test cases/common/43 library chain/meson.build b/test cases/common/42 library chain/meson.build
index 77528d7..77528d7 100644
--- a/test cases/common/43 library chain/meson.build
+++ b/test cases/common/42 library chain/meson.build
diff --git a/test cases/common/43 library chain/subdir/lib1.c b/test cases/common/42 library chain/subdir/lib1.c
index 499ef82..499ef82 100644
--- a/test cases/common/43 library chain/subdir/lib1.c
+++ b/test cases/common/42 library chain/subdir/lib1.c
diff --git a/test cases/common/43 library chain/subdir/meson.build b/test cases/common/42 library chain/subdir/meson.build
index ab71bda..ab71bda 100644
--- a/test cases/common/43 library chain/subdir/meson.build
+++ b/test cases/common/42 library chain/subdir/meson.build
diff --git a/test cases/common/43 library chain/subdir/subdir2/lib2.c b/test cases/common/42 library chain/subdir/subdir2/lib2.c
index 34fadf2..34fadf2 100644
--- a/test cases/common/43 library chain/subdir/subdir2/lib2.c
+++ b/test cases/common/42 library chain/subdir/subdir2/lib2.c
diff --git a/test cases/common/43 library chain/subdir/subdir2/meson.build b/test cases/common/42 library chain/subdir/subdir2/meson.build
index befd94d..befd94d 100644
--- a/test cases/common/43 library chain/subdir/subdir2/meson.build
+++ b/test cases/common/42 library chain/subdir/subdir2/meson.build
diff --git a/test cases/common/43 library chain/subdir/subdir3/lib3.c b/test cases/common/42 library chain/subdir/subdir3/lib3.c
index 7bd88af..7bd88af 100644
--- a/test cases/common/43 library chain/subdir/subdir3/lib3.c
+++ b/test cases/common/42 library chain/subdir/subdir3/lib3.c
diff --git a/test cases/common/43 library chain/subdir/subdir3/meson.build b/test cases/common/42 library chain/subdir/subdir3/meson.build
index 7bd249a..7bd249a 100644
--- a/test cases/common/43 library chain/subdir/subdir3/meson.build
+++ b/test cases/common/42 library chain/subdir/subdir3/meson.build
diff --git a/test cases/common/44 options/meson.build b/test cases/common/43 options/meson.build
index c6cf9c8..c6cf9c8 100644
--- a/test cases/common/44 options/meson.build
+++ b/test cases/common/43 options/meson.build
diff --git a/test cases/common/44 options/meson_options.txt b/test cases/common/43 options/meson_options.txt
index 4e1c8d8..4e1c8d8 100644
--- a/test cases/common/44 options/meson_options.txt
+++ b/test cases/common/43 options/meson_options.txt
diff --git a/test cases/common/45 test args/cmd_args.c b/test cases/common/44 test args/cmd_args.c
index 545b795..545b795 100644
--- a/test cases/common/45 test args/cmd_args.c
+++ b/test cases/common/44 test args/cmd_args.c
diff --git a/test cases/common/45 test args/copyfile.py b/test cases/common/44 test args/copyfile.py
index ff42ac3..ff42ac3 100644
--- a/test cases/common/45 test args/copyfile.py
+++ b/test cases/common/44 test args/copyfile.py
diff --git a/test cases/common/45 test args/env2vars.c b/test cases/common/44 test args/env2vars.c
index 19250a8..19250a8 100644
--- a/test cases/common/45 test args/env2vars.c
+++ b/test cases/common/44 test args/env2vars.c
diff --git a/test cases/common/45 test args/envvars.c b/test cases/common/44 test args/envvars.c
index 627e413..627e413 100644
--- a/test cases/common/45 test args/envvars.c
+++ b/test cases/common/44 test args/envvars.c
diff --git a/test cases/common/45 test args/meson.build b/test cases/common/44 test args/meson.build
index 81d3491..81d3491 100644
--- a/test cases/common/45 test args/meson.build
+++ b/test cases/common/44 test args/meson.build
diff --git a/test cases/common/45 test args/tester.c b/test cases/common/44 test args/tester.c
index 419277e..419277e 100644
--- a/test cases/common/45 test args/tester.c
+++ b/test cases/common/44 test args/tester.c
diff --git a/test cases/common/45 test args/tester.py b/test cases/common/44 test args/tester.py
index 0b4010a..0b4010a 100755
--- a/test cases/common/45 test args/tester.py
+++ b/test cases/common/44 test args/tester.py
diff --git a/test cases/common/45 test args/testfile.txt b/test cases/common/44 test args/testfile.txt
index 12f00e9..12f00e9 100644
--- a/test cases/common/45 test args/testfile.txt
+++ b/test cases/common/44 test args/testfile.txt
diff --git a/test cases/common/46 subproject/installed_files.txt b/test cases/common/45 subproject/installed_files.txt
index dba3202..dba3202 100644
--- a/test cases/common/46 subproject/installed_files.txt
+++ b/test cases/common/45 subproject/installed_files.txt
diff --git a/test cases/common/46 subproject/meson.build b/test cases/common/45 subproject/meson.build
index 2b939d1..2b939d1 100644
--- a/test cases/common/46 subproject/meson.build
+++ b/test cases/common/45 subproject/meson.build
diff --git a/test cases/common/46 subproject/subprojects/sublib/include/subdefs.h b/test cases/common/45 subproject/subprojects/sublib/include/subdefs.h
index 681c7b8..681c7b8 100644
--- a/test cases/common/46 subproject/subprojects/sublib/include/subdefs.h
+++ b/test cases/common/45 subproject/subprojects/sublib/include/subdefs.h
diff --git a/test cases/common/46 subproject/subprojects/sublib/meson.build b/test cases/common/45 subproject/subprojects/sublib/meson.build
index acaf1bf..acaf1bf 100644
--- a/test cases/common/46 subproject/subprojects/sublib/meson.build
+++ b/test cases/common/45 subproject/subprojects/sublib/meson.build
diff --git a/test cases/common/46 subproject/subprojects/sublib/simpletest.c b/test cases/common/45 subproject/subprojects/sublib/simpletest.c
index 3801a40..3801a40 100644
--- a/test cases/common/46 subproject/subprojects/sublib/simpletest.c
+++ b/test cases/common/45 subproject/subprojects/sublib/simpletest.c
diff --git a/test cases/common/46 subproject/subprojects/sublib/sublib.c b/test cases/common/45 subproject/subprojects/sublib/sublib.c
index c13326b..c13326b 100644
--- a/test cases/common/46 subproject/subprojects/sublib/sublib.c
+++ b/test cases/common/45 subproject/subprojects/sublib/sublib.c
diff --git a/test cases/common/46 subproject/user.c b/test cases/common/45 subproject/user.c
index cfde532..cfde532 100644
--- a/test cases/common/46 subproject/user.c
+++ b/test cases/common/45 subproject/user.c
diff --git a/test cases/common/47 subproject options/meson.build b/test cases/common/46 subproject options/meson.build
index d4598b6..d4598b6 100644
--- a/test cases/common/47 subproject options/meson.build
+++ b/test cases/common/46 subproject options/meson.build
diff --git a/test cases/common/47 subproject options/meson_options.txt b/test cases/common/46 subproject options/meson_options.txt
index c295ddd..c295ddd 100644
--- a/test cases/common/47 subproject options/meson_options.txt
+++ b/test cases/common/46 subproject options/meson_options.txt
diff --git a/test cases/common/47 subproject options/subprojects/subproject/meson.build b/test cases/common/46 subproject options/subprojects/subproject/meson.build
index 5000b86..5000b86 100644
--- a/test cases/common/47 subproject options/subprojects/subproject/meson.build
+++ b/test cases/common/46 subproject options/subprojects/subproject/meson.build
diff --git a/test cases/common/47 subproject options/subprojects/subproject/meson_options.txt b/test cases/common/46 subproject options/subprojects/subproject/meson_options.txt
index ac78533..ac78533 100644
--- a/test cases/common/47 subproject options/subprojects/subproject/meson_options.txt
+++ b/test cases/common/46 subproject options/subprojects/subproject/meson_options.txt
diff --git a/test cases/common/48 pkgconfig-gen/dependencies/custom.c b/test cases/common/47 pkgconfig-gen/dependencies/custom.c
index 2cc5651..2cc5651 100644
--- a/test cases/common/48 pkgconfig-gen/dependencies/custom.c
+++ b/test cases/common/47 pkgconfig-gen/dependencies/custom.c
diff --git a/test cases/common/48 pkgconfig-gen/dependencies/exposed.c b/test cases/common/47 pkgconfig-gen/dependencies/exposed.c
index 005202e..005202e 100644
--- a/test cases/common/48 pkgconfig-gen/dependencies/exposed.c
+++ b/test cases/common/47 pkgconfig-gen/dependencies/exposed.c
diff --git a/test cases/common/48 pkgconfig-gen/dependencies/internal.c b/test cases/common/47 pkgconfig-gen/dependencies/internal.c
index 1a41b11..1a41b11 100644
--- a/test cases/common/48 pkgconfig-gen/dependencies/internal.c
+++ b/test cases/common/47 pkgconfig-gen/dependencies/internal.c
diff --git a/test cases/common/48 pkgconfig-gen/dependencies/meson.build b/test cases/common/47 pkgconfig-gen/dependencies/meson.build
index c72f96b..c72f96b 100644
--- a/test cases/common/48 pkgconfig-gen/dependencies/meson.build
+++ b/test cases/common/47 pkgconfig-gen/dependencies/meson.build
diff --git a/test cases/common/48 pkgconfig-gen/installed_files.txt b/test cases/common/47 pkgconfig-gen/installed_files.txt
index 94de704..94de704 100644
--- a/test cases/common/48 pkgconfig-gen/installed_files.txt
+++ b/test cases/common/47 pkgconfig-gen/installed_files.txt
diff --git a/test cases/common/48 pkgconfig-gen/meson.build b/test cases/common/47 pkgconfig-gen/meson.build
index 7e6c670..7e6c670 100644
--- a/test cases/common/48 pkgconfig-gen/meson.build
+++ b/test cases/common/47 pkgconfig-gen/meson.build
diff --git a/test cases/common/48 pkgconfig-gen/simple.c b/test cases/common/47 pkgconfig-gen/simple.c
index e8a6d83..e8a6d83 100644
--- a/test cases/common/48 pkgconfig-gen/simple.c
+++ b/test cases/common/47 pkgconfig-gen/simple.c
diff --git a/test cases/common/48 pkgconfig-gen/simple.h b/test cases/common/47 pkgconfig-gen/simple.h
index bb52e6d..bb52e6d 100644
--- a/test cases/common/48 pkgconfig-gen/simple.h
+++ b/test cases/common/47 pkgconfig-gen/simple.h
diff --git a/test cases/common/49 custom install dirs/datafile.cat b/test cases/common/48 custom install dirs/datafile.cat
index 53d81fc..53d81fc 100644
--- a/test cases/common/49 custom install dirs/datafile.cat
+++ b/test cases/common/48 custom install dirs/datafile.cat
diff --git a/test cases/common/49 custom install dirs/installed_files.txt b/test cases/common/48 custom install dirs/installed_files.txt
index 4e17c2d..4e17c2d 100644
--- a/test cases/common/49 custom install dirs/installed_files.txt
+++ b/test cases/common/48 custom install dirs/installed_files.txt
diff --git a/test cases/common/49 custom install dirs/meson.build b/test cases/common/48 custom install dirs/meson.build
index 494ff0e..494ff0e 100644
--- a/test cases/common/49 custom install dirs/meson.build
+++ b/test cases/common/48 custom install dirs/meson.build
diff --git a/test cases/common/49 custom install dirs/prog.1 b/test cases/common/48 custom install dirs/prog.1
index 08ef7da..08ef7da 100644
--- a/test cases/common/49 custom install dirs/prog.1
+++ b/test cases/common/48 custom install dirs/prog.1
diff --git a/test cases/common/49 custom install dirs/prog.c b/test cases/common/48 custom install dirs/prog.c
index 0f0061d..0f0061d 100644
--- a/test cases/common/49 custom install dirs/prog.c
+++ b/test cases/common/48 custom install dirs/prog.c
diff --git a/test cases/common/49 custom install dirs/sample.h b/test cases/common/48 custom install dirs/sample.h
index dc030da..dc030da 100644
--- a/test cases/common/49 custom install dirs/sample.h
+++ b/test cases/common/48 custom install dirs/sample.h
diff --git a/test cases/common/49 custom install dirs/subdir/datafile.dog b/test cases/common/48 custom install dirs/subdir/datafile.dog
index 7a5bcb7..7a5bcb7 100644
--- a/test cases/common/49 custom install dirs/subdir/datafile.dog
+++ b/test cases/common/48 custom install dirs/subdir/datafile.dog
diff --git a/test cases/common/50 subproject subproject/meson.build b/test cases/common/49 subproject subproject/meson.build
index d8735a1..d8735a1 100644
--- a/test cases/common/50 subproject subproject/meson.build
+++ b/test cases/common/49 subproject subproject/meson.build
diff --git a/test cases/common/50 subproject subproject/prog.c b/test cases/common/49 subproject subproject/prog.c
index 394f139..394f139 100644
--- a/test cases/common/50 subproject subproject/prog.c
+++ b/test cases/common/49 subproject subproject/prog.c
diff --git a/test cases/common/50 subproject subproject/subprojects/a/a.c b/test cases/common/49 subproject subproject/subprojects/a/a.c
index 7ac3e5e..7ac3e5e 100644
--- a/test cases/common/50 subproject subproject/subprojects/a/a.c
+++ b/test cases/common/49 subproject subproject/subprojects/a/a.c
diff --git a/test cases/common/50 subproject subproject/subprojects/a/meson.build b/test cases/common/49 subproject subproject/subprojects/a/meson.build
index f0dfc44..f0dfc44 100644
--- a/test cases/common/50 subproject subproject/subprojects/a/meson.build
+++ b/test cases/common/49 subproject subproject/subprojects/a/meson.build
diff --git a/test cases/common/50 subproject subproject/subprojects/b/b.c b/test cases/common/49 subproject subproject/subprojects/b/b.c
index a95651b..a95651b 100644
--- a/test cases/common/50 subproject subproject/subprojects/b/b.c
+++ b/test cases/common/49 subproject subproject/subprojects/b/b.c
diff --git a/test cases/common/50 subproject subproject/subprojects/b/meson.build b/test cases/common/49 subproject subproject/subprojects/b/meson.build
index e7af606..e7af606 100644
--- a/test cases/common/50 subproject subproject/subprojects/b/meson.build
+++ b/test cases/common/49 subproject subproject/subprojects/b/meson.build
diff --git a/test cases/common/50 subproject subproject/subprojects/c/meson.build b/test cases/common/49 subproject subproject/subprojects/c/meson.build
index 97a5be1..97a5be1 100644
--- a/test cases/common/50 subproject subproject/subprojects/c/meson.build
+++ b/test cases/common/49 subproject subproject/subprojects/c/meson.build
diff --git a/test cases/common/51 same file name/d1/file.c b/test cases/common/50 same file name/d1/file.c
index 8084d73..8084d73 100644
--- a/test cases/common/51 same file name/d1/file.c
+++ b/test cases/common/50 same file name/d1/file.c
diff --git a/test cases/common/51 same file name/d2/file.c b/test cases/common/50 same file name/d2/file.c
index d1444a2..d1444a2 100644
--- a/test cases/common/51 same file name/d2/file.c
+++ b/test cases/common/50 same file name/d2/file.c
diff --git a/test cases/common/51 same file name/meson.build b/test cases/common/50 same file name/meson.build
index 3f351af..3f351af 100644
--- a/test cases/common/51 same file name/meson.build
+++ b/test cases/common/50 same file name/meson.build
diff --git a/test cases/common/51 same file name/prog.c b/test cases/common/50 same file name/prog.c
index 3441288..3441288 100644
--- a/test cases/common/51 same file name/prog.c
+++ b/test cases/common/50 same file name/prog.c
diff --git a/test cases/common/52 file grabber/a.c b/test cases/common/51 file grabber/a.c
index bee8ad7..bee8ad7 100644
--- a/test cases/common/52 file grabber/a.c
+++ b/test cases/common/51 file grabber/a.c
diff --git a/test cases/common/52 file grabber/b.c b/test cases/common/51 file grabber/b.c
index 0fdd162..0fdd162 100644
--- a/test cases/common/52 file grabber/b.c
+++ b/test cases/common/51 file grabber/b.c
diff --git a/test cases/common/52 file grabber/c.c b/test cases/common/51 file grabber/c.c
index 63f951c..63f951c 100644
--- a/test cases/common/52 file grabber/c.c
+++ b/test cases/common/51 file grabber/c.c
diff --git a/test cases/common/52 file grabber/grabber.bat b/test cases/common/51 file grabber/grabber.bat
index 8660314..8660314 100644
--- a/test cases/common/52 file grabber/grabber.bat
+++ b/test cases/common/51 file grabber/grabber.bat
diff --git a/test cases/common/52 file grabber/grabber.sh b/test cases/common/51 file grabber/grabber.sh
index 5e8f4b9..5e8f4b9 100755
--- a/test cases/common/52 file grabber/grabber.sh
+++ b/test cases/common/51 file grabber/grabber.sh
diff --git a/test cases/common/52 file grabber/grabber2.bat b/test cases/common/51 file grabber/grabber2.bat
index d1a3f98..d1a3f98 100644
--- a/test cases/common/52 file grabber/grabber2.bat
+++ b/test cases/common/51 file grabber/grabber2.bat
diff --git a/test cases/common/52 file grabber/meson.build b/test cases/common/51 file grabber/meson.build
index e332c0b..e332c0b 100644
--- a/test cases/common/52 file grabber/meson.build
+++ b/test cases/common/51 file grabber/meson.build
diff --git a/test cases/common/52 file grabber/prog.c b/test cases/common/51 file grabber/prog.c
index 3524f60..3524f60 100644
--- a/test cases/common/52 file grabber/prog.c
+++ b/test cases/common/51 file grabber/prog.c
diff --git a/test cases/common/52 file grabber/subdir/meson.build b/test cases/common/51 file grabber/subdir/meson.build
index 230d6f7..230d6f7 100644
--- a/test cases/common/52 file grabber/subdir/meson.build
+++ b/test cases/common/51 file grabber/subdir/meson.build
diff --git a/test cases/common/52 file grabber/subdir/suba.c b/test cases/common/51 file grabber/subdir/suba.c
index bee8ad7..bee8ad7 100644
--- a/test cases/common/52 file grabber/subdir/suba.c
+++ b/test cases/common/51 file grabber/subdir/suba.c
diff --git a/test cases/common/52 file grabber/subdir/subb.c b/test cases/common/51 file grabber/subdir/subb.c
index 0fdd162..0fdd162 100644
--- a/test cases/common/52 file grabber/subdir/subb.c
+++ b/test cases/common/51 file grabber/subdir/subb.c
diff --git a/test cases/common/52 file grabber/subdir/subc.c b/test cases/common/51 file grabber/subdir/subc.c
index 63f951c..63f951c 100644
--- a/test cases/common/52 file grabber/subdir/subc.c
+++ b/test cases/common/51 file grabber/subdir/subc.c
diff --git a/test cases/common/52 file grabber/subdir/subprog.c b/test cases/common/51 file grabber/subdir/subprog.c
index 3524f60..3524f60 100644
--- a/test cases/common/52 file grabber/subdir/subprog.c
+++ b/test cases/common/51 file grabber/subdir/subprog.c
diff --git a/test cases/common/53 custom target/data_source.txt b/test cases/common/52 custom target/data_source.txt
index 0c23cc0..0c23cc0 100644
--- a/test cases/common/53 custom target/data_source.txt
+++ b/test cases/common/52 custom target/data_source.txt
diff --git a/test cases/common/53 custom target/depfile/dep.py b/test cases/common/52 custom target/depfile/dep.py
index 476e88b..476e88b 100755
--- a/test cases/common/53 custom target/depfile/dep.py
+++ b/test cases/common/52 custom target/depfile/dep.py
diff --git a/test cases/common/53 custom target/depfile/meson.build b/test cases/common/52 custom target/depfile/meson.build
index 46bca74..46bca74 100644
--- a/test cases/common/53 custom target/depfile/meson.build
+++ b/test cases/common/52 custom target/depfile/meson.build
diff --git a/test cases/common/53 custom target/installed_files.txt b/test cases/common/52 custom target/installed_files.txt
index d90a6b0..d90a6b0 100644
--- a/test cases/common/53 custom target/installed_files.txt
+++ b/test cases/common/52 custom target/installed_files.txt
diff --git a/test cases/common/53 custom target/meson.build b/test cases/common/52 custom target/meson.build
index 2e6f69c..2e6f69c 100644
--- a/test cases/common/53 custom target/meson.build
+++ b/test cases/common/52 custom target/meson.build
diff --git a/test cases/common/53 custom target/my_compiler.py b/test cases/common/52 custom target/my_compiler.py
index f46d23a..f46d23a 100755
--- a/test cases/common/53 custom target/my_compiler.py
+++ b/test cases/common/52 custom target/my_compiler.py
diff --git a/test cases/common/54 custom target chain/data_source.txt b/test cases/common/53 custom target chain/data_source.txt
index 0c23cc0..0c23cc0 100644
--- a/test cases/common/54 custom target chain/data_source.txt
+++ b/test cases/common/53 custom target chain/data_source.txt
diff --git a/test cases/common/54 custom target chain/installed_files.txt b/test cases/common/53 custom target chain/installed_files.txt
index 7feb072..7feb072 100644
--- a/test cases/common/54 custom target chain/installed_files.txt
+++ b/test cases/common/53 custom target chain/installed_files.txt
diff --git a/test cases/common/54 custom target chain/meson.build b/test cases/common/53 custom target chain/meson.build
index 138f795..138f795 100644
--- a/test cases/common/54 custom target chain/meson.build
+++ b/test cases/common/53 custom target chain/meson.build
diff --git a/test cases/common/54 custom target chain/my_compiler.py b/test cases/common/53 custom target chain/my_compiler.py
index 9cf4425..9cf4425 100755
--- a/test cases/common/54 custom target chain/my_compiler.py
+++ b/test cases/common/53 custom target chain/my_compiler.py
diff --git a/test cases/common/54 custom target chain/my_compiler2.py b/test cases/common/53 custom target chain/my_compiler2.py
index 0191f3f..0191f3f 100755
--- a/test cases/common/54 custom target chain/my_compiler2.py
+++ b/test cases/common/53 custom target chain/my_compiler2.py
diff --git a/test cases/common/54 custom target chain/usetarget/meson.build b/test cases/common/53 custom target chain/usetarget/meson.build
index 9aece8c..9aece8c 100644
--- a/test cases/common/54 custom target chain/usetarget/meson.build
+++ b/test cases/common/53 custom target chain/usetarget/meson.build
diff --git a/test cases/common/54 custom target chain/usetarget/myexe.c b/test cases/common/53 custom target chain/usetarget/myexe.c
index f9874fd..f9874fd 100644
--- a/test cases/common/54 custom target chain/usetarget/myexe.c
+++ b/test cases/common/53 custom target chain/usetarget/myexe.c
diff --git a/test cases/common/54 custom target chain/usetarget/subcomp.py b/test cases/common/53 custom target chain/usetarget/subcomp.py
index b5f6eb0..b5f6eb0 100755
--- a/test cases/common/54 custom target chain/usetarget/subcomp.py
+++ b/test cases/common/53 custom target chain/usetarget/subcomp.py
diff --git a/test cases/common/55 run target/check_exists.py b/test cases/common/54 run target/check_exists.py
index b6fc967..b6fc967 100755
--- a/test cases/common/55 run target/check_exists.py
+++ b/test cases/common/54 run target/check_exists.py
diff --git a/test cases/common/55 run target/configure.in b/test cases/common/54 run target/configure.in
index 0d42d04..0d42d04 100755
--- a/test cases/common/55 run target/configure.in
+++ b/test cases/common/54 run target/configure.in
diff --git a/test cases/common/55 run target/converter.py b/test cases/common/54 run target/converter.py
index 8dd31fe..8dd31fe 100644
--- a/test cases/common/55 run target/converter.py
+++ b/test cases/common/54 run target/converter.py
diff --git a/test cases/common/55 run target/fakeburner.py b/test cases/common/54 run target/fakeburner.py
index da3d0ac..da3d0ac 100755
--- a/test cases/common/55 run target/fakeburner.py
+++ b/test cases/common/54 run target/fakeburner.py
diff --git a/test cases/common/55 run target/helloprinter.c b/test cases/common/54 run target/helloprinter.c
index 4a6e0ac..4a6e0ac 100644
--- a/test cases/common/55 run target/helloprinter.c
+++ b/test cases/common/54 run target/helloprinter.c
diff --git a/test cases/common/55 run target/meson.build b/test cases/common/54 run target/meson.build
index 93a4ad0..93a4ad0 100644
--- a/test cases/common/55 run target/meson.build
+++ b/test cases/common/54 run target/meson.build
diff --git a/test cases/common/55 run target/scripts/script.sh b/test cases/common/54 run target/scripts/script.sh
index 0adf263..0adf263 100755
--- a/test cases/common/55 run target/scripts/script.sh
+++ b/test cases/common/54 run target/scripts/script.sh
diff --git a/test cases/common/56 object generator/meson.build b/test cases/common/55 object generator/meson.build
index e20da6f..e20da6f 100644
--- a/test cases/common/56 object generator/meson.build
+++ b/test cases/common/55 object generator/meson.build
diff --git a/test cases/common/56 object generator/obj_generator.py b/test cases/common/55 object generator/obj_generator.py
index a33872a..a33872a 100755
--- a/test cases/common/56 object generator/obj_generator.py
+++ b/test cases/common/55 object generator/obj_generator.py
diff --git a/test cases/common/56 object generator/prog.c b/test cases/common/55 object generator/prog.c
index 60459d6..60459d6 100644
--- a/test cases/common/56 object generator/prog.c
+++ b/test cases/common/55 object generator/prog.c
diff --git a/test cases/common/56 object generator/source.c b/test cases/common/55 object generator/source.c
index 7779b33..7779b33 100644
--- a/test cases/common/56 object generator/source.c
+++ b/test cases/common/55 object generator/source.c
diff --git a/test cases/common/56 object generator/source2.c b/test cases/common/55 object generator/source2.c
index 29aad40..29aad40 100644
--- a/test cases/common/56 object generator/source2.c
+++ b/test cases/common/55 object generator/source2.c
diff --git a/test cases/common/56 object generator/source3.c b/test cases/common/55 object generator/source3.c
index 1580f1e..1580f1e 100644
--- a/test cases/common/56 object generator/source3.c
+++ b/test cases/common/55 object generator/source3.c
diff --git a/test cases/common/57 install script/installed_files.txt b/test cases/common/56 install script/installed_files.txt
index 28f9ed0..28f9ed0 100644
--- a/test cases/common/57 install script/installed_files.txt
+++ b/test cases/common/56 install script/installed_files.txt
diff --git a/test cases/common/57 install script/meson.build b/test cases/common/56 install script/meson.build
index 6351518..6351518 100644
--- a/test cases/common/57 install script/meson.build
+++ b/test cases/common/56 install script/meson.build
diff --git a/test cases/common/57 install script/myinstall.py b/test cases/common/56 install script/myinstall.py
index 812561e..812561e 100644
--- a/test cases/common/57 install script/myinstall.py
+++ b/test cases/common/56 install script/myinstall.py
diff --git a/test cases/common/57 install script/no-installed-files b/test cases/common/56 install script/no-installed-files
index e69de29..e69de29 100644
--- a/test cases/common/57 install script/no-installed-files
+++ b/test cases/common/56 install script/no-installed-files
diff --git a/test cases/common/57 install script/prog.c b/test cases/common/56 install script/prog.c
index 06bc6b1..06bc6b1 100644
--- a/test cases/common/57 install script/prog.c
+++ b/test cases/common/56 install script/prog.c
diff --git a/test cases/common/57 install script/src/meson.build b/test cases/common/56 install script/src/meson.build
index b23574a..b23574a 100644
--- a/test cases/common/57 install script/src/meson.build
+++ b/test cases/common/56 install script/src/meson.build
diff --git a/test cases/common/57 install script/src/myinstall.py b/test cases/common/56 install script/src/myinstall.py
index 3b7ce37..3b7ce37 100644
--- a/test cases/common/57 install script/src/myinstall.py
+++ b/test cases/common/56 install script/src/myinstall.py
diff --git a/test cases/common/58 custom target source output/generator.py b/test cases/common/57 custom target source output/generator.py
index 3464b0a..3464b0a 100755
--- a/test cases/common/58 custom target source output/generator.py
+++ b/test cases/common/57 custom target source output/generator.py
diff --git a/test cases/common/58 custom target source output/main.c b/test cases/common/57 custom target source output/main.c
index 2813c39..2813c39 100644
--- a/test cases/common/58 custom target source output/main.c
+++ b/test cases/common/57 custom target source output/main.c
diff --git a/test cases/common/58 custom target source output/meson.build b/test cases/common/57 custom target source output/meson.build
index f9d039d..f9d039d 100644
--- a/test cases/common/58 custom target source output/meson.build
+++ b/test cases/common/57 custom target source output/meson.build
diff --git a/test cases/common/59 exe static shared/meson.build b/test cases/common/58 exe static shared/meson.build
index 69ede5e..69ede5e 100644
--- a/test cases/common/59 exe static shared/meson.build
+++ b/test cases/common/58 exe static shared/meson.build
diff --git a/test cases/common/59 exe static shared/prog.c b/test cases/common/58 exe static shared/prog.c
index 26603b6..26603b6 100644
--- a/test cases/common/59 exe static shared/prog.c
+++ b/test cases/common/58 exe static shared/prog.c
diff --git a/test cases/common/59 exe static shared/shlib2.c b/test cases/common/58 exe static shared/shlib2.c
index 12bc913..12bc913 100644
--- a/test cases/common/59 exe static shared/shlib2.c
+++ b/test cases/common/58 exe static shared/shlib2.c
diff --git a/test cases/common/59 exe static shared/stat.c b/test cases/common/58 exe static shared/stat.c
index 680ed92..680ed92 100644
--- a/test cases/common/59 exe static shared/stat.c
+++ b/test cases/common/58 exe static shared/stat.c
diff --git a/test cases/common/59 exe static shared/stat2.c b/test cases/common/58 exe static shared/stat2.c
index 4ae3775..4ae3775 100644
--- a/test cases/common/59 exe static shared/stat2.c
+++ b/test cases/common/58 exe static shared/stat2.c
diff --git a/test cases/common/59 exe static shared/subdir/exports.h b/test cases/common/58 exe static shared/subdir/exports.h
index c89ccb2..c89ccb2 100644
--- a/test cases/common/59 exe static shared/subdir/exports.h
+++ b/test cases/common/58 exe static shared/subdir/exports.h
diff --git a/test cases/common/59 exe static shared/subdir/meson.build b/test cases/common/58 exe static shared/subdir/meson.build
index 2b7393b..2b7393b 100644
--- a/test cases/common/59 exe static shared/subdir/meson.build
+++ b/test cases/common/58 exe static shared/subdir/meson.build
diff --git a/test cases/common/59 exe static shared/subdir/shlib.c b/test cases/common/58 exe static shared/subdir/shlib.c
index 002c83f..002c83f 100644
--- a/test cases/common/59 exe static shared/subdir/shlib.c
+++ b/test cases/common/58 exe static shared/subdir/shlib.c
diff --git a/test cases/common/60 array methods/meson.build b/test cases/common/59 array methods/meson.build
index cdda41d..cdda41d 100644
--- a/test cases/common/60 array methods/meson.build
+++ b/test cases/common/59 array methods/meson.build
diff --git a/test cases/common/61 custom header generator/input.def b/test cases/common/60 custom header generator/input.def
index 573541a..573541a 100644
--- a/test cases/common/61 custom header generator/input.def
+++ b/test cases/common/60 custom header generator/input.def
diff --git a/test cases/common/61 custom header generator/makeheader.py b/test cases/common/60 custom header generator/makeheader.py
index f156834..f156834 100644
--- a/test cases/common/61 custom header generator/makeheader.py
+++ b/test cases/common/60 custom header generator/makeheader.py
diff --git a/test cases/common/61 custom header generator/meson.build b/test cases/common/60 custom header generator/meson.build
index d43915a..d43915a 100644
--- a/test cases/common/61 custom header generator/meson.build
+++ b/test cases/common/60 custom header generator/meson.build
diff --git a/test cases/common/61 custom header generator/prog.c b/test cases/common/60 custom header generator/prog.c
index 184973a..184973a 100644
--- a/test cases/common/61 custom header generator/prog.c
+++ b/test cases/common/60 custom header generator/prog.c
diff --git a/test cases/common/61 custom header generator/somefile.txt b/test cases/common/60 custom header generator/somefile.txt
index e69de29..e69de29 100644
--- a/test cases/common/61 custom header generator/somefile.txt
+++ b/test cases/common/60 custom header generator/somefile.txt
diff --git a/test cases/common/62 multiple generators/data2.dat b/test cases/common/61 multiple generators/data2.dat
index 0cfbf08..0cfbf08 100644
--- a/test cases/common/62 multiple generators/data2.dat
+++ b/test cases/common/61 multiple generators/data2.dat
diff --git a/test cases/common/62 multiple generators/main.cpp b/test cases/common/61 multiple generators/main.cpp
index 5277063..5277063 100644
--- a/test cases/common/62 multiple generators/main.cpp
+++ b/test cases/common/61 multiple generators/main.cpp
diff --git a/test cases/common/62 multiple generators/meson.build b/test cases/common/61 multiple generators/meson.build
index 66f7fa9..66f7fa9 100644
--- a/test cases/common/62 multiple generators/meson.build
+++ b/test cases/common/61 multiple generators/meson.build
diff --git a/test cases/common/62 multiple generators/mygen.py b/test cases/common/61 multiple generators/mygen.py
index 99dc331..99dc331 100755
--- a/test cases/common/62 multiple generators/mygen.py
+++ b/test cases/common/61 multiple generators/mygen.py
diff --git a/test cases/common/62 multiple generators/subdir/data.dat b/test cases/common/61 multiple generators/subdir/data.dat
index d00491f..d00491f 100644
--- a/test cases/common/62 multiple generators/subdir/data.dat
+++ b/test cases/common/61 multiple generators/subdir/data.dat
diff --git a/test cases/common/62 multiple generators/subdir/meson.build b/test cases/common/61 multiple generators/subdir/meson.build
index 2456ecb..2456ecb 100644
--- a/test cases/common/62 multiple generators/subdir/meson.build
+++ b/test cases/common/61 multiple generators/subdir/meson.build
diff --git a/test cases/common/63 install subdir/installed_files.txt b/test cases/common/62 install subdir/installed_files.txt
index 3f561d5..3f561d5 100644
--- a/test cases/common/63 install subdir/installed_files.txt
+++ b/test cases/common/62 install subdir/installed_files.txt
diff --git a/test cases/common/63 install subdir/meson.build b/test cases/common/62 install subdir/meson.build
index 6f92efd..6f92efd 100644
--- a/test cases/common/63 install subdir/meson.build
+++ b/test cases/common/62 install subdir/meson.build
diff --git a/test cases/common/63 install subdir/nested_elided/sub/dircheck/nineth.dat b/test cases/common/62 install subdir/nested_elided/sub/dircheck/nineth.dat
index c4eaca7..c4eaca7 100644
--- a/test cases/common/63 install subdir/nested_elided/sub/dircheck/nineth.dat
+++ b/test cases/common/62 install subdir/nested_elided/sub/dircheck/nineth.dat
diff --git a/test cases/common/63 install subdir/nested_elided/sub/eighth.dat b/test cases/common/62 install subdir/nested_elided/sub/eighth.dat
index fa9b7b7..fa9b7b7 100644
--- a/test cases/common/63 install subdir/nested_elided/sub/eighth.dat
+++ b/test cases/common/62 install subdir/nested_elided/sub/eighth.dat
diff --git a/test cases/common/63 install subdir/sub/sub1/third.dat b/test cases/common/62 install subdir/sub/sub1/third.dat
index 5ccbc43..5ccbc43 100644
--- a/test cases/common/63 install subdir/sub/sub1/third.dat
+++ b/test cases/common/62 install subdir/sub/sub1/third.dat
diff --git a/test cases/common/63 install subdir/sub1/second.dat b/test cases/common/62 install subdir/sub1/second.dat
index 48857a8..48857a8 100644
--- a/test cases/common/63 install subdir/sub1/second.dat
+++ b/test cases/common/62 install subdir/sub1/second.dat
diff --git a/test cases/common/63 install subdir/sub2/dircheck/excluded-three.dat b/test cases/common/62 install subdir/sub2/dircheck/excluded-three.dat
index e69de29..e69de29 100644
--- a/test cases/common/63 install subdir/sub2/dircheck/excluded-three.dat
+++ b/test cases/common/62 install subdir/sub2/dircheck/excluded-three.dat
diff --git a/test cases/common/63 install subdir/sub2/excluded-three.dat b/test cases/common/62 install subdir/sub2/excluded-three.dat
index e69de29..e69de29 100644
--- a/test cases/common/63 install subdir/sub2/excluded-three.dat
+++ b/test cases/common/62 install subdir/sub2/excluded-three.dat
diff --git a/test cases/common/63 install subdir/sub2/excluded/two.dat b/test cases/common/62 install subdir/sub2/excluded/two.dat
index e69de29..e69de29 100644
--- a/test cases/common/63 install subdir/sub2/excluded/two.dat
+++ b/test cases/common/62 install subdir/sub2/excluded/two.dat
diff --git a/test cases/common/63 install subdir/sub2/one.dat b/test cases/common/62 install subdir/sub2/one.dat
index e69de29..e69de29 100644
--- a/test cases/common/63 install subdir/sub2/one.dat
+++ b/test cases/common/62 install subdir/sub2/one.dat
diff --git a/test cases/common/63 install subdir/sub_elided/dircheck/fifth.dat b/test cases/common/62 install subdir/sub_elided/dircheck/fifth.dat
index b6ca009..b6ca009 100644
--- a/test cases/common/63 install subdir/sub_elided/dircheck/fifth.dat
+++ b/test cases/common/62 install subdir/sub_elided/dircheck/fifth.dat
diff --git a/test cases/common/63 install subdir/sub_elided/fourth.dat b/test cases/common/62 install subdir/sub_elided/fourth.dat
index ca5f26a..ca5f26a 100644
--- a/test cases/common/63 install subdir/sub_elided/fourth.dat
+++ b/test cases/common/62 install subdir/sub_elided/fourth.dat
diff --git a/test cases/common/63 install subdir/subdir/meson.build b/test cases/common/62 install subdir/subdir/meson.build
index 0f81cdb..0f81cdb 100644
--- a/test cases/common/63 install subdir/subdir/meson.build
+++ b/test cases/common/62 install subdir/subdir/meson.build
diff --git a/test cases/common/63 install subdir/subdir/sub1/data1.dat b/test cases/common/62 install subdir/subdir/sub1/data1.dat
index d83c370..d83c370 100644
--- a/test cases/common/63 install subdir/subdir/sub1/data1.dat
+++ b/test cases/common/62 install subdir/subdir/sub1/data1.dat
diff --git a/test cases/common/63 install subdir/subdir/sub1/sub2/data2.dat b/test cases/common/62 install subdir/subdir/sub1/sub2/data2.dat
index 8ce1392..8ce1392 100644
--- a/test cases/common/63 install subdir/subdir/sub1/sub2/data2.dat
+++ b/test cases/common/62 install subdir/subdir/sub1/sub2/data2.dat
diff --git a/test cases/common/63 install subdir/subdir/sub_elided/dircheck/seventh.dat b/test cases/common/62 install subdir/subdir/sub_elided/dircheck/seventh.dat
index ea0b8dc..ea0b8dc 100644
--- a/test cases/common/63 install subdir/subdir/sub_elided/dircheck/seventh.dat
+++ b/test cases/common/62 install subdir/subdir/sub_elided/dircheck/seventh.dat
diff --git a/test cases/common/63 install subdir/subdir/sub_elided/sixth.dat b/test cases/common/62 install subdir/subdir/sub_elided/sixth.dat
index 140f075..140f075 100644
--- a/test cases/common/63 install subdir/subdir/sub_elided/sixth.dat
+++ b/test cases/common/62 install subdir/subdir/sub_elided/sixth.dat
diff --git a/test cases/common/64 foreach/installed_files.txt b/test cases/common/63 foreach/installed_files.txt
index 3376925..3376925 100644
--- a/test cases/common/64 foreach/installed_files.txt
+++ b/test cases/common/63 foreach/installed_files.txt
diff --git a/test cases/common/64 foreach/meson.build b/test cases/common/63 foreach/meson.build
index 7084e80..7084e80 100644
--- a/test cases/common/64 foreach/meson.build
+++ b/test cases/common/63 foreach/meson.build
diff --git a/test cases/common/64 foreach/prog1.c b/test cases/common/63 foreach/prog1.c
index a5ef0f1..a5ef0f1 100644
--- a/test cases/common/64 foreach/prog1.c
+++ b/test cases/common/63 foreach/prog1.c
diff --git a/test cases/common/64 foreach/prog2.c b/test cases/common/63 foreach/prog2.c
index b9fddbe..b9fddbe 100644
--- a/test cases/common/64 foreach/prog2.c
+++ b/test cases/common/63 foreach/prog2.c
diff --git a/test cases/common/64 foreach/prog3.c b/test cases/common/63 foreach/prog3.c
index 5657396..5657396 100644
--- a/test cases/common/64 foreach/prog3.c
+++ b/test cases/common/63 foreach/prog3.c
diff --git a/test cases/common/65 number arithmetic/meson.build b/test cases/common/64 number arithmetic/meson.build
index e31d7e4..e31d7e4 100644
--- a/test cases/common/65 number arithmetic/meson.build
+++ b/test cases/common/64 number arithmetic/meson.build
diff --git a/test cases/common/66 string arithmetic/meson.build b/test cases/common/65 string arithmetic/meson.build
index 59567de..59567de 100644
--- a/test cases/common/66 string arithmetic/meson.build
+++ b/test cases/common/65 string arithmetic/meson.build
diff --git a/test cases/common/67 array arithmetic/meson.build b/test cases/common/66 array arithmetic/meson.build
index 8b8785a..8b8785a 100644
--- a/test cases/common/67 array arithmetic/meson.build
+++ b/test cases/common/66 array arithmetic/meson.build
diff --git a/test cases/common/68 arithmetic bidmas/meson.build b/test cases/common/67 arithmetic bidmas/meson.build
index c7334b4..c7334b4 100644
--- a/test cases/common/68 arithmetic bidmas/meson.build
+++ b/test cases/common/67 arithmetic bidmas/meson.build
diff --git a/test cases/common/69 build always/main.c b/test cases/common/68 build always/main.c
index f8d9ac9..f8d9ac9 100644
--- a/test cases/common/69 build always/main.c
+++ b/test cases/common/68 build always/main.c
diff --git a/test cases/common/69 build always/meson.build b/test cases/common/68 build always/meson.build
index f720c89..f720c89 100644
--- a/test cases/common/69 build always/meson.build
+++ b/test cases/common/68 build always/meson.build
diff --git a/test cases/common/69 build always/version.c.in b/test cases/common/68 build always/version.c.in
index 619e517..619e517 100644
--- a/test cases/common/69 build always/version.c.in
+++ b/test cases/common/68 build always/version.c.in
diff --git a/test cases/common/69 build always/version.h b/test cases/common/68 build always/version.h
index d3fe5c6..d3fe5c6 100644
--- a/test cases/common/69 build always/version.h
+++ b/test cases/common/68 build always/version.h
diff --git a/test cases/common/69 build always/version_gen.py b/test cases/common/68 build always/version_gen.py
index fbe2df9..fbe2df9 100755
--- a/test cases/common/69 build always/version_gen.py
+++ b/test cases/common/68 build always/version_gen.py
diff --git a/test cases/common/70 vcstag/meson.build b/test cases/common/69 vcstag/meson.build
index 7e5983a..7e5983a 100644
--- a/test cases/common/70 vcstag/meson.build
+++ b/test cases/common/69 vcstag/meson.build
diff --git a/test cases/common/70 vcstag/tagprog.c b/test cases/common/69 vcstag/tagprog.c
index 34146b4..34146b4 100644
--- a/test cases/common/70 vcstag/tagprog.c
+++ b/test cases/common/69 vcstag/tagprog.c
diff --git a/test cases/common/70 vcstag/vcstag.c.in b/test cases/common/69 vcstag/vcstag.c.in
index 09192d9..09192d9 100644
--- a/test cases/common/70 vcstag/vcstag.c.in
+++ b/test cases/common/69 vcstag/vcstag.c.in
diff --git a/test cases/common/71 modules/meson.build b/test cases/common/70 modules/meson.build
index e9750cd..e9750cd 100644
--- a/test cases/common/71 modules/meson.build
+++ b/test cases/common/70 modules/meson.build
diff --git a/test cases/common/72 should fail/failing.c b/test cases/common/71 should fail/failing.c
index adada8d..adada8d 100644
--- a/test cases/common/72 should fail/failing.c
+++ b/test cases/common/71 should fail/failing.c
diff --git a/test cases/common/72 should fail/meson.build b/test cases/common/71 should fail/meson.build
index dffbbb3..dffbbb3 100644
--- a/test cases/common/72 should fail/meson.build
+++ b/test cases/common/71 should fail/meson.build
diff --git a/test cases/common/73 configure file in custom target/inc/confdata.in b/test cases/common/72 configure file in custom target/inc/confdata.in
index e44cdea..e44cdea 100644
--- a/test cases/common/73 configure file in custom target/inc/confdata.in
+++ b/test cases/common/72 configure file in custom target/inc/confdata.in
diff --git a/test cases/common/73 configure file in custom target/inc/meson.build b/test cases/common/72 configure file in custom target/inc/meson.build
index 05d2dcb..05d2dcb 100644
--- a/test cases/common/73 configure file in custom target/inc/meson.build
+++ b/test cases/common/72 configure file in custom target/inc/meson.build
diff --git a/test cases/common/73 configure file in custom target/meson.build b/test cases/common/72 configure file in custom target/meson.build
index 0a850a1..0a850a1 100644
--- a/test cases/common/73 configure file in custom target/meson.build
+++ b/test cases/common/72 configure file in custom target/meson.build
diff --git a/test cases/common/73 configure file in custom target/src/meson.build b/test cases/common/72 configure file in custom target/src/meson.build
index e0ab9eb..e0ab9eb 100644
--- a/test cases/common/73 configure file in custom target/src/meson.build
+++ b/test cases/common/72 configure file in custom target/src/meson.build
diff --git a/test cases/common/73 configure file in custom target/src/mycompiler.py b/test cases/common/72 configure file in custom target/src/mycompiler.py
index b00c862..b00c862 100644
--- a/test cases/common/73 configure file in custom target/src/mycompiler.py
+++ b/test cases/common/72 configure file in custom target/src/mycompiler.py
diff --git a/test cases/common/74 external test program/meson.build b/test cases/common/73 external test program/meson.build
index d18ddcd..d18ddcd 100644
--- a/test cases/common/74 external test program/meson.build
+++ b/test cases/common/73 external test program/meson.build
diff --git a/test cases/common/74 external test program/mytest.py b/test cases/common/73 external test program/mytest.py
index 9947773..9947773 100755
--- a/test cases/common/74 external test program/mytest.py
+++ b/test cases/common/73 external test program/mytest.py
diff --git a/test cases/common/75 ctarget dependency/gen1.py b/test cases/common/74 ctarget dependency/gen1.py
index 0fa6ea1..0fa6ea1 100755
--- a/test cases/common/75 ctarget dependency/gen1.py
+++ b/test cases/common/74 ctarget dependency/gen1.py
diff --git a/test cases/common/75 ctarget dependency/gen2.py b/test cases/common/74 ctarget dependency/gen2.py
index b087b02..b087b02 100755
--- a/test cases/common/75 ctarget dependency/gen2.py
+++ b/test cases/common/74 ctarget dependency/gen2.py
diff --git a/test cases/common/75 ctarget dependency/input.dat b/test cases/common/74 ctarget dependency/input.dat
index 7af91e2..7af91e2 100644
--- a/test cases/common/75 ctarget dependency/input.dat
+++ b/test cases/common/74 ctarget dependency/input.dat
diff --git a/test cases/common/75 ctarget dependency/meson.build b/test cases/common/74 ctarget dependency/meson.build
index cd11951..cd11951 100644
--- a/test cases/common/75 ctarget dependency/meson.build
+++ b/test cases/common/74 ctarget dependency/meson.build
diff --git a/test cases/common/76 shared subproject/a.c b/test cases/common/75 shared subproject/a.c
index 6ed96fa..6ed96fa 100644
--- a/test cases/common/76 shared subproject/a.c
+++ b/test cases/common/75 shared subproject/a.c
diff --git a/test cases/common/76 shared subproject/meson.build b/test cases/common/75 shared subproject/meson.build
index 6803d51..6803d51 100644
--- a/test cases/common/76 shared subproject/meson.build
+++ b/test cases/common/75 shared subproject/meson.build
diff --git a/test cases/common/76 shared subproject/subprojects/B/b.c b/test cases/common/75 shared subproject/subprojects/B/b.c
index a1f3a51..a1f3a51 100644
--- a/test cases/common/76 shared subproject/subprojects/B/b.c
+++ b/test cases/common/75 shared subproject/subprojects/B/b.c
diff --git a/test cases/common/76 shared subproject/subprojects/B/meson.build b/test cases/common/75 shared subproject/subprojects/B/meson.build
index 280c60c..280c60c 100644
--- a/test cases/common/76 shared subproject/subprojects/B/meson.build
+++ b/test cases/common/75 shared subproject/subprojects/B/meson.build
diff --git a/test cases/common/76 shared subproject/subprojects/C/c.c b/test cases/common/75 shared subproject/subprojects/C/c.c
index eebfb9f..eebfb9f 100644
--- a/test cases/common/76 shared subproject/subprojects/C/c.c
+++ b/test cases/common/75 shared subproject/subprojects/C/c.c
diff --git a/test cases/common/76 shared subproject/subprojects/C/meson.build b/test cases/common/75 shared subproject/subprojects/C/meson.build
index abf0b1e..abf0b1e 100644
--- a/test cases/common/76 shared subproject/subprojects/C/meson.build
+++ b/test cases/common/75 shared subproject/subprojects/C/meson.build
diff --git a/test cases/common/77 shared subproject 2/a.c b/test cases/common/76 shared subproject 2/a.c
index 6ed96fa..6ed96fa 100644
--- a/test cases/common/77 shared subproject 2/a.c
+++ b/test cases/common/76 shared subproject 2/a.c
diff --git a/test cases/common/77 shared subproject 2/meson.build b/test cases/common/76 shared subproject 2/meson.build
index 0647325..0647325 100644
--- a/test cases/common/77 shared subproject 2/meson.build
+++ b/test cases/common/76 shared subproject 2/meson.build
diff --git a/test cases/common/77 shared subproject 2/subprojects/B/b.c b/test cases/common/76 shared subproject 2/subprojects/B/b.c
index 4c94ee9..4c94ee9 100644
--- a/test cases/common/77 shared subproject 2/subprojects/B/b.c
+++ b/test cases/common/76 shared subproject 2/subprojects/B/b.c
diff --git a/test cases/common/77 shared subproject 2/subprojects/B/meson.build b/test cases/common/76 shared subproject 2/subprojects/B/meson.build
index 280c60c..280c60c 100644
--- a/test cases/common/77 shared subproject 2/subprojects/B/meson.build
+++ b/test cases/common/76 shared subproject 2/subprojects/B/meson.build
diff --git a/test cases/common/77 shared subproject 2/subprojects/C/c.c b/test cases/common/76 shared subproject 2/subprojects/C/c.c
index eebfb9f..eebfb9f 100644
--- a/test cases/common/77 shared subproject 2/subprojects/C/c.c
+++ b/test cases/common/76 shared subproject 2/subprojects/C/c.c
diff --git a/test cases/common/77 shared subproject 2/subprojects/C/meson.build b/test cases/common/76 shared subproject 2/subprojects/C/meson.build
index abf0b1e..abf0b1e 100644
--- a/test cases/common/77 shared subproject 2/subprojects/C/meson.build
+++ b/test cases/common/76 shared subproject 2/subprojects/C/meson.build
diff --git a/test cases/common/78 file object/lib.c b/test cases/common/77 file object/lib.c
index 6f1c172..6f1c172 100644
--- a/test cases/common/78 file object/lib.c
+++ b/test cases/common/77 file object/lib.c
diff --git a/test cases/common/78 file object/meson.build b/test cases/common/77 file object/meson.build
index c3ecb7b..c3ecb7b 100644
--- a/test cases/common/78 file object/meson.build
+++ b/test cases/common/77 file object/meson.build
diff --git a/test cases/common/78 file object/prog.c b/test cases/common/77 file object/prog.c
index 884d678..884d678 100644
--- a/test cases/common/78 file object/prog.c
+++ b/test cases/common/77 file object/prog.c
diff --git a/test cases/common/78 file object/subdir1/lib.c b/test cases/common/77 file object/subdir1/lib.c
index bc1e7b0..bc1e7b0 100644
--- a/test cases/common/78 file object/subdir1/lib.c
+++ b/test cases/common/77 file object/subdir1/lib.c
diff --git a/test cases/common/78 file object/subdir1/meson.build b/test cases/common/77 file object/subdir1/meson.build
index f5066f0..f5066f0 100644
--- a/test cases/common/78 file object/subdir1/meson.build
+++ b/test cases/common/77 file object/subdir1/meson.build
diff --git a/test cases/common/78 file object/subdir1/prog.c b/test cases/common/77 file object/subdir1/prog.c
index 37ccf72..37ccf72 100644
--- a/test cases/common/78 file object/subdir1/prog.c
+++ b/test cases/common/77 file object/subdir1/prog.c
diff --git a/test cases/common/78 file object/subdir2/lib.c b/test cases/common/77 file object/subdir2/lib.c
index cfef4d0..cfef4d0 100644
--- a/test cases/common/78 file object/subdir2/lib.c
+++ b/test cases/common/77 file object/subdir2/lib.c
diff --git a/test cases/common/78 file object/subdir2/meson.build b/test cases/common/77 file object/subdir2/meson.build
index 5886510..5886510 100644
--- a/test cases/common/78 file object/subdir2/meson.build
+++ b/test cases/common/77 file object/subdir2/meson.build
diff --git a/test cases/common/78 file object/subdir2/prog.c b/test cases/common/77 file object/subdir2/prog.c
index 3a90b0a..3a90b0a 100644
--- a/test cases/common/78 file object/subdir2/prog.c
+++ b/test cases/common/77 file object/subdir2/prog.c
diff --git a/test cases/common/79 custom subproject dir/a.c b/test cases/common/78 custom subproject dir/a.c
index 6ed96fa..6ed96fa 100644
--- a/test cases/common/79 custom subproject dir/a.c
+++ b/test cases/common/78 custom subproject dir/a.c
diff --git a/test cases/common/79 custom subproject dir/custom_subproject_dir/B/b.c b/test cases/common/78 custom subproject dir/custom_subproject_dir/B/b.c
index 4c94ee9..4c94ee9 100644
--- a/test cases/common/79 custom subproject dir/custom_subproject_dir/B/b.c
+++ b/test cases/common/78 custom subproject dir/custom_subproject_dir/B/b.c
diff --git a/test cases/common/79 custom subproject dir/custom_subproject_dir/B/meson.build b/test cases/common/78 custom subproject dir/custom_subproject_dir/B/meson.build
index 280c60c..280c60c 100644
--- a/test cases/common/79 custom subproject dir/custom_subproject_dir/B/meson.build
+++ b/test cases/common/78 custom subproject dir/custom_subproject_dir/B/meson.build
diff --git a/test cases/common/79 custom subproject dir/custom_subproject_dir/C/c.c b/test cases/common/78 custom subproject dir/custom_subproject_dir/C/c.c
index eebfb9f..eebfb9f 100644
--- a/test cases/common/79 custom subproject dir/custom_subproject_dir/C/c.c
+++ b/test cases/common/78 custom subproject dir/custom_subproject_dir/C/c.c
diff --git a/test cases/common/79 custom subproject dir/custom_subproject_dir/C/meson.build b/test cases/common/78 custom subproject dir/custom_subproject_dir/C/meson.build
index abf0b1e..abf0b1e 100644
--- a/test cases/common/79 custom subproject dir/custom_subproject_dir/C/meson.build
+++ b/test cases/common/78 custom subproject dir/custom_subproject_dir/C/meson.build
diff --git a/test cases/common/79 custom subproject dir/meson.build b/test cases/common/78 custom subproject dir/meson.build
index d9ba649..d9ba649 100644
--- a/test cases/common/79 custom subproject dir/meson.build
+++ b/test cases/common/78 custom subproject dir/meson.build
diff --git a/test cases/common/80 has type/meson.build b/test cases/common/79 has type/meson.build
index de8dbc8..de8dbc8 100644
--- a/test cases/common/80 has type/meson.build
+++ b/test cases/common/79 has type/meson.build
diff --git a/test cases/common/81 extract from nested subdir/meson.build b/test cases/common/80 extract from nested subdir/meson.build
index 3a42806..3a42806 100644
--- a/test cases/common/81 extract from nested subdir/meson.build
+++ b/test cases/common/80 extract from nested subdir/meson.build
diff --git a/test cases/common/81 extract from nested subdir/src/first/lib_first.c b/test cases/common/80 extract from nested subdir/src/first/lib_first.c
index 3004906..3004906 100644
--- a/test cases/common/81 extract from nested subdir/src/first/lib_first.c
+++ b/test cases/common/80 extract from nested subdir/src/first/lib_first.c
diff --git a/test cases/common/81 extract from nested subdir/src/first/meson.build b/test cases/common/80 extract from nested subdir/src/first/meson.build
index b97aef4..b97aef4 100644
--- a/test cases/common/81 extract from nested subdir/src/first/meson.build
+++ b/test cases/common/80 extract from nested subdir/src/first/meson.build
diff --git a/test cases/common/81 extract from nested subdir/src/meson.build b/test cases/common/80 extract from nested subdir/src/meson.build
index 3f5ec32..3f5ec32 100644
--- a/test cases/common/81 extract from nested subdir/src/meson.build
+++ b/test cases/common/80 extract from nested subdir/src/meson.build
diff --git a/test cases/common/81 extract from nested subdir/tst/first/exe_first.c b/test cases/common/80 extract from nested subdir/tst/first/exe_first.c
index f6c1f74..f6c1f74 100644
--- a/test cases/common/81 extract from nested subdir/tst/first/exe_first.c
+++ b/test cases/common/80 extract from nested subdir/tst/first/exe_first.c
diff --git a/test cases/common/81 extract from nested subdir/tst/first/meson.build b/test cases/common/80 extract from nested subdir/tst/first/meson.build
index a6fa7da..a6fa7da 100644
--- a/test cases/common/81 extract from nested subdir/tst/first/meson.build
+++ b/test cases/common/80 extract from nested subdir/tst/first/meson.build
diff --git a/test cases/common/81 extract from nested subdir/tst/meson.build b/test cases/common/80 extract from nested subdir/tst/meson.build
index 3f5ec32..3f5ec32 100644
--- a/test cases/common/81 extract from nested subdir/tst/meson.build
+++ b/test cases/common/80 extract from nested subdir/tst/meson.build
diff --git a/test cases/common/82 internal dependency/meson.build b/test cases/common/81 internal dependency/meson.build
index 6faedb0..6faedb0 100644
--- a/test cases/common/82 internal dependency/meson.build
+++ b/test cases/common/81 internal dependency/meson.build
diff --git a/test cases/common/82 internal dependency/proj1/include/proj1.h b/test cases/common/81 internal dependency/proj1/include/proj1.h
index ded6f75..ded6f75 100644
--- a/test cases/common/82 internal dependency/proj1/include/proj1.h
+++ b/test cases/common/81 internal dependency/proj1/include/proj1.h
diff --git a/test cases/common/82 internal dependency/proj1/meson.build b/test cases/common/81 internal dependency/proj1/meson.build
index 422021e..422021e 100644
--- a/test cases/common/82 internal dependency/proj1/meson.build
+++ b/test cases/common/81 internal dependency/proj1/meson.build
diff --git a/test cases/common/82 internal dependency/proj1/proj1f1.c b/test cases/common/81 internal dependency/proj1/proj1f1.c
index 9077f4f..9077f4f 100644
--- a/test cases/common/82 internal dependency/proj1/proj1f1.c
+++ b/test cases/common/81 internal dependency/proj1/proj1f1.c
diff --git a/test cases/common/82 internal dependency/proj1/proj1f2.c b/test cases/common/81 internal dependency/proj1/proj1f2.c
index 374ee4e..374ee4e 100644
--- a/test cases/common/82 internal dependency/proj1/proj1f2.c
+++ b/test cases/common/81 internal dependency/proj1/proj1f2.c
diff --git a/test cases/common/82 internal dependency/proj1/proj1f3.c b/test cases/common/81 internal dependency/proj1/proj1f3.c
index 8c8fca4..8c8fca4 100644
--- a/test cases/common/82 internal dependency/proj1/proj1f3.c
+++ b/test cases/common/81 internal dependency/proj1/proj1f3.c
diff --git a/test cases/common/82 internal dependency/src/main.c b/test cases/common/81 internal dependency/src/main.c
index 7d50b05..7d50b05 100644
--- a/test cases/common/82 internal dependency/src/main.c
+++ b/test cases/common/81 internal dependency/src/main.c
diff --git a/test cases/common/82 internal dependency/src/meson.build b/test cases/common/81 internal dependency/src/meson.build
index 89f99ab..89f99ab 100644
--- a/test cases/common/82 internal dependency/src/meson.build
+++ b/test cases/common/81 internal dependency/src/meson.build
diff --git a/test cases/common/83 same basename/exe1.c b/test cases/common/82 same basename/exe1.c
index 175a90d..175a90d 100644
--- a/test cases/common/83 same basename/exe1.c
+++ b/test cases/common/82 same basename/exe1.c
diff --git a/test cases/common/83 same basename/exe2.c b/test cases/common/82 same basename/exe2.c
index 56b04cc..56b04cc 100644
--- a/test cases/common/83 same basename/exe2.c
+++ b/test cases/common/82 same basename/exe2.c
diff --git a/test cases/common/83 same basename/lib.c b/test cases/common/82 same basename/lib.c
index 6fd432e..6fd432e 100644
--- a/test cases/common/83 same basename/lib.c
+++ b/test cases/common/82 same basename/lib.c
diff --git a/test cases/common/83 same basename/meson.build b/test cases/common/82 same basename/meson.build
index 856c536..856c536 100644
--- a/test cases/common/83 same basename/meson.build
+++ b/test cases/common/82 same basename/meson.build
diff --git a/test cases/common/83 same basename/sharedsub/meson.build b/test cases/common/82 same basename/sharedsub/meson.build
index 29654a9..29654a9 100644
--- a/test cases/common/83 same basename/sharedsub/meson.build
+++ b/test cases/common/82 same basename/sharedsub/meson.build
diff --git a/test cases/common/83 same basename/staticsub/meson.build b/test cases/common/82 same basename/staticsub/meson.build
index 5e5242e..5e5242e 100644
--- a/test cases/common/83 same basename/staticsub/meson.build
+++ b/test cases/common/82 same basename/staticsub/meson.build
diff --git a/test cases/common/84 declare dep/entity/entity.h b/test cases/common/83 declare dep/entity/entity.h
index c695b14..c695b14 100644
--- a/test cases/common/84 declare dep/entity/entity.h
+++ b/test cases/common/83 declare dep/entity/entity.h
diff --git a/test cases/common/84 declare dep/entity/entity1.c b/test cases/common/83 declare dep/entity/entity1.c
index 204eb8b..204eb8b 100644
--- a/test cases/common/84 declare dep/entity/entity1.c
+++ b/test cases/common/83 declare dep/entity/entity1.c
diff --git a/test cases/common/84 declare dep/entity/entity2.c b/test cases/common/83 declare dep/entity/entity2.c
index f34f546..f34f546 100644
--- a/test cases/common/84 declare dep/entity/entity2.c
+++ b/test cases/common/83 declare dep/entity/entity2.c
diff --git a/test cases/common/84 declare dep/entity/meson.build b/test cases/common/83 declare dep/entity/meson.build
index 469ecd3..469ecd3 100644
--- a/test cases/common/84 declare dep/entity/meson.build
+++ b/test cases/common/83 declare dep/entity/meson.build
diff --git a/test cases/common/84 declare dep/main.c b/test cases/common/83 declare dep/main.c
index 4ad9d2a..4ad9d2a 100644
--- a/test cases/common/84 declare dep/main.c
+++ b/test cases/common/83 declare dep/main.c
diff --git a/test cases/common/84 declare dep/meson.build b/test cases/common/83 declare dep/meson.build
index e427def..e427def 100644
--- a/test cases/common/84 declare dep/meson.build
+++ b/test cases/common/83 declare dep/meson.build
diff --git a/test cases/common/85 extract all/extractor.h b/test cases/common/84 extract all/extractor.h
index d0917a1..d0917a1 100644
--- a/test cases/common/85 extract all/extractor.h
+++ b/test cases/common/84 extract all/extractor.h
diff --git a/test cases/common/85 extract all/four.c b/test cases/common/84 extract all/four.c
index 5ca6696..5ca6696 100644
--- a/test cases/common/85 extract all/four.c
+++ b/test cases/common/84 extract all/four.c
diff --git a/test cases/common/85 extract all/meson.build b/test cases/common/84 extract all/meson.build
index 4f08a4f..4f08a4f 100644
--- a/test cases/common/85 extract all/meson.build
+++ b/test cases/common/84 extract all/meson.build
diff --git a/test cases/common/85 extract all/one.c b/test cases/common/84 extract all/one.c
index cfb0157..cfb0157 100644
--- a/test cases/common/85 extract all/one.c
+++ b/test cases/common/84 extract all/one.c
diff --git a/test cases/common/85 extract all/prog.c b/test cases/common/84 extract all/prog.c
index 57a4c64..57a4c64 100644
--- a/test cases/common/85 extract all/prog.c
+++ b/test cases/common/84 extract all/prog.c
diff --git a/test cases/common/85 extract all/three.c b/test cases/common/84 extract all/three.c
index c410046..c410046 100644
--- a/test cases/common/85 extract all/three.c
+++ b/test cases/common/84 extract all/three.c
diff --git a/test cases/common/85 extract all/two.c b/test cases/common/84 extract all/two.c
index 3ece512..3ece512 100644
--- a/test cases/common/85 extract all/two.c
+++ b/test cases/common/84 extract all/two.c
diff --git a/test cases/common/86 add language/meson.build b/test cases/common/85 add language/meson.build
index d9bc0fa..d9bc0fa 100644
--- a/test cases/common/86 add language/meson.build
+++ b/test cases/common/85 add language/meson.build
diff --git a/test cases/common/86 add language/prog.c b/test cases/common/85 add language/prog.c
index 9b5685f..9b5685f 100644
--- a/test cases/common/86 add language/prog.c
+++ b/test cases/common/85 add language/prog.c
diff --git a/test cases/common/86 add language/prog.cc b/test cases/common/85 add language/prog.cc
index 03647dd..03647dd 100644
--- a/test cases/common/86 add language/prog.cc
+++ b/test cases/common/85 add language/prog.cc
diff --git a/test cases/common/87 identical target name in subproject/bar.c b/test cases/common/86 identical target name in subproject/bar.c
index 864869b..864869b 100644
--- a/test cases/common/87 identical target name in subproject/bar.c
+++ b/test cases/common/86 identical target name in subproject/bar.c
diff --git a/test cases/common/87 identical target name in subproject/meson.build b/test cases/common/86 identical target name in subproject/meson.build
index c5be5b7..c5be5b7 100644
--- a/test cases/common/87 identical target name in subproject/meson.build
+++ b/test cases/common/86 identical target name in subproject/meson.build
diff --git a/test cases/common/87 identical target name in subproject/subprojects/foo/bar.c b/test cases/common/86 identical target name in subproject/subprojects/foo/bar.c
index 106005e..106005e 100644
--- a/test cases/common/87 identical target name in subproject/subprojects/foo/bar.c
+++ b/test cases/common/86 identical target name in subproject/subprojects/foo/bar.c
diff --git a/test cases/common/87 identical target name in subproject/subprojects/foo/meson.build b/test cases/common/86 identical target name in subproject/subprojects/foo/meson.build
index 06addb4..06addb4 100644
--- a/test cases/common/87 identical target name in subproject/subprojects/foo/meson.build
+++ b/test cases/common/86 identical target name in subproject/subprojects/foo/meson.build
diff --git a/test cases/common/88 plusassign/meson.build b/test cases/common/87 plusassign/meson.build
index ac477e7..ac477e7 100644
--- a/test cases/common/88 plusassign/meson.build
+++ b/test cases/common/87 plusassign/meson.build
diff --git a/test cases/common/89 skip subdir/meson.build b/test cases/common/88 skip subdir/meson.build
index 30ede0e..30ede0e 100644
--- a/test cases/common/89 skip subdir/meson.build
+++ b/test cases/common/88 skip subdir/meson.build
diff --git a/test cases/common/89 skip subdir/subdir1/meson.build b/test cases/common/88 skip subdir/subdir1/meson.build
index 51cb003..51cb003 100644
--- a/test cases/common/89 skip subdir/subdir1/meson.build
+++ b/test cases/common/88 skip subdir/subdir1/meson.build
diff --git a/test cases/common/89 skip subdir/subdir1/subdir2/meson.build b/test cases/common/88 skip subdir/subdir1/subdir2/meson.build
index e37cad6..e37cad6 100644
--- a/test cases/common/89 skip subdir/subdir1/subdir2/meson.build
+++ b/test cases/common/88 skip subdir/subdir1/subdir2/meson.build
diff --git a/test cases/common/90 private include/meson.build b/test cases/common/89 private include/meson.build
index 2485fbf..2485fbf 100644
--- a/test cases/common/90 private include/meson.build
+++ b/test cases/common/89 private include/meson.build
diff --git a/test cases/common/90 private include/stlib/compiler.py b/test cases/common/89 private include/stlib/compiler.py
index 98dbe46..98dbe46 100755
--- a/test cases/common/90 private include/stlib/compiler.py
+++ b/test cases/common/89 private include/stlib/compiler.py
diff --git a/test cases/common/90 private include/stlib/foo1.def b/test cases/common/89 private include/stlib/foo1.def
index e69de29..e69de29 100644
--- a/test cases/common/90 private include/stlib/foo1.def
+++ b/test cases/common/89 private include/stlib/foo1.def
diff --git a/test cases/common/90 private include/stlib/foo2.def b/test cases/common/89 private include/stlib/foo2.def
index e69de29..e69de29 100644
--- a/test cases/common/90 private include/stlib/foo2.def
+++ b/test cases/common/89 private include/stlib/foo2.def
diff --git a/test cases/common/90 private include/stlib/meson.build b/test cases/common/89 private include/stlib/meson.build
index 8d70650..8d70650 100644
--- a/test cases/common/90 private include/stlib/meson.build
+++ b/test cases/common/89 private include/stlib/meson.build
diff --git a/test cases/common/90 private include/user/libuser.c b/test cases/common/89 private include/user/libuser.c
index a74a973..a74a973 100644
--- a/test cases/common/90 private include/user/libuser.c
+++ b/test cases/common/89 private include/user/libuser.c
diff --git a/test cases/common/90 private include/user/meson.build b/test cases/common/89 private include/user/meson.build
index ab88b1d..ab88b1d 100644
--- a/test cases/common/90 private include/user/meson.build
+++ b/test cases/common/89 private include/user/meson.build
diff --git a/test cases/common/91 default options/meson.build b/test cases/common/90 default options/meson.build
index 4a9fc2f..4a9fc2f 100644
--- a/test cases/common/91 default options/meson.build
+++ b/test cases/common/90 default options/meson.build
diff --git a/test cases/common/92 dep fallback/gensrc.py b/test cases/common/91 dep fallback/gensrc.py
index ff42ac3..ff42ac3 100644
--- a/test cases/common/92 dep fallback/gensrc.py
+++ b/test cases/common/91 dep fallback/gensrc.py
diff --git a/test cases/common/92 dep fallback/meson.build b/test cases/common/91 dep fallback/meson.build
index a96520e..a96520e 100644
--- a/test cases/common/92 dep fallback/meson.build
+++ b/test cases/common/91 dep fallback/meson.build
diff --git a/test cases/common/92 dep fallback/subprojects/boblib/bob.c b/test cases/common/91 dep fallback/subprojects/boblib/bob.c
index ae0f394..ae0f394 100644
--- a/test cases/common/92 dep fallback/subprojects/boblib/bob.c
+++ b/test cases/common/91 dep fallback/subprojects/boblib/bob.c
diff --git a/test cases/common/92 dep fallback/subprojects/boblib/bob.h b/test cases/common/91 dep fallback/subprojects/boblib/bob.h
index f874ae7..f874ae7 100644
--- a/test cases/common/92 dep fallback/subprojects/boblib/bob.h
+++ b/test cases/common/91 dep fallback/subprojects/boblib/bob.h
diff --git a/test cases/common/92 dep fallback/subprojects/boblib/genbob.py b/test cases/common/91 dep fallback/subprojects/boblib/genbob.py
index 34af779..34af779 100644
--- a/test cases/common/92 dep fallback/subprojects/boblib/genbob.py
+++ b/test cases/common/91 dep fallback/subprojects/boblib/genbob.py
diff --git a/test cases/common/92 dep fallback/subprojects/boblib/meson.build b/test cases/common/91 dep fallback/subprojects/boblib/meson.build
index bb250e4..bb250e4 100644
--- a/test cases/common/92 dep fallback/subprojects/boblib/meson.build
+++ b/test cases/common/91 dep fallback/subprojects/boblib/meson.build
diff --git a/test cases/common/92 dep fallback/subprojects/dummylib/meson.build b/test cases/common/91 dep fallback/subprojects/dummylib/meson.build
index 3ad33e7..3ad33e7 100644
--- a/test cases/common/92 dep fallback/subprojects/dummylib/meson.build
+++ b/test cases/common/91 dep fallback/subprojects/dummylib/meson.build
diff --git a/test cases/common/92 dep fallback/tester.c b/test cases/common/91 dep fallback/tester.c
index e6651d9..e6651d9 100644
--- a/test cases/common/92 dep fallback/tester.c
+++ b/test cases/common/91 dep fallback/tester.c
diff --git a/test cases/common/93 default library/ef.cpp b/test cases/common/92 default library/ef.cpp
index 34784f8..34784f8 100644
--- a/test cases/common/93 default library/ef.cpp
+++ b/test cases/common/92 default library/ef.cpp
diff --git a/test cases/common/93 default library/ef.h b/test cases/common/92 default library/ef.h
index 21704b5..21704b5 100644
--- a/test cases/common/93 default library/ef.h
+++ b/test cases/common/92 default library/ef.h
diff --git a/test cases/common/93 default library/eftest.cpp b/test cases/common/92 default library/eftest.cpp
index 4d4412d..4d4412d 100644
--- a/test cases/common/93 default library/eftest.cpp
+++ b/test cases/common/92 default library/eftest.cpp
diff --git a/test cases/common/93 default library/meson.build b/test cases/common/92 default library/meson.build
index 508f25f..508f25f 100644
--- a/test cases/common/93 default library/meson.build
+++ b/test cases/common/92 default library/meson.build
diff --git a/test cases/common/94 selfbuilt custom/data.dat b/test cases/common/93 selfbuilt custom/data.dat
index 83fd1d9..83fd1d9 100644
--- a/test cases/common/94 selfbuilt custom/data.dat
+++ b/test cases/common/93 selfbuilt custom/data.dat
diff --git a/test cases/common/94 selfbuilt custom/mainprog.cpp b/test cases/common/93 selfbuilt custom/mainprog.cpp
index dcf9d20..dcf9d20 100644
--- a/test cases/common/94 selfbuilt custom/mainprog.cpp
+++ b/test cases/common/93 selfbuilt custom/mainprog.cpp
diff --git a/test cases/common/94 selfbuilt custom/meson.build b/test cases/common/93 selfbuilt custom/meson.build
index e5da27e..e5da27e 100644
--- a/test cases/common/94 selfbuilt custom/meson.build
+++ b/test cases/common/93 selfbuilt custom/meson.build
diff --git a/test cases/common/94 selfbuilt custom/tool.cpp b/test cases/common/93 selfbuilt custom/tool.cpp
index 6a28dd8..6a28dd8 100644
--- a/test cases/common/94 selfbuilt custom/tool.cpp
+++ b/test cases/common/93 selfbuilt custom/tool.cpp
diff --git a/test cases/common/95 gen extra/meson.build b/test cases/common/94 gen extra/meson.build
index cbbdceb..cbbdceb 100644
--- a/test cases/common/95 gen extra/meson.build
+++ b/test cases/common/94 gen extra/meson.build
diff --git a/test cases/common/95 gen extra/name.dat b/test cases/common/94 gen extra/name.dat
index caf5b1c..caf5b1c 100644
--- a/test cases/common/95 gen extra/name.dat
+++ b/test cases/common/94 gen extra/name.dat
diff --git a/test cases/common/95 gen extra/name.l b/test cases/common/94 gen extra/name.l
index 3adda4f..3adda4f 100644
--- a/test cases/common/95 gen extra/name.l
+++ b/test cases/common/94 gen extra/name.l
diff --git a/test cases/common/95 gen extra/plain.c b/test cases/common/94 gen extra/plain.c
index 3845aee..3845aee 100644
--- a/test cases/common/95 gen extra/plain.c
+++ b/test cases/common/94 gen extra/plain.c
diff --git a/test cases/common/95 gen extra/srcgen.py b/test cases/common/94 gen extra/srcgen.py
index 8988cd9..8988cd9 100755
--- a/test cases/common/95 gen extra/srcgen.py
+++ b/test cases/common/94 gen extra/srcgen.py
diff --git a/test cases/common/95 gen extra/srcgen2.py b/test cases/common/94 gen extra/srcgen2.py
index 9cdf12d..9cdf12d 100644
--- a/test cases/common/95 gen extra/srcgen2.py
+++ b/test cases/common/94 gen extra/srcgen2.py
diff --git a/test cases/common/95 gen extra/srcgen3.py b/test cases/common/94 gen extra/srcgen3.py
index b737114..b737114 100644
--- a/test cases/common/95 gen extra/srcgen3.py
+++ b/test cases/common/94 gen extra/srcgen3.py
diff --git a/test cases/common/95 gen extra/upper.c b/test cases/common/94 gen extra/upper.c
index 44f8ad7..44f8ad7 100644
--- a/test cases/common/95 gen extra/upper.c
+++ b/test cases/common/94 gen extra/upper.c
diff --git a/test cases/common/96 benchmark/delayer.c b/test cases/common/95 benchmark/delayer.c
index cfcedad..cfcedad 100644
--- a/test cases/common/96 benchmark/delayer.c
+++ b/test cases/common/95 benchmark/delayer.c
diff --git a/test cases/common/96 benchmark/meson.build b/test cases/common/95 benchmark/meson.build
index 9d583d2..9d583d2 100644
--- a/test cases/common/96 benchmark/meson.build
+++ b/test cases/common/95 benchmark/meson.build
diff --git a/test cases/common/97 test workdir/meson.build b/test cases/common/96 test workdir/meson.build
index a8290f7..a8290f7 100644
--- a/test cases/common/97 test workdir/meson.build
+++ b/test cases/common/96 test workdir/meson.build
diff --git a/test cases/common/97 test workdir/opener.c b/test cases/common/96 test workdir/opener.c
index 43c53ce..43c53ce 100644
--- a/test cases/common/97 test workdir/opener.c
+++ b/test cases/common/96 test workdir/opener.c
diff --git a/test cases/common/97 test workdir/subdir/checker.py b/test cases/common/96 test workdir/subdir/checker.py
index 66e287d..66e287d 100755
--- a/test cases/common/97 test workdir/subdir/checker.py
+++ b/test cases/common/96 test workdir/subdir/checker.py
diff --git a/test cases/common/97 test workdir/subdir/meson.build b/test cases/common/96 test workdir/subdir/meson.build
index 687a1cf..687a1cf 100644
--- a/test cases/common/97 test workdir/subdir/meson.build
+++ b/test cases/common/96 test workdir/subdir/meson.build
diff --git a/test cases/common/98 suites/exe1.c b/test cases/common/97 suites/exe1.c
index 23894c0..23894c0 100644
--- a/test cases/common/98 suites/exe1.c
+++ b/test cases/common/97 suites/exe1.c
diff --git a/test cases/common/98 suites/exe2.c b/test cases/common/97 suites/exe2.c
index ec88e20..ec88e20 100644
--- a/test cases/common/98 suites/exe2.c
+++ b/test cases/common/97 suites/exe2.c
diff --git a/test cases/common/98 suites/meson.build b/test cases/common/97 suites/meson.build
index 057e059..057e059 100644
--- a/test cases/common/98 suites/meson.build
+++ b/test cases/common/97 suites/meson.build
diff --git a/test cases/common/98 suites/subprojects/sub/meson.build b/test cases/common/97 suites/subprojects/sub/meson.build
index 697d95f..697d95f 100644
--- a/test cases/common/98 suites/subprojects/sub/meson.build
+++ b/test cases/common/97 suites/subprojects/sub/meson.build
diff --git a/test cases/common/98 suites/subprojects/sub/sub1.c b/test cases/common/97 suites/subprojects/sub/sub1.c
index 3409e48..3409e48 100644
--- a/test cases/common/98 suites/subprojects/sub/sub1.c
+++ b/test cases/common/97 suites/subprojects/sub/sub1.c
diff --git a/test cases/common/98 suites/subprojects/sub/sub2.c b/test cases/common/97 suites/subprojects/sub/sub2.c
index 1a64a2a..1a64a2a 100644
--- a/test cases/common/98 suites/subprojects/sub/sub2.c
+++ b/test cases/common/97 suites/subprojects/sub/sub2.c
diff --git a/test cases/common/99 threads/meson.build b/test cases/common/98 threads/meson.build
index 1fbb15a..1fbb15a 100644
--- a/test cases/common/99 threads/meson.build
+++ b/test cases/common/98 threads/meson.build
diff --git a/test cases/common/99 threads/threadprog.c b/test cases/common/98 threads/threadprog.c
index 47a5d18..47a5d18 100644
--- a/test cases/common/99 threads/threadprog.c
+++ b/test cases/common/98 threads/threadprog.c
diff --git a/test cases/common/99 threads/threadprog.cpp b/test cases/common/98 threads/threadprog.cpp
index 6fd747f..6fd747f 100644
--- a/test cases/common/99 threads/threadprog.cpp
+++ b/test cases/common/98 threads/threadprog.cpp
diff --git a/test cases/common/100 manygen/depuser.c b/test cases/common/99 manygen/depuser.c
index 1a825e0..1a825e0 100644
--- a/test cases/common/100 manygen/depuser.c
+++ b/test cases/common/99 manygen/depuser.c
diff --git a/test cases/common/100 manygen/meson.build b/test cases/common/99 manygen/meson.build
index e70a55a..e70a55a 100644
--- a/test cases/common/100 manygen/meson.build
+++ b/test cases/common/99 manygen/meson.build
diff --git a/test cases/common/100 manygen/subdir/funcinfo.def b/test cases/common/99 manygen/subdir/funcinfo.def
index b074186..b074186 100644
--- a/test cases/common/100 manygen/subdir/funcinfo.def
+++ b/test cases/common/99 manygen/subdir/funcinfo.def
diff --git a/test cases/common/100 manygen/subdir/manygen.py b/test cases/common/99 manygen/subdir/manygen.py
index 0fbc2ec..0fbc2ec 100755
--- a/test cases/common/100 manygen/subdir/manygen.py
+++ b/test cases/common/99 manygen/subdir/manygen.py
diff --git a/test cases/common/100 manygen/subdir/meson.build b/test cases/common/99 manygen/subdir/meson.build
index 56f60e6..56f60e6 100644
--- a/test cases/common/100 manygen/subdir/meson.build
+++ b/test cases/common/99 manygen/subdir/meson.build
diff --git a/test cases/failing/90 subproj not-found dep/meson.build b/test cases/failing/89 subproj not-found dep/meson.build
index 2b17df1..2b17df1 100644
--- a/test cases/failing/90 subproj not-found dep/meson.build
+++ b/test cases/failing/89 subproj not-found dep/meson.build
diff --git a/test cases/failing/90 subproj not-found dep/subprojects/somesubproj/meson.build b/test cases/failing/89 subproj not-found dep/subprojects/somesubproj/meson.build
index 5f451f4..5f451f4 100644
--- a/test cases/failing/90 subproj not-found dep/subprojects/somesubproj/meson.build
+++ b/test cases/failing/89 subproj not-found dep/subprojects/somesubproj/meson.build
diff --git a/test cases/failing/91 invalid configure file/input b/test cases/failing/90 invalid configure file/input
index e69de29..e69de29 100644
--- a/test cases/failing/91 invalid configure file/input
+++ b/test cases/failing/90 invalid configure file/input
diff --git a/test cases/failing/91 invalid configure file/meson.build b/test cases/failing/90 invalid configure file/meson.build
index 08eca2b..08eca2b 100644
--- a/test cases/failing/91 invalid configure file/meson.build
+++ b/test cases/failing/90 invalid configure file/meson.build
diff --git a/test cases/failing/92 kwarg dupe/meson.build b/test cases/failing/91 kwarg dupe/meson.build
index 06821a2..06821a2 100644
--- a/test cases/failing/92 kwarg dupe/meson.build
+++ b/test cases/failing/91 kwarg dupe/meson.build
diff --git a/test cases/failing/92 kwarg dupe/prog.c b/test cases/failing/91 kwarg dupe/prog.c
index 5f3fbe6..5f3fbe6 100644
--- a/test cases/failing/92 kwarg dupe/prog.c
+++ b/test cases/failing/91 kwarg dupe/prog.c
diff --git a/test cases/failing/93 missing pch file/meson.build b/test cases/failing/92 missing pch file/meson.build
index a67b798..a67b798 100644
--- a/test cases/failing/93 missing pch file/meson.build
+++ b/test cases/failing/92 missing pch file/meson.build
diff --git a/test cases/failing/93 missing pch file/prog.c b/test cases/failing/92 missing pch file/prog.c
index 11b7fad..11b7fad 100644
--- a/test cases/failing/93 missing pch file/prog.c
+++ b/test cases/failing/92 missing pch file/prog.c
diff --git a/test cases/failing/94 pch source different folder/include/pch.h b/test cases/failing/93 pch source different folder/include/pch.h
index e69de29..e69de29 100644
--- a/test cases/failing/94 pch source different folder/include/pch.h
+++ b/test cases/failing/93 pch source different folder/include/pch.h
diff --git a/test cases/failing/94 pch source different folder/meson.build b/test cases/failing/93 pch source different folder/meson.build
index d320717..d320717 100644
--- a/test cases/failing/94 pch source different folder/meson.build
+++ b/test cases/failing/93 pch source different folder/meson.build
diff --git a/test cases/failing/94 pch source different folder/prog.c b/test cases/failing/93 pch source different folder/prog.c
index c272dab..c272dab 100644
--- a/test cases/failing/94 pch source different folder/prog.c
+++ b/test cases/failing/93 pch source different folder/prog.c
diff --git a/test cases/failing/94 pch source different folder/src/pch.c b/test cases/failing/93 pch source different folder/src/pch.c
index e69de29..e69de29 100644
--- a/test cases/failing/94 pch source different folder/src/pch.c
+++ b/test cases/failing/93 pch source different folder/src/pch.c
diff --git a/test cases/failing/95 vala without c/meson.build b/test cases/failing/94 vala without c/meson.build
index ce39d5d..ce39d5d 100644
--- a/test cases/failing/95 vala without c/meson.build
+++ b/test cases/failing/94 vala without c/meson.build
diff --git a/test cases/failing/96 unknown config tool/meson.build b/test cases/failing/95 unknown config tool/meson.build
index 536976e..536976e 100644
--- a/test cases/failing/96 unknown config tool/meson.build
+++ b/test cases/failing/95 unknown config tool/meson.build
diff --git a/test cases/failing/97 custom target install data/Info.plist.cpp b/test cases/failing/96 custom target install data/Info.plist.cpp
index 9ca2fcb..9ca2fcb 100644
--- a/test cases/failing/97 custom target install data/Info.plist.cpp
+++ b/test cases/failing/96 custom target install data/Info.plist.cpp
diff --git a/test cases/failing/97 custom target install data/meson.build b/test cases/failing/96 custom target install data/meson.build
index 00d348c..00d348c 100644
--- a/test cases/failing/97 custom target install data/meson.build
+++ b/test cases/failing/96 custom target install data/meson.build
diff --git a/test cases/failing/97 custom target install data/preproc.py b/test cases/failing/96 custom target install data/preproc.py
index e6eba4c..e6eba4c 100644
--- a/test cases/failing/97 custom target install data/preproc.py
+++ b/test cases/failing/96 custom target install data/preproc.py
diff --git a/test cases/unit/50 std remains/meson.build b/test cases/unit/51 std remains/meson.build
index ac6f9e2..ac6f9e2 100644
--- a/test cases/unit/50 std remains/meson.build
+++ b/test cases/unit/51 std remains/meson.build
diff --git a/test cases/unit/50 std remains/prog.c b/test cases/unit/51 std remains/prog.c
index 0314ff1..0314ff1 100644
--- a/test cases/unit/50 std remains/prog.c
+++ b/test cases/unit/51 std remains/prog.c
diff --git a/test cases/unit/51 ldflagdedup/bob.c b/test cases/unit/52 ldflagdedup/bob.c
index a68d4b1..a68d4b1 100644
--- a/test cases/unit/51 ldflagdedup/bob.c
+++ b/test cases/unit/52 ldflagdedup/bob.c
diff --git a/test cases/unit/51 ldflagdedup/meson.build b/test cases/unit/52 ldflagdedup/meson.build
index 0bbcc50..0bbcc50 100644
--- a/test cases/unit/51 ldflagdedup/meson.build
+++ b/test cases/unit/52 ldflagdedup/meson.build
diff --git a/test cases/unit/51 ldflagdedup/prog.c b/test cases/unit/52 ldflagdedup/prog.c
index 02c599d..02c599d 100644
--- a/test cases/unit/51 ldflagdedup/prog.c
+++ b/test cases/unit/52 ldflagdedup/prog.c
diff --git a/test cases/unit/52 pkgconfig static link order/meson.build b/test cases/unit/53 pkgconfig static link order/meson.build
index b61de9a..b61de9a 100644
--- a/test cases/unit/52 pkgconfig static link order/meson.build
+++ b/test cases/unit/53 pkgconfig static link order/meson.build
diff --git a/test cases/unit/53 clang-format/.clang-format b/test cases/unit/54 clang-format/.clang-format
index 5c60ac9..5c60ac9 100644
--- a/test cases/unit/53 clang-format/.clang-format
+++ b/test cases/unit/54 clang-format/.clang-format
diff --git a/test cases/unit/53 clang-format/header_expected_h b/test cases/unit/54 clang-format/header_expected_h
index 4303176..4303176 100644
--- a/test cases/unit/53 clang-format/header_expected_h
+++ b/test cases/unit/54 clang-format/header_expected_h
diff --git a/test cases/unit/53 clang-format/header_orig_h b/test cases/unit/54 clang-format/header_orig_h
index f2222f3..f2222f3 100644
--- a/test cases/unit/53 clang-format/header_orig_h
+++ b/test cases/unit/54 clang-format/header_orig_h
diff --git a/test cases/unit/53 clang-format/meson.build b/test cases/unit/54 clang-format/meson.build
index 1b93cd5..1b93cd5 100644
--- a/test cases/unit/53 clang-format/meson.build
+++ b/test cases/unit/54 clang-format/meson.build
diff --git a/test cases/unit/53 clang-format/prog_expected_c b/test cases/unit/54 clang-format/prog_expected_c
index a045966..a045966 100644
--- a/test cases/unit/53 clang-format/prog_expected_c
+++ b/test cases/unit/54 clang-format/prog_expected_c
diff --git a/test cases/unit/53 clang-format/prog_orig_c b/test cases/unit/54 clang-format/prog_orig_c
index f098bbc..f098bbc 100644
--- a/test cases/unit/53 clang-format/prog_orig_c
+++ b/test cases/unit/54 clang-format/prog_orig_c
diff --git a/test cases/unit/54 introspect buildoptions/subprojects/projectBad/meson.build b/test cases/unit/55 introspect buildoptions/subprojects/projectBad/meson.build
index 4d0aeeb..4d0aeeb 100644
--- a/test cases/unit/54 introspect buildoptions/subprojects/projectBad/meson.build
+++ b/test cases/unit/55 introspect buildoptions/subprojects/projectBad/meson.build
diff --git a/test cases/unit/54 introspect buildoptions/subprojects/projectBad/meson_options.txt b/test cases/unit/55 introspect buildoptions/subprojects/projectBad/meson_options.txt
index f15d352..f15d352 100644
--- a/test cases/unit/54 introspect buildoptions/subprojects/projectBad/meson_options.txt
+++ b/test cases/unit/55 introspect buildoptions/subprojects/projectBad/meson_options.txt
diff --git a/test cases/unit/55 dedup compiler libs/app/app.c b/test cases/unit/56 dedup compiler libs/app/app.c
index 4e215b3..4e215b3 100644
--- a/test cases/unit/55 dedup compiler libs/app/app.c
+++ b/test cases/unit/56 dedup compiler libs/app/app.c
diff --git a/test cases/unit/55 dedup compiler libs/app/meson.build b/test cases/unit/56 dedup compiler libs/app/meson.build
index 82ac306..82ac306 100644
--- a/test cases/unit/55 dedup compiler libs/app/meson.build
+++ b/test cases/unit/56 dedup compiler libs/app/meson.build
diff --git a/test cases/unit/55 dedup compiler libs/liba/liba.c b/test cases/unit/56 dedup compiler libs/liba/liba.c
index 962d47f..962d47f 100644
--- a/test cases/unit/55 dedup compiler libs/liba/liba.c
+++ b/test cases/unit/56 dedup compiler libs/liba/liba.c
diff --git a/test cases/unit/55 dedup compiler libs/liba/liba.h b/test cases/unit/56 dedup compiler libs/liba/liba.h
index a980cdc..a980cdc 100644
--- a/test cases/unit/55 dedup compiler libs/liba/liba.h
+++ b/test cases/unit/56 dedup compiler libs/liba/liba.h
diff --git a/test cases/unit/55 dedup compiler libs/liba/meson.build b/test cases/unit/56 dedup compiler libs/liba/meson.build
index eccfa46..eccfa46 100644
--- a/test cases/unit/55 dedup compiler libs/liba/meson.build
+++ b/test cases/unit/56 dedup compiler libs/liba/meson.build
diff --git a/test cases/unit/55 dedup compiler libs/libb/libb.c b/test cases/unit/56 dedup compiler libs/libb/libb.c
index 3720868..3720868 100644
--- a/test cases/unit/55 dedup compiler libs/libb/libb.c
+++ b/test cases/unit/56 dedup compiler libs/libb/libb.c
diff --git a/test cases/unit/55 dedup compiler libs/libb/libb.h b/test cases/unit/56 dedup compiler libs/libb/libb.h
index 2e4ddd0..2e4ddd0 100644
--- a/test cases/unit/55 dedup compiler libs/libb/libb.h
+++ b/test cases/unit/56 dedup compiler libs/libb/libb.h
diff --git a/test cases/unit/55 dedup compiler libs/libb/meson.build b/test cases/unit/56 dedup compiler libs/libb/meson.build
index d59206f..d59206f 100644
--- a/test cases/unit/55 dedup compiler libs/libb/meson.build
+++ b/test cases/unit/56 dedup compiler libs/libb/meson.build
diff --git a/test cases/unit/55 dedup compiler libs/meson.build b/test cases/unit/56 dedup compiler libs/meson.build
index fad0ed5..fad0ed5 100644
--- a/test cases/unit/55 dedup compiler libs/meson.build
+++ b/test cases/unit/56 dedup compiler libs/meson.build
diff --git a/test cases/unit/55 introspection/meson.build b/test cases/unit/57 introspection/meson.build
index 7589f3f..7589f3f 100644
--- a/test cases/unit/55 introspection/meson.build
+++ b/test cases/unit/57 introspection/meson.build
diff --git a/test cases/unit/55 introspection/meson_options.txt b/test cases/unit/57 introspection/meson_options.txt
index fc5cb4d..fc5cb4d 100644
--- a/test cases/unit/55 introspection/meson_options.txt
+++ b/test cases/unit/57 introspection/meson_options.txt
diff --git a/test cases/unit/55 introspection/sharedlib/meson.build b/test cases/unit/57 introspection/sharedlib/meson.build
index 3de3493..3de3493 100644
--- a/test cases/unit/55 introspection/sharedlib/meson.build
+++ b/test cases/unit/57 introspection/sharedlib/meson.build
diff --git a/test cases/unit/55 introspection/sharedlib/shared.cpp b/test cases/unit/57 introspection/sharedlib/shared.cpp
index 5030ab7..5030ab7 100644
--- a/test cases/unit/55 introspection/sharedlib/shared.cpp
+++ b/test cases/unit/57 introspection/sharedlib/shared.cpp
diff --git a/test cases/unit/55 introspection/sharedlib/shared.hpp b/test cases/unit/57 introspection/sharedlib/shared.hpp
index dc9b2da..dc9b2da 100644
--- a/test cases/unit/55 introspection/sharedlib/shared.hpp
+++ b/test cases/unit/57 introspection/sharedlib/shared.hpp
diff --git a/test cases/unit/55 introspection/staticlib/meson.build b/test cases/unit/57 introspection/staticlib/meson.build
index b1b9afe..b1b9afe 100644
--- a/test cases/unit/55 introspection/staticlib/meson.build
+++ b/test cases/unit/57 introspection/staticlib/meson.build
diff --git a/test cases/unit/55 introspection/staticlib/static.c b/test cases/unit/57 introspection/staticlib/static.c
index 37ebc0d..37ebc0d 100644
--- a/test cases/unit/55 introspection/staticlib/static.c
+++ b/test cases/unit/57 introspection/staticlib/static.c
diff --git a/test cases/unit/55 introspection/staticlib/static.h b/test cases/unit/57 introspection/staticlib/static.h
index 506784e..506784e 100644
--- a/test cases/unit/55 introspection/staticlib/static.h
+++ b/test cases/unit/57 introspection/staticlib/static.h
diff --git a/test cases/unit/55 introspection/t1.cpp b/test cases/unit/57 introspection/t1.cpp
index 2bcaab8..2bcaab8 100644
--- a/test cases/unit/55 introspection/t1.cpp
+++ b/test cases/unit/57 introspection/t1.cpp
diff --git a/test cases/unit/55 introspection/t2.cpp b/test cases/unit/57 introspection/t2.cpp
index fee5097..fee5097 100644
--- a/test cases/unit/55 introspection/t2.cpp
+++ b/test cases/unit/57 introspection/t2.cpp
diff --git a/test cases/unit/55 introspection/t3.cpp b/test cases/unit/57 introspection/t3.cpp
index 8a906e0..8a906e0 100644
--- a/test cases/unit/55 introspection/t3.cpp
+++ b/test cases/unit/57 introspection/t3.cpp
diff --git a/test cases/unit/55 pkg_config_path option/build_extra_path/totally_made_up_dep.pc b/test cases/unit/58 pkg_config_path option/build_extra_path/totally_made_up_dep.pc
index 5b149f6..5b149f6 100644
--- a/test cases/unit/55 pkg_config_path option/build_extra_path/totally_made_up_dep.pc
+++ b/test cases/unit/58 pkg_config_path option/build_extra_path/totally_made_up_dep.pc
diff --git a/test cases/unit/55 pkg_config_path option/host_extra_path/totally_made_up_dep.pc b/test cases/unit/58 pkg_config_path option/host_extra_path/totally_made_up_dep.pc
index 6d08687..6d08687 100644
--- a/test cases/unit/55 pkg_config_path option/host_extra_path/totally_made_up_dep.pc
+++ b/test cases/unit/58 pkg_config_path option/host_extra_path/totally_made_up_dep.pc
diff --git a/test cases/unit/55 pkg_config_path option/meson.build b/test cases/unit/58 pkg_config_path option/meson.build
index f9ceead..f9ceead 100644
--- a/test cases/unit/55 pkg_config_path option/meson.build
+++ b/test cases/unit/58 pkg_config_path option/meson.build
diff --git a/test cases/unit/56 introspect buildoptions/c_compiler.py b/test cases/unit/59 introspect buildoptions/c_compiler.py
index c7241e7..c7241e7 100644
--- a/test cases/unit/56 introspect buildoptions/c_compiler.py
+++ b/test cases/unit/59 introspect buildoptions/c_compiler.py
diff --git a/test cases/unit/56 introspect buildoptions/main.c b/test cases/unit/59 introspect buildoptions/main.c
index ef99ae6..ef99ae6 100644
--- a/test cases/unit/56 introspect buildoptions/main.c
+++ b/test cases/unit/59 introspect buildoptions/main.c
diff --git a/test cases/unit/56 introspect buildoptions/meson.build b/test cases/unit/59 introspect buildoptions/meson.build
index 8052b5f..8052b5f 100644
--- a/test cases/unit/56 introspect buildoptions/meson.build
+++ b/test cases/unit/59 introspect buildoptions/meson.build
diff --git a/test cases/unit/56 introspect buildoptions/meson_options.txt b/test cases/unit/59 introspect buildoptions/meson_options.txt
index 61f9a8d..61f9a8d 100644
--- a/test cases/unit/56 introspect buildoptions/meson_options.txt
+++ b/test cases/unit/59 introspect buildoptions/meson_options.txt
diff --git a/test cases/unit/56 introspect buildoptions/subprojects/evilFile.txt b/test cases/unit/59 introspect buildoptions/subprojects/evilFile.txt
index e69de29..e69de29 100644
--- a/test cases/unit/56 introspect buildoptions/subprojects/evilFile.txt
+++ b/test cases/unit/59 introspect buildoptions/subprojects/evilFile.txt
diff --git a/test cases/unit/56 introspect buildoptions/subprojects/projectA/meson.build b/test cases/unit/59 introspect buildoptions/subprojects/projectA/meson.build
index 1ab9ee8..1ab9ee8 100644
--- a/test cases/unit/56 introspect buildoptions/subprojects/projectA/meson.build
+++ b/test cases/unit/59 introspect buildoptions/subprojects/projectA/meson.build
diff --git a/test cases/unit/56 introspect buildoptions/subprojects/projectA/meson_options.txt b/test cases/unit/59 introspect buildoptions/subprojects/projectA/meson_options.txt
index fa77f95..fa77f95 100644
--- a/test cases/unit/56 introspect buildoptions/subprojects/projectA/meson_options.txt
+++ b/test cases/unit/59 introspect buildoptions/subprojects/projectA/meson_options.txt
diff --git a/test cases/unit/56 introspect buildoptions/subprojects/projectBad/meson.build b/test cases/unit/59 introspect buildoptions/subprojects/projectBad/meson.build
index 500c1b9..500c1b9 100644
--- a/test cases/unit/56 introspect buildoptions/subprojects/projectBad/meson.build
+++ b/test cases/unit/59 introspect buildoptions/subprojects/projectBad/meson.build
diff --git a/test cases/unit/56 introspect buildoptions/subprojects/projectBad/meson_options.txt b/test cases/unit/59 introspect buildoptions/subprojects/projectBad/meson_options.txt
index f15d352..f15d352 100644
--- a/test cases/unit/56 introspect buildoptions/subprojects/projectBad/meson_options.txt
+++ b/test cases/unit/59 introspect buildoptions/subprojects/projectBad/meson_options.txt
diff --git a/test cases/unit/57 native file override/crossfile b/test cases/unit/60 native file override/crossfile
index 9dc4fbc..9dc4fbc 100644
--- a/test cases/unit/57 native file override/crossfile
+++ b/test cases/unit/60 native file override/crossfile
diff --git a/test cases/unit/57 native file override/crossfile2 b/test cases/unit/60 native file override/crossfile2
index 70946c9..70946c9 100644
--- a/test cases/unit/57 native file override/crossfile2
+++ b/test cases/unit/60 native file override/crossfile2
diff --git a/test cases/unit/57 native file override/meson.build b/test cases/unit/60 native file override/meson.build
index 8318aba..8318aba 100644
--- a/test cases/unit/57 native file override/meson.build
+++ b/test cases/unit/60 native file override/meson.build
diff --git a/test cases/unit/57 native file override/meson_options.txt b/test cases/unit/60 native file override/meson_options.txt
index 4d2abf9..4d2abf9 100644
--- a/test cases/unit/57 native file override/meson_options.txt
+++ b/test cases/unit/60 native file override/meson_options.txt
diff --git a/test cases/unit/57 native file override/nativefile b/test cases/unit/60 native file override/nativefile
index a390725..a390725 100644
--- a/test cases/unit/57 native file override/nativefile
+++ b/test cases/unit/60 native file override/nativefile
diff --git a/test cases/unit/58 identity cross/build_wrapper.py b/test cases/unit/61 identity cross/build_wrapper.py
index 22e8b5d..22e8b5d 100755
--- a/test cases/unit/58 identity cross/build_wrapper.py
+++ b/test cases/unit/61 identity cross/build_wrapper.py
diff --git a/test cases/unit/58 identity cross/host_wrapper.py b/test cases/unit/61 identity cross/host_wrapper.py
index 5b4eed8..5b4eed8 100755
--- a/test cases/unit/58 identity cross/host_wrapper.py
+++ b/test cases/unit/61 identity cross/host_wrapper.py
diff --git a/test cases/unit/58 identity cross/meson.build b/test cases/unit/61 identity cross/meson.build
index 950137a..950137a 100644
--- a/test cases/unit/58 identity cross/meson.build
+++ b/test cases/unit/61 identity cross/meson.build
diff --git a/test cases/unit/58 identity cross/stuff.h b/test cases/unit/61 identity cross/stuff.h
index 62f1cc9..62f1cc9 100644
--- a/test cases/unit/58 identity cross/stuff.h
+++ b/test cases/unit/61 identity cross/stuff.h
diff --git a/test cases/unit/58 pkgconfig relative paths/pkgconfig/librelativepath.pc b/test cases/unit/62 pkgconfig relative paths/pkgconfig/librelativepath.pc
index dae1eed..dae1eed 100644
--- a/test cases/unit/58 pkgconfig relative paths/pkgconfig/librelativepath.pc
+++ b/test cases/unit/62 pkgconfig relative paths/pkgconfig/librelativepath.pc
diff --git a/test cases/unit/59 test env doesn't stack/meson.build b/test cases/unit/63 test env does not stack/meson.build
index 01f2637..01f2637 100644
--- a/test cases/unit/59 test env doesn't stack/meson.build
+++ b/test cases/unit/63 test env does not stack/meson.build
diff --git a/test cases/unit/59 test env doesn't stack/script.py b/test cases/unit/63 test env does not stack/script.py
index 2a76673..2a76673 100755
--- a/test cases/unit/59 test env doesn't stack/script.py
+++ b/test cases/unit/63 test env does not stack/script.py
diff --git a/test cases/unit/60 cmake_prefix_path/meson.build b/test cases/unit/64 cmake_prefix_path/meson.build
index 442bbd3..442bbd3 100644
--- a/test cases/unit/60 cmake_prefix_path/meson.build
+++ b/test cases/unit/64 cmake_prefix_path/meson.build
diff --git a/test cases/unit/60 cmake_prefix_path/prefix/lib/cmake/mesontest/mesontest-config.cmake b/test cases/unit/64 cmake_prefix_path/prefix/lib/cmake/mesontest/mesontest-config.cmake
index 289b349..289b349 100644
--- a/test cases/unit/60 cmake_prefix_path/prefix/lib/cmake/mesontest/mesontest-config.cmake
+++ b/test cases/unit/64 cmake_prefix_path/prefix/lib/cmake/mesontest/mesontest-config.cmake
diff --git a/test cases/unit/61 cmake parser/meson.build b/test cases/unit/65 cmake parser/meson.build
index 62b9124..62b9124 100644
--- a/test cases/unit/61 cmake parser/meson.build
+++ b/test cases/unit/65 cmake parser/meson.build
diff --git a/test cases/unit/61 cmake parser/prefix/lib/cmake/mesontest/mesontest-config.cmake b/test cases/unit/65 cmake parser/prefix/lib/cmake/mesontest/mesontest-config.cmake
index 7474eb7..7474eb7 100644
--- a/test cases/unit/61 cmake parser/prefix/lib/cmake/mesontest/mesontest-config.cmake
+++ b/test cases/unit/65 cmake parser/prefix/lib/cmake/mesontest/mesontest-config.cmake
diff --git a/test cases/unit/62 alias target/main.c b/test cases/unit/66 alias target/main.c
index 0fb4389..0fb4389 100644
--- a/test cases/unit/62 alias target/main.c
+++ b/test cases/unit/66 alias target/main.c
diff --git a/test cases/unit/62 alias target/meson.build b/test cases/unit/66 alias target/meson.build
index 6934cc7..6934cc7 100644
--- a/test cases/unit/62 alias target/meson.build
+++ b/test cases/unit/66 alias target/meson.build