Condense test directory names again.dircondense2

1076 files changed, 74 insertions, 74 deletions

diff --git a/run_unittests.py b/run_unittests.py
index 85292d137..f0c2f6547 100755
--- a/run_unittests.py
+++ b/run_unittests.py
@@ -1932,7 +1932,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, '90 default options')
+        testdir = os.path.join(self.common_test_dir, '88 default options')
         self.init(testdir, default_args=False)
         opts = self.introspect('--buildoptions')
         for opt in opts:
@@ -2010,7 +2010,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, '90 default options')
+        testdir = os.path.join(self.common_test_dir, '88 default options')
         # on Windows, /someabs is *not* an absolute path
         prefix = 'x:/someabs' if is_windows() else '/someabs'
         libdir = 'libdir'
@@ -2108,7 +2108,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, '168 default options prefix dependent defaults')
+        testdir = os.path.join(self.common_test_dir, '164 default options prefix dependent defaults')
         expected = {
             '':
             {'prefix':         '/usr',
@@ -2211,7 +2211,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, '54 run target')
+        testdir = os.path.join(self.common_test_dir, '52 run target')
         self.init(testdir)
         self.run_target('check_exists')
 
@@ -2235,7 +2235,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, '62 install subdir')
+        testdir = os.path.join(self.common_test_dir, '60 install subdir')
         self.init(testdir)
         intro = self.introspect('--installed')
         expected = {
@@ -2268,7 +2268,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, '144 custom target multiple outputs')
+        testdir = os.path.join(self.common_test_dir, '141 custom target multiple outputs')
         self.init(testdir)
         intro = self.introspect('--targets')
         if intro[0]['type'] == 'executable':
@@ -2284,7 +2284,7 @@ class AllPlatformTests(BasePlatformTests):
         Specifically checks that the log file only contains one entry per file/directory.
         https://github.com/mesonbuild/meson/issues/4499
         '''
-        testdir = os.path.join(self.common_test_dir, '62 install subdir')
+        testdir = os.path.join(self.common_test_dir, '60 install subdir')
         self.init(testdir)
         self.install()
         installpath = Path(self.installdir)
@@ -2481,7 +2481,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, '133 build by default')
+        testdir = os.path.join(self.common_test_dir, '130 build by default')
         self.init(testdir)
         self.build()
         genfile1 = os.path.join(self.builddir, 'generated1.dat')
@@ -2501,7 +2501,7 @@ class AllPlatformTests(BasePlatformTests):
         if mesonbuild.environment.detect_msys2_arch() and ('MESON_RSP_THRESHOLD' in os.environ):
             raise unittest.SkipTest('Test does not yet support gcc rsp files on msys2')
 
-        testdir = os.path.join(self.common_test_dir, '134 include order')
+        testdir = os.path.join(self.common_test_dir, '131 include order')
         self.init(testdir)
         execmd = fxecmd = None
         for cmd in self.get_compdb():
@@ -2687,7 +2687,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, '137 c cpp and asm')
+        testdir = os.path.join(self.common_test_dir, '134 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':
@@ -2757,7 +2757,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, '136 get define')
+        testdir = os.path.join(self.common_test_dir, '133 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
@@ -2772,7 +2772,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, '113 custom target capture')
+        testdir = os.path.join(self.common_test_dir, '110 custom target capture')
         self.init(testdir)
         meson_exe_dat1 = glob(os.path.join(self.privatedir, 'meson_exe*.dat'))
         self.wipe()
@@ -2818,7 +2818,7 @@ class AllPlatformTests(BasePlatformTests):
         ExternalProgram, and any File objects on the command-line cause
         a rebuild.
         '''
-        testdir = os.path.join(self.common_test_dir, '60 custom header generator')
+        testdir = os.path.join(self.common_test_dir, '58 custom header generator')
         self.init(testdir)
         self.build()
         # Immediately rebuilding should not do anything
@@ -2833,7 +2833,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, '94 gen extra')
+        testdir = os.path.join(self.common_test_dir, '91 gen extra')
         self.init(testdir)
         self.build()
         # Immediately rebuilding should not do anything
@@ -3004,7 +3004,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, '42 library chain')
+        testdir = os.path.join(self.common_test_dir, '40 library chain')
         self.init(testdir)
         self.build()
         for each in ('prog', 'subdir/liblib1.so', ):
@@ -3040,10 +3040,10 @@ int main(int argc, char **argv) {
 
     def test_all_forbidden_targets_tested(self):
         '''
-        Test that all forbidden targets are tested in the '154 reserved targets'
+        Test that all forbidden targets are tested in the '151 reserved targets'
         test. Needs to be a unit test because it accesses Meson internals.
         '''
-        testdir = os.path.join(self.common_test_dir, '154 reserved targets')
+        testdir = os.path.join(self.common_test_dir, '151 reserved targets')
         targets = mesonbuild.coredata.FORBIDDEN_TARGET_NAMES
         # We don't actually define a target with this name
         targets.pop('build.ninja')
@@ -3216,7 +3216,7 @@ int main(int argc, char **argv) {
     @skipIfNoPkgconfig
     @mock.patch.dict(os.environ)
     def test_pkgconfig_gen_escaping(self):
-        testdir = os.path.join(self.common_test_dir, '47 pkgconfig-gen')
+        testdir = os.path.join(self.common_test_dir, '45 pkgconfig-gen')
         prefix = '/usr/with spaces'
         libdir = 'lib'
         self.init(testdir, extra_args=['--prefix=' + prefix,
@@ -3320,7 +3320,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, '43 options')
+        testdir = os.path.join(self.common_test_dir, '41 options')
         self.init(testdir)
         self.opt_has('free_array_opt', [])
         self.setconf('-Dfree_array_opt=foo,bar', will_build=False)
@@ -3339,7 +3339,7 @@ int main(int argc, char **argv) {
 
     def test_options_with_choices_changing(self) -> None:
         """Detect when options like arrays or combos have their choices change."""
-        testdir = Path(os.path.join(self.unit_test_dir, '84 change option choices'))
+        testdir = Path(os.path.join(self.unit_test_dir, '85 change option choices'))
         options1 = str(testdir / 'meson_options.1.txt')
         options2 = str(testdir / 'meson_options.2.txt')
 
@@ -3580,7 +3580,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, '177 identical target name in subproject flat layout')
+        testdir = os.path.join(self.common_test_dir, '173 identical target name in subproject flat layout')
         self.init(testdir, extra_args=['--layout=flat'])
         self.build()
 
@@ -3589,7 +3589,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, '186 same target name flat layout')
+        testdir = os.path.join(self.common_test_dir, '182 same target name flat layout')
         self.init(testdir, extra_args=['--layout=flat'])
         self.build()
 
@@ -3872,7 +3872,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, '214 warning level 0')
+        testdir = os.path.join(self.common_test_dir, '208 warning level 0')
 
         # Verify default values when passing no args
         self.init(testdir)
@@ -4114,7 +4114,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, '161 custom target subdir depend files')
+        testdir = os.path.join(self.common_test_dir, '158 custom target subdir depend files')
         self.init(testdir)
         self.__reconfigure()
 
@@ -4149,21 +4149,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, '35 run program', 'meson.build')
+        testfile = os.path.join(self.common_test_dir, '34 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, '43 options', 'meson.build')
+        testfile = os.path.join(self.common_test_dir, '41 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, '46 subproject options', 'meson.build')
+        testfile = os.path.join(self.common_test_dir, '44 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')
@@ -4176,7 +4176,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, '102 subproject subdir')
+        testdir = os.path.join(self.common_test_dir, '99 subproject subdir')
         self.init(testdir)
         res = self.introspect('--projectinfo')
         expected = {
@@ -4215,7 +4215,7 @@ recommended as it is not supported on some platforms''')
         self.assertDictEqual(expected, res)
 
     def test_introspection_target_subproject(self):
-        testdir = os.path.join(self.common_test_dir, '45 subproject')
+        testdir = os.path.join(self.common_test_dir, '43 subproject')
         self.init(testdir)
         res = self.introspect('--targets')
 
@@ -4230,14 +4230,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, '78 custom subproject dir')
+        testdir = os.path.join(self.common_test_dir, '76 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, '78 custom subproject dir', 'meson.build')
+        testfile = os.path.join(self.common_test_dir, '76 custom subproject dir', 'meson.build')
         res = self.introspect_directory(testfile, '--projectinfo')
 
         self.assertEqual(res['subproject_dir'], 'custom_subproject_dir')
@@ -4309,7 +4309,7 @@ recommended as it is not supported on some platforms''')
         self._run(self.mconf_command + [testdir])
 
     def test_introspect_buildoptions_cross_only(self):
-        testdir = os.path.join(self.unit_test_dir, '83 cross only introspect')
+        testdir = os.path.join(self.unit_test_dir, '84 cross only introspect')
         testfile = os.path.join(testdir, 'meson.build')
         res = self.introspect_directory(testfile, ['--buildoptions'] + self.meson_args)
         optnames = [o['name'] for o in res]
@@ -4854,7 +4854,7 @@ recommended as it is not supported on some platforms''')
 
         # Target specified in a project with non unique names
 
-        testdir = os.path.join(self.common_test_dir, '190 same target name')
+        testdir = os.path.join(self.common_test_dir, '186 same target name')
         self.init(testdir, extra_args=['--wipe'])
         self._run([*self.meson_command, 'compile', '-C', self.builddir, './foo'])
         self.assertPathExists(os.path.join(self.builddir, get_static_lib_name('foo')))
@@ -4863,7 +4863,7 @@ recommended as it is not supported on some platforms''')
 
         # run_target
 
-        testdir = os.path.join(self.common_test_dir, '54 run target')
+        testdir = os.path.join(self.common_test_dir, '52 run target')
         self.init(testdir, extra_args=['--wipe'])
         out = self._run([*self.meson_command, 'compile', '-C', self.builddir, 'py3hi'])
         self.assertIn('I am Python3.', out)
@@ -4930,10 +4930,10 @@ recommended as it is not supported on some platforms''')
             self.fail(e.error_log)
 
     def test_junit_valid_tap(self):
-        self._test_junit(os.path.join(self.common_test_dir, '213 tap tests'))
+        self._test_junit(os.path.join(self.common_test_dir, '207 tap tests'))
 
     def test_junit_valid_exitcode(self):
-        self._test_junit(os.path.join(self.common_test_dir, '44 test args'))
+        self._test_junit(os.path.join(self.common_test_dir, '42 test args'))
 
     def test_junit_valid_gtest(self):
         self._test_junit(os.path.join(self.framework_test_dir, '2 gtest'))
@@ -4944,7 +4944,7 @@ recommended as it is not supported on some platforms''')
         if self.backend is not Backend.ninja:
             raise unittest.SkipTest('This test reads the ninja file')
 
-        testdir = os.path.join(self.common_test_dir, '232 link language')
+        testdir = os.path.join(self.common_test_dir, '226 link language')
         self.init(testdir)
 
         build_ninja = os.path.join(self.builddir, 'build.ninja')
@@ -5042,7 +5042,7 @@ recommended as it is not supported on some platforms''')
         gcovr_exe, gcovr_new_rootdir = mesonbuild.environment.detect_gcovr()
         if not gcovr_exe:
             raise unittest.SkipTest('gcovr not found, or too old')
-        testdir = os.path.join(self.common_test_dir, '109 generatorcustom')
+        testdir = os.path.join(self.common_test_dir, '106 generatorcustom')
         env = get_fake_env(testdir, self.builddir, self.prefix)
         cc = env.detect_c_compiler(MachineChoice.HOST)
         if cc.get_id() == 'clang':
@@ -5150,7 +5150,7 @@ recommended as it is not supported on some platforms''')
     def test_wrap_git(self):
         with tempfile.TemporaryDirectory() as tmpdir:
             srcdir = os.path.join(tmpdir, 'src')
-            shutil.copytree(os.path.join(self.unit_test_dir, '81 wrap-git'), srcdir)
+            shutil.copytree(os.path.join(self.unit_test_dir, '82 wrap-git'), srcdir)
             upstream = os.path.join(srcdir, 'subprojects', 'wrap_git_upstream')
             upstream_uri = Path(upstream).as_uri()
             _git_init(upstream)
@@ -5166,7 +5166,7 @@ recommended as it is not supported on some platforms''')
             self.run_tests()
 
     def test_multi_output_custom_target_no_warning(self):
-        testdir = os.path.join(self.common_test_dir, '235 custom_target source')
+        testdir = os.path.join(self.common_test_dir, '229 custom_target source')
 
         out = self.init(testdir)
         self.assertNotRegex(out, 'WARNING:.*Using the first one.')
@@ -5197,7 +5197,7 @@ recommended as it is not supported on some platforms''')
         self.build()
 
     def test_meson_version_compare(self):
-        testdir = os.path.join(self.unit_test_dir, '82 meson version compare')
+        testdir = os.path.join(self.unit_test_dir, '83 meson version compare')
         out = self.init(testdir)
         self.assertNotRegex(out, r'WARNING')
 
@@ -5252,7 +5252,7 @@ recommended as it is not supported on some platforms''')
         # This checks a bug where if a non-meson project is used as a third
         # level (or deeper) subproject it doesn't cause a rebuild if the build
         # files for that project are changed
-        testdir = os.path.join(self.unit_test_dir, '85 nested subproject regenerate depends')
+        testdir = os.path.join(self.unit_test_dir, '86 nested subproject regenerate depends')
         cmakefile = Path(testdir) / 'subprojects' / 'sub2' / 'CMakeLists.txt'
         self.init(testdir)
         self.build()
@@ -5940,7 +5940,7 @@ class DarwinTests(BasePlatformTests):
         '''
         Same as above, just for shared_module()
         '''
-        testdir = os.path.join(self.common_test_dir, '152 shared module resolving symbol in executable')
+        testdir = os.path.join(self.common_test_dir, '149 shared module resolving symbol in executable')
         # Ensure that it builds even with bitcode enabled
         self.init(testdir, extra_args='-Db_bitcode=true')
         self.build()
@@ -5986,7 +5986,7 @@ class DarwinTests(BasePlatformTests):
         self.install()
 
     def test_removing_unused_linker_args(self):
-        testdir = os.path.join(self.common_test_dir, '108 has arg')
+        testdir = os.path.join(self.common_test_dir, '105 has arg')
         env = {'CFLAGS': '-L/tmp -L /var/tmp -headerpad_max_install_names -Wl,-export_dynamic -framework Foundation'}
         self.init(testdir, override_envvars=env)
 
@@ -6052,7 +6052,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, '47 pkgconfig-gen')
+        testdir = os.path.join(self.common_test_dir, '45 pkgconfig-gen')
         self.init(testdir)
         env = get_fake_env(testdir, self.builddir, self.prefix)
         kwargs = {'required': True, 'silent': True}
@@ -6074,12 +6074,12 @@ class LinuxlikeTests(BasePlatformTests):
         '''
         Test that generated pkg-config files correctly handle dependencies
         '''
-        testdir = os.path.join(self.common_test_dir, '47 pkgconfig-gen')
+        testdir = os.path.join(self.common_test_dir, '45 pkgconfig-gen')
         self.init(testdir)
         privatedir1 = self.privatedir
 
         self.new_builddir()
-        testdir = os.path.join(self.common_test_dir, '47 pkgconfig-gen', 'dependencies')
+        testdir = os.path.join(self.common_test_dir, '45 pkgconfig-gen', 'dependencies')
         self.init(testdir, override_envvars={'PKG_CONFIG_LIBDIR': privatedir1})
         privatedir2 = self.privatedir
 
@@ -6130,7 +6130,7 @@ class LinuxlikeTests(BasePlatformTests):
         out = self._run(cmd + ['--libs'], override_envvars=env).strip().split()
         self.assertEqual(out, ['-llibmain2', '-llibinternal'])
 
-        # See common/47 pkgconfig-gen/meson.build for description of the case this test
+        # See common/45 pkgconfig-gen/meson.build for description of the case this test
         with open(os.path.join(privatedir1, 'simple2.pc')) as f:
             content = f.read()
             self.assertIn('Libs: -L${libdir} -lsimple2 -lsimple1', content)
@@ -6146,7 +6146,7 @@ class LinuxlikeTests(BasePlatformTests):
 
     @mock.patch.dict(os.environ)
     def test_pkgconfig_uninstalled(self):
-        testdir = os.path.join(self.common_test_dir, '47 pkgconfig-gen')
+        testdir = os.path.join(self.common_test_dir, '45 pkgconfig-gen')
         self.init(testdir)
         self.build()
 
@@ -6155,7 +6155,7 @@ class LinuxlikeTests(BasePlatformTests):
             os.environ['PATH'] += os.pathsep + self.builddir
 
         self.new_builddir()
-        testdir = os.path.join(self.common_test_dir, '47 pkgconfig-gen', 'dependencies')
+        testdir = os.path.join(self.common_test_dir, '45 pkgconfig-gen', 'dependencies')
         self.init(testdir)
         self.build()
         self.run_tests()
@@ -6316,7 +6316,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, '39 has function')
+        testdir = os.path.join(self.common_test_dir, '37 has function')
         env = get_fake_env(testdir, self.builddir, self.prefix)
         cpp = env.detect_cpp_compiler(MachineChoice.HOST)
         Oflag = '-O3'
@@ -6333,7 +6333,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 '39 has function' test case
+            # This is set in the '37 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')]
@@ -6420,7 +6420,7 @@ class LinuxlikeTests(BasePlatformTests):
         self._test_stds_impl(testdir, cpp, 'cpp')
 
     def test_unity_subproj(self):
-        testdir = os.path.join(self.common_test_dir, '45 subproject')
+        testdir = os.path.join(self.common_test_dir, '43 subproject')
         self.init(testdir, extra_args='--unity=subprojects')
         pdirs = glob(os.path.join(self.builddir, 'subprojects/sublib/simpletest*.p'))
         self.assertEqual(len(pdirs), 1)
@@ -6471,7 +6471,7 @@ class LinuxlikeTests(BasePlatformTests):
 
         self.wipe()
         # Test directory modes
-        testdir = os.path.join(self.common_test_dir, '62 install subdir')
+        testdir = os.path.join(self.common_test_dir, '60 install subdir')
         self.init(testdir)
         self.install()
 
@@ -6488,7 +6488,7 @@ class LinuxlikeTests(BasePlatformTests):
         '''
         Test that files are installed with correct permissions using install_mode.
         '''
-        testdir = os.path.join(self.common_test_dir, '195 install_mode')
+        testdir = os.path.join(self.common_test_dir, '191 install_mode')
         self.init(testdir)
         self.build()
         self.install()
@@ -6769,7 +6769,7 @@ class LinuxlikeTests(BasePlatformTests):
         if is_osx():
             raise unittest.SkipTest('Global RPATHs via LDFLAGS not yet supported on MacOS (does anybody need it?)')
 
-        testdir = os.path.join(self.unit_test_dir, '80 global-rpath')
+        testdir = os.path.join(self.unit_test_dir, '81 global-rpath')
         oldinstalldir = self.installdir
 
         # Build and install an external library without DESTDIR.
@@ -7068,7 +7068,7 @@ class LinuxlikeTests(BasePlatformTests):
         '''
         Test that we produce the correct dependencies when a program is overridden with an executable.
         '''
-        testdir = os.path.join(self.src_root, 'test cases', 'native', '201 override with exe')
+        testdir = os.path.join(self.src_root, 'test cases', 'native', '9 override with exe')
         self.init(testdir)
         with open(os.path.join(self.builddir, 'build.ninja')) as bfile:
             for line in bfile:
@@ -7142,7 +7142,7 @@ class LinuxlikeTests(BasePlatformTests):
         oldinstalldir = self.installdir
 
         # Build and install both external libraries without DESTDIR
-        val1dir = os.path.join(self.unit_test_dir, '77 pkgconfig prefixes', 'val1')
+        val1dir = os.path.join(self.unit_test_dir, '76 pkgconfig prefixes', 'val1')
         val1prefix = os.path.join(oldinstalldir, 'val1')
         self.prefix = val1prefix
         self.installdir = val1prefix
@@ -7153,7 +7153,7 @@ class LinuxlikeTests(BasePlatformTests):
 
         env1 = {}
         env1['PKG_CONFIG_PATH'] = os.path.join(val1prefix, self.libdir, 'pkgconfig')
-        val2dir = os.path.join(self.unit_test_dir, '77 pkgconfig prefixes', 'val2')
+        val2dir = os.path.join(self.unit_test_dir, '76 pkgconfig prefixes', 'val2')
         val2prefix = os.path.join(oldinstalldir, 'val2')
         self.prefix = val2prefix
         self.installdir = val2prefix
@@ -7165,7 +7165,7 @@ class LinuxlikeTests(BasePlatformTests):
         # Build, install, and run the client program
         env2 = {}
         env2['PKG_CONFIG_PATH'] = os.path.join(val2prefix, self.libdir, 'pkgconfig')
-        testdir = os.path.join(self.unit_test_dir, '77 pkgconfig prefixes', 'client')
+        testdir = os.path.join(self.unit_test_dir, '76 pkgconfig prefixes', 'client')
         testprefix = os.path.join(oldinstalldir, 'client')
         self.prefix = testprefix
         self.installdir = testprefix
@@ -7209,13 +7209,13 @@ class LinuxlikeTests(BasePlatformTests):
                 os.remove(os.path.join(subdir, 'invalid-symlink.txt'))
 
     def test_install_subdir_symlinks(self):
-        self.install_subdir_invalid_symlinks('62 install subdir', os.path.join('sub', 'sub1'))
+        self.install_subdir_invalid_symlinks('60 install subdir', os.path.join('sub', 'sub1'))
 
     def test_install_subdir_symlinks_with_default_umask(self):
-        self.install_subdir_invalid_symlinks('195 install_mode', 'sub2')
+        self.install_subdir_invalid_symlinks('191 install_mode', 'sub2')
 
     def test_install_subdir_symlinks_with_default_umask_and_mode(self):
-        self.install_subdir_invalid_symlinks('195 install_mode', 'sub1')
+        self.install_subdir_invalid_symlinks('191 install_mode', 'sub1')
 
     @skipIfNoPkgconfigDep('gmodule-2.0')
     def test_ldflag_dedup(self):
@@ -7417,7 +7417,7 @@ c = ['{0}']
 
     def test_lookup_system_after_broken_fallback(self):
         # Just to generate libfoo.pc so we can test system dependency lookup.
-        testdir = os.path.join(self.common_test_dir, '47 pkgconfig-gen')
+        testdir = os.path.join(self.common_test_dir, '45 pkgconfig-gen')
         self.init(testdir)
         privatedir = self.privatedir
 
@@ -7435,7 +7435,7 @@ c = ['{0}']
             self.init(d, override_envvars={'PKG_CONFIG_LIBDIR': privatedir})
 
     def test_as_link_whole(self):
-        testdir = os.path.join(self.unit_test_dir, '79 as link whole')
+        testdir = os.path.join(self.unit_test_dir, '78 as link whole')
         self.init(testdir)
         with open(os.path.join(self.privatedir, 'bar1.pc')) as f:
             content = f.read()
@@ -7504,7 +7504,7 @@ class LinuxCrossArmTests(BaseLinuxCrossTests):
     def test_cross_libdir_subproject(self):
         # Guard against a regression where calling "subproject"
         # would reset the value of libdir to its default value.
-        testdir = os.path.join(self.unit_test_dir, '78 subdir libdir')
+        testdir = os.path.join(self.unit_test_dir, '77 subdir libdir')
         self.init(testdir, extra_args=['--libdir=fuf'])
         for i in self.introspect('--buildoptions'):
             if i['name'] == 'libdir':
@@ -8326,7 +8326,7 @@ class NativeFileTests(BasePlatformTests):
         self.build()
 
     def test_user_options(self):
-        testcase = os.path.join(self.common_test_dir, '43 options')
+        testcase = os.path.join(self.common_test_dir, '41 options')
         for opt, value in [('testoption', 'some other val'), ('other_one', True),
                            ('combo_opt', 'one'), ('array_opt', ['two']),
                            ('integer_opt', 0),
@@ -8338,19 +8338,19 @@ class NativeFileTests(BasePlatformTests):
                 self.assertRegex(cm.exception.stdout, r'Incorrect value to [a-z]+ option')
 
     def test_user_options_command_line_overrides(self):
-        testcase = os.path.join(self.common_test_dir, '43 options')
+        testcase = os.path.join(self.common_test_dir, '41 options')
         config = self.helper_create_native_file({'project options': {'other_one': True}})
         self.init(testcase, extra_args=['--native-file', config, '-Dother_one=false'])
 
     def test_user_options_subproject(self):
-        testcase = os.path.join(self.unit_test_dir, '79 user options for subproject')
+        testcase = os.path.join(self.unit_test_dir, '80 user options for subproject')
 
         s = os.path.join(testcase, 'subprojects')
         if not os.path.exists(s):
             os.mkdir(s)
         s = os.path.join(s, 'sub')
         if not os.path.exists(s):
-            sub = os.path.join(self.common_test_dir, '43 options')
+            sub = os.path.join(self.common_test_dir, '41 options')
             shutil.copytree(sub, s)
 
         for opt, value in [('testoption', 'some other val'), ('other_one', True),
@@ -8416,7 +8416,7 @@ class NativeFileTests(BasePlatformTests):
             self.fail('Did not find pkg_config_path in build options?')
 
     def test_builtin_options_subprojects(self):
-        testcase = os.path.join(self.common_test_dir, '102 subproject subdir')
+        testcase = os.path.join(self.common_test_dir, '99 subproject subdir')
         config = self.helper_create_native_file({'built-in options': {'default_library': 'both', 'c_args': ['-Dfoo']}, 'sub:built-in options': {'default_library': 'static'}})
 
         self.init(testcase, extra_args=['--native-file', config])
@@ -8438,7 +8438,7 @@ class NativeFileTests(BasePlatformTests):
 
     def test_builtin_options_subprojects_overrides_buildfiles(self):
         # If the buildfile says subproject(... default_library: shared), ensure that's overwritten
-        testcase = os.path.join(self.common_test_dir, '230 persubproject options')
+        testcase = os.path.join(self.common_test_dir, '224 persubproject options')
         config = self.helper_create_native_file({'sub2:built-in options': {'default_library': 'shared'}})
 
         with self.assertRaises(subprocess.CalledProcessError) as cm:
@@ -8447,7 +8447,7 @@ class NativeFileTests(BasePlatformTests):
 
     def test_builtin_options_subprojects_dont_inherits_parent_override(self):
         # If the buildfile says subproject(... default_library: shared), ensure that's overwritten
-        testcase = os.path.join(self.common_test_dir, '230 persubproject options')
+        testcase = os.path.join(self.common_test_dir, '224 persubproject options')
         config = self.helper_create_native_file({'built-in options': {'default_library': 'both'}})
         self.init(testcase, extra_args=['--native-file', config])
 
@@ -8753,7 +8753,7 @@ class CrossFileTests(BasePlatformTests):
     def test_user_options(self):
         # This is just a touch test for cross file, since the implementation
         # shares code after loading from the files
-        testcase = os.path.join(self.common_test_dir, '43 options')
+        testcase = os.path.join(self.common_test_dir, '41 options')
         config = self.helper_create_cross_file({'project options': {'testoption': 'some other value'}})
         with self.assertRaises(subprocess.CalledProcessError) as cm:
             self.init(testcase, extra_args=['--cross-file', config])
diff --git a/test cases/common/103 postconf/meson.build b/test cases/common/100 postconf/meson.build
index 12b3c5bfe..12b3c5bfe 100644
--- a/test cases/common/103 postconf/meson.build
+++ b/test cases/common/100 postconf/meson.build
diff --git a/test cases/common/103 postconf/postconf.py b/test cases/common/100 postconf/postconf.py
index 950c7064a..950c7064a 100644
--- a/test cases/common/103 postconf/postconf.py
+++ b/test cases/common/100 postconf/postconf.py
diff --git a/test cases/common/103 postconf/prog.c b/test cases/common/100 postconf/prog.c
index 85a25a300..85a25a300 100644
--- a/test cases/common/103 postconf/prog.c
+++ b/test cases/common/100 postconf/prog.c
diff --git a/test cases/common/103 postconf/raw.dat b/test cases/common/100 postconf/raw.dat
index ec635144f..ec635144f 100644
--- a/test cases/common/103 postconf/raw.dat
+++ b/test cases/common/100 postconf/raw.dat
diff --git a/test cases/common/104 postconf with args/meson.build b/test cases/common/101 postconf with args/meson.build
index a34502c33..a34502c33 100644
--- a/test cases/common/104 postconf with args/meson.build
+++ b/test cases/common/101 postconf with args/meson.build
diff --git a/test cases/common/104 postconf with args/postconf.py b/test cases/common/101 postconf with args/postconf.py
index cef7f790f..cef7f790f 100644
--- a/test cases/common/104 postconf with args/postconf.py
+++ b/test cases/common/101 postconf with args/postconf.py
diff --git a/test cases/common/104 postconf with args/prog.c b/test cases/common/101 postconf with args/prog.c
index 5db9d17df..5db9d17df 100644
--- a/test cases/common/104 postconf with args/prog.c
+++ b/test cases/common/101 postconf with args/prog.c
diff --git a/test cases/common/104 postconf with args/raw.dat b/test cases/common/101 postconf with args/raw.dat
index ec635144f..ec635144f 100644
--- a/test cases/common/104 postconf with args/raw.dat
+++ b/test cases/common/101 postconf with args/raw.dat
diff --git a/test cases/common/105 testframework options/meson.build b/test cases/common/102 testframework options/meson.build
index 827bae76a..827bae76a 100644
--- a/test cases/common/105 testframework options/meson.build
+++ b/test cases/common/102 testframework options/meson.build
diff --git a/test cases/common/105 testframework options/meson_options.txt b/test cases/common/102 testframework options/meson_options.txt
index 653dd75f9..653dd75f9 100644
--- a/test cases/common/105 testframework options/meson_options.txt
+++ b/test cases/common/102 testframework options/meson_options.txt
diff --git a/test cases/common/105 testframework options/test.json b/test cases/common/102 testframework options/test.json
index 65bf3c04f..65bf3c04f 100644
--- a/test cases/common/105 testframework options/test.json
+++ b/test cases/common/102 testframework options/test.json
diff --git a/test cases/common/106 extract same name/lib.c b/test cases/common/103 extract same name/lib.c
index f3d0417ea..f3d0417ea 100644
--- a/test cases/common/106 extract same name/lib.c
+++ b/test cases/common/103 extract same name/lib.c
diff --git a/test cases/common/106 extract same name/main.c b/test cases/common/103 extract same name/main.c
index e5a0c1eab..e5a0c1eab 100644
--- a/test cases/common/106 extract same name/main.c
+++ b/test cases/common/103 extract same name/main.c
diff --git a/test cases/common/106 extract same name/meson.build b/test cases/common/103 extract same name/meson.build
index 0bfbb4d0e..0bfbb4d0e 100644
--- a/test cases/common/106 extract same name/meson.build
+++ b/test cases/common/103 extract same name/meson.build
diff --git a/test cases/common/106 extract same name/src/lib.c b/test cases/common/103 extract same name/src/lib.c
index a7d7e77f9..a7d7e77f9 100644
--- a/test cases/common/106 extract same name/src/lib.c
+++ b/test cases/common/103 extract same name/src/lib.c
diff --git a/test cases/common/107 has header symbol/meson.build b/test cases/common/104 has header symbol/meson.build
index 54cedce1b..54cedce1b 100644
--- a/test cases/common/107 has header symbol/meson.build
+++ b/test cases/common/104 has header symbol/meson.build
diff --git a/test cases/common/108 has arg/meson.build b/test cases/common/105 has arg/meson.build
index ba0731111..ba0731111 100644
--- a/test cases/common/108 has arg/meson.build
+++ b/test cases/common/105 has arg/meson.build
diff --git a/test cases/common/109 generatorcustom/catter.py b/test cases/common/106 generatorcustom/catter.py
index 198fa98e2..198fa98e2 100755
--- a/test cases/common/109 generatorcustom/catter.py
+++ b/test cases/common/106 generatorcustom/catter.py
diff --git a/test cases/common/109 generatorcustom/gen.py b/test cases/common/106 generatorcustom/gen.py
index c1e34ed6c..c1e34ed6c 100755
--- a/test cases/common/109 generatorcustom/gen.py
+++ b/test cases/common/106 generatorcustom/gen.py
diff --git a/test cases/common/109 generatorcustom/main.c b/test cases/common/106 generatorcustom/main.c
index 4b6857d52..4b6857d52 100644
--- a/test cases/common/109 generatorcustom/main.c
+++ b/test cases/common/106 generatorcustom/main.c
diff --git a/test cases/common/109 generatorcustom/meson.build b/test cases/common/106 generatorcustom/meson.build
index b3f50bb52..b3f50bb52 100644
--- a/test cases/common/109 generatorcustom/meson.build
+++ b/test cases/common/106 generatorcustom/meson.build
diff --git a/test cases/common/109 generatorcustom/res1.txt b/test cases/common/106 generatorcustom/res1.txt
index 6487c56ba..6487c56ba 100644
--- a/test cases/common/109 generatorcustom/res1.txt
+++ b/test cases/common/106 generatorcustom/res1.txt
diff --git a/test cases/common/109 generatorcustom/res2.txt b/test cases/common/106 generatorcustom/res2.txt
index 0a8879d51..0a8879d51 100644
--- a/test cases/common/109 generatorcustom/res2.txt
+++ b/test cases/common/106 generatorcustom/res2.txt
diff --git a/test cases/common/110 multiple dir configure file/meson.build b/test cases/common/107 multiple dir configure file/meson.build
index a4615fae8..a4615fae8 100644
--- a/test cases/common/110 multiple dir configure file/meson.build
+++ b/test cases/common/107 multiple dir configure file/meson.build
diff --git a/test cases/common/110 multiple dir configure file/subdir/foo.txt b/test cases/common/107 multiple dir configure file/subdir/foo.txt
index e69de29bb..e69de29bb 100644
--- a/test cases/common/110 multiple dir configure file/subdir/foo.txt
+++ b/test cases/common/107 multiple dir configure file/subdir/foo.txt
diff --git a/test cases/common/110 multiple dir configure file/subdir/meson.build b/test cases/common/107 multiple dir configure file/subdir/meson.build
index 503df964a..503df964a 100644
--- a/test cases/common/110 multiple dir configure file/subdir/meson.build
+++ b/test cases/common/107 multiple dir configure file/subdir/meson.build
diff --git a/test cases/common/110 multiple dir configure file/subdir/someinput.in b/test cases/common/107 multiple dir configure file/subdir/someinput.in
index e69de29bb..e69de29bb 100644
--- a/test cases/common/110 multiple dir configure file/subdir/someinput.in
+++ b/test cases/common/107 multiple dir configure file/subdir/someinput.in
diff --git a/test cases/common/111 spaces backslash/asm output/meson.build b/test cases/common/108 spaces backslash/asm output/meson.build
index b5f13f5ca..b5f13f5ca 100644
--- a/test cases/common/111 spaces backslash/asm output/meson.build
+++ b/test cases/common/108 spaces backslash/asm output/meson.build
diff --git a/test cases/common/111 spaces backslash/comparer-end-notstring.c b/test cases/common/108 spaces backslash/comparer-end-notstring.c
index 8b8190ff8..8b8190ff8 100644
--- a/test cases/common/111 spaces backslash/comparer-end-notstring.c
+++ b/test cases/common/108 spaces backslash/comparer-end-notstring.c
diff --git a/test cases/common/111 spaces backslash/comparer-end.c b/test cases/common/108 spaces backslash/comparer-end.c
index 8cff1b1b1..8cff1b1b1 100644
--- a/test cases/common/111 spaces backslash/comparer-end.c
+++ b/test cases/common/108 spaces backslash/comparer-end.c
diff --git a/test cases/common/111 spaces backslash/comparer.c b/test cases/common/108 spaces backslash/comparer.c
index 7e3033e1e..7e3033e1e 100644
--- a/test cases/common/111 spaces backslash/comparer.c
+++ b/test cases/common/108 spaces backslash/comparer.c
diff --git a/test cases/common/111 spaces backslash/include/comparer.h b/test cases/common/108 spaces backslash/include/comparer.h
index 624d96c92..624d96c92 100644
--- a/test cases/common/111 spaces backslash/include/comparer.h
+++ b/test cases/common/108 spaces backslash/include/comparer.h
diff --git a/test cases/common/111 spaces backslash/meson.build b/test cases/common/108 spaces backslash/meson.build
index d5904946e..d5904946e 100644
--- a/test cases/common/111 spaces backslash/meson.build
+++ b/test cases/common/108 spaces backslash/meson.build
diff --git a/test cases/common/112 ternary/meson.build b/test cases/common/109 ternary/meson.build
index 7539d569f..7539d569f 100644
--- a/test cases/common/112 ternary/meson.build
+++ b/test cases/common/109 ternary/meson.build
diff --git a/test cases/common/113 custom target capture/data_source.txt b/test cases/common/110 custom target capture/data_source.txt
index 0c23cc0c3..0c23cc0c3 100644
--- a/test cases/common/113 custom target capture/data_source.txt
+++ b/test cases/common/110 custom target capture/data_source.txt
diff --git a/test cases/common/113 custom target capture/meson.build b/test cases/common/110 custom target capture/meson.build
index 58a69cacc..58a69cacc 100644
--- a/test cases/common/113 custom target capture/meson.build
+++ b/test cases/common/110 custom target capture/meson.build
diff --git a/test cases/common/113 custom target capture/my_compiler.py b/test cases/common/110 custom target capture/my_compiler.py
index b60722a5e..b60722a5e 100755
--- a/test cases/common/113 custom target capture/my_compiler.py
+++ b/test cases/common/110 custom target capture/my_compiler.py
diff --git a/test cases/common/113 custom target capture/test.json b/test cases/common/110 custom target capture/test.json
index ba66b024a..ba66b024a 100644
--- a/test cases/common/113 custom target capture/test.json
+++ b/test cases/common/110 custom target capture/test.json
diff --git a/test cases/common/114 allgenerate/converter.py b/test cases/common/111 allgenerate/converter.py
index f8e2ca05a..f8e2ca05a 100755
--- a/test cases/common/114 allgenerate/converter.py
+++ b/test cases/common/111 allgenerate/converter.py
diff --git a/test cases/common/114 allgenerate/foobar.cpp.in b/test cases/common/111 allgenerate/foobar.cpp.in
index 32e1261f1..32e1261f1 100644
--- a/test cases/common/114 allgenerate/foobar.cpp.in
+++ b/test cases/common/111 allgenerate/foobar.cpp.in
diff --git a/test cases/common/114 allgenerate/meson.build b/test cases/common/111 allgenerate/meson.build
index 049e8498c..049e8498c 100644
--- a/test cases/common/114 allgenerate/meson.build
+++ b/test cases/common/111 allgenerate/meson.build
diff --git a/test cases/common/115 pathjoin/meson.build b/test cases/common/112 pathjoin/meson.build
index d3957dd77..d3957dd77 100644
--- a/test cases/common/115 pathjoin/meson.build
+++ b/test cases/common/112 pathjoin/meson.build
diff --git a/test cases/common/116 subdir subproject/meson.build b/test cases/common/113 subdir subproject/meson.build
index 54ecfe07a..54ecfe07a 100644
--- a/test cases/common/116 subdir subproject/meson.build
+++ b/test cases/common/113 subdir subproject/meson.build
diff --git a/test cases/common/116 subdir subproject/prog/meson.build b/test cases/common/113 subdir subproject/prog/meson.build
index 360b5f59d..360b5f59d 100644
--- a/test cases/common/116 subdir subproject/prog/meson.build
+++ b/test cases/common/113 subdir subproject/prog/meson.build
diff --git a/test cases/common/102 subproject subdir/prog.c b/test cases/common/113 subdir subproject/prog/prog.c
index 9035ff114..9035ff114 100644
--- a/test cases/common/102 subproject subdir/prog.c
+++ b/test cases/common/113 subdir subproject/prog/prog.c
diff --git a/test cases/common/116 subdir subproject/subprojects/sub/meson.build b/test cases/common/113 subdir subproject/subprojects/sub/meson.build
index 94e9eecd0..94e9eecd0 100644
--- a/test cases/common/116 subdir subproject/subprojects/sub/meson.build
+++ b/test cases/common/113 subdir subproject/subprojects/sub/meson.build
diff --git a/test cases/common/102 subproject subdir/subprojects/sub/lib/sub.c b/test cases/common/113 subdir subproject/subprojects/sub/sub.c
index e748ac750..e748ac750 100644
--- a/test cases/common/102 subproject subdir/subprojects/sub/lib/sub.c
+++ b/test cases/common/113 subdir subproject/subprojects/sub/sub.c
diff --git a/test cases/common/102 subproject subdir/subprojects/sub/lib/sub.h b/test cases/common/113 subdir subproject/subprojects/sub/sub.h
index 2b59a3a32..2b59a3a32 100644
--- a/test cases/common/102 subproject subdir/subprojects/sub/lib/sub.h
+++ b/test cases/common/113 subdir subproject/subprojects/sub/sub.h
diff --git a/test cases/common/117 interpreter copy mutable var on assignment/meson.build b/test cases/common/114 interpreter copy mutable var on assignment/meson.build
index 8b15357ad..8b15357ad 100644
--- a/test cases/common/117 interpreter copy mutable var on assignment/meson.build
+++ b/test cases/common/114 interpreter copy mutable var on assignment/meson.build
diff --git a/test cases/common/118 skip/meson.build b/test cases/common/115 skip/meson.build
index 1adedb6fd..1adedb6fd 100644
--- a/test cases/common/118 skip/meson.build
+++ b/test cases/common/115 skip/meson.build
diff --git a/test cases/common/119 subproject project arguments/exe.c b/test cases/common/116 subproject project arguments/exe.c
index e8f2271a3..e8f2271a3 100644
--- a/test cases/common/119 subproject project arguments/exe.c
+++ b/test cases/common/116 subproject project arguments/exe.c
diff --git a/test cases/common/119 subproject project arguments/exe.cpp b/test cases/common/116 subproject project arguments/exe.cpp
index 9cfaec4a2..9cfaec4a2 100644
--- a/test cases/common/119 subproject project arguments/exe.cpp
+++ b/test cases/common/116 subproject project arguments/exe.cpp
diff --git a/test cases/common/119 subproject project arguments/meson.build b/test cases/common/116 subproject project arguments/meson.build
index 90d4c05f3..90d4c05f3 100644
--- a/test cases/common/119 subproject project arguments/meson.build
+++ b/test cases/common/116 subproject project arguments/meson.build
diff --git a/test cases/common/119 subproject project arguments/subprojects/subexe/meson.build b/test cases/common/116 subproject project arguments/subprojects/subexe/meson.build
index ef141dc0a..ef141dc0a 100644
--- a/test cases/common/119 subproject project arguments/subprojects/subexe/meson.build
+++ b/test cases/common/116 subproject project arguments/subprojects/subexe/meson.build
diff --git a/test cases/common/119 subproject project arguments/subprojects/subexe/subexe.c b/test cases/common/116 subproject project arguments/subprojects/subexe/subexe.c
index bd5316db9..bd5316db9 100644
--- a/test cases/common/119 subproject project arguments/subprojects/subexe/subexe.c
+++ b/test cases/common/116 subproject project arguments/subprojects/subexe/subexe.c
diff --git a/test cases/common/120 test skip/meson.build b/test cases/common/117 test skip/meson.build
index 568527f18..568527f18 100644
--- a/test cases/common/120 test skip/meson.build
+++ b/test cases/common/117 test skip/meson.build
diff --git a/test cases/common/120 test skip/test_skip.c b/test cases/common/117 test skip/test_skip.c
index 59c134bb9..59c134bb9 100644
--- a/test cases/common/120 test skip/test_skip.c
+++ b/test cases/common/117 test skip/test_skip.c
diff --git a/test cases/common/121 shared module/meson.build b/test cases/common/118 shared module/meson.build
index 936c8396f..936c8396f 100644
--- a/test cases/common/121 shared module/meson.build
+++ b/test cases/common/118 shared module/meson.build
diff --git a/test cases/common/121 shared module/module.c b/test cases/common/118 shared module/module.c
index 5dd26d7ef..5dd26d7ef 100644
--- a/test cases/common/121 shared module/module.c
+++ b/test cases/common/118 shared module/module.c
diff --git a/test cases/common/121 shared module/nosyms.c b/test cases/common/118 shared module/nosyms.c
index 3432b1c46..3432b1c46 100644
--- a/test cases/common/121 shared module/nosyms.c
+++ b/test cases/common/118 shared module/nosyms.c
diff --git a/test cases/common/121 shared module/prog.c b/test cases/common/118 shared module/prog.c
index 47411856d..47411856d 100644
--- a/test cases/common/121 shared module/prog.c
+++ b/test cases/common/118 shared module/prog.c
diff --git a/test cases/common/121 shared module/runtime.c b/test cases/common/118 shared module/runtime.c
index 03bde8614..03bde8614 100644
--- a/test cases/common/121 shared module/runtime.c
+++ b/test cases/common/118 shared module/runtime.c
diff --git a/test cases/common/121 shared module/test.json b/test cases/common/118 shared module/test.json
index 33bfeff07..33bfeff07 100644
--- a/test cases/common/121 shared module/test.json
+++ b/test cases/common/118 shared module/test.json
diff --git a/test cases/common/122 llvm ir and assembly/main.c b/test cases/common/119 llvm ir and assembly/main.c
index 35e8ed623..35e8ed623 100644
--- a/test cases/common/122 llvm ir and assembly/main.c
+++ b/test cases/common/119 llvm ir and assembly/main.c
diff --git a/test cases/common/122 llvm ir and assembly/main.cpp b/test cases/common/119 llvm ir and assembly/main.cpp
index aac3cbfef..aac3cbfef 100644
--- a/test cases/common/122 llvm ir and assembly/main.cpp
+++ b/test cases/common/119 llvm ir and assembly/main.cpp
diff --git a/test cases/common/122 llvm ir and assembly/meson.build b/test cases/common/119 llvm ir and assembly/meson.build
index fd07d87ef..fd07d87ef 100644
--- a/test cases/common/122 llvm ir and assembly/meson.build
+++ b/test cases/common/119 llvm ir and assembly/meson.build
diff --git a/test cases/common/122 llvm ir and assembly/square-aarch64.S b/test cases/common/119 llvm ir and assembly/square-aarch64.S
index ebe74e7de..ebe74e7de 100644
--- a/test cases/common/122 llvm ir and assembly/square-aarch64.S
+++ b/test cases/common/119 llvm ir and assembly/square-aarch64.S
diff --git a/test cases/common/122 llvm ir and assembly/square-arm.S b/test cases/common/119 llvm ir and assembly/square-arm.S
index aea3f1f61..aea3f1f61 100644
--- a/test cases/common/122 llvm ir and assembly/square-arm.S
+++ b/test cases/common/119 llvm ir and assembly/square-arm.S
diff --git a/test cases/common/122 llvm ir and assembly/square-x86.S b/test cases/common/119 llvm ir and assembly/square-x86.S
index 18284c1a6..18284c1a6 100644
--- a/test cases/common/122 llvm ir and assembly/square-x86.S
+++ b/test cases/common/119 llvm ir and assembly/square-x86.S
diff --git a/test cases/common/122 llvm ir and assembly/square-x86_64.S b/test cases/common/119 llvm ir and assembly/square-x86_64.S
index 5678d00a3..5678d00a3 100644
--- a/test cases/common/122 llvm ir and assembly/square-x86_64.S
+++ b/test cases/common/119 llvm ir and assembly/square-x86_64.S
diff --git a/test cases/common/122 llvm ir and assembly/square.ll b/test cases/common/119 llvm ir and assembly/square.ll
index 7c321aa82..7c321aa82 100644
--- a/test cases/common/122 llvm ir and assembly/square.ll
+++ b/test cases/common/119 llvm ir and assembly/square.ll
diff --git a/test cases/common/122 llvm ir and assembly/symbol-underscore.h b/test cases/common/119 llvm ir and assembly/symbol-underscore.h
index d0f3ef9cc..d0f3ef9cc 100644
--- a/test cases/common/122 llvm ir and assembly/symbol-underscore.h
+++ b/test cases/common/119 llvm ir and assembly/symbol-underscore.h
diff --git a/test cases/common/123 cpp and asm/meson.build b/test cases/common/120 cpp and asm/meson.build
index ec7c46684..ec7c46684 100644
--- a/test cases/common/123 cpp and asm/meson.build
+++ b/test cases/common/120 cpp and asm/meson.build
diff --git a/test cases/common/123 cpp and asm/retval-arm.S b/test cases/common/120 cpp and asm/retval-arm.S
index a8923624a..a8923624a 100644
--- a/test cases/common/123 cpp and asm/retval-arm.S
+++ b/test cases/common/120 cpp and asm/retval-arm.S
diff --git a/test cases/common/123 cpp and asm/retval-x86.S b/test cases/common/120 cpp and asm/retval-x86.S
index f9e819070..f9e819070 100644
--- a/test cases/common/123 cpp and asm/retval-x86.S
+++ b/test cases/common/120 cpp and asm/retval-x86.S
diff --git a/test cases/common/123 cpp and asm/retval-x86_64.S b/test cases/common/120 cpp and asm/retval-x86_64.S
index 1a5f3eb23..1a5f3eb23 100644
--- a/test cases/common/123 cpp and asm/retval-x86_64.S
+++ b/test cases/common/120 cpp and asm/retval-x86_64.S
diff --git a/test cases/common/123 cpp and asm/symbol-underscore.h b/test cases/common/120 cpp and asm/symbol-underscore.h
index d0f3ef9cc..d0f3ef9cc 100644
--- a/test cases/common/123 cpp and asm/symbol-underscore.h
+++ b/test cases/common/120 cpp and asm/symbol-underscore.h
diff --git a/test cases/common/123 cpp and asm/trivial.cc b/test cases/common/120 cpp and asm/trivial.cc
index 19d5e944d..19d5e944d 100644
--- a/test cases/common/123 cpp and asm/trivial.cc
+++ b/test cases/common/120 cpp and asm/trivial.cc
diff --git a/test cases/common/124 extract all shared library/extractor.h b/test cases/common/121 extract all shared library/extractor.h
index cfb7ff6d6..cfb7ff6d6 100644
--- a/test cases/common/124 extract all shared library/extractor.h
+++ b/test cases/common/121 extract all shared library/extractor.h
diff --git a/test cases/common/124 extract all shared library/four.c b/test cases/common/121 extract all shared library/four.c
index f67a85e68..f67a85e68 100644
--- a/test cases/common/124 extract all shared library/four.c
+++ b/test cases/common/121 extract all shared library/four.c
diff --git a/test cases/common/124 extract all shared library/func1234.def b/test cases/common/121 extract all shared library/func1234.def
index d62c08d78..d62c08d78 100644
--- a/test cases/common/124 extract all shared library/func1234.def
+++ b/test cases/common/121 extract all shared library/func1234.def
diff --git a/test cases/common/124 extract all shared library/meson.build b/test cases/common/121 extract all shared library/meson.build
index 7c24fdeeb..7c24fdeeb 100644
--- a/test cases/common/124 extract all shared library/meson.build
+++ b/test cases/common/121 extract all shared library/meson.build
diff --git a/test cases/common/124 extract all shared library/one.c b/test cases/common/121 extract all shared library/one.c
index 152a1455d..152a1455d 100644
--- a/test cases/common/124 extract all shared library/one.c
+++ b/test cases/common/121 extract all shared library/one.c
diff --git a/test cases/common/124 extract all shared library/prog.c b/test cases/common/121 extract all shared library/prog.c
index de0cc7f8e..de0cc7f8e 100644
--- a/test cases/common/124 extract all shared library/prog.c
+++ b/test cases/common/121 extract all shared library/prog.c
diff --git a/test cases/common/124 extract all shared library/three.c b/test cases/common/121 extract all shared library/three.c
index 24604ed72..24604ed72 100644
--- a/test cases/common/124 extract all shared library/three.c
+++ b/test cases/common/121 extract all shared library/three.c
diff --git a/test cases/common/124 extract all shared library/two.c b/test cases/common/121 extract all shared library/two.c
index 800cd2dfb..800cd2dfb 100644
--- a/test cases/common/124 extract all shared library/two.c
+++ b/test cases/common/121 extract all shared library/two.c
diff --git a/test cases/common/125 object only target/meson.build b/test cases/common/122 object only target/meson.build
index d83a65825..d83a65825 100644
--- a/test cases/common/125 object only target/meson.build
+++ b/test cases/common/122 object only target/meson.build
diff --git a/test cases/common/125 object only target/obj_generator.py b/test cases/common/122 object only target/obj_generator.py
index afdbc09ad..afdbc09ad 100755
--- a/test cases/common/125 object only target/obj_generator.py
+++ b/test cases/common/122 object only target/obj_generator.py
diff --git a/test cases/common/125 object only target/prog.c b/test cases/common/122 object only target/prog.c
index 9841180d0..9841180d0 100644
--- a/test cases/common/125 object only target/prog.c
+++ b/test cases/common/122 object only target/prog.c
diff --git a/test cases/common/125 object only target/source.c b/test cases/common/122 object only target/source.c
index 1dc08e168..1dc08e168 100644
--- a/test cases/common/125 object only target/source.c
+++ b/test cases/common/122 object only target/source.c
diff --git a/test cases/common/125 object only target/source2.c b/test cases/common/122 object only target/source2.c
index 8024b9714..8024b9714 100644
--- a/test cases/common/125 object only target/source2.c
+++ b/test cases/common/122 object only target/source2.c
diff --git a/test cases/common/125 object only target/source2.def b/test cases/common/122 object only target/source2.def
index a993ab8ca..a993ab8ca 100644
--- a/test cases/common/125 object only target/source2.def
+++ b/test cases/common/122 object only target/source2.def
diff --git a/test cases/common/125 object only target/source3.c b/test cases/common/122 object only target/source3.c
index c4362c4d6..c4362c4d6 100644
--- a/test cases/common/125 object only target/source3.c
+++ b/test cases/common/122 object only target/source3.c
diff --git a/test cases/common/125 object only target/test.json b/test cases/common/122 object only target/test.json
index 135300de5..135300de5 100644
--- a/test cases/common/125 object only target/test.json
+++ b/test cases/common/122 object only target/test.json
diff --git a/test cases/common/126 no buildincdir/include/header.h b/test cases/common/123 no buildincdir/include/header.h
index 1170ee36a..1170ee36a 100644
--- a/test cases/common/126 no buildincdir/include/header.h
+++ b/test cases/common/123 no buildincdir/include/header.h
diff --git a/test cases/common/126 no buildincdir/meson.build b/test cases/common/123 no buildincdir/meson.build
index 53f1a7f58..53f1a7f58 100644
--- a/test cases/common/126 no buildincdir/meson.build
+++ b/test cases/common/123 no buildincdir/meson.build
diff --git a/test cases/common/126 no buildincdir/prog.c b/test cases/common/123 no buildincdir/prog.c
index b356f6550..b356f6550 100644
--- a/test cases/common/126 no buildincdir/prog.c
+++ b/test cases/common/123 no buildincdir/prog.c
diff --git a/test cases/common/127 custom target directory install/docgen.py b/test cases/common/124 custom target directory install/docgen.py
index 97a3f906c..97a3f906c 100644
--- a/test cases/common/127 custom target directory install/docgen.py
+++ b/test cases/common/124 custom target directory install/docgen.py
diff --git a/test cases/common/127 custom target directory install/meson.build b/test cases/common/124 custom target directory install/meson.build
index ada9ae119..ada9ae119 100644
--- a/test cases/common/127 custom target directory install/meson.build
+++ b/test cases/common/124 custom target directory install/meson.build
diff --git a/test cases/common/127 custom target directory install/test.json b/test cases/common/124 custom target directory install/test.json
index c7eebf58f..c7eebf58f 100644
--- a/test cases/common/127 custom target directory install/test.json
+++ b/test cases/common/124 custom target directory install/test.json
diff --git a/test cases/common/128 dependency file generation/main .c b/test cases/common/125 dependency file generation/main .c
index 03b2213bb..03b2213bb 100644
--- a/test cases/common/128 dependency file generation/main .c
+++ b/test cases/common/125 dependency file generation/main .c
diff --git a/test cases/common/128 dependency file generation/meson.build b/test cases/common/125 dependency file generation/meson.build
index b5ee47bf2..b5ee47bf2 100644
--- a/test cases/common/128 dependency file generation/meson.build
+++ b/test cases/common/125 dependency file generation/meson.build
diff --git a/test cases/common/129 configure file in generator/inc/confdata.in b/test cases/common/126 configure file in generator/inc/confdata.in
index e44cdea20..e44cdea20 100644
--- a/test cases/common/129 configure file in generator/inc/confdata.in
+++ b/test cases/common/126 configure file in generator/inc/confdata.in
diff --git a/test cases/common/129 configure file in generator/inc/meson.build b/test cases/common/126 configure file in generator/inc/meson.build
index 05d2dcb8a..05d2dcb8a 100644
--- a/test cases/common/129 configure file in generator/inc/meson.build
+++ b/test cases/common/126 configure file in generator/inc/meson.build
diff --git a/test cases/common/129 configure file in generator/meson.build b/test cases/common/126 configure file in generator/meson.build
index e1c26b6d1..e1c26b6d1 100644
--- a/test cases/common/129 configure file in generator/meson.build
+++ b/test cases/common/126 configure file in generator/meson.build
diff --git a/test cases/common/129 configure file in generator/src/gen.py b/test cases/common/126 configure file in generator/src/gen.py
index 99b7cddb9..99b7cddb9 100755
--- a/test cases/common/129 configure file in generator/src/gen.py
+++ b/test cases/common/126 configure file in generator/src/gen.py
diff --git a/test cases/common/129 configure file in generator/src/main.c b/test cases/common/126 configure file in generator/src/main.c
index 6329e4791..6329e4791 100644
--- a/test cases/common/129 configure file in generator/src/main.c
+++ b/test cases/common/126 configure file in generator/src/main.c
diff --git a/test cases/common/129 configure file in generator/src/meson.build b/test cases/common/126 configure file in generator/src/meson.build
index 2fb804eec..2fb804eec 100644
--- a/test cases/common/129 configure file in generator/src/meson.build
+++ b/test cases/common/126 configure file in generator/src/meson.build
diff --git a/test cases/common/129 configure file in generator/src/source b/test cases/common/126 configure file in generator/src/source
index 409940768..409940768 100644
--- a/test cases/common/129 configure file in generator/src/source
+++ b/test cases/common/126 configure file in generator/src/source
diff --git a/test cases/common/130 generated llvm ir/copyfile.py b/test cases/common/127 generated llvm ir/copyfile.py
index ff42ac359..ff42ac359 100644
--- a/test cases/common/130 generated llvm ir/copyfile.py
+++ b/test cases/common/127 generated llvm ir/copyfile.py
diff --git a/test cases/common/130 generated llvm ir/main.c b/test cases/common/127 generated llvm ir/main.c
index 35e8ed623..35e8ed623 100644
--- a/test cases/common/130 generated llvm ir/main.c
+++ b/test cases/common/127 generated llvm ir/main.c
diff --git a/test cases/common/130 generated llvm ir/meson.build b/test cases/common/127 generated llvm ir/meson.build
index 111cdc063..111cdc063 100644
--- a/test cases/common/130 generated llvm ir/meson.build
+++ b/test cases/common/127 generated llvm ir/meson.build
diff --git a/test cases/common/130 generated llvm ir/square.ll.in b/test cases/common/127 generated llvm ir/square.ll.in
index 7c321aa82..7c321aa82 100644
--- a/test cases/common/130 generated llvm ir/square.ll.in
+++ b/test cases/common/127 generated llvm ir/square.ll.in
diff --git a/test cases/common/131 generated assembly/copyfile.py b/test cases/common/128 generated assembly/copyfile.py
index ff42ac359..ff42ac359 100644
--- a/test cases/common/131 generated assembly/copyfile.py
+++ b/test cases/common/128 generated assembly/copyfile.py
diff --git a/test cases/common/131 generated assembly/main.c b/test cases/common/128 generated assembly/main.c
index fb38f9df4..fb38f9df4 100644
--- a/test cases/common/131 generated assembly/main.c
+++ b/test cases/common/128 generated assembly/main.c
diff --git a/test cases/common/131 generated assembly/meson.build b/test cases/common/128 generated assembly/meson.build
index 283774729..283774729 100644
--- a/test cases/common/131 generated assembly/meson.build
+++ b/test cases/common/128 generated assembly/meson.build
diff --git a/test cases/common/131 generated assembly/square-arm.S.in b/test cases/common/128 generated assembly/square-arm.S.in
index d2fb7ac20..d2fb7ac20 100644
--- a/test cases/common/131 generated assembly/square-arm.S.in
+++ b/test cases/common/128 generated assembly/square-arm.S.in
diff --git a/test cases/common/131 generated assembly/square-x86.S.in b/test cases/common/128 generated assembly/square-x86.S.in
index ee77b81be..ee77b81be 100644
--- a/test cases/common/131 generated assembly/square-x86.S.in
+++ b/test cases/common/128 generated assembly/square-x86.S.in
diff --git a/test cases/common/131 generated assembly/square-x86_64.S.in b/test cases/common/128 generated assembly/square-x86_64.S.in
index b2cf3ebe9..b2cf3ebe9 100644
--- a/test cases/common/131 generated assembly/square-x86_64.S.in
+++ b/test cases/common/128 generated assembly/square-x86_64.S.in
diff --git a/test cases/common/131 generated assembly/symbol-underscore.h b/test cases/common/128 generated assembly/symbol-underscore.h
index d0f3ef9cc..d0f3ef9cc 100644
--- a/test cases/common/131 generated assembly/symbol-underscore.h
+++ b/test cases/common/128 generated assembly/symbol-underscore.h
diff --git a/test cases/common/132 build by default targets in tests/main.c b/test cases/common/129 build by default targets in tests/main.c
index 03b2213bb..03b2213bb 100644
--- a/test cases/common/132 build by default targets in tests/main.c
+++ b/test cases/common/129 build by default targets in tests/main.c
diff --git a/test cases/common/132 build by default targets in tests/meson.build b/test cases/common/129 build by default targets in tests/meson.build
index 5cc505519..5cc505519 100644
--- a/test cases/common/132 build by default targets in tests/meson.build
+++ b/test cases/common/129 build by default targets in tests/meson.build
diff --git a/test cases/common/132 build by default targets in tests/write_file.py b/test cases/common/129 build by default targets in tests/write_file.py
index ff9c224f0..ff9c224f0 100644
--- a/test cases/common/132 build by default targets in tests/write_file.py
+++ b/test cases/common/129 build by default targets in tests/write_file.py
diff --git a/test cases/common/133 build by default/checkexists.py b/test cases/common/130 build by default/checkexists.py
index 6664f7291..6664f7291 100644
--- a/test cases/common/133 build by default/checkexists.py
+++ b/test cases/common/130 build by default/checkexists.py
diff --git a/test cases/common/133 build by default/foo.c b/test cases/common/130 build by default/foo.c
index 0322828dc..0322828dc 100644
--- a/test cases/common/133 build by default/foo.c
+++ b/test cases/common/130 build by default/foo.c
diff --git a/test cases/common/133 build by default/meson.build b/test cases/common/130 build by default/meson.build
index b28b6347c..b28b6347c 100644
--- a/test cases/common/133 build by default/meson.build
+++ b/test cases/common/130 build by default/meson.build
diff --git a/test cases/common/133 build by default/mygen.py b/test cases/common/130 build by default/mygen.py
index 5a74153ee..5a74153ee 100644
--- a/test cases/common/133 build by default/mygen.py
+++ b/test cases/common/130 build by default/mygen.py
diff --git a/test cases/common/133 build by default/source.txt b/test cases/common/130 build by default/source.txt
index 3573f4b21..3573f4b21 100644
--- a/test cases/common/133 build by default/source.txt
+++ b/test cases/common/130 build by default/source.txt
diff --git a/test cases/common/134 include order/ctsub/copyfile.py b/test cases/common/131 include order/ctsub/copyfile.py
index ff42ac359..ff42ac359 100644
--- a/test cases/common/134 include order/ctsub/copyfile.py
+++ b/test cases/common/131 include order/ctsub/copyfile.py
diff --git a/test cases/common/134 include order/ctsub/emptyfile.c b/test cases/common/131 include order/ctsub/emptyfile.c
index e69de29bb..e69de29bb 100644
--- a/test cases/common/134 include order/ctsub/emptyfile.c
+++ b/test cases/common/131 include order/ctsub/emptyfile.c
diff --git a/test cases/common/134 include order/ctsub/main.h b/test cases/common/131 include order/ctsub/main.h
index 9d9acf36f..9d9acf36f 100644
--- a/test cases/common/134 include order/ctsub/main.h
+++ b/test cases/common/131 include order/ctsub/main.h
diff --git a/test cases/common/134 include order/ctsub/meson.build b/test cases/common/131 include order/ctsub/meson.build
index a242e0764..a242e0764 100644
--- a/test cases/common/134 include order/ctsub/meson.build
+++ b/test cases/common/131 include order/ctsub/meson.build
diff --git a/test cases/common/134 include order/inc1/hdr.h b/test cases/common/131 include order/inc1/hdr.h
index 9d755a830..9d755a830 100644
--- a/test cases/common/134 include order/inc1/hdr.h
+++ b/test cases/common/131 include order/inc1/hdr.h
diff --git a/test cases/common/134 include order/inc2/hdr.h b/test cases/common/131 include order/inc2/hdr.h
index 2ebcacaf4..2ebcacaf4 100644
--- a/test cases/common/134 include order/inc2/hdr.h
+++ b/test cases/common/131 include order/inc2/hdr.h
diff --git a/test cases/common/134 include order/meson.build b/test cases/common/131 include order/meson.build
index 9f275b866..9f275b866 100644
--- a/test cases/common/134 include order/meson.build
+++ b/test cases/common/131 include order/meson.build
diff --git a/test cases/common/134 include order/ordertest.c b/test cases/common/131 include order/ordertest.c
index 775e34fa1..775e34fa1 100644
--- a/test cases/common/134 include order/ordertest.c
+++ b/test cases/common/131 include order/ordertest.c
diff --git a/test cases/common/134 include order/sub1/main.h b/test cases/common/131 include order/sub1/main.h
index acf4a358c..acf4a358c 100644
--- a/test cases/common/134 include order/sub1/main.h
+++ b/test cases/common/131 include order/sub1/main.h
diff --git a/test cases/common/134 include order/sub1/meson.build b/test cases/common/131 include order/sub1/meson.build
index 9672945b6..9672945b6 100644
--- a/test cases/common/134 include order/sub1/meson.build
+++ b/test cases/common/131 include order/sub1/meson.build
diff --git a/test cases/common/134 include order/sub1/some.c b/test cases/common/131 include order/sub1/some.c
index 1ab0db4dd..1ab0db4dd 100644
--- a/test cases/common/134 include order/sub1/some.c
+++ b/test cases/common/131 include order/sub1/some.c
diff --git a/test cases/common/134 include order/sub1/some.h b/test cases/common/131 include order/sub1/some.h
index 6479492ea..6479492ea 100644
--- a/test cases/common/134 include order/sub1/some.h
+++ b/test cases/common/131 include order/sub1/some.h
diff --git a/test cases/common/134 include order/sub2/main.h b/test cases/common/131 include order/sub2/main.h
index b9c0da93a..b9c0da93a 100644
--- a/test cases/common/134 include order/sub2/main.h
+++ b/test cases/common/131 include order/sub2/main.h
diff --git a/test cases/common/134 include order/sub2/meson.build b/test cases/common/131 include order/sub2/meson.build
index b1e61900f..b1e61900f 100644
--- a/test cases/common/134 include order/sub2/meson.build
+++ b/test cases/common/131 include order/sub2/meson.build
diff --git a/test cases/common/134 include order/sub3/main.h b/test cases/common/131 include order/sub3/main.h
index 1ab723141..1ab723141 100644
--- a/test cases/common/134 include order/sub3/main.h
+++ b/test cases/common/131 include order/sub3/main.h
diff --git a/test cases/common/134 include order/sub3/meson.build b/test cases/common/131 include order/sub3/meson.build
index 0bd3906c1..0bd3906c1 100644
--- a/test cases/common/134 include order/sub3/meson.build
+++ b/test cases/common/131 include order/sub3/meson.build
diff --git a/test cases/common/134 include order/sub4/main.c b/test cases/common/131 include order/sub4/main.c
index 89226a464..89226a464 100644
--- a/test cases/common/134 include order/sub4/main.c
+++ b/test cases/common/131 include order/sub4/main.c
diff --git a/test cases/common/134 include order/sub4/main.h b/test cases/common/131 include order/sub4/main.h
index 194d7fe5f..194d7fe5f 100644
--- a/test cases/common/134 include order/sub4/main.h
+++ b/test cases/common/131 include order/sub4/main.h
diff --git a/test cases/common/134 include order/sub4/meson.build b/test cases/common/131 include order/sub4/meson.build
index c01edaa20..c01edaa20 100644
--- a/test cases/common/134 include order/sub4/meson.build
+++ b/test cases/common/131 include order/sub4/meson.build
diff --git a/test cases/common/135 override options/four.c b/test cases/common/132 override options/four.c
index 44e344f72..44e344f72 100644
--- a/test cases/common/135 override options/four.c
+++ b/test cases/common/132 override options/four.c
diff --git a/test cases/common/135 override options/meson.build b/test cases/common/132 override options/meson.build
index 4dd8d797e..4dd8d797e 100644
--- a/test cases/common/135 override options/meson.build
+++ b/test cases/common/132 override options/meson.build
diff --git a/test cases/common/135 override options/one.c b/test cases/common/132 override options/one.c
index 6120d4889..6120d4889 100644
--- a/test cases/common/135 override options/one.c
+++ b/test cases/common/132 override options/one.c
diff --git a/test cases/common/135 override options/three.c b/test cases/common/132 override options/three.c
index 094260e04..094260e04 100644
--- a/test cases/common/135 override options/three.c
+++ b/test cases/common/132 override options/three.c
diff --git a/test cases/common/135 override options/two.c b/test cases/common/132 override options/two.c
index 0f8048c21..0f8048c21 100644
--- a/test cases/common/135 override options/two.c
+++ b/test cases/common/132 override options/two.c
diff --git a/test cases/common/136 get define/concat.h b/test cases/common/133 get define/concat.h
index 6eb3e5e3b..6eb3e5e3b 100644
--- a/test cases/common/136 get define/concat.h
+++ b/test cases/common/133 get define/concat.h
diff --git a/test cases/common/136 get define/meson.build b/test cases/common/133 get define/meson.build
index df3d02ab6..df3d02ab6 100644
--- a/test cases/common/136 get define/meson.build
+++ b/test cases/common/133 get define/meson.build
diff --git a/test cases/common/136 get define/meson_options.txt b/test cases/common/133 get define/meson_options.txt
index 7d34a2e60..7d34a2e60 100644
--- a/test cases/common/136 get define/meson_options.txt
+++ b/test cases/common/133 get define/meson_options.txt
diff --git a/test cases/common/137 c cpp and asm/main.c b/test cases/common/134 c cpp and asm/main.c
index 293258f51..293258f51 100644
--- a/test cases/common/137 c cpp and asm/main.c
+++ b/test cases/common/134 c cpp and asm/main.c
diff --git a/test cases/common/137 c cpp and asm/main.cpp b/test cases/common/134 c cpp and asm/main.cpp
index debb97ac6..debb97ac6 100644
--- a/test cases/common/137 c cpp and asm/main.cpp
+++ b/test cases/common/134 c cpp and asm/main.cpp
diff --git a/test cases/common/137 c cpp and asm/meson.build b/test cases/common/134 c cpp and asm/meson.build
index ca820e2ae..ca820e2ae 100644
--- a/test cases/common/137 c cpp and asm/meson.build
+++ b/test cases/common/134 c cpp and asm/meson.build
diff --git a/test cases/common/137 c cpp and asm/retval-arm.S b/test cases/common/134 c cpp and asm/retval-arm.S
index a8923624a..a8923624a 100644
--- a/test cases/common/137 c cpp and asm/retval-arm.S
+++ b/test cases/common/134 c cpp and asm/retval-arm.S
diff --git a/test cases/common/137 c cpp and asm/retval-x86.S b/test cases/common/134 c cpp and asm/retval-x86.S
index 3cb023764..3cb023764 100644
--- a/test cases/common/137 c cpp and asm/retval-x86.S
+++ b/test cases/common/134 c cpp and asm/retval-x86.S
diff --git a/test cases/common/137 c cpp and asm/retval-x86_64.S b/test cases/common/134 c cpp and asm/retval-x86_64.S
index 1a5f3eb23..1a5f3eb23 100644
--- a/test cases/common/137 c cpp and asm/retval-x86_64.S
+++ b/test cases/common/134 c cpp and asm/retval-x86_64.S
diff --git a/test cases/common/137 c cpp and asm/somelib.c b/test cases/common/134 c cpp and asm/somelib.c
index e585b8e9f..e585b8e9f 100644
--- a/test cases/common/137 c cpp and asm/somelib.c
+++ b/test cases/common/134 c cpp and asm/somelib.c
diff --git a/test cases/common/137 c cpp and asm/symbol-underscore.h b/test cases/common/134 c cpp and asm/symbol-underscore.h
index d0f3ef9cc..d0f3ef9cc 100644
--- a/test cases/common/137 c cpp and asm/symbol-underscore.h
+++ b/test cases/common/134 c cpp and asm/symbol-underscore.h
diff --git a/test cases/common/138 compute int/config.h.in b/test cases/common/135 compute int/config.h.in
index 0de63ab7d..0de63ab7d 100644
--- a/test cases/common/138 compute int/config.h.in
+++ b/test cases/common/135 compute int/config.h.in
diff --git a/test cases/common/138 compute int/foobar.h b/test cases/common/135 compute int/foobar.h
index fd3cb5ea6..fd3cb5ea6 100644
--- a/test cases/common/138 compute int/foobar.h
+++ b/test cases/common/135 compute int/foobar.h
diff --git a/test cases/common/138 compute int/meson.build b/test cases/common/135 compute int/meson.build
index 89f4746fe..89f4746fe 100644
--- a/test cases/common/138 compute int/meson.build
+++ b/test cases/common/135 compute int/meson.build
diff --git a/test cases/common/138 compute int/prog.c.in b/test cases/common/135 compute int/prog.c.in
index 0983aff17..0983aff17 100644
--- a/test cases/common/138 compute int/prog.c.in
+++ b/test cases/common/135 compute int/prog.c.in
diff --git a/test cases/common/139 custom target object output/meson.build b/test cases/common/136 custom target object output/meson.build
index ede165bd4..ede165bd4 100644
--- a/test cases/common/139 custom target object output/meson.build
+++ b/test cases/common/136 custom target object output/meson.build
diff --git a/test cases/common/139 custom target object output/obj_generator.py b/test cases/common/136 custom target object output/obj_generator.py
index a33872aac..a33872aac 100644
--- a/test cases/common/139 custom target object output/obj_generator.py
+++ b/test cases/common/136 custom target object output/obj_generator.py
diff --git a/test cases/common/139 custom target object output/objdir/meson.build b/test cases/common/136 custom target object output/objdir/meson.build
index 0d7f6c259..0d7f6c259 100644
--- a/test cases/common/139 custom target object output/objdir/meson.build
+++ b/test cases/common/136 custom target object output/objdir/meson.build
diff --git a/test cases/common/139 custom target object output/objdir/source.c b/test cases/common/136 custom target object output/objdir/source.c
index 1dc08e168..1dc08e168 100644
--- a/test cases/common/139 custom target object output/objdir/source.c
+++ b/test cases/common/136 custom target object output/objdir/source.c
diff --git a/test cases/common/139 custom target object output/progdir/meson.build b/test cases/common/136 custom target object output/progdir/meson.build
index 4216c24a6..4216c24a6 100644
--- a/test cases/common/139 custom target object output/progdir/meson.build
+++ b/test cases/common/136 custom target object output/progdir/meson.build
diff --git a/test cases/common/139 custom target object output/progdir/prog.c b/test cases/common/136 custom target object output/progdir/prog.c
index bc3caf3e2..bc3caf3e2 100644
--- a/test cases/common/139 custom target object output/progdir/prog.c
+++ b/test cases/common/136 custom target object output/progdir/prog.c
diff --git a/test cases/common/140 empty build file/meson.build b/test cases/common/137 empty build file/meson.build
index 73d03974f..73d03974f 100644
--- a/test cases/common/140 empty build file/meson.build
+++ b/test cases/common/137 empty build file/meson.build
diff --git a/test cases/common/140 empty build file/subdir/meson.build b/test cases/common/137 empty build file/subdir/meson.build
index e69de29bb..e69de29bb 100644
--- a/test cases/common/140 empty build file/subdir/meson.build
+++ b/test cases/common/137 empty build file/subdir/meson.build
diff --git a/test cases/common/141 whole archive/exe/meson.build b/test cases/common/138 whole archive/exe/meson.build
index 91d298dce..91d298dce 100644
--- a/test cases/common/141 whole archive/exe/meson.build
+++ b/test cases/common/138 whole archive/exe/meson.build
diff --git a/test cases/common/141 whole archive/exe2/meson.build b/test cases/common/138 whole archive/exe2/meson.build
index 918486402..918486402 100644
--- a/test cases/common/141 whole archive/exe2/meson.build
+++ b/test cases/common/138 whole archive/exe2/meson.build
diff --git a/test cases/common/141 whole archive/exe3/meson.build b/test cases/common/138 whole archive/exe3/meson.build
index 82cf57e05..82cf57e05 100644
--- a/test cases/common/141 whole archive/exe3/meson.build
+++ b/test cases/common/138 whole archive/exe3/meson.build
diff --git a/test cases/common/141 whole archive/exe4/meson.build b/test cases/common/138 whole archive/exe4/meson.build
index 0781250fb..0781250fb 100644
--- a/test cases/common/141 whole archive/exe4/meson.build
+++ b/test cases/common/138 whole archive/exe4/meson.build
diff --git a/test cases/common/141 whole archive/func1.c b/test cases/common/138 whole archive/func1.c
index 161c5da1c..161c5da1c 100644
--- a/test cases/common/141 whole archive/func1.c
+++ b/test cases/common/138 whole archive/func1.c
diff --git a/test cases/common/141 whole archive/func2.c b/test cases/common/138 whole archive/func2.c
index 4fe7150ff..4fe7150ff 100644
--- a/test cases/common/141 whole archive/func2.c
+++ b/test cases/common/138 whole archive/func2.c
diff --git a/test cases/common/141 whole archive/meson.build b/test cases/common/138 whole archive/meson.build
index 012df3335..012df3335 100644
--- a/test cases/common/141 whole archive/meson.build
+++ b/test cases/common/138 whole archive/meson.build
diff --git a/test cases/common/141 whole archive/mylib.h b/test cases/common/138 whole archive/mylib.h
index 79ce585ef..79ce585ef 100644
--- a/test cases/common/141 whole archive/mylib.h
+++ b/test cases/common/138 whole archive/mylib.h
diff --git a/test cases/common/141 whole archive/prog.c b/test cases/common/138 whole archive/prog.c
index 1f553e554..1f553e554 100644
--- a/test cases/common/141 whole archive/prog.c
+++ b/test cases/common/138 whole archive/prog.c
diff --git a/test cases/common/141 whole archive/sh_func2_dep_func1/meson.build b/test cases/common/138 whole archive/sh_func2_dep_func1/meson.build
index 92baca6fb..92baca6fb 100644
--- a/test cases/common/141 whole archive/sh_func2_dep_func1/meson.build
+++ b/test cases/common/138 whole archive/sh_func2_dep_func1/meson.build
diff --git a/test cases/common/141 whole archive/sh_func2_linked_func1/meson.build b/test cases/common/138 whole archive/sh_func2_linked_func1/meson.build
index 2858f65ec..2858f65ec 100644
--- a/test cases/common/141 whole archive/sh_func2_linked_func1/meson.build
+++ b/test cases/common/138 whole archive/sh_func2_linked_func1/meson.build
diff --git a/test cases/common/141 whole archive/sh_func2_transdep_func1/meson.build b/test cases/common/138 whole archive/sh_func2_transdep_func1/meson.build
index 07030772e..07030772e 100644
--- a/test cases/common/141 whole archive/sh_func2_transdep_func1/meson.build
+++ b/test cases/common/138 whole archive/sh_func2_transdep_func1/meson.build
diff --git a/test cases/common/141 whole archive/sh_only_link_whole/meson.build b/test cases/common/138 whole archive/sh_only_link_whole/meson.build
index 64baabd5d..64baabd5d 100644
--- a/test cases/common/141 whole archive/sh_only_link_whole/meson.build
+++ b/test cases/common/138 whole archive/sh_only_link_whole/meson.build
diff --git a/test cases/common/141 whole archive/st_func1/meson.build b/test cases/common/138 whole archive/st_func1/meson.build
index c84d78109..c84d78109 100644
--- a/test cases/common/141 whole archive/st_func1/meson.build
+++ b/test cases/common/138 whole archive/st_func1/meson.build
diff --git a/test cases/common/141 whole archive/st_func2/meson.build b/test cases/common/138 whole archive/st_func2/meson.build
index 2732f96ec..2732f96ec 100644
--- a/test cases/common/141 whole archive/st_func2/meson.build
+++ b/test cases/common/138 whole archive/st_func2/meson.build
diff --git a/test cases/common/142 C and CPP link/dummy.c b/test cases/common/139 C and CPP link/dummy.c
index e69de29bb..e69de29bb 100644
--- a/test cases/common/142 C and CPP link/dummy.c
+++ b/test cases/common/139 C and CPP link/dummy.c
diff --git a/test cases/common/142 C and CPP link/foo.c b/test cases/common/139 C and CPP link/foo.c
index 77c7e39ff..77c7e39ff 100644
--- a/test cases/common/142 C and CPP link/foo.c
+++ b/test cases/common/139 C and CPP link/foo.c
diff --git a/test cases/common/142 C and CPP link/foo.cpp b/test cases/common/139 C and CPP link/foo.cpp
index 9db7fb238..9db7fb238 100644
--- a/test cases/common/142 C and CPP link/foo.cpp
+++ b/test cases/common/139 C and CPP link/foo.cpp
diff --git a/test cases/common/142 C and CPP link/foo.h b/test cases/common/139 C and CPP link/foo.h
index 1ed8ce9b3..1ed8ce9b3 100644
--- a/test cases/common/142 C and CPP link/foo.h
+++ b/test cases/common/139 C and CPP link/foo.h
diff --git a/test cases/common/142 C and CPP link/foo.hpp b/test cases/common/139 C and CPP link/foo.hpp
index e47f01dce..e47f01dce 100644
--- a/test cases/common/142 C and CPP link/foo.hpp
+++ b/test cases/common/139 C and CPP link/foo.hpp
diff --git a/test cases/common/142 C and CPP link/foobar.c b/test cases/common/139 C and CPP link/foobar.c
index 27928bff5..27928bff5 100644
--- a/test cases/common/142 C and CPP link/foobar.c
+++ b/test cases/common/139 C and CPP link/foobar.c
diff --git a/test cases/common/142 C and CPP link/foobar.h b/test cases/common/139 C and CPP link/foobar.h
index 6dcb09664..6dcb09664 100644
--- a/test cases/common/142 C and CPP link/foobar.h
+++ b/test cases/common/139 C and CPP link/foobar.h
diff --git a/test cases/common/142 C and CPP link/meson.build b/test cases/common/139 C and CPP link/meson.build
index a93a981b4..a93a981b4 100644
--- a/test cases/common/142 C and CPP link/meson.build
+++ b/test cases/common/139 C and CPP link/meson.build
diff --git a/test cases/common/142 C and CPP link/sub.c b/test cases/common/139 C and CPP link/sub.c
index 7c078f8e3..7c078f8e3 100644
--- a/test cases/common/142 C and CPP link/sub.c
+++ b/test cases/common/139 C and CPP link/sub.c
diff --git a/test cases/common/142 C and CPP link/sub.h b/test cases/common/139 C and CPP link/sub.h
index 5b02e172d..5b02e172d 100644
--- a/test cases/common/142 C and CPP link/sub.h
+++ b/test cases/common/139 C and CPP link/sub.h
diff --git a/test cases/common/143 mesonintrospect from scripts/check_env.py b/test cases/common/140 mesonintrospect from scripts/check_env.py
index 2d46d888f..2d46d888f 100644
--- a/test cases/common/143 mesonintrospect from scripts/check_env.py
+++ b/test cases/common/140 mesonintrospect from scripts/check_env.py
diff --git a/test cases/common/143 mesonintrospect from scripts/check_introspection.py b/test cases/common/140 mesonintrospect from scripts/check_introspection.py
index 851a415c4..851a415c4 100644
--- a/test cases/common/143 mesonintrospect from scripts/check_introspection.py
+++ b/test cases/common/140 mesonintrospect from scripts/check_introspection.py
diff --git a/test cases/common/143 mesonintrospect from scripts/meson.build b/test cases/common/140 mesonintrospect from scripts/meson.build
index 11176727d..11176727d 100644
--- a/test cases/common/143 mesonintrospect from scripts/meson.build
+++ b/test cases/common/140 mesonintrospect from scripts/meson.build
diff --git a/test cases/common/144 custom target multiple outputs/generator.py b/test cases/common/141 custom target multiple outputs/generator.py
index 39dbd11c4..39dbd11c4 100755
--- a/test cases/common/144 custom target multiple outputs/generator.py
+++ b/test cases/common/141 custom target multiple outputs/generator.py
diff --git a/test cases/common/144 custom target multiple outputs/meson.build b/test cases/common/141 custom target multiple outputs/meson.build
index 382c9b2c8..382c9b2c8 100644
--- a/test cases/common/144 custom target multiple outputs/meson.build
+++ b/test cases/common/141 custom target multiple outputs/meson.build
diff --git a/test cases/common/144 custom target multiple outputs/test.json b/test cases/common/141 custom target multiple outputs/test.json
index e59cb9f83..e59cb9f83 100644
--- a/test cases/common/144 custom target multiple outputs/test.json
+++ b/test cases/common/141 custom target multiple outputs/test.json
diff --git a/test cases/common/145 special characters/arg-char-test.c b/test cases/common/142 special characters/arg-char-test.c
index 04e02f8e8..04e02f8e8 100644
--- a/test cases/common/145 special characters/arg-char-test.c
+++ b/test cases/common/142 special characters/arg-char-test.c
diff --git a/test cases/common/145 special characters/arg-string-test.c b/test cases/common/142 special characters/arg-string-test.c
index 199fd7917..199fd7917 100644
--- a/test cases/common/145 special characters/arg-string-test.c
+++ b/test cases/common/142 special characters/arg-string-test.c
diff --git a/test cases/common/145 special characters/arg-unquoted-test.c b/test cases/common/142 special characters/arg-unquoted-test.c
index 7f679ca68..7f679ca68 100644
--- a/test cases/common/145 special characters/arg-unquoted-test.c
+++ b/test cases/common/142 special characters/arg-unquoted-test.c
diff --git a/test cases/common/145 special characters/check_quoting.py b/test cases/common/142 special characters/check_quoting.py
index d6e50ea69..d6e50ea69 100644
--- a/test cases/common/145 special characters/check_quoting.py
+++ b/test cases/common/142 special characters/check_quoting.py
diff --git a/test cases/common/145 special characters/meson.build b/test cases/common/142 special characters/meson.build
index 579601e80..579601e80 100644
--- a/test cases/common/145 special characters/meson.build
+++ b/test cases/common/142 special characters/meson.build
diff --git a/test cases/common/145 special characters/test.json b/test cases/common/142 special characters/test.json
index 9709e5bc6..9709e5bc6 100644
--- a/test cases/common/145 special characters/test.json
+++ b/test cases/common/142 special characters/test.json
diff --git a/test cases/common/146 nested links/meson.build b/test cases/common/143 nested links/meson.build
index 0821b038d..0821b038d 100644
--- a/test cases/common/146 nested links/meson.build
+++ b/test cases/common/143 nested links/meson.build
diff --git a/test cases/common/146 nested links/xephyr.c b/test cases/common/143 nested links/xephyr.c
index 9b6bdc2ec..9b6bdc2ec 100644
--- a/test cases/common/146 nested links/xephyr.c
+++ b/test cases/common/143 nested links/xephyr.c
diff --git a/test cases/common/147 list of file sources/foo b/test cases/common/144 list of file sources/foo
index 7b57bd29e..7b57bd29e 100644
--- a/test cases/common/147 list of file sources/foo
+++ b/test cases/common/144 list of file sources/foo
diff --git a/test cases/common/147 list of file sources/gen.py b/test cases/common/144 list of file sources/gen.py
index 2337d3d6b..2337d3d6b 100644
--- a/test cases/common/147 list of file sources/gen.py
+++ b/test cases/common/144 list of file sources/gen.py
diff --git a/test cases/common/147 list of file sources/meson.build b/test cases/common/144 list of file sources/meson.build
index 819509dd6..819509dd6 100644
--- a/test cases/common/147 list of file sources/meson.build
+++ b/test cases/common/144 list of file sources/meson.build
diff --git a/test cases/common/148 link depends custom target/foo.c b/test cases/common/145 link depends custom target/foo.c
index 58c86a62b..58c86a62b 100644
--- a/test cases/common/148 link depends custom target/foo.c
+++ b/test cases/common/145 link depends custom target/foo.c
diff --git a/test cases/common/148 link depends custom target/make_file.py b/test cases/common/145 link depends custom target/make_file.py
index ceb6e19aa..ceb6e19aa 100755
--- a/test cases/common/148 link depends custom target/make_file.py
+++ b/test cases/common/145 link depends custom target/make_file.py
diff --git a/test cases/common/148 link depends custom target/meson.build b/test cases/common/145 link depends custom target/meson.build
index ee7a865d9..ee7a865d9 100644
--- a/test cases/common/148 link depends custom target/meson.build
+++ b/test cases/common/145 link depends custom target/meson.build
diff --git a/test cases/common/149 recursive linking/3rdorderdeps/lib.c.in b/test cases/common/146 recursive linking/3rdorderdeps/lib.c.in
index 461f85995..461f85995 100644
--- a/test cases/common/149 recursive linking/3rdorderdeps/lib.c.in
+++ b/test cases/common/146 recursive linking/3rdorderdeps/lib.c.in
diff --git a/test cases/common/149 recursive linking/3rdorderdeps/main.c.in b/test cases/common/146 recursive linking/3rdorderdeps/main.c.in
index 643c24694..643c24694 100644
--- a/test cases/common/149 recursive linking/3rdorderdeps/main.c.in
+++ b/test cases/common/146 recursive linking/3rdorderdeps/main.c.in
diff --git a/test cases/common/149 recursive linking/3rdorderdeps/meson.build b/test cases/common/146 recursive linking/3rdorderdeps/meson.build
index 4c5ac7307..4c5ac7307 100644
--- a/test cases/common/149 recursive linking/3rdorderdeps/meson.build
+++ b/test cases/common/146 recursive linking/3rdorderdeps/meson.build
diff --git a/test cases/common/149 recursive linking/circular/lib1.c b/test cases/common/146 recursive linking/circular/lib1.c
index 38889cfa0..38889cfa0 100644
--- a/test cases/common/149 recursive linking/circular/lib1.c
+++ b/test cases/common/146 recursive linking/circular/lib1.c
diff --git a/test cases/common/149 recursive linking/circular/lib2.c b/test cases/common/146 recursive linking/circular/lib2.c
index 31cd37cc1..31cd37cc1 100644
--- a/test cases/common/149 recursive linking/circular/lib2.c
+++ b/test cases/common/146 recursive linking/circular/lib2.c
diff --git a/test cases/common/149 recursive linking/circular/lib3.c b/test cases/common/146 recursive linking/circular/lib3.c
index 67d473aac..67d473aac 100644
--- a/test cases/common/149 recursive linking/circular/lib3.c
+++ b/test cases/common/146 recursive linking/circular/lib3.c
diff --git a/test cases/common/149 recursive linking/circular/main.c b/test cases/common/146 recursive linking/circular/main.c
index 164abdf85..164abdf85 100644
--- a/test cases/common/149 recursive linking/circular/main.c
+++ b/test cases/common/146 recursive linking/circular/main.c
diff --git a/test cases/common/149 recursive linking/circular/meson.build b/test cases/common/146 recursive linking/circular/meson.build
index b7a70a86b..b7a70a86b 100644
--- a/test cases/common/149 recursive linking/circular/meson.build
+++ b/test cases/common/146 recursive linking/circular/meson.build
diff --git a/test cases/common/149 recursive linking/circular/prop1.c b/test cases/common/146 recursive linking/circular/prop1.c
index 4e571f5ee..4e571f5ee 100644
--- a/test cases/common/149 recursive linking/circular/prop1.c
+++ b/test cases/common/146 recursive linking/circular/prop1.c
diff --git a/test cases/common/149 recursive linking/circular/prop2.c b/test cases/common/146 recursive linking/circular/prop2.c
index ceabba055..ceabba055 100644
--- a/test cases/common/149 recursive linking/circular/prop2.c
+++ b/test cases/common/146 recursive linking/circular/prop2.c
diff --git a/test cases/common/149 recursive linking/circular/prop3.c b/test cases/common/146 recursive linking/circular/prop3.c
index 246206c2c..246206c2c 100644
--- a/test cases/common/149 recursive linking/circular/prop3.c
+++ b/test cases/common/146 recursive linking/circular/prop3.c
diff --git a/test cases/common/149 recursive linking/edge-cases/libsto.c b/test cases/common/146 recursive linking/edge-cases/libsto.c
index 93f46a88c..93f46a88c 100644
--- a/test cases/common/149 recursive linking/edge-cases/libsto.c
+++ b/test cases/common/146 recursive linking/edge-cases/libsto.c
diff --git a/test cases/common/149 recursive linking/edge-cases/meson.build b/test cases/common/146 recursive linking/edge-cases/meson.build
index 6a46266b4..6a46266b4 100644
--- a/test cases/common/149 recursive linking/edge-cases/meson.build
+++ b/test cases/common/146 recursive linking/edge-cases/meson.build
diff --git a/test cases/common/149 recursive linking/edge-cases/shstmain.c b/test cases/common/146 recursive linking/edge-cases/shstmain.c
index 334f86788..334f86788 100644
--- a/test cases/common/149 recursive linking/edge-cases/shstmain.c
+++ b/test cases/common/146 recursive linking/edge-cases/shstmain.c
diff --git a/test cases/common/149 recursive linking/edge-cases/stobuilt.c b/test cases/common/146 recursive linking/edge-cases/stobuilt.c
index 9cc15bcae..9cc15bcae 100644
--- a/test cases/common/149 recursive linking/edge-cases/stobuilt.c
+++ b/test cases/common/146 recursive linking/edge-cases/stobuilt.c
diff --git a/test cases/common/149 recursive linking/edge-cases/stomain.c b/test cases/common/146 recursive linking/edge-cases/stomain.c
index a16a89b31..a16a89b31 100644
--- a/test cases/common/149 recursive linking/edge-cases/stomain.c
+++ b/test cases/common/146 recursive linking/edge-cases/stomain.c
diff --git a/test cases/common/149 recursive linking/lib.h b/test cases/common/146 recursive linking/lib.h
index b54bf3673..b54bf3673 100644
--- a/test cases/common/149 recursive linking/lib.h
+++ b/test cases/common/146 recursive linking/lib.h
diff --git a/test cases/common/149 recursive linking/main.c b/test cases/common/146 recursive linking/main.c
index cf091d089..cf091d089 100644
--- a/test cases/common/149 recursive linking/main.c
+++ b/test cases/common/146 recursive linking/main.c
diff --git a/test cases/common/149 recursive linking/meson.build b/test cases/common/146 recursive linking/meson.build
index 2ca715157..2ca715157 100644
--- a/test cases/common/149 recursive linking/meson.build
+++ b/test cases/common/146 recursive linking/meson.build
diff --git a/test cases/common/149 recursive linking/shnodep/lib.c b/test cases/common/146 recursive linking/shnodep/lib.c
index a3b7993c2..a3b7993c2 100644
--- a/test cases/common/149 recursive linking/shnodep/lib.c
+++ b/test cases/common/146 recursive linking/shnodep/lib.c
diff --git a/test cases/common/149 recursive linking/shnodep/meson.build b/test cases/common/146 recursive linking/shnodep/meson.build
index 66cfd9bc6..66cfd9bc6 100644
--- a/test cases/common/149 recursive linking/shnodep/meson.build
+++ b/test cases/common/146 recursive linking/shnodep/meson.build
diff --git a/test cases/common/149 recursive linking/shshdep/lib.c b/test cases/common/146 recursive linking/shshdep/lib.c
index 715d12092..715d12092 100644
--- a/test cases/common/149 recursive linking/shshdep/lib.c
+++ b/test cases/common/146 recursive linking/shshdep/lib.c
diff --git a/test cases/common/149 recursive linking/shshdep/meson.build b/test cases/common/146 recursive linking/shshdep/meson.build
index 020b481cf..020b481cf 100644
--- a/test cases/common/149 recursive linking/shshdep/meson.build
+++ b/test cases/common/146 recursive linking/shshdep/meson.build
diff --git a/test cases/common/149 recursive linking/shstdep/lib.c b/test cases/common/146 recursive linking/shstdep/lib.c
index 5da8d0b2e..5da8d0b2e 100644
--- a/test cases/common/149 recursive linking/shstdep/lib.c
+++ b/test cases/common/146 recursive linking/shstdep/lib.c
diff --git a/test cases/common/149 recursive linking/shstdep/meson.build b/test cases/common/146 recursive linking/shstdep/meson.build
index 008f9f893..008f9f893 100644
--- a/test cases/common/149 recursive linking/shstdep/meson.build
+++ b/test cases/common/146 recursive linking/shstdep/meson.build
diff --git a/test cases/common/149 recursive linking/stnodep/lib.c b/test cases/common/146 recursive linking/stnodep/lib.c
index 4bc50bea2..4bc50bea2 100644
--- a/test cases/common/149 recursive linking/stnodep/lib.c
+++ b/test cases/common/146 recursive linking/stnodep/lib.c
diff --git a/test cases/common/149 recursive linking/stnodep/meson.build b/test cases/common/146 recursive linking/stnodep/meson.build
index 77f7129b6..77f7129b6 100644
--- a/test cases/common/149 recursive linking/stnodep/meson.build
+++ b/test cases/common/146 recursive linking/stnodep/meson.build
diff --git a/test cases/common/149 recursive linking/stshdep/lib.c b/test cases/common/146 recursive linking/stshdep/lib.c
index 3cfa12bcb..3cfa12bcb 100644
--- a/test cases/common/149 recursive linking/stshdep/lib.c
+++ b/test cases/common/146 recursive linking/stshdep/lib.c
diff --git a/test cases/common/149 recursive linking/stshdep/meson.build b/test cases/common/146 recursive linking/stshdep/meson.build
index 0967c1ce4..0967c1ce4 100644
--- a/test cases/common/149 recursive linking/stshdep/meson.build
+++ b/test cases/common/146 recursive linking/stshdep/meson.build
diff --git a/test cases/common/149 recursive linking/ststdep/lib.c b/test cases/common/146 recursive linking/ststdep/lib.c
index fca870669..fca870669 100644
--- a/test cases/common/149 recursive linking/ststdep/lib.c
+++ b/test cases/common/146 recursive linking/ststdep/lib.c
diff --git a/test cases/common/149 recursive linking/ststdep/meson.build b/test cases/common/146 recursive linking/ststdep/meson.build
index 3602442aa..3602442aa 100644
--- a/test cases/common/149 recursive linking/ststdep/meson.build
+++ b/test cases/common/146 recursive linking/ststdep/meson.build
diff --git a/test cases/common/150 library at root/lib.c b/test cases/common/147 library at root/lib.c
index a5b3dc3b8..a5b3dc3b8 100644
--- a/test cases/common/150 library at root/lib.c
+++ b/test cases/common/147 library at root/lib.c
diff --git a/test cases/common/150 library at root/main/main.c b/test cases/common/147 library at root/main/main.c
index eadf7e8ce..eadf7e8ce 100644
--- a/test cases/common/150 library at root/main/main.c
+++ b/test cases/common/147 library at root/main/main.c
diff --git a/test cases/common/150 library at root/main/meson.build b/test cases/common/147 library at root/main/meson.build
index 557378ae5..557378ae5 100644
--- a/test cases/common/150 library at root/main/meson.build
+++ b/test cases/common/147 library at root/main/meson.build
diff --git a/test cases/common/150 library at root/meson.build b/test cases/common/147 library at root/meson.build
index bfdd869d7..bfdd869d7 100644
--- a/test cases/common/150 library at root/meson.build
+++ b/test cases/common/147 library at root/meson.build
diff --git a/test cases/common/151 simd/fallback.c b/test cases/common/148 simd/fallback.c
index ab435f433..ab435f433 100644
--- a/test cases/common/151 simd/fallback.c
+++ b/test cases/common/148 simd/fallback.c
diff --git a/test cases/common/151 simd/include/simdheader.h b/test cases/common/148 simd/include/simdheader.h
index 6515e413e..6515e413e 100644
--- a/test cases/common/151 simd/include/simdheader.h
+++ b/test cases/common/148 simd/include/simdheader.h
diff --git a/test cases/common/151 simd/meson.build b/test cases/common/148 simd/meson.build
index 2628a1234..2628a1234 100644
--- a/test cases/common/151 simd/meson.build
+++ b/test cases/common/148 simd/meson.build
diff --git a/test cases/common/151 simd/simd_avx.c b/test cases/common/148 simd/simd_avx.c
index 5f45a4e2f..5f45a4e2f 100644
--- a/test cases/common/151 simd/simd_avx.c
+++ b/test cases/common/148 simd/simd_avx.c
diff --git a/test cases/common/151 simd/simd_avx2.c b/test cases/common/148 simd/simd_avx2.c
index c79819b75..c79819b75 100644
--- a/test cases/common/151 simd/simd_avx2.c
+++ b/test cases/common/148 simd/simd_avx2.c
diff --git a/test cases/common/151 simd/simd_mmx.c b/test cases/common/148 simd/simd_mmx.c
index 76054420b..76054420b 100644
--- a/test cases/common/151 simd/simd_mmx.c
+++ b/test cases/common/148 simd/simd_mmx.c
diff --git a/test cases/common/151 simd/simd_neon.c b/test cases/common/148 simd/simd_neon.c
index 2834b3096..2834b3096 100644
--- a/test cases/common/151 simd/simd_neon.c
+++ b/test cases/common/148 simd/simd_neon.c
diff --git a/test cases/common/151 simd/simd_sse.c b/test cases/common/148 simd/simd_sse.c
index 6014e0cc9..6014e0cc9 100644
--- a/test cases/common/151 simd/simd_sse.c
+++ b/test cases/common/148 simd/simd_sse.c
diff --git a/test cases/common/151 simd/simd_sse2.c b/test cases/common/148 simd/simd_sse2.c
index 445afb631..445afb631 100644
--- a/test cases/common/151 simd/simd_sse2.c
+++ b/test cases/common/148 simd/simd_sse2.c
diff --git a/test cases/common/151 simd/simd_sse3.c b/test cases/common/148 simd/simd_sse3.c
index 29a35e60f..29a35e60f 100644
--- a/test cases/common/151 simd/simd_sse3.c
+++ b/test cases/common/148 simd/simd_sse3.c
diff --git a/test cases/common/151 simd/simd_sse41.c b/test cases/common/148 simd/simd_sse41.c
index 29f25554a..29f25554a 100644
--- a/test cases/common/151 simd/simd_sse41.c
+++ b/test cases/common/148 simd/simd_sse41.c
diff --git a/test cases/common/151 simd/simd_sse42.c b/test cases/common/148 simd/simd_sse42.c
index f1564e2b9..f1564e2b9 100644
--- a/test cases/common/151 simd/simd_sse42.c
+++ b/test cases/common/148 simd/simd_sse42.c
diff --git a/test cases/common/151 simd/simd_ssse3.c b/test cases/common/148 simd/simd_ssse3.c
index fa557f4c1..fa557f4c1 100644
--- a/test cases/common/151 simd/simd_ssse3.c
+++ b/test cases/common/148 simd/simd_ssse3.c
diff --git a/test cases/common/151 simd/simdchecker.c b/test cases/common/148 simd/simdchecker.c
index c7a0a978a..c7a0a978a 100644
--- a/test cases/common/151 simd/simdchecker.c
+++ b/test cases/common/148 simd/simdchecker.c
diff --git a/test cases/common/151 simd/simdfuncs.h b/test cases/common/148 simd/simdfuncs.h
index d820f2503..d820f2503 100644
--- a/test cases/common/151 simd/simdfuncs.h
+++ b/test cases/common/148 simd/simdfuncs.h
diff --git a/test cases/common/152 shared module resolving symbol in executable/meson.build b/test cases/common/149 shared module resolving symbol in executable/meson.build
index 4e5188f12..4e5188f12 100644
--- a/test cases/common/152 shared module resolving symbol in executable/meson.build
+++ b/test cases/common/149 shared module resolving symbol in executable/meson.build
diff --git a/test cases/common/152 shared module resolving symbol in executable/module.c b/test cases/common/149 shared module resolving symbol in executable/module.c
index 64374d590..64374d590 100644
--- a/test cases/common/152 shared module resolving symbol in executable/module.c
+++ b/test cases/common/149 shared module resolving symbol in executable/module.c
diff --git a/test cases/common/152 shared module resolving symbol in executable/prog.c b/test cases/common/149 shared module resolving symbol in executable/prog.c
index b2abcdb18..b2abcdb18 100644
--- a/test cases/common/152 shared module resolving symbol in executable/prog.c
+++ b/test cases/common/149 shared module resolving symbol in executable/prog.c
diff --git a/test cases/common/153 dotinclude/dotproc.c b/test cases/common/150 dotinclude/dotproc.c
index f48c330bd..f48c330bd 100644
--- a/test cases/common/153 dotinclude/dotproc.c
+++ b/test cases/common/150 dotinclude/dotproc.c
diff --git a/test cases/common/153 dotinclude/meson.build b/test cases/common/150 dotinclude/meson.build
index e0c2cd7a0..e0c2cd7a0 100644
--- a/test cases/common/153 dotinclude/meson.build
+++ b/test cases/common/150 dotinclude/meson.build
diff --git a/test cases/common/153 dotinclude/stdio.h b/test cases/common/150 dotinclude/stdio.h
index b6bd09fc4..b6bd09fc4 100644
--- a/test cases/common/153 dotinclude/stdio.h
+++ b/test cases/common/150 dotinclude/stdio.h
diff --git a/test cases/common/154 reserved targets/all/meson.build b/test cases/common/151 reserved targets/all/meson.build
index adee88214..adee88214 100644
--- a/test cases/common/154 reserved targets/all/meson.build
+++ b/test cases/common/151 reserved targets/all/meson.build
diff --git a/test cases/common/154 reserved targets/benchmark/meson.build b/test cases/common/151 reserved targets/benchmark/meson.build
index 242cc235d..242cc235d 100644
--- a/test cases/common/154 reserved targets/benchmark/meson.build
+++ b/test cases/common/151 reserved targets/benchmark/meson.build
diff --git a/test cases/common/154 reserved targets/clean-ctlist/meson.build b/test cases/common/151 reserved targets/clean-ctlist/meson.build
index 75eb207db..75eb207db 100644
--- a/test cases/common/154 reserved targets/clean-ctlist/meson.build
+++ b/test cases/common/151 reserved targets/clean-ctlist/meson.build
diff --git a/test cases/common/154 reserved targets/clean-gcda/meson.build b/test cases/common/151 reserved targets/clean-gcda/meson.build
index 488a527fc..488a527fc 100644
--- a/test cases/common/154 reserved targets/clean-gcda/meson.build
+++ b/test cases/common/151 reserved targets/clean-gcda/meson.build
diff --git a/test cases/common/154 reserved targets/clean-gcno/meson.build b/test cases/common/151 reserved targets/clean-gcno/meson.build
index eec789ac2..eec789ac2 100644
--- a/test cases/common/154 reserved targets/clean-gcno/meson.build
+++ b/test cases/common/151 reserved targets/clean-gcno/meson.build
diff --git a/test cases/common/154 reserved targets/clean/meson.build b/test cases/common/151 reserved targets/clean/meson.build
index 4e27b6c27..4e27b6c27 100644
--- a/test cases/common/154 reserved targets/clean/meson.build
+++ b/test cases/common/151 reserved targets/clean/meson.build
diff --git a/test cases/common/154 reserved targets/coverage-html/meson.build b/test cases/common/151 reserved targets/coverage-html/meson.build
index 10a4cc89b..10a4cc89b 100644
--- a/test cases/common/154 reserved targets/coverage-html/meson.build
+++ b/test cases/common/151 reserved targets/coverage-html/meson.build
diff --git a/test cases/common/154 reserved targets/coverage-text/meson.build b/test cases/common/151 reserved targets/coverage-text/meson.build
index 21dcae5fe..21dcae5fe 100644
--- a/test cases/common/154 reserved targets/coverage-text/meson.build
+++ b/test cases/common/151 reserved targets/coverage-text/meson.build
diff --git a/test cases/common/154 reserved targets/coverage-xml/meson.build b/test cases/common/151 reserved targets/coverage-xml/meson.build
index 44d7bfbe3..44d7bfbe3 100644
--- a/test cases/common/154 reserved targets/coverage-xml/meson.build
+++ b/test cases/common/151 reserved targets/coverage-xml/meson.build
diff --git a/test cases/common/154 reserved targets/coverage/meson.build b/test cases/common/151 reserved targets/coverage/meson.build
index b40105550..b40105550 100644
--- a/test cases/common/154 reserved targets/coverage/meson.build
+++ b/test cases/common/151 reserved targets/coverage/meson.build
diff --git a/test cases/common/154 reserved targets/dist/meson.build b/test cases/common/151 reserved targets/dist/meson.build
index 951bbb4da..951bbb4da 100644
--- a/test cases/common/154 reserved targets/dist/meson.build
+++ b/test cases/common/151 reserved targets/dist/meson.build
diff --git a/test cases/common/154 reserved targets/distcheck/meson.build b/test cases/common/151 reserved targets/distcheck/meson.build
index 12b9328ad..12b9328ad 100644
--- a/test cases/common/154 reserved targets/distcheck/meson.build
+++ b/test cases/common/151 reserved targets/distcheck/meson.build
diff --git a/test cases/common/154 reserved targets/install/meson.build b/test cases/common/151 reserved targets/install/meson.build
index 483990186..483990186 100644
--- a/test cases/common/154 reserved targets/install/meson.build
+++ b/test cases/common/151 reserved targets/install/meson.build
diff --git a/test cases/common/154 reserved targets/meson.build b/test cases/common/151 reserved targets/meson.build
index 24fd937bc..24fd937bc 100644
--- a/test cases/common/154 reserved targets/meson.build
+++ b/test cases/common/151 reserved targets/meson.build
diff --git a/test cases/common/154 reserved targets/phony/meson.build b/test cases/common/151 reserved targets/phony/meson.build
index 6710fc124..6710fc124 100644
--- a/test cases/common/154 reserved targets/phony/meson.build
+++ b/test cases/common/151 reserved targets/phony/meson.build
diff --git a/test cases/common/154 reserved targets/reconfigure/meson.build b/test cases/common/151 reserved targets/reconfigure/meson.build
index c3ea3da8a..c3ea3da8a 100644
--- a/test cases/common/154 reserved targets/reconfigure/meson.build
+++ b/test cases/common/151 reserved targets/reconfigure/meson.build
diff --git a/test cases/common/154 reserved targets/runtarget/meson.build b/test cases/common/151 reserved targets/runtarget/meson.build
index 52c371b5d..52c371b5d 100644
--- a/test cases/common/154 reserved targets/runtarget/meson.build
+++ b/test cases/common/151 reserved targets/runtarget/meson.build
diff --git a/test cases/common/154 reserved targets/scan-build/meson.build b/test cases/common/151 reserved targets/scan-build/meson.build
index 100205346..100205346 100644
--- a/test cases/common/154 reserved targets/scan-build/meson.build
+++ b/test cases/common/151 reserved targets/scan-build/meson.build
diff --git a/test cases/common/154 reserved targets/test.c b/test cases/common/151 reserved targets/test.c
index 03b2213bb..03b2213bb 100644
--- a/test cases/common/154 reserved targets/test.c
+++ b/test cases/common/151 reserved targets/test.c
diff --git a/test cases/common/154 reserved targets/test/meson.build b/test cases/common/151 reserved targets/test/meson.build
index 4ab123cdd..4ab123cdd 100644
--- a/test cases/common/154 reserved targets/test/meson.build
+++ b/test cases/common/151 reserved targets/test/meson.build
diff --git a/test cases/common/154 reserved targets/uninstall/meson.build b/test cases/common/151 reserved targets/uninstall/meson.build
index 21c6ca60d..21c6ca60d 100644
--- a/test cases/common/154 reserved targets/uninstall/meson.build
+++ b/test cases/common/151 reserved targets/uninstall/meson.build
diff --git a/test cases/common/155 duplicate source names/dir1/file.c b/test cases/common/152 duplicate source names/dir1/file.c
index 1c4753eb9..1c4753eb9 100644
--- a/test cases/common/155 duplicate source names/dir1/file.c
+++ b/test cases/common/152 duplicate source names/dir1/file.c
diff --git a/test cases/common/155 duplicate source names/dir1/meson.build b/test cases/common/152 duplicate source names/dir1/meson.build
index 00bc85daf..00bc85daf 100644
--- a/test cases/common/155 duplicate source names/dir1/meson.build
+++ b/test cases/common/152 duplicate source names/dir1/meson.build
diff --git a/test cases/common/155 duplicate source names/dir2/dir1/file.c b/test cases/common/152 duplicate source names/dir2/dir1/file.c
index 5aac8e53f..5aac8e53f 100644
--- a/test cases/common/155 duplicate source names/dir2/dir1/file.c
+++ b/test cases/common/152 duplicate source names/dir2/dir1/file.c
diff --git a/test cases/common/155 duplicate source names/dir2/file.c b/test cases/common/152 duplicate source names/dir2/file.c
index 6cf8d6602..6cf8d6602 100644
--- a/test cases/common/155 duplicate source names/dir2/file.c
+++ b/test cases/common/152 duplicate source names/dir2/file.c
diff --git a/test cases/common/155 duplicate source names/dir2/meson.build b/test cases/common/152 duplicate source names/dir2/meson.build
index f116a0200..f116a0200 100644
--- a/test cases/common/155 duplicate source names/dir2/meson.build
+++ b/test cases/common/152 duplicate source names/dir2/meson.build
diff --git a/test cases/common/155 duplicate source names/dir3/dir1/file.c b/test cases/common/152 duplicate source names/dir3/dir1/file.c
index 04667c2ff..04667c2ff 100644
--- a/test cases/common/155 duplicate source names/dir3/dir1/file.c
+++ b/test cases/common/152 duplicate source names/dir3/dir1/file.c
diff --git a/test cases/common/155 duplicate source names/dir3/file.c b/test cases/common/152 duplicate source names/dir3/file.c
index d16d0a8cf..d16d0a8cf 100644
--- a/test cases/common/155 duplicate source names/dir3/file.c
+++ b/test cases/common/152 duplicate source names/dir3/file.c
diff --git a/test cases/common/155 duplicate source names/dir3/meson.build b/test cases/common/152 duplicate source names/dir3/meson.build
index 70ddbf2d0..70ddbf2d0 100644
--- a/test cases/common/155 duplicate source names/dir3/meson.build
+++ b/test cases/common/152 duplicate source names/dir3/meson.build
diff --git a/test cases/common/155 duplicate source names/meson.build b/test cases/common/152 duplicate source names/meson.build
index cac519401..cac519401 100644
--- a/test cases/common/155 duplicate source names/meson.build
+++ b/test cases/common/152 duplicate source names/meson.build
diff --git a/test cases/common/156 index customtarget/check_args.py b/test cases/common/153 index customtarget/check_args.py
index 8663a6fe2..8663a6fe2 100644
--- a/test cases/common/156 index customtarget/check_args.py
+++ b/test cases/common/153 index customtarget/check_args.py
diff --git a/test cases/common/156 index customtarget/gen_sources.py b/test cases/common/153 index customtarget/gen_sources.py
index 0bdb529cd..0bdb529cd 100644
--- a/test cases/common/156 index customtarget/gen_sources.py
+++ b/test cases/common/153 index customtarget/gen_sources.py
diff --git a/test cases/common/156 index customtarget/lib.c b/test cases/common/153 index customtarget/lib.c
index 17117d54c..17117d54c 100644
--- a/test cases/common/156 index customtarget/lib.c
+++ b/test cases/common/153 index customtarget/lib.c
diff --git a/test cases/common/156 index customtarget/meson.build b/test cases/common/153 index customtarget/meson.build
index efddfaca3..efddfaca3 100644
--- a/test cases/common/156 index customtarget/meson.build
+++ b/test cases/common/153 index customtarget/meson.build
diff --git a/test cases/common/156 index customtarget/subdir/foo.c b/test cases/common/153 index customtarget/subdir/foo.c
index c620a1183..c620a1183 100644
--- a/test cases/common/156 index customtarget/subdir/foo.c
+++ b/test cases/common/153 index customtarget/subdir/foo.c
diff --git a/test cases/common/156 index customtarget/subdir/meson.build b/test cases/common/153 index customtarget/subdir/meson.build
index 47bcd322a..47bcd322a 100644
--- a/test cases/common/156 index customtarget/subdir/meson.build
+++ b/test cases/common/153 index customtarget/subdir/meson.build
diff --git a/test cases/common/157 wrap file should not failed/meson.build b/test cases/common/154 wrap file should not failed/meson.build
index 48d10688a..48d10688a 100644
--- a/test cases/common/157 wrap file should not failed/meson.build
+++ b/test cases/common/154 wrap file should not failed/meson.build
diff --git a/test cases/common/157 wrap file should not failed/src/meson.build b/test cases/common/154 wrap file should not failed/src/meson.build
index 0c82165d1..0c82165d1 100644
--- a/test cases/common/157 wrap file should not failed/src/meson.build
+++ b/test cases/common/154 wrap file should not failed/src/meson.build
diff --git a/test cases/common/157 wrap file should not failed/src/subprojects/foo/prog2.c b/test cases/common/154 wrap file should not failed/src/subprojects/foo/prog2.c
index 849b40004..849b40004 100644
--- a/test cases/common/157 wrap file should not failed/src/subprojects/foo/prog2.c
+++ b/test cases/common/154 wrap file should not failed/src/subprojects/foo/prog2.c
diff --git a/test cases/common/157 wrap file should not failed/src/subprojects/prog.c b/test cases/common/154 wrap file should not failed/src/subprojects/prog.c
index 849b40004..849b40004 100644
--- a/test cases/common/157 wrap file should not failed/src/subprojects/prog.c
+++ b/test cases/common/154 wrap file should not failed/src/subprojects/prog.c
diff --git a/test cases/common/157 wrap file should not failed/src/test.c b/test cases/common/154 wrap file should not failed/src/test.c
index 34cf99183..34cf99183 100644
--- a/test cases/common/157 wrap file should not failed/src/test.c
+++ b/test cases/common/154 wrap file should not failed/src/test.c
diff --git a/test cases/common/157 wrap file should not failed/subprojects/.gitignore b/test cases/common/154 wrap file should not failed/subprojects/.gitignore
index aabded6b2..aabded6b2 100644
--- a/test cases/common/157 wrap file should not failed/subprojects/.gitignore
+++ b/test cases/common/154 wrap file should not failed/subprojects/.gitignore
diff --git a/test cases/common/157 wrap file should not failed/subprojects/bar.wrap b/test cases/common/154 wrap file should not failed/subprojects/bar.wrap
index 4e8f7e392..4e8f7e392 100644
--- a/test cases/common/157 wrap file should not failed/subprojects/bar.wrap
+++ b/test cases/common/154 wrap file should not failed/subprojects/bar.wrap
diff --git a/test cases/common/157 wrap file should not failed/subprojects/foo.wrap b/test cases/common/154 wrap file should not failed/subprojects/foo.wrap
index c67c5e5db..c67c5e5db 100644
--- a/test cases/common/157 wrap file should not failed/subprojects/foo.wrap
+++ b/test cases/common/154 wrap file should not failed/subprojects/foo.wrap
diff --git a/test cases/common/157 wrap file should not failed/subprojects/packagecache/foo-1.0-patch.tar.xz b/test cases/common/154 wrap file should not failed/subprojects/packagecache/foo-1.0-patch.tar.xz
index e26b8e06f..e26b8e06f 100644
--- a/test cases/common/157 wrap file should not failed/subprojects/packagecache/foo-1.0-patch.tar.xz
+++ b/test cases/common/154 wrap file should not failed/subprojects/packagecache/foo-1.0-patch.tar.xz
diff --git a/test cases/common/157 wrap file should not failed/subprojects/packagecache/foo-1.0.tar.xz b/test cases/common/154 wrap file should not failed/subprojects/packagecache/foo-1.0.tar.xz
index 37eb6cc71..37eb6cc71 100644
--- a/test cases/common/157 wrap file should not failed/subprojects/packagecache/foo-1.0.tar.xz
+++ b/test cases/common/154 wrap file should not failed/subprojects/packagecache/foo-1.0.tar.xz
diff --git a/test cases/common/157 wrap file should not failed/subprojects/packagecache/zlib-1.2.8-8-wrap.zip b/test cases/common/154 wrap file should not failed/subprojects/packagecache/zlib-1.2.8-8-wrap.zip
index 421376db9..421376db9 100644
--- a/test cases/common/157 wrap file should not failed/subprojects/packagecache/zlib-1.2.8-8-wrap.zip
+++ b/test cases/common/154 wrap file should not failed/subprojects/packagecache/zlib-1.2.8-8-wrap.zip
diff --git a/test cases/common/157 wrap file should not failed/subprojects/packagecache/zlib-1.2.8.tar.gz b/test cases/common/154 wrap file should not failed/subprojects/packagecache/zlib-1.2.8.tar.gz
index 421376db9..421376db9 100644
--- a/test cases/common/157 wrap file should not failed/subprojects/packagecache/zlib-1.2.8.tar.gz
+++ b/test cases/common/154 wrap file should not failed/subprojects/packagecache/zlib-1.2.8.tar.gz
diff --git a/test cases/common/157 wrap file should not failed/subprojects/packagefiles/bar-1.0-patch.tar.xz b/test cases/common/154 wrap file should not failed/subprojects/packagefiles/bar-1.0-patch.tar.xz
index f257a1965..f257a1965 100644
--- a/test cases/common/157 wrap file should not failed/subprojects/packagefiles/bar-1.0-patch.tar.xz
+++ b/test cases/common/154 wrap file should not failed/subprojects/packagefiles/bar-1.0-patch.tar.xz
diff --git a/test cases/common/157 wrap file should not failed/subprojects/packagefiles/bar-1.0.tar.xz b/test cases/common/154 wrap file should not failed/subprojects/packagefiles/bar-1.0.tar.xz
index d90a9e8b0..d90a9e8b0 100644
--- a/test cases/common/157 wrap file should not failed/subprojects/packagefiles/bar-1.0.tar.xz
+++ b/test cases/common/154 wrap file should not failed/subprojects/packagefiles/bar-1.0.tar.xz
diff --git a/test cases/common/157 wrap file should not failed/subprojects/packagefiles/foo-1.0/meson.build b/test cases/common/154 wrap file should not failed/subprojects/packagefiles/foo-1.0/meson.build
index dbaf91f2b..dbaf91f2b 100644
--- a/test cases/common/157 wrap file should not failed/subprojects/packagefiles/foo-1.0/meson.build
+++ b/test cases/common/154 wrap file should not failed/subprojects/packagefiles/foo-1.0/meson.build
diff --git a/test cases/common/157 wrap file should not failed/subprojects/patchdir.wrap b/test cases/common/154 wrap file should not failed/subprojects/patchdir.wrap
index 1a2134c3d..1a2134c3d 100644
--- a/test cases/common/157 wrap file should not failed/subprojects/patchdir.wrap
+++ b/test cases/common/154 wrap file should not failed/subprojects/patchdir.wrap
diff --git a/test cases/common/157 wrap file should not failed/subprojects/zlib-1.2.8/foo.c b/test cases/common/154 wrap file should not failed/subprojects/zlib-1.2.8/foo.c
index 267b43aa5..267b43aa5 100644
--- a/test cases/common/157 wrap file should not failed/subprojects/zlib-1.2.8/foo.c
+++ b/test cases/common/154 wrap file should not failed/subprojects/zlib-1.2.8/foo.c
diff --git a/test cases/common/157 wrap file should not failed/subprojects/zlib-1.2.8/meson.build b/test cases/common/154 wrap file should not failed/subprojects/zlib-1.2.8/meson.build
index 8d8008e47..8d8008e47 100644
--- a/test cases/common/157 wrap file should not failed/subprojects/zlib-1.2.8/meson.build
+++ b/test cases/common/154 wrap file should not failed/subprojects/zlib-1.2.8/meson.build
diff --git a/test cases/common/157 wrap file should not failed/subprojects/zlib.wrap b/test cases/common/154 wrap file should not failed/subprojects/zlib.wrap
index 6d5896f79..6d5896f79 100644
--- a/test cases/common/157 wrap file should not failed/subprojects/zlib.wrap
+++ b/test cases/common/154 wrap file should not failed/subprojects/zlib.wrap
diff --git a/test cases/common/158 includedir subproj/meson.build b/test cases/common/155 includedir subproj/meson.build
index b3de5af6c..b3de5af6c 100644
--- a/test cases/common/158 includedir subproj/meson.build
+++ b/test cases/common/155 includedir subproj/meson.build
diff --git a/test cases/common/158 includedir subproj/prog.c b/test cases/common/155 includedir subproj/prog.c
index 03b2213bb..03b2213bb 100644
--- a/test cases/common/158 includedir subproj/prog.c
+++ b/test cases/common/155 includedir subproj/prog.c
diff --git a/test cases/common/158 includedir subproj/subprojects/inctest/include/incfile.h b/test cases/common/155 includedir subproj/subprojects/inctest/include/incfile.h
index ec740dab0..ec740dab0 100644
--- a/test cases/common/158 includedir subproj/subprojects/inctest/include/incfile.h
+++ b/test cases/common/155 includedir subproj/subprojects/inctest/include/incfile.h
diff --git a/test cases/common/158 includedir subproj/subprojects/inctest/meson.build b/test cases/common/155 includedir subproj/subprojects/inctest/meson.build
index 74aabcb6d..74aabcb6d 100644
--- a/test cases/common/158 includedir subproj/subprojects/inctest/meson.build
+++ b/test cases/common/155 includedir subproj/subprojects/inctest/meson.build
diff --git a/test cases/common/159 subproject dir name collision/a.c b/test cases/common/156 subproject dir name collision/a.c
index 7510a1b55..7510a1b55 100644
--- a/test cases/common/159 subproject dir name collision/a.c
+++ b/test cases/common/156 subproject dir name collision/a.c
diff --git a/test cases/common/159 subproject dir name collision/custom_subproject_dir/B/b.c b/test cases/common/156 subproject dir name collision/custom_subproject_dir/B/b.c
index 4d71c0f9d..4d71c0f9d 100644
--- a/test cases/common/159 subproject dir name collision/custom_subproject_dir/B/b.c
+++ b/test cases/common/156 subproject dir name collision/custom_subproject_dir/B/b.c
diff --git a/test cases/common/159 subproject dir name collision/custom_subproject_dir/B/meson.build b/test cases/common/156 subproject dir name collision/custom_subproject_dir/B/meson.build
index 280c60ce2..280c60ce2 100644
--- a/test cases/common/159 subproject dir name collision/custom_subproject_dir/B/meson.build
+++ b/test cases/common/156 subproject dir name collision/custom_subproject_dir/B/meson.build
diff --git a/test cases/common/159 subproject dir name collision/custom_subproject_dir/C/c.c b/test cases/common/156 subproject dir name collision/custom_subproject_dir/C/c.c
index facd19943..facd19943 100644
--- a/test cases/common/159 subproject dir name collision/custom_subproject_dir/C/c.c
+++ b/test cases/common/156 subproject dir name collision/custom_subproject_dir/C/c.c
diff --git a/test cases/common/159 subproject dir name collision/custom_subproject_dir/C/meson.build b/test cases/common/156 subproject dir name collision/custom_subproject_dir/C/meson.build
index abf0b1e26..abf0b1e26 100644
--- a/test cases/common/159 subproject dir name collision/custom_subproject_dir/C/meson.build
+++ b/test cases/common/156 subproject dir name collision/custom_subproject_dir/C/meson.build
diff --git a/test cases/common/159 subproject dir name collision/meson.build b/test cases/common/156 subproject dir name collision/meson.build
index 55312175e..55312175e 100644
--- a/test cases/common/159 subproject dir name collision/meson.build
+++ b/test cases/common/156 subproject dir name collision/meson.build
diff --git a/test cases/common/159 subproject dir name collision/other_subdir/custom_subproject_dir/other.c b/test cases/common/156 subproject dir name collision/other_subdir/custom_subproject_dir/other.c
index fa1953e6b..fa1953e6b 100644
--- a/test cases/common/159 subproject dir name collision/other_subdir/custom_subproject_dir/other.c
+++ b/test cases/common/156 subproject dir name collision/other_subdir/custom_subproject_dir/other.c
diff --git a/test cases/common/159 subproject dir name collision/other_subdir/meson.build b/test cases/common/156 subproject dir name collision/other_subdir/meson.build
index 90cb67a63..90cb67a63 100644
--- a/test cases/common/159 subproject dir name collision/other_subdir/meson.build
+++ b/test cases/common/156 subproject dir name collision/other_subdir/meson.build
diff --git a/test cases/common/160 config tool variable/meson.build b/test cases/common/157 config tool variable/meson.build
index 95841179c..95841179c 100644
--- a/test cases/common/160 config tool variable/meson.build
+++ b/test cases/common/157 config tool variable/meson.build
diff --git a/test cases/common/161 custom target subdir depend files/copyfile.py b/test cases/common/158 custom target subdir depend files/copyfile.py
index ff42ac359..ff42ac359 100644
--- a/test cases/common/161 custom target subdir depend files/copyfile.py
+++ b/test cases/common/158 custom target subdir depend files/copyfile.py
diff --git a/test cases/common/161 custom target subdir depend files/meson.build b/test cases/common/158 custom target subdir depend files/meson.build
index 44f5c7157..44f5c7157 100644
--- a/test cases/common/161 custom target subdir depend files/meson.build
+++ b/test cases/common/158 custom target subdir depend files/meson.build
diff --git a/test cases/common/161 custom target subdir depend files/subdir/dep.dat b/test cases/common/158 custom target subdir depend files/subdir/dep.dat
index 5daee496d..5daee496d 100644
--- a/test cases/common/161 custom target subdir depend files/subdir/dep.dat
+++ b/test cases/common/158 custom target subdir depend files/subdir/dep.dat
diff --git a/test cases/common/161 custom target subdir depend files/subdir/foo.c.in b/test cases/common/158 custom target subdir depend files/subdir/foo.c.in
index a867b3237..a867b3237 100644
--- a/test cases/common/161 custom target subdir depend files/subdir/foo.c.in
+++ b/test cases/common/158 custom target subdir depend files/subdir/foo.c.in
diff --git a/test cases/common/161 custom target subdir depend files/subdir/meson.build b/test cases/common/158 custom target subdir depend files/subdir/meson.build
index f9d31c4c7..f9d31c4c7 100644
--- a/test cases/common/161 custom target subdir depend files/subdir/meson.build
+++ b/test cases/common/158 custom target subdir depend files/subdir/meson.build
diff --git a/test cases/common/163 disabler/meson.build b/test cases/common/159 disabler/meson.build
index d132e2b52..d132e2b52 100644
--- a/test cases/common/163 disabler/meson.build
+++ b/test cases/common/159 disabler/meson.build
diff --git a/test cases/common/164 array option/meson.build b/test cases/common/160 array option/meson.build
index 034b9a545..034b9a545 100644
--- a/test cases/common/164 array option/meson.build
+++ b/test cases/common/160 array option/meson.build
diff --git a/test cases/common/164 array option/meson_options.txt b/test cases/common/160 array option/meson_options.txt
index 7ed0ac14d..7ed0ac14d 100644
--- a/test cases/common/164 array option/meson_options.txt
+++ b/test cases/common/160 array option/meson_options.txt
diff --git a/test cases/common/165 custom target template substitution/checkcopy.py b/test cases/common/161 custom target template substitution/checkcopy.py
index ab9f436ce..ab9f436ce 100644
--- a/test cases/common/165 custom target template substitution/checkcopy.py
+++ b/test cases/common/161 custom target template substitution/checkcopy.py
diff --git a/test cases/common/165 custom target template substitution/foo.c.in b/test cases/common/161 custom target template substitution/foo.c.in
index a867b3237..a867b3237 100644
--- a/test cases/common/165 custom target template substitution/foo.c.in
+++ b/test cases/common/161 custom target template substitution/foo.c.in
diff --git a/test cases/common/165 custom target template substitution/meson.build b/test cases/common/161 custom target template substitution/meson.build
index 737408ebf..737408ebf 100644
--- a/test cases/common/165 custom target template substitution/meson.build
+++ b/test cases/common/161 custom target template substitution/meson.build
diff --git a/test cases/common/166 not-found dependency/meson.build b/test cases/common/162 not-found dependency/meson.build
index 02072b6a0..02072b6a0 100644
--- a/test cases/common/166 not-found dependency/meson.build
+++ b/test cases/common/162 not-found dependency/meson.build
diff --git a/test cases/common/166 not-found dependency/sub/meson.build b/test cases/common/162 not-found dependency/sub/meson.build
index 2a33cae06..2a33cae06 100644
--- a/test cases/common/166 not-found dependency/sub/meson.build
+++ b/test cases/common/162 not-found dependency/sub/meson.build
diff --git a/test cases/common/166 not-found dependency/subprojects/trivial/meson.build b/test cases/common/162 not-found dependency/subprojects/trivial/meson.build
index 8769c7008..8769c7008 100644
--- a/test cases/common/166 not-found dependency/subprojects/trivial/meson.build
+++ b/test cases/common/162 not-found dependency/subprojects/trivial/meson.build
diff --git a/test cases/common/166 not-found dependency/subprojects/trivial/trivial.c b/test cases/common/162 not-found dependency/subprojects/trivial/trivial.c
index cb0c02fcc..cb0c02fcc 100644
--- a/test cases/common/166 not-found dependency/subprojects/trivial/trivial.c
+++ b/test cases/common/162 not-found dependency/subprojects/trivial/trivial.c
diff --git a/test cases/common/166 not-found dependency/testlib.c b/test cases/common/162 not-found dependency/testlib.c
index e69de29bb..e69de29bb 100644
--- a/test cases/common/166 not-found dependency/testlib.c
+++ b/test cases/common/162 not-found dependency/testlib.c
diff --git a/test cases/common/167 subdir if_found/meson.build b/test cases/common/163 subdir if_found/meson.build
index 2c640cfad..2c640cfad 100644
--- a/test cases/common/167 subdir if_found/meson.build
+++ b/test cases/common/163 subdir if_found/meson.build
diff --git a/test cases/common/167 subdir if_found/subdir/meson.build b/test cases/common/163 subdir if_found/subdir/meson.build
index 1030e2551..1030e2551 100644
--- a/test cases/common/167 subdir if_found/subdir/meson.build
+++ b/test cases/common/163 subdir if_found/subdir/meson.build
diff --git a/test cases/common/168 default options prefix dependent defaults/meson.build b/test cases/common/164 default options prefix dependent defaults/meson.build
index 9ca4ec552..9ca4ec552 100644
--- a/test cases/common/168 default options prefix dependent defaults/meson.build
+++ b/test cases/common/164 default options prefix dependent defaults/meson.build
diff --git a/test cases/common/169 dependency factory/meson.build b/test cases/common/165 dependency factory/meson.build
index 2de0f0e71..2de0f0e71 100644
--- a/test cases/common/169 dependency factory/meson.build
+++ b/test cases/common/165 dependency factory/meson.build
diff --git a/test cases/common/170 get project license/bar.c b/test cases/common/166 get project license/bar.c
index f1bd822dc..f1bd822dc 100644
--- a/test cases/common/170 get project license/bar.c
+++ b/test cases/common/166 get project license/bar.c
diff --git a/test cases/common/170 get project license/meson.build b/test cases/common/166 get project license/meson.build
index 37303e372..37303e372 100644
--- a/test cases/common/170 get project license/meson.build
+++ b/test cases/common/166 get project license/meson.build
diff --git a/test cases/common/171 yield/meson.build b/test cases/common/167 yield/meson.build
index 9b115696f..9b115696f 100644
--- a/test cases/common/171 yield/meson.build
+++ b/test cases/common/167 yield/meson.build
diff --git a/test cases/common/171 yield/meson_options.txt b/test cases/common/167 yield/meson_options.txt
index 9f58fbbc8..9f58fbbc8 100644
--- a/test cases/common/171 yield/meson_options.txt
+++ b/test cases/common/167 yield/meson_options.txt
diff --git a/test cases/common/171 yield/subprojects/sub/meson.build b/test cases/common/167 yield/subprojects/sub/meson.build
index 832c13cc2..832c13cc2 100644
--- a/test cases/common/171 yield/subprojects/sub/meson.build
+++ b/test cases/common/167 yield/subprojects/sub/meson.build
diff --git a/test cases/common/171 yield/subprojects/sub/meson_options.txt b/test cases/common/167 yield/subprojects/sub/meson_options.txt
index 101122eeb..101122eeb 100644
--- a/test cases/common/171 yield/subprojects/sub/meson_options.txt
+++ b/test cases/common/167 yield/subprojects/sub/meson_options.txt
diff --git a/test cases/common/172 subproject nested subproject dirs/contrib/subprojects/alpha/a.c b/test cases/common/168 subproject nested subproject dirs/contrib/subprojects/alpha/a.c
index f9848c136..f9848c136 100644
--- a/test cases/common/172 subproject nested subproject dirs/contrib/subprojects/alpha/a.c
+++ b/test cases/common/168 subproject nested subproject dirs/contrib/subprojects/alpha/a.c
diff --git a/test cases/common/172 subproject nested subproject dirs/contrib/subprojects/alpha/meson.build b/test cases/common/168 subproject nested subproject dirs/contrib/subprojects/alpha/meson.build
index 12f656427..12f656427 100644
--- a/test cases/common/172 subproject nested subproject dirs/contrib/subprojects/alpha/meson.build
+++ b/test cases/common/168 subproject nested subproject dirs/contrib/subprojects/alpha/meson.build
diff --git a/test cases/common/172 subproject nested subproject dirs/contrib/subprojects/alpha/var/subprojects/wrap_files_might_be_here b/test cases/common/168 subproject nested subproject dirs/contrib/subprojects/alpha/var/subprojects/wrap_files_might_be_here
index 8d1c8b69c..8d1c8b69c 100644
--- a/test cases/common/172 subproject nested subproject dirs/contrib/subprojects/alpha/var/subprojects/wrap_files_might_be_here
+++ b/test cases/common/168 subproject nested subproject dirs/contrib/subprojects/alpha/var/subprojects/wrap_files_might_be_here
diff --git a/test cases/common/172 subproject nested subproject dirs/contrib/subprojects/beta/b.c b/test cases/common/168 subproject nested subproject dirs/contrib/subprojects/beta/b.c
index 8c07177a6..8c07177a6 100644
--- a/test cases/common/172 subproject nested subproject dirs/contrib/subprojects/beta/b.c
+++ b/test cases/common/168 subproject nested subproject dirs/contrib/subprojects/beta/b.c
diff --git a/test cases/common/172 subproject nested subproject dirs/contrib/subprojects/beta/meson.build b/test cases/common/168 subproject nested subproject dirs/contrib/subprojects/beta/meson.build
index 1720d3e7c..1720d3e7c 100644
--- a/test cases/common/172 subproject nested subproject dirs/contrib/subprojects/beta/meson.build
+++ b/test cases/common/168 subproject nested subproject dirs/contrib/subprojects/beta/meson.build
diff --git a/test cases/common/172 subproject nested subproject dirs/meson.build b/test cases/common/168 subproject nested subproject dirs/meson.build
index 875eed350..875eed350 100644
--- a/test cases/common/172 subproject nested subproject dirs/meson.build
+++ b/test cases/common/168 subproject nested subproject dirs/meson.build
diff --git a/test cases/common/172 subproject nested subproject dirs/prog.c b/test cases/common/168 subproject nested subproject dirs/prog.c
index 27162c5e0..27162c5e0 100644
--- a/test cases/common/172 subproject nested subproject dirs/prog.c
+++ b/test cases/common/168 subproject nested subproject dirs/prog.c
diff --git a/test cases/common/173 preserve gendir/base.inp b/test cases/common/169 preserve gendir/base.inp
index df967b96a..df967b96a 100644
--- a/test cases/common/173 preserve gendir/base.inp
+++ b/test cases/common/169 preserve gendir/base.inp
diff --git a/test cases/common/173 preserve gendir/com/mesonbuild/subbie.inp b/test cases/common/169 preserve gendir/com/mesonbuild/subbie.inp
index df0f4e9ae..df0f4e9ae 100644
--- a/test cases/common/173 preserve gendir/com/mesonbuild/subbie.inp
+++ b/test cases/common/169 preserve gendir/com/mesonbuild/subbie.inp
diff --git a/test cases/common/173 preserve gendir/genprog.py b/test cases/common/169 preserve gendir/genprog.py
index a50642b56..a50642b56 100755
--- a/test cases/common/173 preserve gendir/genprog.py
+++ b/test cases/common/169 preserve gendir/genprog.py
diff --git a/test cases/common/173 preserve gendir/meson.build b/test cases/common/169 preserve gendir/meson.build
index ce219f0d8..ce219f0d8 100644
--- a/test cases/common/173 preserve gendir/meson.build
+++ b/test cases/common/169 preserve gendir/meson.build
diff --git a/test cases/common/173 preserve gendir/testprog.c b/test cases/common/169 preserve gendir/testprog.c
index b6a99268a..b6a99268a 100644
--- a/test cases/common/173 preserve gendir/testprog.c
+++ b/test cases/common/169 preserve gendir/testprog.c
diff --git a/test cases/common/174 source in dep/bar.cpp b/test cases/common/170 source in dep/bar.cpp
index 2ea623bf8..2ea623bf8 100644
--- a/test cases/common/174 source in dep/bar.cpp
+++ b/test cases/common/170 source in dep/bar.cpp
diff --git a/test cases/common/174 source in dep/foo.c b/test cases/common/170 source in dep/foo.c
index c1be8d053..c1be8d053 100644
--- a/test cases/common/174 source in dep/foo.c
+++ b/test cases/common/170 source in dep/foo.c
diff --git a/test cases/common/174 source in dep/generated/funname b/test cases/common/170 source in dep/generated/funname
index 79f3c867f..79f3c867f 100644
--- a/test cases/common/174 source in dep/generated/funname
+++ b/test cases/common/170 source in dep/generated/funname
diff --git a/test cases/common/174 source in dep/generated/genheader.py b/test cases/common/170 source in dep/generated/genheader.py
index 489db23d3..489db23d3 100755
--- a/test cases/common/174 source in dep/generated/genheader.py
+++ b/test cases/common/170 source in dep/generated/genheader.py
diff --git a/test cases/common/174 source in dep/generated/main.c b/test cases/common/170 source in dep/generated/main.c
index 1ab980ac6..1ab980ac6 100644
--- a/test cases/common/174 source in dep/generated/main.c
+++ b/test cases/common/170 source in dep/generated/main.c
diff --git a/test cases/common/174 source in dep/generated/meson.build b/test cases/common/170 source in dep/generated/meson.build
index 286270901..286270901 100644
--- a/test cases/common/174 source in dep/generated/meson.build
+++ b/test cases/common/170 source in dep/generated/meson.build
diff --git a/test cases/common/174 source in dep/meson.build b/test cases/common/170 source in dep/meson.build
index 7111ba11f..7111ba11f 100644
--- a/test cases/common/174 source in dep/meson.build
+++ b/test cases/common/170 source in dep/meson.build
diff --git a/test cases/common/175 generator link whole/export.h b/test cases/common/171 generator link whole/export.h
index f4f6f451b..f4f6f451b 100644
--- a/test cases/common/175 generator link whole/export.h
+++ b/test cases/common/171 generator link whole/export.h
diff --git a/test cases/common/175 generator link whole/generator.py b/test cases/common/171 generator link whole/generator.py
index 18a6cc2f5..18a6cc2f5 100755
--- a/test cases/common/175 generator link whole/generator.py
+++ b/test cases/common/171 generator link whole/generator.py
diff --git a/test cases/common/175 generator link whole/main.c b/test cases/common/171 generator link whole/main.c
index 7605022d8..7605022d8 100644
--- a/test cases/common/175 generator link whole/main.c
+++ b/test cases/common/171 generator link whole/main.c
diff --git a/test cases/common/175 generator link whole/meson.build b/test cases/common/171 generator link whole/meson.build
index 30ae9c62c..30ae9c62c 100644
--- a/test cases/common/175 generator link whole/meson.build
+++ b/test cases/common/171 generator link whole/meson.build
diff --git a/test cases/common/175 generator link whole/meson_test_function.tmpl b/test cases/common/171 generator link whole/meson_test_function.tmpl
index e69de29bb..e69de29bb 100644
--- a/test cases/common/175 generator link whole/meson_test_function.tmpl
+++ b/test cases/common/171 generator link whole/meson_test_function.tmpl
diff --git a/test cases/common/175 generator link whole/pull_meson_test_function.c b/test cases/common/171 generator link whole/pull_meson_test_function.c
index 23d24acf4..23d24acf4 100644
--- a/test cases/common/175 generator link whole/pull_meson_test_function.c
+++ b/test cases/common/171 generator link whole/pull_meson_test_function.c
diff --git a/test cases/common/176 initial c_args/meson.build b/test cases/common/172 initial c_args/meson.build
index 638f8c277..638f8c277 100644
--- a/test cases/common/176 initial c_args/meson.build
+++ b/test cases/common/172 initial c_args/meson.build
diff --git a/test cases/common/176 initial c_args/test.json b/test cases/common/172 initial c_args/test.json
index f9b73a47d..f9b73a47d 100644
--- a/test cases/common/176 initial c_args/test.json
+++ b/test cases/common/172 initial c_args/test.json
diff --git a/test cases/common/177 identical target name in subproject flat layout/foo.c b/test cases/common/173 identical target name in subproject flat layout/foo.c
index ed427899a..ed427899a 100644
--- a/test cases/common/177 identical target name in subproject flat layout/foo.c
+++ b/test cases/common/173 identical target name in subproject flat layout/foo.c
diff --git a/test cases/common/177 identical target name in subproject flat layout/main.c b/test cases/common/173 identical target name in subproject flat layout/main.c
index 6f02aeb82..6f02aeb82 100644
--- a/test cases/common/177 identical target name in subproject flat layout/main.c
+++ b/test cases/common/173 identical target name in subproject flat layout/main.c
diff --git a/test cases/common/177 identical target name in subproject flat layout/meson.build b/test cases/common/173 identical target name in subproject flat layout/meson.build
index d859fda3e..d859fda3e 100644
--- a/test cases/common/177 identical target name in subproject flat layout/meson.build
+++ b/test cases/common/173 identical target name in subproject flat layout/meson.build
diff --git a/test cases/common/177 identical target name in subproject flat layout/subprojects/subproj/foo.c b/test cases/common/173 identical target name in subproject flat layout/subprojects/subproj/foo.c
index f33429229..f33429229 100644
--- a/test cases/common/177 identical target name in subproject flat layout/subprojects/subproj/foo.c
+++ b/test cases/common/173 identical target name in subproject flat layout/subprojects/subproj/foo.c
diff --git a/test cases/common/177 identical target name in subproject flat layout/subprojects/subproj/meson.build b/test cases/common/173 identical target name in subproject flat layout/subprojects/subproj/meson.build
index c92719469..c92719469 100644
--- a/test cases/common/177 identical target name in subproject flat layout/subprojects/subproj/meson.build
+++ b/test cases/common/173 identical target name in subproject flat layout/subprojects/subproj/meson.build
diff --git a/test cases/common/178 as-needed/config.h b/test cases/common/174 as-needed/config.h
index b8fb60fe4..b8fb60fe4 100644
--- a/test cases/common/178 as-needed/config.h
+++ b/test cases/common/174 as-needed/config.h
diff --git a/test cases/common/178 as-needed/libA.cpp b/test cases/common/174 as-needed/libA.cpp
index 5f45bc077..5f45bc077 100644
--- a/test cases/common/178 as-needed/libA.cpp
+++ b/test cases/common/174 as-needed/libA.cpp
diff --git a/test cases/common/178 as-needed/libA.h b/test cases/common/174 as-needed/libA.h
index 8e76d22fa..8e76d22fa 100644
--- a/test cases/common/178 as-needed/libA.h
+++ b/test cases/common/174 as-needed/libA.h
diff --git a/test cases/common/178 as-needed/libB.cpp b/test cases/common/174 as-needed/libB.cpp
index a8723941b..a8723941b 100644
--- a/test cases/common/178 as-needed/libB.cpp
+++ b/test cases/common/174 as-needed/libB.cpp
diff --git a/test cases/common/178 as-needed/main.cpp b/test cases/common/174 as-needed/main.cpp
index a893431d4..a893431d4 100644
--- a/test cases/common/178 as-needed/main.cpp
+++ b/test cases/common/174 as-needed/main.cpp
diff --git a/test cases/common/178 as-needed/meson.build b/test cases/common/174 as-needed/meson.build
index 3b54aaa02..3b54aaa02 100644
--- a/test cases/common/178 as-needed/meson.build
+++ b/test cases/common/174 as-needed/meson.build
diff --git a/test cases/common/179 ndebug if-release enabled/main.c b/test cases/common/175 ndebug if-release enabled/main.c
index 984ebcabe..984ebcabe 100644
--- a/test cases/common/179 ndebug if-release enabled/main.c
+++ b/test cases/common/175 ndebug if-release enabled/main.c
diff --git a/test cases/common/179 ndebug if-release enabled/meson.build b/test cases/common/175 ndebug if-release enabled/meson.build
index be263752a..be263752a 100644
--- a/test cases/common/179 ndebug if-release enabled/meson.build
+++ b/test cases/common/175 ndebug if-release enabled/meson.build
diff --git a/test cases/common/180 ndebug if-release disabled/main.c b/test cases/common/176 ndebug if-release disabled/main.c
index cb3ec3f65..cb3ec3f65 100644
--- a/test cases/common/180 ndebug if-release disabled/main.c
+++ b/test cases/common/176 ndebug if-release disabled/main.c
diff --git a/test cases/common/180 ndebug if-release disabled/meson.build b/test cases/common/176 ndebug if-release disabled/meson.build
index a9a79ea9b..a9a79ea9b 100644
--- a/test cases/common/180 ndebug if-release disabled/meson.build
+++ b/test cases/common/176 ndebug if-release disabled/meson.build
diff --git a/test cases/common/181 subproject version/meson.build b/test cases/common/177 subproject version/meson.build
index bd8fc0392..bd8fc0392 100644
--- a/test cases/common/181 subproject version/meson.build
+++ b/test cases/common/177 subproject version/meson.build
diff --git a/test cases/common/181 subproject version/subprojects/a/meson.build b/test cases/common/177 subproject version/subprojects/a/meson.build
index dae31300f..dae31300f 100644
--- a/test cases/common/181 subproject version/subprojects/a/meson.build
+++ b/test cases/common/177 subproject version/subprojects/a/meson.build
diff --git a/test cases/common/182 subdir_done/meson.build b/test cases/common/178 subdir_done/meson.build
index 457e613b1..457e613b1 100644
--- a/test cases/common/182 subdir_done/meson.build
+++ b/test cases/common/178 subdir_done/meson.build
diff --git a/test cases/common/183 bothlibraries/libfile.c b/test cases/common/179 bothlibraries/libfile.c
index f5e228ec1..f5e228ec1 100644
--- a/test cases/common/183 bothlibraries/libfile.c
+++ b/test cases/common/179 bothlibraries/libfile.c
diff --git a/test cases/common/183 bothlibraries/main.c b/test cases/common/179 bothlibraries/main.c
index 8237bae0a..8237bae0a 100644
--- a/test cases/common/183 bothlibraries/main.c
+++ b/test cases/common/179 bothlibraries/main.c
diff --git a/test cases/common/183 bothlibraries/meson.build b/test cases/common/179 bothlibraries/meson.build
index 0bfba76ed..0bfba76ed 100644
--- a/test cases/common/183 bothlibraries/meson.build
+++ b/test cases/common/179 bothlibraries/meson.build
diff --git a/test cases/common/183 bothlibraries/mylib.h b/test cases/common/179 bothlibraries/mylib.h
index 1038a0142..1038a0142 100644
--- a/test cases/common/183 bothlibraries/mylib.h
+++ b/test cases/common/179 bothlibraries/mylib.h
diff --git a/test cases/common/184 escape and unicode/file.c.in b/test cases/common/180 escape and unicode/file.c.in
index 5dd6e50fa..5dd6e50fa 100644
--- a/test cases/common/184 escape and unicode/file.c.in
+++ b/test cases/common/180 escape and unicode/file.c.in
diff --git a/test cases/common/184 escape and unicode/file.py b/test cases/common/180 escape and unicode/file.py
index 40fa7ca48..40fa7ca48 100644
--- a/test cases/common/184 escape and unicode/file.py
+++ b/test cases/common/180 escape and unicode/file.py
diff --git a/test cases/common/184 escape and unicode/find.py b/test cases/common/180 escape and unicode/find.py
index 34a3eb835..34a3eb835 100644
--- a/test cases/common/184 escape and unicode/find.py
+++ b/test cases/common/180 escape and unicode/find.py
diff --git a/test cases/common/184 escape and unicode/fun.c b/test cases/common/180 escape and unicode/fun.c
index c5634d836..c5634d836 100644
--- a/test cases/common/184 escape and unicode/fun.c
+++ b/test cases/common/180 escape and unicode/fun.c
diff --git a/test cases/common/184 escape and unicode/main.c b/test cases/common/180 escape and unicode/main.c
index 6137ad79c..6137ad79c 100644
--- a/test cases/common/184 escape and unicode/main.c
+++ b/test cases/common/180 escape and unicode/main.c
diff --git a/test cases/common/184 escape and unicode/meson.build b/test cases/common/180 escape and unicode/meson.build
index e4fe628ae..e4fe628ae 100644
--- a/test cases/common/184 escape and unicode/meson.build
+++ b/test cases/common/180 escape and unicode/meson.build
diff --git a/test cases/common/185 has link arg/meson.build b/test cases/common/181 has link arg/meson.build
index 6bfbd59e7..6bfbd59e7 100644
--- a/test cases/common/185 has link arg/meson.build
+++ b/test cases/common/181 has link arg/meson.build
diff --git a/test cases/common/186 same target name flat layout/foo.c b/test cases/common/182 same target name flat layout/foo.c
index ed427899a..ed427899a 100644
--- a/test cases/common/186 same target name flat layout/foo.c
+++ b/test cases/common/182 same target name flat layout/foo.c
diff --git a/test cases/common/186 same target name flat layout/main.c b/test cases/common/182 same target name flat layout/main.c
index 6f02aeb82..6f02aeb82 100644
--- a/test cases/common/186 same target name flat layout/main.c
+++ b/test cases/common/182 same target name flat layout/main.c
diff --git a/test cases/common/186 same target name flat layout/meson.build b/test cases/common/182 same target name flat layout/meson.build
index a3c95fa25..a3c95fa25 100644
--- a/test cases/common/186 same target name flat layout/meson.build
+++ b/test cases/common/182 same target name flat layout/meson.build
diff --git a/test cases/common/186 same target name flat layout/subdir/foo.c b/test cases/common/182 same target name flat layout/subdir/foo.c
index f33429229..f33429229 100644
--- a/test cases/common/186 same target name flat layout/subdir/foo.c
+++ b/test cases/common/182 same target name flat layout/subdir/foo.c
diff --git a/test cases/common/186 same target name flat layout/subdir/meson.build b/test cases/common/182 same target name flat layout/subdir/meson.build
index 223a5ef90..223a5ef90 100644
--- a/test cases/common/186 same target name flat layout/subdir/meson.build
+++ b/test cases/common/182 same target name flat layout/subdir/meson.build
diff --git a/test cases/common/187 find override/meson.build b/test cases/common/183 find override/meson.build
index b27745905..b27745905 100644
--- a/test cases/common/187 find override/meson.build
+++ b/test cases/common/183 find override/meson.build
diff --git a/test cases/common/187 find override/otherdir/main.c b/test cases/common/183 find override/otherdir/main.c
index 5fb6371b8..5fb6371b8 100644
--- a/test cases/common/187 find override/otherdir/main.c
+++ b/test cases/common/183 find override/otherdir/main.c
diff --git a/test cases/common/187 find override/otherdir/main2.c b/test cases/common/183 find override/otherdir/main2.c
index 80a30091e..80a30091e 100644
--- a/test cases/common/187 find override/otherdir/main2.c
+++ b/test cases/common/183 find override/otherdir/main2.c
diff --git a/test cases/common/187 find override/otherdir/meson.build b/test cases/common/183 find override/otherdir/meson.build
index 5cefc880b..5cefc880b 100644
--- a/test cases/common/187 find override/otherdir/meson.build
+++ b/test cases/common/183 find override/otherdir/meson.build
diff --git a/test cases/common/187 find override/otherdir/source.desc b/test cases/common/183 find override/otherdir/source.desc
index 8b19c9c2f..8b19c9c2f 100644
--- a/test cases/common/187 find override/otherdir/source.desc
+++ b/test cases/common/183 find override/otherdir/source.desc
diff --git a/test cases/common/187 find override/otherdir/source2.desc b/test cases/common/183 find override/otherdir/source2.desc
index 965f868df..965f868df 100644
--- a/test cases/common/187 find override/otherdir/source2.desc
+++ b/test cases/common/183 find override/otherdir/source2.desc
diff --git a/test cases/common/187 find override/subdir/converter.py b/test cases/common/183 find override/subdir/converter.py
index efe04649d..efe04649d 100755
--- a/test cases/common/187 find override/subdir/converter.py
+++ b/test cases/common/183 find override/subdir/converter.py
diff --git a/test cases/common/187 find override/subdir/gencodegen.py.in b/test cases/common/183 find override/subdir/gencodegen.py.in
index 78ebb2f4e..78ebb2f4e 100755
--- a/test cases/common/187 find override/subdir/gencodegen.py.in
+++ b/test cases/common/183 find override/subdir/gencodegen.py.in
diff --git a/test cases/common/187 find override/subdir/meson.build b/test cases/common/183 find override/subdir/meson.build
index e5de34dde..e5de34dde 100644
--- a/test cases/common/187 find override/subdir/meson.build
+++ b/test cases/common/183 find override/subdir/meson.build
diff --git a/test cases/common/187 find override/subprojects/sub.wrap b/test cases/common/183 find override/subprojects/sub.wrap
index 17aa3323f..17aa3323f 100644
--- a/test cases/common/187 find override/subprojects/sub.wrap
+++ b/test cases/common/183 find override/subprojects/sub.wrap
diff --git a/test cases/common/187 find override/subprojects/sub/meson.build b/test cases/common/183 find override/subprojects/sub/meson.build
index 640f2704c..640f2704c 100644
--- a/test cases/common/187 find override/subprojects/sub/meson.build
+++ b/test cases/common/183 find override/subprojects/sub/meson.build
diff --git a/test cases/common/188 partial dependency/declare_dependency/headers/foo.c b/test cases/common/184 partial dependency/declare_dependency/headers/foo.c
index 215112ca5..215112ca5 100644
--- a/test cases/common/188 partial dependency/declare_dependency/headers/foo.c
+++ b/test cases/common/184 partial dependency/declare_dependency/headers/foo.c
diff --git a/test cases/common/188 partial dependency/declare_dependency/headers/foo.h b/test cases/common/184 partial dependency/declare_dependency/headers/foo.h
index 28c81c9d3..28c81c9d3 100644
--- a/test cases/common/188 partial dependency/declare_dependency/headers/foo.h
+++ b/test cases/common/184 partial dependency/declare_dependency/headers/foo.h
diff --git a/test cases/common/188 partial dependency/declare_dependency/main.c b/test cases/common/184 partial dependency/declare_dependency/main.c
index 057b71304..057b71304 100644
--- a/test cases/common/188 partial dependency/declare_dependency/main.c
+++ b/test cases/common/184 partial dependency/declare_dependency/main.c
diff --git a/test cases/common/188 partial dependency/declare_dependency/meson.build b/test cases/common/184 partial dependency/declare_dependency/meson.build
index 3783f6694..3783f6694 100644
--- a/test cases/common/188 partial dependency/declare_dependency/meson.build
+++ b/test cases/common/184 partial dependency/declare_dependency/meson.build
diff --git a/test cases/common/188 partial dependency/declare_dependency/other.c b/test cases/common/184 partial dependency/declare_dependency/other.c
index b1e199e44..b1e199e44 100644
--- a/test cases/common/188 partial dependency/declare_dependency/other.c
+++ b/test cases/common/184 partial dependency/declare_dependency/other.c
diff --git a/test cases/common/188 partial dependency/meson.build b/test cases/common/184 partial dependency/meson.build
index e908487f1..e908487f1 100644
--- a/test cases/common/188 partial dependency/meson.build
+++ b/test cases/common/184 partial dependency/meson.build
diff --git a/test cases/common/189 openmp/main.c b/test cases/common/185 openmp/main.c
index cc81f4897..cc81f4897 100644
--- a/test cases/common/189 openmp/main.c
+++ b/test cases/common/185 openmp/main.c
diff --git a/test cases/common/189 openmp/main.cpp b/test cases/common/185 openmp/main.cpp
index b12be3fd8..b12be3fd8 100644
--- a/test cases/common/189 openmp/main.cpp
+++ b/test cases/common/185 openmp/main.cpp
diff --git a/test cases/common/189 openmp/main.f90 b/test cases/common/185 openmp/main.f90
index d80f90fdf..d80f90fdf 100644
--- a/test cases/common/189 openmp/main.f90
+++ b/test cases/common/185 openmp/main.f90
diff --git a/test cases/common/189 openmp/meson.build b/test cases/common/185 openmp/meson.build
index a1154c22c..a1154c22c 100644
--- a/test cases/common/189 openmp/meson.build
+++ b/test cases/common/185 openmp/meson.build
diff --git a/test cases/common/190 same target name/file.c b/test cases/common/186 same target name/file.c
index 91800303c..91800303c 100644
--- a/test cases/common/190 same target name/file.c
+++ b/test cases/common/186 same target name/file.c
diff --git a/test cases/common/190 same target name/meson.build b/test cases/common/186 same target name/meson.build
index 4e585d56e..4e585d56e 100644
--- a/test cases/common/190 same target name/meson.build
+++ b/test cases/common/186 same target name/meson.build
diff --git a/test cases/common/190 same target name/sub/file2.c b/test cases/common/186 same target name/sub/file2.c
index 3d1a1c323..3d1a1c323 100644
--- a/test cases/common/190 same target name/sub/file2.c
+++ b/test cases/common/186 same target name/sub/file2.c
diff --git a/test cases/common/190 same target name/sub/meson.build b/test cases/common/186 same target name/sub/meson.build
index 610a4a3c7..610a4a3c7 100644
--- a/test cases/common/190 same target name/sub/meson.build
+++ b/test cases/common/186 same target name/sub/meson.build
diff --git a/test cases/common/191 test depends/gen.py b/test cases/common/187 test depends/gen.py
index ee4ed9818..ee4ed9818 100755
--- a/test cases/common/191 test depends/gen.py
+++ b/test cases/common/187 test depends/gen.py
diff --git a/test cases/common/191 test depends/main.c b/test cases/common/187 test depends/main.c
index 78f2de106..78f2de106 100644
--- a/test cases/common/191 test depends/main.c
+++ b/test cases/common/187 test depends/main.c
diff --git a/test cases/common/191 test depends/meson.build b/test cases/common/187 test depends/meson.build
index 888c45118..888c45118 100644
--- a/test cases/common/191 test depends/meson.build
+++ b/test cases/common/187 test depends/meson.build
diff --git a/test cases/common/191 test depends/test.py b/test cases/common/187 test depends/test.py
index 5b9f65c86..5b9f65c86 100755
--- a/test cases/common/191 test depends/test.py
+++ b/test cases/common/187 test depends/test.py
diff --git a/test cases/common/192 args flattening/meson.build b/test cases/common/188 args flattening/meson.build
index 1dac2f912..1dac2f912 100644
--- a/test cases/common/192 args flattening/meson.build
+++ b/test cases/common/188 args flattening/meson.build
diff --git a/test cases/common/193 dict/meson.build b/test cases/common/189 dict/meson.build
index dacf01db3..dacf01db3 100644
--- a/test cases/common/193 dict/meson.build
+++ b/test cases/common/189 dict/meson.build
diff --git a/test cases/common/193 dict/prog.c b/test cases/common/189 dict/prog.c
index bf0999d4a..bf0999d4a 100644
--- a/test cases/common/193 dict/prog.c
+++ b/test cases/common/189 dict/prog.c
diff --git a/test cases/common/194 check header/meson.build b/test cases/common/190 check header/meson.build
index 98b395de5..98b395de5 100644
--- a/test cases/common/194 check header/meson.build
+++ b/test cases/common/190 check header/meson.build
diff --git a/test cases/common/194 check header/ouagadougou.h b/test cases/common/190 check header/ouagadougou.h
index 2f76c49cc..2f76c49cc 100644
--- a/test cases/common/194 check header/ouagadougou.h
+++ b/test cases/common/190 check header/ouagadougou.h
diff --git a/test cases/common/195 install_mode/config.h.in b/test cases/common/191 install_mode/config.h.in
index 14a155874..14a155874 100644
--- a/test cases/common/195 install_mode/config.h.in
+++ b/test cases/common/191 install_mode/config.h.in
diff --git a/test cases/common/195 install_mode/data_source.txt b/test cases/common/191 install_mode/data_source.txt
index 0c23cc0c3..0c23cc0c3 100644
--- a/test cases/common/195 install_mode/data_source.txt
+++ b/test cases/common/191 install_mode/data_source.txt
diff --git a/test cases/common/195 install_mode/foo.1 b/test cases/common/191 install_mode/foo.1
index 647c0970c..647c0970c 100644
--- a/test cases/common/195 install_mode/foo.1
+++ b/test cases/common/191 install_mode/foo.1
diff --git a/test cases/common/195 install_mode/meson.build b/test cases/common/191 install_mode/meson.build
index cae1e91ab..cae1e91ab 100644
--- a/test cases/common/195 install_mode/meson.build
+++ b/test cases/common/191 install_mode/meson.build
diff --git a/test cases/common/195 install_mode/rootdir.h b/test cases/common/191 install_mode/rootdir.h
index 72fb13220..72fb13220 100644
--- a/test cases/common/195 install_mode/rootdir.h
+++ b/test cases/common/191 install_mode/rootdir.h
diff --git a/test cases/common/195 install_mode/runscript.sh b/test cases/common/191 install_mode/runscript.sh
index 8bc5ca6ce..8bc5ca6ce 100644
--- a/test cases/common/195 install_mode/runscript.sh
+++ b/test cases/common/191 install_mode/runscript.sh
diff --git a/test cases/common/195 install_mode/stat.c b/test cases/common/191 install_mode/stat.c
index 4825cefd2..4825cefd2 100644
--- a/test cases/common/195 install_mode/stat.c
+++ b/test cases/common/191 install_mode/stat.c
diff --git a/test cases/common/195 install_mode/sub1/second.dat b/test cases/common/191 install_mode/sub1/second.dat
index 48857a8b6..48857a8b6 100644
--- a/test cases/common/195 install_mode/sub1/second.dat
+++ b/test cases/common/191 install_mode/sub1/second.dat
diff --git a/test cases/common/195 install_mode/sub2/stub b/test cases/common/191 install_mode/sub2/stub
index e69de29bb..e69de29bb 100644
--- a/test cases/common/195 install_mode/sub2/stub
+++ b/test cases/common/191 install_mode/sub2/stub
diff --git a/test cases/common/195 install_mode/test.json b/test cases/common/191 install_mode/test.json
index 3614dbcca..3614dbcca 100644
--- a/test cases/common/195 install_mode/test.json
+++ b/test cases/common/191 install_mode/test.json
diff --git a/test cases/common/195 install_mode/trivial.c b/test cases/common/191 install_mode/trivial.c
index 96612d48b..96612d48b 100644
--- a/test cases/common/195 install_mode/trivial.c
+++ b/test cases/common/191 install_mode/trivial.c
diff --git a/test cases/common/196 subproject array version/meson.build b/test cases/common/192 subproject array version/meson.build
index 0870bc498..0870bc498 100644
--- a/test cases/common/196 subproject array version/meson.build
+++ b/test cases/common/192 subproject array version/meson.build
diff --git a/test cases/common/196 subproject array version/subprojects/foo/meson.build b/test cases/common/192 subproject array version/subprojects/foo/meson.build
index f4ff53548..f4ff53548 100644
--- a/test cases/common/196 subproject array version/subprojects/foo/meson.build
+++ b/test cases/common/192 subproject array version/subprojects/foo/meson.build
diff --git a/test cases/common/197 feature option/meson.build b/test cases/common/193 feature option/meson.build
index ef3fa2285..ef3fa2285 100644
--- a/test cases/common/197 feature option/meson.build
+++ b/test cases/common/193 feature option/meson.build
diff --git a/test cases/common/197 feature option/meson_options.txt b/test cases/common/193 feature option/meson_options.txt
index 063a35f39..063a35f39 100644
--- a/test cases/common/197 feature option/meson_options.txt
+++ b/test cases/common/193 feature option/meson_options.txt
diff --git a/test cases/common/198 feature option disabled/meson.build b/test cases/common/194 feature option disabled/meson.build
index 1a831872a..1a831872a 100644
--- a/test cases/common/198 feature option disabled/meson.build
+++ b/test cases/common/194 feature option disabled/meson.build
diff --git a/test cases/common/198 feature option disabled/meson_options.txt b/test cases/common/194 feature option disabled/meson_options.txt
index 063a35f39..063a35f39 100644
--- a/test cases/common/198 feature option disabled/meson_options.txt
+++ b/test cases/common/194 feature option disabled/meson_options.txt
diff --git a/test cases/common/199 static threads/lib1.c b/test cases/common/195 static threads/lib1.c
index 1aa786c66..1aa786c66 100644
--- a/test cases/common/199 static threads/lib1.c
+++ b/test cases/common/195 static threads/lib1.c
diff --git a/test cases/common/199 static threads/lib2.c b/test cases/common/195 static threads/lib2.c
index e988814e2..e988814e2 100644
--- a/test cases/common/199 static threads/lib2.c
+++ b/test cases/common/195 static threads/lib2.c
diff --git a/test cases/common/199 static threads/meson.build b/test cases/common/195 static threads/meson.build
index 427920034..427920034 100644
--- a/test cases/common/199 static threads/meson.build
+++ b/test cases/common/195 static threads/meson.build
diff --git a/test cases/common/199 static threads/prog.c b/test cases/common/195 static threads/prog.c
index 14a7c760f..14a7c760f 100644
--- a/test cases/common/199 static threads/prog.c
+++ b/test cases/common/195 static threads/prog.c
diff --git a/test cases/common/200 generator in subdir/com/mesonbuild/genprog.py b/test cases/common/196 generator in subdir/com/mesonbuild/genprog.py
index a50642b56..a50642b56 100644
--- a/test cases/common/200 generator in subdir/com/mesonbuild/genprog.py
+++ b/test cases/common/196 generator in subdir/com/mesonbuild/genprog.py
diff --git a/test cases/common/200 generator in subdir/com/mesonbuild/meson.build b/test cases/common/196 generator in subdir/com/mesonbuild/meson.build
index 4808743fe..4808743fe 100644
--- a/test cases/common/200 generator in subdir/com/mesonbuild/meson.build
+++ b/test cases/common/196 generator in subdir/com/mesonbuild/meson.build
diff --git a/test cases/common/200 generator in subdir/com/mesonbuild/subbie.inp b/test cases/common/196 generator in subdir/com/mesonbuild/subbie.inp
index df0f4e9ae..df0f4e9ae 100644
--- a/test cases/common/200 generator in subdir/com/mesonbuild/subbie.inp
+++ b/test cases/common/196 generator in subdir/com/mesonbuild/subbie.inp
diff --git a/test cases/common/200 generator in subdir/com/mesonbuild/testprog.c b/test cases/common/196 generator in subdir/com/mesonbuild/testprog.c
index 7a7cdf7aa..7a7cdf7aa 100644
--- a/test cases/common/200 generator in subdir/com/mesonbuild/testprog.c
+++ b/test cases/common/196 generator in subdir/com/mesonbuild/testprog.c
diff --git a/test cases/common/200 generator in subdir/meson.build b/test cases/common/196 generator in subdir/meson.build
index 9b8eb7c63..9b8eb7c63 100644
--- a/test cases/common/200 generator in subdir/meson.build
+++ b/test cases/common/196 generator in subdir/meson.build
diff --git a/test cases/common/202 subproject with features/meson.build b/test cases/common/197 subproject with features/meson.build
index 5bdfefbc0..5bdfefbc0 100644
--- a/test cases/common/202 subproject with features/meson.build
+++ b/test cases/common/197 subproject with features/meson.build
diff --git a/test cases/common/202 subproject with features/meson_options.txt b/test cases/common/197 subproject with features/meson_options.txt
index a46e5fbf5..a46e5fbf5 100644
--- a/test cases/common/202 subproject with features/meson_options.txt
+++ b/test cases/common/197 subproject with features/meson_options.txt
diff --git a/test cases/common/202 subproject with features/nothing.c b/test cases/common/197 subproject with features/nothing.c
index 58fe69254..58fe69254 100644
--- a/test cases/common/202 subproject with features/nothing.c
+++ b/test cases/common/197 subproject with features/nothing.c
diff --git a/test cases/common/202 subproject with features/subprojects/auto_sub_with_missing_dep/meson.build b/test cases/common/197 subproject with features/subprojects/auto_sub_with_missing_dep/meson.build
index fa6b011ea..fa6b011ea 100644
--- a/test cases/common/202 subproject with features/subprojects/auto_sub_with_missing_dep/meson.build
+++ b/test cases/common/197 subproject with features/subprojects/auto_sub_with_missing_dep/meson.build
diff --git a/test cases/common/202 subproject with features/subprojects/disabled_sub/lib/meson.build b/test cases/common/197 subproject with features/subprojects/disabled_sub/lib/meson.build
index 933001aeb..933001aeb 100644
--- a/test cases/common/202 subproject with features/subprojects/disabled_sub/lib/meson.build
+++ b/test cases/common/197 subproject with features/subprojects/disabled_sub/lib/meson.build
diff --git a/test cases/common/116 subdir subproject/subprojects/sub/sub.c b/test cases/common/197 subproject with features/subprojects/disabled_sub/lib/sub.c
index e748ac750..e748ac750 100644
--- a/test cases/common/116 subdir subproject/subprojects/sub/sub.c
+++ b/test cases/common/197 subproject with features/subprojects/disabled_sub/lib/sub.c
diff --git a/test cases/common/202 subproject with features/subprojects/disabled_sub/lib/sub.h b/test cases/common/197 subproject with features/subprojects/disabled_sub/lib/sub.h
index f1ab0e19d..f1ab0e19d 100644
--- a/test cases/common/202 subproject with features/subprojects/disabled_sub/lib/sub.h
+++ b/test cases/common/197 subproject with features/subprojects/disabled_sub/lib/sub.h
diff --git a/test cases/common/202 subproject with features/subprojects/disabled_sub/meson.build b/test cases/common/197 subproject with features/subprojects/disabled_sub/meson.build
index 65fef032b..65fef032b 100644
--- a/test cases/common/202 subproject with features/subprojects/disabled_sub/meson.build
+++ b/test cases/common/197 subproject with features/subprojects/disabled_sub/meson.build
diff --git a/test cases/common/202 subproject with features/subprojects/sub/lib/meson.build b/test cases/common/197 subproject with features/subprojects/sub/lib/meson.build
index 731d22bfb..731d22bfb 100644
--- a/test cases/common/202 subproject with features/subprojects/sub/lib/meson.build
+++ b/test cases/common/197 subproject with features/subprojects/sub/lib/meson.build
diff --git a/test cases/common/202 subproject with features/subprojects/sub/lib/sub.c b/test cases/common/197 subproject with features/subprojects/sub/lib/sub.c
index 768ed36d6..768ed36d6 100644
--- a/test cases/common/202 subproject with features/subprojects/sub/lib/sub.c
+++ b/test cases/common/197 subproject with features/subprojects/sub/lib/sub.c
diff --git a/test cases/common/116 subdir subproject/subprojects/sub/sub.h b/test cases/common/197 subproject with features/subprojects/sub/lib/sub.h
index 2b59a3a32..2b59a3a32 100644
--- a/test cases/common/116 subdir subproject/subprojects/sub/sub.h
+++ b/test cases/common/197 subproject with features/subprojects/sub/lib/sub.h
diff --git a/test cases/common/202 subproject with features/subprojects/sub/meson.build b/test cases/common/197 subproject with features/subprojects/sub/meson.build
index 31882ac4c..31882ac4c 100644
--- a/test cases/common/202 subproject with features/subprojects/sub/meson.build
+++ b/test cases/common/197 subproject with features/subprojects/sub/meson.build
diff --git a/test cases/common/203 function attributes/meson.build b/test cases/common/198 function attributes/meson.build
index 98173096b..98173096b 100644
--- a/test cases/common/203 function attributes/meson.build
+++ b/test cases/common/198 function attributes/meson.build
diff --git a/test cases/common/203 function attributes/meson_options.txt b/test cases/common/198 function attributes/meson_options.txt
index 4a1d87ce7..4a1d87ce7 100644
--- a/test cases/common/203 function attributes/meson_options.txt
+++ b/test cases/common/198 function attributes/meson_options.txt
diff --git a/test cases/common/203 function attributes/test.json b/test cases/common/198 function attributes/test.json
index d06a24a00..d06a24a00 100644
--- a/test cases/common/203 function attributes/test.json
+++ b/test cases/common/198 function attributes/test.json
diff --git a/test cases/common/204 broken subproject/meson.build b/test cases/common/199 broken subproject/meson.build
index e3a6cae36..e3a6cae36 100644
--- a/test cases/common/204 broken subproject/meson.build
+++ b/test cases/common/199 broken subproject/meson.build
diff --git a/test cases/common/204 broken subproject/subprojects/broken/broken.c b/test cases/common/199 broken subproject/subprojects/broken/broken.c
index a9fc4b1e2..a9fc4b1e2 100644
--- a/test cases/common/204 broken subproject/subprojects/broken/broken.c
+++ b/test cases/common/199 broken subproject/subprojects/broken/broken.c
diff --git a/test cases/common/204 broken subproject/subprojects/broken/meson.build b/test cases/common/199 broken subproject/subprojects/broken/meson.build
index 2d64fdeda..2d64fdeda 100644
--- a/test cases/common/204 broken subproject/subprojects/broken/meson.build
+++ b/test cases/common/199 broken subproject/subprojects/broken/meson.build
diff --git a/test cases/common/205 argument syntax/meson.build b/test cases/common/200 argument syntax/meson.build
index b97ca7432..b97ca7432 100644
--- a/test cases/common/205 argument syntax/meson.build
+++ b/test cases/common/200 argument syntax/meson.build
diff --git a/test cases/common/206 install name_prefix name_suffix/libfile.c b/test cases/common/201 install name_prefix name_suffix/libfile.c
index 91489b287..91489b287 100644
--- a/test cases/common/206 install name_prefix name_suffix/libfile.c
+++ b/test cases/common/201 install name_prefix name_suffix/libfile.c
diff --git a/test cases/common/206 install name_prefix name_suffix/meson.build b/test cases/common/201 install name_prefix name_suffix/meson.build
index 044f915c0..044f915c0 100644
--- a/test cases/common/206 install name_prefix name_suffix/meson.build
+++ b/test cases/common/201 install name_prefix name_suffix/meson.build
diff --git a/test cases/common/206 install name_prefix name_suffix/test.json b/test cases/common/201 install name_prefix name_suffix/test.json
index b92a98538..b92a98538 100644
--- a/test cases/common/206 install name_prefix name_suffix/test.json
+++ b/test cases/common/201 install name_prefix name_suffix/test.json
diff --git a/test cases/common/207 kwarg entry/inc/prog.h b/test cases/common/202 kwarg entry/inc/prog.h
index 665521dee..665521dee 100644
--- a/test cases/common/207 kwarg entry/inc/prog.h
+++ b/test cases/common/202 kwarg entry/inc/prog.h
diff --git a/test cases/common/207 kwarg entry/meson.build b/test cases/common/202 kwarg entry/meson.build
index 564ec37fc..564ec37fc 100644
--- a/test cases/common/207 kwarg entry/meson.build
+++ b/test cases/common/202 kwarg entry/meson.build
diff --git a/test cases/common/207 kwarg entry/prog.c b/test cases/common/202 kwarg entry/prog.c
index 2eec26bbb..2eec26bbb 100644
--- a/test cases/common/207 kwarg entry/prog.c
+++ b/test cases/common/202 kwarg entry/prog.c
diff --git a/test cases/common/207 kwarg entry/test.json b/test cases/common/202 kwarg entry/test.json
index 135300de5..135300de5 100644
--- a/test cases/common/207 kwarg entry/test.json
+++ b/test cases/common/202 kwarg entry/test.json
diff --git a/test cases/common/208 custom target build by default/docgen.py b/test cases/common/203 custom target build by default/docgen.py
index f343f2178..f343f2178 100644
--- a/test cases/common/208 custom target build by default/docgen.py
+++ b/test cases/common/203 custom target build by default/docgen.py
diff --git a/test cases/common/208 custom target build by default/meson.build b/test cases/common/203 custom target build by default/meson.build
index 7c81aa254..7c81aa254 100644
--- a/test cases/common/208 custom target build by default/meson.build
+++ b/test cases/common/203 custom target build by default/meson.build
diff --git a/test cases/common/208 custom target build by default/test.json b/test cases/common/203 custom target build by default/test.json
index df8bcb959..df8bcb959 100644
--- a/test cases/common/208 custom target build by default/test.json
+++ b/test cases/common/203 custom target build by default/test.json
diff --git a/test cases/common/209 find_library and headers/foo.h b/test cases/common/204 find_library and headers/foo.h
index 014e06e82..014e06e82 100644
--- a/test cases/common/209 find_library and headers/foo.h
+++ b/test cases/common/204 find_library and headers/foo.h
diff --git a/test cases/common/209 find_library and headers/meson.build b/test cases/common/204 find_library and headers/meson.build
index bcd71f12a..bcd71f12a 100644
--- a/test cases/common/209 find_library and headers/meson.build
+++ b/test cases/common/204 find_library and headers/meson.build
diff --git a/test cases/common/210 line continuation/meson.build b/test cases/common/205 line continuation/meson.build
index 16c72f9ae..16c72f9ae 100644
--- a/test cases/common/210 line continuation/meson.build
+++ b/test cases/common/205 line continuation/meson.build
diff --git a/test cases/common/212 native file path override/main.cpp b/test cases/common/206 native file path override/main.cpp
index 91bc80906..91bc80906 100644
--- a/test cases/common/212 native file path override/main.cpp
+++ b/test cases/common/206 native file path override/main.cpp
diff --git a/test cases/common/212 native file path override/meson.build b/test cases/common/206 native file path override/meson.build
index 142ca1cfc..142ca1cfc 100644
--- a/test cases/common/212 native file path override/meson.build
+++ b/test cases/common/206 native file path override/meson.build
diff --git a/test cases/common/212 native file path override/nativefile.ini b/test cases/common/206 native file path override/nativefile.ini
index 1c295c7d4..1c295c7d4 100644
--- a/test cases/common/212 native file path override/nativefile.ini
+++ b/test cases/common/206 native file path override/nativefile.ini
diff --git a/test cases/common/212 native file path override/test.json b/test cases/common/206 native file path override/test.json
index 7954c8ea8..7954c8ea8 100644
--- a/test cases/common/212 native file path override/test.json
+++ b/test cases/common/206 native file path override/test.json
diff --git a/test cases/common/213 tap tests/cat.c b/test cases/common/207 tap tests/cat.c
index 4b92010ad..4b92010ad 100644
--- a/test cases/common/213 tap tests/cat.c
+++ b/test cases/common/207 tap tests/cat.c
diff --git a/test cases/common/213 tap tests/issue7515.txt b/test cases/common/207 tap tests/issue7515.txt
index ca8563778..ca8563778 100644
--- a/test cases/common/213 tap tests/issue7515.txt
+++ b/test cases/common/207 tap tests/issue7515.txt
diff --git a/test cases/common/213 tap tests/meson.build b/test cases/common/207 tap tests/meson.build
index 522131965..522131965 100644
--- a/test cases/common/213 tap tests/meson.build
+++ b/test cases/common/207 tap tests/meson.build
diff --git a/test cases/common/213 tap tests/tester.c b/test cases/common/207 tap tests/tester.c
index ac582e7c0..ac582e7c0 100644
--- a/test cases/common/213 tap tests/tester.c
+++ b/test cases/common/207 tap tests/tester.c
diff --git a/test cases/common/214 warning level 0/main.cpp b/test cases/common/208 warning level 0/main.cpp
index 954d9ce3e..954d9ce3e 100644
--- a/test cases/common/214 warning level 0/main.cpp
+++ b/test cases/common/208 warning level 0/main.cpp
diff --git a/test cases/common/214 warning level 0/meson.build b/test cases/common/208 warning level 0/meson.build
index f2bd3390b..f2bd3390b 100644
--- a/test cases/common/214 warning level 0/meson.build
+++ b/test cases/common/208 warning level 0/meson.build
diff --git a/test cases/common/215 link custom/custom_stlib.py b/test cases/common/209 link custom/custom_stlib.py
index 6a090f3db..6a090f3db 100755
--- a/test cases/common/215 link custom/custom_stlib.py
+++ b/test cases/common/209 link custom/custom_stlib.py
diff --git a/test cases/common/215 link custom/custom_target.c b/test cases/common/209 link custom/custom_target.c
index 1bbe82c38..1bbe82c38 100644
--- a/test cases/common/215 link custom/custom_target.c
+++ b/test cases/common/209 link custom/custom_target.c
diff --git a/test cases/common/215 link custom/custom_target.py b/test cases/common/209 link custom/custom_target.py
index c246344da..c246344da 100644
--- a/test cases/common/215 link custom/custom_target.py
+++ b/test cases/common/209 link custom/custom_target.py
diff --git a/test cases/common/215 link custom/dummy.c b/test cases/common/209 link custom/dummy.c
index 53a4a402d..53a4a402d 100644
--- a/test cases/common/215 link custom/dummy.c
+++ b/test cases/common/209 link custom/dummy.c
diff --git a/test cases/common/215 link custom/lib.c b/test cases/common/209 link custom/lib.c
index 585b6c905..585b6c905 100644
--- a/test cases/common/215 link custom/lib.c
+++ b/test cases/common/209 link custom/lib.c
diff --git a/test cases/common/215 link custom/meson.build b/test cases/common/209 link custom/meson.build
index 837e960ea..837e960ea 100644
--- a/test cases/common/215 link custom/meson.build
+++ b/test cases/common/209 link custom/meson.build
diff --git a/test cases/common/215 link custom/outerlib.c b/test cases/common/209 link custom/outerlib.c
index 6861f8d45..6861f8d45 100644
--- a/test cases/common/215 link custom/outerlib.c
+++ b/test cases/common/209 link custom/outerlib.c
diff --git a/test cases/common/215 link custom/prog.c b/test cases/common/209 link custom/prog.c
index efecbef34..efecbef34 100644
--- a/test cases/common/215 link custom/prog.c
+++ b/test cases/common/209 link custom/prog.c
diff --git a/test cases/common/216 link custom_i single from multiple/generate_conflicting_stlibs.py b/test cases/common/210 link custom_i single from multiple/generate_conflicting_stlibs.py
index 42d6631dd..42d6631dd 100644
--- a/test cases/common/216 link custom_i single from multiple/generate_conflicting_stlibs.py
+++ b/test cases/common/210 link custom_i single from multiple/generate_conflicting_stlibs.py
diff --git a/test cases/common/216 link custom_i single from multiple/meson.build b/test cases/common/210 link custom_i single from multiple/meson.build
index eee1fe13c..eee1fe13c 100644
--- a/test cases/common/216 link custom_i single from multiple/meson.build
+++ b/test cases/common/210 link custom_i single from multiple/meson.build
diff --git a/test cases/common/216 link custom_i single from multiple/prog.c b/test cases/common/210 link custom_i single from multiple/prog.c
index 040672a42..040672a42 100644
--- a/test cases/common/216 link custom_i single from multiple/prog.c
+++ b/test cases/common/210 link custom_i single from multiple/prog.c
diff --git a/test cases/common/217 link custom_i multiple from multiple/generate_stlibs.py b/test cases/common/211 link custom_i multiple from multiple/generate_stlibs.py
index 5292006c5..5292006c5 100644
--- a/test cases/common/217 link custom_i multiple from multiple/generate_stlibs.py
+++ b/test cases/common/211 link custom_i multiple from multiple/generate_stlibs.py
diff --git a/test cases/common/217 link custom_i multiple from multiple/meson.build b/test cases/common/211 link custom_i multiple from multiple/meson.build
index e5236e5f6..e5236e5f6 100644
--- a/test cases/common/217 link custom_i multiple from multiple/meson.build
+++ b/test cases/common/211 link custom_i multiple from multiple/meson.build
diff --git a/test cases/common/217 link custom_i multiple from multiple/prog.c b/test cases/common/211 link custom_i multiple from multiple/prog.c
index 7b0c5cfc8..7b0c5cfc8 100644
--- a/test cases/common/217 link custom_i multiple from multiple/prog.c
+++ b/test cases/common/211 link custom_i multiple from multiple/prog.c
diff --git a/test cases/common/218 dependency get_variable method/meson.build b/test cases/common/212 dependency get_variable method/meson.build
index 9f60836e2..9f60836e2 100644
--- a/test cases/common/218 dependency get_variable method/meson.build
+++ b/test cases/common/212 dependency get_variable method/meson.build
diff --git a/test cases/common/219 source set configuration_data/a.c b/test cases/common/213 source set configuration_data/a.c
index 0570dffc4..0570dffc4 100644
--- a/test cases/common/219 source set configuration_data/a.c
+++ b/test cases/common/213 source set configuration_data/a.c
diff --git a/test cases/common/219 source set configuration_data/all.h b/test cases/common/213 source set configuration_data/all.h
index e3547dfdc..e3547dfdc 100644
--- a/test cases/common/219 source set configuration_data/all.h
+++ b/test cases/common/213 source set configuration_data/all.h
diff --git a/test cases/common/219 source set configuration_data/f.c b/test cases/common/213 source set configuration_data/f.c
index 33d2f18f0..33d2f18f0 100644
--- a/test cases/common/219 source set configuration_data/f.c
+++ b/test cases/common/213 source set configuration_data/f.c
diff --git a/test cases/common/219 source set configuration_data/g.c b/test cases/common/213 source set configuration_data/g.c
index 4a6f253b0..4a6f253b0 100644
--- a/test cases/common/219 source set configuration_data/g.c
+++ b/test cases/common/213 source set configuration_data/g.c
diff --git a/test cases/common/219 source set configuration_data/meson.build b/test cases/common/213 source set configuration_data/meson.build
index 104f39d21..104f39d21 100644
--- a/test cases/common/219 source set configuration_data/meson.build
+++ b/test cases/common/213 source set configuration_data/meson.build
diff --git a/test cases/common/219 source set configuration_data/nope.c b/test cases/common/213 source set configuration_data/nope.c
index 0ce1d3b1e..0ce1d3b1e 100644
--- a/test cases/common/219 source set configuration_data/nope.c
+++ b/test cases/common/213 source set configuration_data/nope.c
diff --git a/test cases/common/219 source set configuration_data/subdir/b.c b/test cases/common/213 source set configuration_data/subdir/b.c
index 31c378934..31c378934 100644
--- a/test cases/common/219 source set configuration_data/subdir/b.c
+++ b/test cases/common/213 source set configuration_data/subdir/b.c
diff --git a/test cases/common/219 source set configuration_data/subdir/meson.build b/test cases/common/213 source set configuration_data/subdir/meson.build
index b497de574..b497de574 100644
--- a/test cases/common/219 source set configuration_data/subdir/meson.build
+++ b/test cases/common/213 source set configuration_data/subdir/meson.build
diff --git a/test cases/common/220 source set dictionary/a.c b/test cases/common/214 source set dictionary/a.c
index 0570dffc4..0570dffc4 100644
--- a/test cases/common/220 source set dictionary/a.c
+++ b/test cases/common/214 source set dictionary/a.c
diff --git a/test cases/common/220 source set dictionary/all.h b/test cases/common/214 source set dictionary/all.h
index e3547dfdc..e3547dfdc 100644
--- a/test cases/common/220 source set dictionary/all.h
+++ b/test cases/common/214 source set dictionary/all.h
diff --git a/test cases/common/220 source set dictionary/f.c b/test cases/common/214 source set dictionary/f.c
index 9c5bb1cb9..9c5bb1cb9 100644
--- a/test cases/common/220 source set dictionary/f.c
+++ b/test cases/common/214 source set dictionary/f.c
diff --git a/test cases/common/220 source set dictionary/g.c b/test cases/common/214 source set dictionary/g.c
index 4a6f253b0..4a6f253b0 100644
--- a/test cases/common/220 source set dictionary/g.c
+++ b/test cases/common/214 source set dictionary/g.c
diff --git a/test cases/common/220 source set dictionary/meson.build b/test cases/common/214 source set dictionary/meson.build
index 9a3450707..9a3450707 100644
--- a/test cases/common/220 source set dictionary/meson.build
+++ b/test cases/common/214 source set dictionary/meson.build
diff --git a/test cases/common/220 source set dictionary/nope.c b/test cases/common/214 source set dictionary/nope.c
index 0ce1d3b1e..0ce1d3b1e 100644
--- a/test cases/common/220 source set dictionary/nope.c
+++ b/test cases/common/214 source set dictionary/nope.c
diff --git a/test cases/common/220 source set dictionary/subdir/b.c b/test cases/common/214 source set dictionary/subdir/b.c
index 31c378934..31c378934 100644
--- a/test cases/common/220 source set dictionary/subdir/b.c
+++ b/test cases/common/214 source set dictionary/subdir/b.c
diff --git a/test cases/common/220 source set dictionary/subdir/meson.build b/test cases/common/214 source set dictionary/subdir/meson.build
index b497de574..b497de574 100644
--- a/test cases/common/220 source set dictionary/subdir/meson.build
+++ b/test cases/common/214 source set dictionary/subdir/meson.build
diff --git a/test cases/common/221 source set custom target/a.c b/test cases/common/215 source set custom target/a.c
index 39a3b6b38..39a3b6b38 100644
--- a/test cases/common/221 source set custom target/a.c
+++ b/test cases/common/215 source set custom target/a.c
diff --git a/test cases/common/221 source set custom target/all.h b/test cases/common/215 source set custom target/all.h
index 5885e3204..5885e3204 100644
--- a/test cases/common/221 source set custom target/all.h
+++ b/test cases/common/215 source set custom target/all.h
diff --git a/test cases/common/221 source set custom target/cp.py b/test cases/common/215 source set custom target/cp.py
index cb09cf399..cb09cf399 100644
--- a/test cases/common/221 source set custom target/cp.py
+++ b/test cases/common/215 source set custom target/cp.py
diff --git a/test cases/common/221 source set custom target/f.c b/test cases/common/215 source set custom target/f.c
index a50ecda32..a50ecda32 100644
--- a/test cases/common/221 source set custom target/f.c
+++ b/test cases/common/215 source set custom target/f.c
diff --git a/test cases/common/221 source set custom target/g.c b/test cases/common/215 source set custom target/g.c
index 7098584c2..7098584c2 100644
--- a/test cases/common/221 source set custom target/g.c
+++ b/test cases/common/215 source set custom target/g.c
diff --git a/test cases/common/221 source set custom target/meson.build b/test cases/common/215 source set custom target/meson.build
index fe6e6e18b..fe6e6e18b 100644
--- a/test cases/common/221 source set custom target/meson.build
+++ b/test cases/common/215 source set custom target/meson.build
diff --git a/test cases/common/222 source set realistic example/boards/arm/aarch64.cc b/test cases/common/216 source set realistic example/boards/arm/aarch64.cc
index 386c771d8..386c771d8 100644
--- a/test cases/common/222 source set realistic example/boards/arm/aarch64.cc
+++ b/test cases/common/216 source set realistic example/boards/arm/aarch64.cc
diff --git a/test cases/common/222 source set realistic example/boards/arm/arm.cc b/test cases/common/216 source set realistic example/boards/arm/arm.cc
index b463ebe7a..b463ebe7a 100644
--- a/test cases/common/222 source set realistic example/boards/arm/arm.cc
+++ b/test cases/common/216 source set realistic example/boards/arm/arm.cc
diff --git a/test cases/common/222 source set realistic example/boards/arm/arm.h b/test cases/common/216 source set realistic example/boards/arm/arm.h
index 4dd6b694f..4dd6b694f 100644
--- a/test cases/common/222 source set realistic example/boards/arm/arm.h
+++ b/test cases/common/216 source set realistic example/boards/arm/arm.h
diff --git a/test cases/common/222 source set realistic example/boards/arm/arm32.cc b/test cases/common/216 source set realistic example/boards/arm/arm32.cc
index 72a24274a..72a24274a 100644
--- a/test cases/common/222 source set realistic example/boards/arm/arm32.cc
+++ b/test cases/common/216 source set realistic example/boards/arm/arm32.cc
diff --git a/test cases/common/222 source set realistic example/boards/arm/versatilepb.cc b/test cases/common/216 source set realistic example/boards/arm/versatilepb.cc
index 3d1a9fe7c..3d1a9fe7c 100644
--- a/test cases/common/222 source set realistic example/boards/arm/versatilepb.cc
+++ b/test cases/common/216 source set realistic example/boards/arm/versatilepb.cc
diff --git a/test cases/common/222 source set realistic example/boards/arm/virt.cc b/test cases/common/216 source set realistic example/boards/arm/virt.cc
index 6f9a1ca94..6f9a1ca94 100644
--- a/test cases/common/222 source set realistic example/boards/arm/virt.cc
+++ b/test cases/common/216 source set realistic example/boards/arm/virt.cc
diff --git a/test cases/common/222 source set realistic example/boards/arm/xlnx_zcu102.cc b/test cases/common/216 source set realistic example/boards/arm/xlnx_zcu102.cc
index 8921e0074..8921e0074 100644
--- a/test cases/common/222 source set realistic example/boards/arm/xlnx_zcu102.cc
+++ b/test cases/common/216 source set realistic example/boards/arm/xlnx_zcu102.cc
diff --git a/test cases/common/222 source set realistic example/boards/meson.build b/test cases/common/216 source set realistic example/boards/meson.build
index 41ead4c3e..41ead4c3e 100644
--- a/test cases/common/222 source set realistic example/boards/meson.build
+++ b/test cases/common/216 source set realistic example/boards/meson.build
diff --git a/test cases/common/222 source set realistic example/boards/x86/pc.cc b/test cases/common/216 source set realistic example/boards/x86/pc.cc
index 04ec39262..04ec39262 100644
--- a/test cases/common/222 source set realistic example/boards/x86/pc.cc
+++ b/test cases/common/216 source set realistic example/boards/x86/pc.cc
diff --git a/test cases/common/222 source set realistic example/common.h b/test cases/common/216 source set realistic example/common.h
index 6e325c7bc..6e325c7bc 100644
--- a/test cases/common/222 source set realistic example/common.h
+++ b/test cases/common/216 source set realistic example/common.h
diff --git a/test cases/common/222 source set realistic example/config/aarch64 b/test cases/common/216 source set realistic example/config/aarch64
index 55b90ebee..55b90ebee 100644
--- a/test cases/common/222 source set realistic example/config/aarch64
+++ b/test cases/common/216 source set realistic example/config/aarch64
diff --git a/test cases/common/222 source set realistic example/config/arm b/test cases/common/216 source set realistic example/config/arm
index d3f7ac761..d3f7ac761 100644
--- a/test cases/common/222 source set realistic example/config/arm
+++ b/test cases/common/216 source set realistic example/config/arm
diff --git a/test cases/common/222 source set realistic example/config/x86 b/test cases/common/216 source set realistic example/config/x86
index 6caa3e244..6caa3e244 100644
--- a/test cases/common/222 source set realistic example/config/x86
+++ b/test cases/common/216 source set realistic example/config/x86
diff --git a/test cases/common/222 source set realistic example/devices/meson.build b/test cases/common/216 source set realistic example/devices/meson.build
index 68ee68eec..68ee68eec 100644
--- a/test cases/common/222 source set realistic example/devices/meson.build
+++ b/test cases/common/216 source set realistic example/devices/meson.build
diff --git a/test cases/common/222 source set realistic example/devices/virtio-mmio.cc b/test cases/common/216 source set realistic example/devices/virtio-mmio.cc
index 5dab97e5c..5dab97e5c 100644
--- a/test cases/common/222 source set realistic example/devices/virtio-mmio.cc
+++ b/test cases/common/216 source set realistic example/devices/virtio-mmio.cc
diff --git a/test cases/common/222 source set realistic example/devices/virtio-pci.cc b/test cases/common/216 source set realistic example/devices/virtio-pci.cc
index 7df7a82b7..7df7a82b7 100644
--- a/test cases/common/222 source set realistic example/devices/virtio-pci.cc
+++ b/test cases/common/216 source set realistic example/devices/virtio-pci.cc
diff --git a/test cases/common/222 source set realistic example/devices/virtio.cc b/test cases/common/216 source set realistic example/devices/virtio.cc
index fc51275bf..fc51275bf 100644
--- a/test cases/common/222 source set realistic example/devices/virtio.cc
+++ b/test cases/common/216 source set realistic example/devices/virtio.cc
diff --git a/test cases/common/222 source set realistic example/devices/virtio.h b/test cases/common/216 source set realistic example/devices/virtio.h
index a157731fe..a157731fe 100644
--- a/test cases/common/222 source set realistic example/devices/virtio.h
+++ b/test cases/common/216 source set realistic example/devices/virtio.h
diff --git a/test cases/common/222 source set realistic example/main.cc b/test cases/common/216 source set realistic example/main.cc
index 2b552176b..2b552176b 100644
--- a/test cases/common/222 source set realistic example/main.cc
+++ b/test cases/common/216 source set realistic example/main.cc
diff --git a/test cases/common/222 source set realistic example/meson.build b/test cases/common/216 source set realistic example/meson.build
index d986b991a..d986b991a 100644
--- a/test cases/common/222 source set realistic example/meson.build
+++ b/test cases/common/216 source set realistic example/meson.build
diff --git a/test cases/common/222 source set realistic example/not-found.cc b/test cases/common/216 source set realistic example/not-found.cc
index 955a7a2a6..955a7a2a6 100644
--- a/test cases/common/222 source set realistic example/not-found.cc
+++ b/test cases/common/216 source set realistic example/not-found.cc
diff --git a/test cases/common/222 source set realistic example/was-found.cc b/test cases/common/216 source set realistic example/was-found.cc
index f1eaf1ea5..f1eaf1ea5 100644
--- a/test cases/common/222 source set realistic example/was-found.cc
+++ b/test cases/common/216 source set realistic example/was-found.cc
diff --git a/test cases/common/222 source set realistic example/zlib.cc b/test cases/common/216 source set realistic example/zlib.cc
index 434e0b7a6..434e0b7a6 100644
--- a/test cases/common/222 source set realistic example/zlib.cc
+++ b/test cases/common/216 source set realistic example/zlib.cc
diff --git a/test cases/common/223 custom target input extracted objects/check_object.py b/test cases/common/217 custom target input extracted objects/check_object.py
index bafcf2c17..bafcf2c17 100644
--- a/test cases/common/223 custom target input extracted objects/check_object.py
+++ b/test cases/common/217 custom target input extracted objects/check_object.py
diff --git a/test cases/common/223 custom target input extracted objects/libdir/meson.build b/test cases/common/217 custom target input extracted objects/libdir/meson.build
index 7f833115c..7f833115c 100644
--- a/test cases/common/223 custom target input extracted objects/libdir/meson.build
+++ b/test cases/common/217 custom target input extracted objects/libdir/meson.build
diff --git a/test cases/common/223 custom target input extracted objects/libdir/source.c b/test cases/common/217 custom target input extracted objects/libdir/source.c
index 1dc08e168..1dc08e168 100644
--- a/test cases/common/223 custom target input extracted objects/libdir/source.c
+++ b/test cases/common/217 custom target input extracted objects/libdir/source.c
diff --git a/test cases/common/223 custom target input extracted objects/meson.build b/test cases/common/217 custom target input extracted objects/meson.build
index 579308c66..579308c66 100644
--- a/test cases/common/223 custom target input extracted objects/meson.build
+++ b/test cases/common/217 custom target input extracted objects/meson.build
diff --git a/test cases/common/224 test priorities/meson.build b/test cases/common/218 test priorities/meson.build
index 33c6fa382..33c6fa382 100644
--- a/test cases/common/224 test priorities/meson.build
+++ b/test cases/common/218 test priorities/meson.build
diff --git a/test cases/common/224 test priorities/testprog.py b/test cases/common/218 test priorities/testprog.py
index 470f28c3b..470f28c3b 100644
--- a/test cases/common/224 test priorities/testprog.py
+++ b/test cases/common/218 test priorities/testprog.py
diff --git a/test cases/common/225 include_dir dot/meson.build b/test cases/common/219 include_dir dot/meson.build
index 71f7189c5..71f7189c5 100644
--- a/test cases/common/225 include_dir dot/meson.build
+++ b/test cases/common/219 include_dir dot/meson.build
diff --git a/test cases/common/225 include_dir dot/rone.h b/test cases/common/219 include_dir dot/rone.h
index 48d7a79e8..48d7a79e8 100644
--- a/test cases/common/225 include_dir dot/rone.h
+++ b/test cases/common/219 include_dir dot/rone.h
diff --git a/test cases/common/225 include_dir dot/src/main.c b/test cases/common/219 include_dir dot/src/main.c
index 192b783f6..192b783f6 100644
--- a/test cases/common/225 include_dir dot/src/main.c
+++ b/test cases/common/219 include_dir dot/src/main.c
diff --git a/test cases/common/225 include_dir dot/src/meson.build b/test cases/common/219 include_dir dot/src/meson.build
index fcbefb0b9..fcbefb0b9 100644
--- a/test cases/common/225 include_dir dot/src/meson.build
+++ b/test cases/common/219 include_dir dot/src/meson.build
diff --git a/test cases/common/225 include_dir dot/src/rone.c b/test cases/common/219 include_dir dot/src/rone.c
index 63cb0d319..63cb0d319 100644
--- a/test cases/common/225 include_dir dot/src/rone.c
+++ b/test cases/common/219 include_dir dot/src/rone.c
diff --git a/test cases/common/226 include_type dependency/main.cpp b/test cases/common/220 include_type dependency/main.cpp
index bf8c4a423..bf8c4a423 100644
--- a/test cases/common/226 include_type dependency/main.cpp
+++ b/test cases/common/220 include_type dependency/main.cpp
diff --git a/test cases/common/226 include_type dependency/meson.build b/test cases/common/220 include_type dependency/meson.build
index fe21dbb82..fe21dbb82 100644
--- a/test cases/common/226 include_type dependency/meson.build
+++ b/test cases/common/220 include_type dependency/meson.build
diff --git a/test cases/common/226 include_type dependency/pch/test.hpp b/test cases/common/220 include_type dependency/pch/test.hpp
index 0d40fe1b9..0d40fe1b9 100644
--- a/test cases/common/226 include_type dependency/pch/test.hpp
+++ b/test cases/common/220 include_type dependency/pch/test.hpp
diff --git a/test cases/common/226 include_type dependency/subprojects/subDep/meson.build b/test cases/common/220 include_type dependency/subprojects/subDep/meson.build
index c3e87c469..c3e87c469 100644
--- a/test cases/common/226 include_type dependency/subprojects/subDep/meson.build
+++ b/test cases/common/220 include_type dependency/subprojects/subDep/meson.build
diff --git a/test cases/common/227 fs module/meson.build b/test cases/common/221 fs module/meson.build
index f090d354c..f090d354c 100644
--- a/test cases/common/227 fs module/meson.build
+++ b/test cases/common/221 fs module/meson.build
diff --git a/test cases/common/227 fs module/subdir/meson.build b/test cases/common/221 fs module/subdir/meson.build
index dc04b4124..dc04b4124 100644
--- a/test cases/common/227 fs module/subdir/meson.build
+++ b/test cases/common/221 fs module/subdir/meson.build
diff --git a/test cases/common/227 fs module/subdir/subdirfile.txt b/test cases/common/221 fs module/subdir/subdirfile.txt
index bcf7cc04b..bcf7cc04b 100644
--- a/test cases/common/227 fs module/subdir/subdirfile.txt
+++ b/test cases/common/221 fs module/subdir/subdirfile.txt
diff --git a/test cases/common/227 fs module/subprojects/subbie/meson.build b/test cases/common/221 fs module/subprojects/subbie/meson.build
index ca6d36b4a..ca6d36b4a 100644
--- a/test cases/common/227 fs module/subprojects/subbie/meson.build
+++ b/test cases/common/221 fs module/subprojects/subbie/meson.build
diff --git a/test cases/common/227 fs module/subprojects/subbie/subprojectfile.txt b/test cases/common/221 fs module/subprojects/subbie/subprojectfile.txt
index bedb84cc4..bedb84cc4 100644
--- a/test cases/common/227 fs module/subprojects/subbie/subprojectfile.txt
+++ b/test cases/common/221 fs module/subprojects/subbie/subprojectfile.txt
diff --git a/test cases/common/227 fs module/subprojects/subbie/subsub/meson.build b/test cases/common/221 fs module/subprojects/subbie/subsub/meson.build
index 4ac68aea5..4ac68aea5 100644
--- a/test cases/common/227 fs module/subprojects/subbie/subsub/meson.build
+++ b/test cases/common/221 fs module/subprojects/subbie/subsub/meson.build
diff --git a/test cases/common/227 fs module/subprojects/subbie/subsub/subsubfile.txt b/test cases/common/221 fs module/subprojects/subbie/subsub/subsubfile.txt
index 2d5120d66..2d5120d66 100644
--- a/test cases/common/227 fs module/subprojects/subbie/subsub/subsubfile.txt
+++ b/test cases/common/221 fs module/subprojects/subbie/subsub/subsubfile.txt
diff --git a/test cases/common/228 zlib/meson.build b/test cases/common/222 zlib/meson.build
index c53f71e4c..c53f71e4c 100644
--- a/test cases/common/228 zlib/meson.build
+++ b/test cases/common/222 zlib/meson.build
diff --git a/test cases/common/229 native prop/crossfile.ini b/test cases/common/223 native prop/crossfile.ini
index 62d63ed63..62d63ed63 100644
--- a/test cases/common/229 native prop/crossfile.ini
+++ b/test cases/common/223 native prop/crossfile.ini
diff --git a/test cases/common/229 native prop/meson.build b/test cases/common/223 native prop/meson.build
index 64da41018..64da41018 100644
--- a/test cases/common/229 native prop/meson.build
+++ b/test cases/common/223 native prop/meson.build
diff --git a/test cases/common/229 native prop/nativefile.ini b/test cases/common/223 native prop/nativefile.ini
index 03c1e0397..03c1e0397 100644
--- a/test cases/common/229 native prop/nativefile.ini
+++ b/test cases/common/223 native prop/nativefile.ini
diff --git a/test cases/common/230 persubproject options/foo.c b/test cases/common/224 persubproject options/foo.c
index 63e4de6a3..63e4de6a3 100644
--- a/test cases/common/230 persubproject options/foo.c
+++ b/test cases/common/224 persubproject options/foo.c
diff --git a/test cases/common/230 persubproject options/meson.build b/test cases/common/224 persubproject options/meson.build
index f76a70cd3..f76a70cd3 100644
--- a/test cases/common/230 persubproject options/meson.build
+++ b/test cases/common/224 persubproject options/meson.build
diff --git a/test cases/common/230 persubproject options/subprojects/sub1/foo.c b/test cases/common/224 persubproject options/subprojects/sub1/foo.c
index 82ad2c2d0..82ad2c2d0 100644
--- a/test cases/common/230 persubproject options/subprojects/sub1/foo.c
+++ b/test cases/common/224 persubproject options/subprojects/sub1/foo.c
diff --git a/test cases/common/230 persubproject options/subprojects/sub1/meson.build b/test cases/common/224 persubproject options/subprojects/sub1/meson.build
index 4e4bc1ba0..4e4bc1ba0 100644
--- a/test cases/common/230 persubproject options/subprojects/sub1/meson.build
+++ b/test cases/common/224 persubproject options/subprojects/sub1/meson.build
diff --git a/test cases/common/230 persubproject options/subprojects/sub2/foo.c b/test cases/common/224 persubproject options/subprojects/sub2/foo.c
index cf7201b92..cf7201b92 100644
--- a/test cases/common/230 persubproject options/subprojects/sub2/foo.c
+++ b/test cases/common/224 persubproject options/subprojects/sub2/foo.c
diff --git a/test cases/common/230 persubproject options/subprojects/sub2/meson.build b/test cases/common/224 persubproject options/subprojects/sub2/meson.build
index f1226b8ba..f1226b8ba 100644
--- a/test cases/common/230 persubproject options/subprojects/sub2/meson.build
+++ b/test cases/common/224 persubproject options/subprojects/sub2/meson.build
diff --git a/test cases/common/231 arithmetic operators/meson.build b/test cases/common/225 arithmetic operators/meson.build
index a904bd040..a904bd040 100644
--- a/test cases/common/231 arithmetic operators/meson.build
+++ b/test cases/common/225 arithmetic operators/meson.build
diff --git a/test cases/common/232 link language/c_linkage.cpp b/test cases/common/226 link language/c_linkage.cpp
index dc006b936..dc006b936 100644
--- a/test cases/common/232 link language/c_linkage.cpp
+++ b/test cases/common/226 link language/c_linkage.cpp
diff --git a/test cases/common/232 link language/c_linkage.h b/test cases/common/226 link language/c_linkage.h
index 1609f4702..1609f4702 100644
--- a/test cases/common/232 link language/c_linkage.h
+++ b/test cases/common/226 link language/c_linkage.h
diff --git a/test cases/common/232 link language/lib.cpp b/test cases/common/226 link language/lib.cpp
index ab4382832..ab4382832 100644
--- a/test cases/common/232 link language/lib.cpp
+++ b/test cases/common/226 link language/lib.cpp
diff --git a/test cases/common/232 link language/main.c b/test cases/common/226 link language/main.c
index 5a167e785..5a167e785 100644
--- a/test cases/common/232 link language/main.c
+++ b/test cases/common/226 link language/main.c
diff --git a/test cases/common/232 link language/meson.build b/test cases/common/226 link language/meson.build
index f9af6cd32..f9af6cd32 100644
--- a/test cases/common/232 link language/meson.build
+++ b/test cases/common/226 link language/meson.build
diff --git a/test cases/common/233 link depends indexed custom target/check_arch.py b/test cases/common/227 link depends indexed custom target/check_arch.py
index 2e09f3589..2e09f3589 100644
--- a/test cases/common/233 link depends indexed custom target/check_arch.py
+++ b/test cases/common/227 link depends indexed custom target/check_arch.py
diff --git a/test cases/common/233 link depends indexed custom target/foo.c b/test cases/common/227 link depends indexed custom target/foo.c
index 58c86a62b..58c86a62b 100644
--- a/test cases/common/233 link depends indexed custom target/foo.c
+++ b/test cases/common/227 link depends indexed custom target/foo.c
diff --git a/test cases/common/233 link depends indexed custom target/make_file.py b/test cases/common/227 link depends indexed custom target/make_file.py
index 6a43b7d05..6a43b7d05 100644
--- a/test cases/common/233 link depends indexed custom target/make_file.py
+++ b/test cases/common/227 link depends indexed custom target/make_file.py
diff --git a/test cases/common/233 link depends indexed custom target/meson.build b/test cases/common/227 link depends indexed custom target/meson.build
index c41c4c1e7..c41c4c1e7 100644
--- a/test cases/common/233 link depends indexed custom target/meson.build
+++ b/test cases/common/227 link depends indexed custom target/meson.build
diff --git a/test cases/common/234 very long commmand line/codegen.py b/test cases/common/228 very long commmand line/codegen.py
index b1de6073e..b1de6073e 100755
--- a/test cases/common/234 very long commmand line/codegen.py
+++ b/test cases/common/228 very long commmand line/codegen.py
diff --git a/test cases/common/234 very long commmand line/main.c b/test cases/common/228 very long commmand line/main.c
index 78f2de106..78f2de106 100644
--- a/test cases/common/234 very long commmand line/main.c
+++ b/test cases/common/228 very long commmand line/main.c
diff --git a/test cases/common/234 very long commmand line/meson.build b/test cases/common/228 very long commmand line/meson.build
index 70058e6c8..70058e6c8 100644
--- a/test cases/common/234 very long commmand line/meson.build
+++ b/test cases/common/228 very long commmand line/meson.build
diff --git a/test cases/common/234 very long commmand line/name_gen.py b/test cases/common/228 very long commmand line/name_gen.py
index 84352984a..84352984a 100755
--- a/test cases/common/234 very long commmand line/name_gen.py
+++ b/test cases/common/228 very long commmand line/name_gen.py
diff --git a/test cases/common/235 custom_target source/a b/test cases/common/229 custom_target source/a
index e69de29bb..e69de29bb 100644
--- a/test cases/common/235 custom_target source/a
+++ b/test cases/common/229 custom_target source/a
diff --git a/test cases/common/235 custom_target source/meson.build b/test cases/common/229 custom_target source/meson.build
index 98b9d2647..98b9d2647 100644
--- a/test cases/common/235 custom_target source/meson.build
+++ b/test cases/common/229 custom_target source/meson.build
diff --git a/test cases/common/235 custom_target source/x.py b/test cases/common/229 custom_target source/x.py
index 12f40c83f..12f40c83f 100644
--- a/test cases/common/235 custom_target source/x.py
+++ b/test cases/common/229 custom_target source/x.py
diff --git a/test cases/common/235 disabler array addition/meson.build b/test cases/common/230 disabler array addition/meson.build
index 231f76acf..231f76acf 100644
--- a/test cases/common/235 disabler array addition/meson.build
+++ b/test cases/common/230 disabler array addition/meson.build
diff --git a/test cases/common/235 disabler array addition/test.c b/test cases/common/230 disabler array addition/test.c
index e9a7aac03..e9a7aac03 100644
--- a/test cases/common/235 disabler array addition/test.c
+++ b/test cases/common/230 disabler array addition/test.c
diff --git a/test cases/common/236 external project/app.c b/test cases/common/231 external project/app.c
index 166f00737..166f00737 100644
--- a/test cases/common/236 external project/app.c
+++ b/test cases/common/231 external project/app.c
diff --git a/test cases/common/236 external project/func.c b/test cases/common/231 external project/func.c
index 5e8f933f5..5e8f933f5 100644
--- a/test cases/common/236 external project/func.c
+++ b/test cases/common/231 external project/func.c
diff --git a/test cases/common/236 external project/func.h b/test cases/common/231 external project/func.h
index 340b82ac8..340b82ac8 100644
--- a/test cases/common/236 external project/func.h
+++ b/test cases/common/231 external project/func.h
diff --git a/test cases/common/236 external project/libfoo/configure b/test cases/common/231 external project/libfoo/configure
index a867b488a..a867b488a 100755
--- a/test cases/common/236 external project/libfoo/configure
+++ b/test cases/common/231 external project/libfoo/configure
diff --git a/test cases/common/236 external project/libfoo/libfoo.c b/test cases/common/231 external project/libfoo/libfoo.c
index 3f6228243..3f6228243 100644
--- a/test cases/common/236 external project/libfoo/libfoo.c
+++ b/test cases/common/231 external project/libfoo/libfoo.c
diff --git a/test cases/common/236 external project/libfoo/libfoo.h b/test cases/common/231 external project/libfoo/libfoo.h
index 8981f18b4..8981f18b4 100644
--- a/test cases/common/236 external project/libfoo/libfoo.h
+++ b/test cases/common/231 external project/libfoo/libfoo.h
diff --git a/test cases/common/236 external project/libfoo/meson.build b/test cases/common/231 external project/libfoo/meson.build
index 941e13f94..941e13f94 100644
--- a/test cases/common/236 external project/libfoo/meson.build
+++ b/test cases/common/231 external project/libfoo/meson.build
diff --git a/test cases/common/236 external project/meson.build b/test cases/common/231 external project/meson.build
index d1ed797c4..d1ed797c4 100644
--- a/test cases/common/236 external project/meson.build
+++ b/test cases/common/231 external project/meson.build
diff --git a/test cases/common/236 external project/test.json b/test cases/common/231 external project/test.json
index 4888e8752..4888e8752 100644
--- a/test cases/common/236 external project/test.json
+++ b/test cases/common/231 external project/test.json
diff --git a/test cases/common/237 subdir files/meson.build b/test cases/common/232 subdir files/meson.build
index eb472f39e..eb472f39e 100644
--- a/test cases/common/237 subdir files/meson.build
+++ b/test cases/common/232 subdir files/meson.build
diff --git a/test cases/common/237 subdir files/subdir/meson.build b/test cases/common/232 subdir files/subdir/meson.build
index 70909c72f..70909c72f 100644
--- a/test cases/common/237 subdir files/subdir/meson.build
+++ b/test cases/common/232 subdir files/subdir/meson.build
diff --git a/test cases/common/237 subdir files/subdir/prog.c b/test cases/common/232 subdir files/subdir/prog.c
index 78f2de106..78f2de106 100644
--- a/test cases/common/237 subdir files/subdir/prog.c
+++ b/test cases/common/232 subdir files/subdir/prog.c
diff --git a/test cases/common/239 dependency allow_fallback/meson.build b/test cases/common/233 dependency allow_fallback/meson.build
index b189faf12..b189faf12 100644
--- a/test cases/common/239 dependency allow_fallback/meson.build
+++ b/test cases/common/233 dependency allow_fallback/meson.build
diff --git a/test cases/common/239 dependency allow_fallback/subprojects/foob/meson.build b/test cases/common/233 dependency allow_fallback/subprojects/foob/meson.build
index b2c4814e2..b2c4814e2 100644
--- a/test cases/common/239 dependency allow_fallback/subprojects/foob/meson.build
+++ b/test cases/common/233 dependency allow_fallback/subprojects/foob/meson.build
diff --git a/test cases/common/239 dependency allow_fallback/subprojects/foob3/meson.build b/test cases/common/233 dependency allow_fallback/subprojects/foob3/meson.build
index 9fdb18817..9fdb18817 100644
--- a/test cases/common/239 dependency allow_fallback/subprojects/foob3/meson.build
+++ b/test cases/common/233 dependency allow_fallback/subprojects/foob3/meson.build
diff --git a/test cases/common/28 find program/meson.build b/test cases/common/27 find program/meson.build
index 3b59caa93..3b59caa93 100644
--- a/test cases/common/28 find program/meson.build
+++ b/test cases/common/27 find program/meson.build
diff --git a/test cases/common/28 find program/print-version-with-prefix.py b/test cases/common/27 find program/print-version-with-prefix.py
index 520e0ba8c..520e0ba8c 100644
--- a/test cases/common/28 find program/print-version-with-prefix.py
+++ b/test cases/common/27 find program/print-version-with-prefix.py
diff --git a/test cases/common/28 find program/print-version.py b/test cases/common/27 find program/print-version.py
index 4a78e5b85..4a78e5b85 100644
--- a/test cases/common/28 find program/print-version.py
+++ b/test cases/common/27 find program/print-version.py
diff --git a/test cases/common/28 find program/scripts/test_subdir.py b/test cases/common/27 find program/scripts/test_subdir.py
index 947ffe408..947ffe408 100644
--- a/test cases/common/28 find program/scripts/test_subdir.py
+++ b/test cases/common/27 find program/scripts/test_subdir.py
diff --git a/test cases/common/28 find program/source.in b/test cases/common/27 find program/source.in
index 03b2213bb..03b2213bb 100644
--- a/test cases/common/28 find program/source.in
+++ b/test cases/common/27 find program/source.in
diff --git a/test cases/common/29 multiline string/meson.build b/test cases/common/28 multiline string/meson.build
index 9cec114d8..9cec114d8 100644
--- a/test cases/common/29 multiline string/meson.build
+++ b/test cases/common/28 multiline string/meson.build
diff --git a/test cases/common/30 try compile/invalid.c b/test cases/common/29 try compile/invalid.c
index 6c9cfb840..6c9cfb840 100644
--- a/test cases/common/30 try compile/invalid.c
+++ b/test cases/common/29 try compile/invalid.c
diff --git a/test cases/common/30 try compile/meson.build b/test cases/common/29 try compile/meson.build
index cb41e1d5a..cb41e1d5a 100644
--- a/test cases/common/30 try compile/meson.build
+++ b/test cases/common/29 try compile/meson.build
diff --git a/test cases/common/30 try compile/valid.c b/test cases/common/29 try compile/valid.c
index f8e76f4ee..f8e76f4ee 100644
--- a/test cases/common/30 try compile/valid.c
+++ b/test cases/common/29 try compile/valid.c
diff --git a/test cases/common/31 compiler id/meson.build b/test cases/common/30 compiler id/meson.build
index 280d4f773..280d4f773 100644
--- a/test cases/common/31 compiler id/meson.build
+++ b/test cases/common/30 compiler id/meson.build
diff --git a/test cases/common/32 sizeof/config.h.in b/test cases/common/31 sizeof/config.h.in
index a442e8a4e..a442e8a4e 100644
--- a/test cases/common/32 sizeof/config.h.in
+++ b/test cases/common/31 sizeof/config.h.in
diff --git a/test cases/common/32 sizeof/meson.build b/test cases/common/31 sizeof/meson.build
index 9de5b7816..9de5b7816 100644
--- a/test cases/common/32 sizeof/meson.build
+++ b/test cases/common/31 sizeof/meson.build
diff --git a/test cases/common/32 sizeof/prog.c.in b/test cases/common/31 sizeof/prog.c.in
index 44918ecc4..44918ecc4 100644
--- a/test cases/common/32 sizeof/prog.c.in
+++ b/test cases/common/31 sizeof/prog.c.in
diff --git a/test cases/common/33 define10/config.h.in b/test cases/common/32 define10/config.h.in
index dc7734637..dc7734637 100644
--- a/test cases/common/33 define10/config.h.in
+++ b/test cases/common/32 define10/config.h.in
diff --git a/test cases/common/33 define10/meson.build b/test cases/common/32 define10/meson.build
index a28e7e48d..a28e7e48d 100644
--- a/test cases/common/33 define10/meson.build
+++ b/test cases/common/32 define10/meson.build
diff --git a/test cases/common/33 define10/prog.c b/test cases/common/32 define10/prog.c
index 519b40dcb..519b40dcb 100644
--- a/test cases/common/33 define10/prog.c
+++ b/test cases/common/32 define10/prog.c
diff --git a/test cases/common/34 has header/meson.build b/test cases/common/33 has header/meson.build
index 8096763a9..8096763a9 100644
--- a/test cases/common/34 has header/meson.build
+++ b/test cases/common/33 has header/meson.build
diff --git a/test cases/common/34 has header/ouagadougou.h b/test cases/common/33 has header/ouagadougou.h
index 2f76c49cc..2f76c49cc 100644
--- a/test cases/common/34 has header/ouagadougou.h
+++ b/test cases/common/33 has header/ouagadougou.h
diff --git a/test cases/common/35 run program/get-version.py b/test cases/common/34 run program/get-version.py
index a22d55998..a22d55998 100644
--- a/test cases/common/35 run program/get-version.py
+++ b/test cases/common/34 run program/get-version.py
diff --git a/test cases/common/35 run program/meson.build b/test cases/common/34 run program/meson.build
index 93897e3f8..93897e3f8 100644
--- a/test cases/common/35 run program/meson.build
+++ b/test cases/common/34 run program/meson.build
diff --git a/test cases/common/35 run program/scripts/hello.bat b/test cases/common/34 run program/scripts/hello.bat
index cbc346bf7..cbc346bf7 100644
--- a/test cases/common/35 run program/scripts/hello.bat
+++ b/test cases/common/34 run program/scripts/hello.bat
diff --git a/test cases/common/35 run program/scripts/hello.sh b/test cases/common/34 run program/scripts/hello.sh
index 2a22daa88..2a22daa88 100755
--- a/test cases/common/35 run program/scripts/hello.sh
+++ b/test cases/common/34 run program/scripts/hello.sh
diff --git a/test cases/common/37 logic ops/meson.build b/test cases/common/35 logic ops/meson.build
index 897054e74..897054e74 100644
--- a/test cases/common/37 logic ops/meson.build
+++ b/test cases/common/35 logic ops/meson.build
diff --git a/test cases/common/38 string operations/meson.build b/test cases/common/36 string operations/meson.build
index 8a06a82d9..8a06a82d9 100644
--- a/test cases/common/38 string operations/meson.build
+++ b/test cases/common/36 string operations/meson.build
diff --git a/test cases/common/39 has function/meson.build b/test cases/common/37 has function/meson.build
index 26f13d6fa..26f13d6fa 100644
--- a/test cases/common/39 has function/meson.build
+++ b/test cases/common/37 has function/meson.build
diff --git a/test cases/common/40 has member/meson.build b/test cases/common/38 has member/meson.build
index 4e61956d9..4e61956d9 100644
--- a/test cases/common/40 has member/meson.build
+++ b/test cases/common/38 has member/meson.build
diff --git a/test cases/common/41 alignment/meson.build b/test cases/common/39 alignment/meson.build
index a9bd65b73..a9bd65b73 100644
--- a/test cases/common/41 alignment/meson.build
+++ b/test cases/common/39 alignment/meson.build
diff --git a/test cases/common/42 library chain/main.c b/test cases/common/40 library chain/main.c
index 9c88e73ae..9c88e73ae 100644
--- a/test cases/common/42 library chain/main.c
+++ b/test cases/common/40 library chain/main.c
diff --git a/test cases/common/42 library chain/meson.build b/test cases/common/40 library chain/meson.build
index 77528d7d0..77528d7d0 100644
--- a/test cases/common/42 library chain/meson.build
+++ b/test cases/common/40 library chain/meson.build
diff --git a/test cases/common/42 library chain/subdir/lib1.c b/test cases/common/40 library chain/subdir/lib1.c
index 88436b27e..88436b27e 100644
--- a/test cases/common/42 library chain/subdir/lib1.c
+++ b/test cases/common/40 library chain/subdir/lib1.c
diff --git a/test cases/common/42 library chain/subdir/meson.build b/test cases/common/40 library chain/subdir/meson.build
index ab71bda18..ab71bda18 100644
--- a/test cases/common/42 library chain/subdir/meson.build
+++ b/test cases/common/40 library chain/subdir/meson.build
diff --git a/test cases/common/42 library chain/subdir/subdir2/lib2.c b/test cases/common/40 library chain/subdir/subdir2/lib2.c
index e788f0795..e788f0795 100644
--- a/test cases/common/42 library chain/subdir/subdir2/lib2.c
+++ b/test cases/common/40 library chain/subdir/subdir2/lib2.c
diff --git a/test cases/common/42 library chain/subdir/subdir2/meson.build b/test cases/common/40 library chain/subdir/subdir2/meson.build
index befd94db8..befd94db8 100644
--- a/test cases/common/42 library chain/subdir/subdir2/meson.build
+++ b/test cases/common/40 library chain/subdir/subdir2/meson.build
diff --git a/test cases/common/42 library chain/subdir/subdir3/lib3.c b/test cases/common/40 library chain/subdir/subdir3/lib3.c
index a99c64e66..a99c64e66 100644
--- a/test cases/common/42 library chain/subdir/subdir3/lib3.c
+++ b/test cases/common/40 library chain/subdir/subdir3/lib3.c
diff --git a/test cases/common/42 library chain/subdir/subdir3/meson.build b/test cases/common/40 library chain/subdir/subdir3/meson.build
index 7bd249a29..7bd249a29 100644
--- a/test cases/common/42 library chain/subdir/subdir3/meson.build
+++ b/test cases/common/40 library chain/subdir/subdir3/meson.build
diff --git a/test cases/common/42 library chain/test.json b/test cases/common/40 library chain/test.json
index 135300de5..135300de5 100644
--- a/test cases/common/42 library chain/test.json
+++ b/test cases/common/40 library chain/test.json
diff --git a/test cases/common/43 options/meson.build b/test cases/common/41 options/meson.build
index 2eccef7b0..2eccef7b0 100644
--- a/test cases/common/43 options/meson.build
+++ b/test cases/common/41 options/meson.build
diff --git a/test cases/common/43 options/meson_options.txt b/test cases/common/41 options/meson_options.txt
index 8067eae17..8067eae17 100644
--- a/test cases/common/43 options/meson_options.txt
+++ b/test cases/common/41 options/meson_options.txt
diff --git a/test cases/common/44 test args/cmd_args.c b/test cases/common/42 test args/cmd_args.c
index 545b795c5..545b795c5 100644
--- a/test cases/common/44 test args/cmd_args.c
+++ b/test cases/common/42 test args/cmd_args.c
diff --git a/test cases/common/44 test args/copyfile.py b/test cases/common/42 test args/copyfile.py
index ff42ac359..ff42ac359 100644
--- a/test cases/common/44 test args/copyfile.py
+++ b/test cases/common/42 test args/copyfile.py
diff --git a/test cases/common/44 test args/env2vars.c b/test cases/common/42 test args/env2vars.c
index e940c9a8c..e940c9a8c 100644
--- a/test cases/common/44 test args/env2vars.c
+++ b/test cases/common/42 test args/env2vars.c
diff --git a/test cases/common/44 test args/envvars.c b/test cases/common/42 test args/envvars.c
index 086b0be34..086b0be34 100644
--- a/test cases/common/44 test args/envvars.c
+++ b/test cases/common/42 test args/envvars.c
diff --git a/test cases/common/44 test args/meson.build b/test cases/common/42 test args/meson.build
index 81d34915a..81d34915a 100644
--- a/test cases/common/44 test args/meson.build
+++ b/test cases/common/42 test args/meson.build
diff --git a/test cases/common/44 test args/tester.c b/test cases/common/42 test args/tester.c
index 419277e5b..419277e5b 100644
--- a/test cases/common/44 test args/tester.c
+++ b/test cases/common/42 test args/tester.c
diff --git a/test cases/common/44 test args/tester.py b/test cases/common/42 test args/tester.py
index 0b4010ab9..0b4010ab9 100755
--- a/test cases/common/44 test args/tester.py
+++ b/test cases/common/42 test args/tester.py
diff --git a/test cases/common/44 test args/testfile.txt b/test cases/common/42 test args/testfile.txt
index 12f00e90b..12f00e90b 100644
--- a/test cases/common/44 test args/testfile.txt
+++ b/test cases/common/42 test args/testfile.txt
diff --git a/test cases/common/45 subproject/meson.build b/test cases/common/43 subproject/meson.build
index 2b939d19b..2b939d19b 100644
--- a/test cases/common/45 subproject/meson.build
+++ b/test cases/common/43 subproject/meson.build
diff --git a/test cases/common/45 subproject/subprojects/sublib/include/subdefs.h b/test cases/common/43 subproject/subprojects/sublib/include/subdefs.h
index 6ae8462f6..6ae8462f6 100644
--- a/test cases/common/45 subproject/subprojects/sublib/include/subdefs.h
+++ b/test cases/common/43 subproject/subprojects/sublib/include/subdefs.h
diff --git a/test cases/common/45 subproject/subprojects/sublib/meson.build b/test cases/common/43 subproject/subprojects/sublib/meson.build
index acaf1bf38..acaf1bf38 100644
--- a/test cases/common/45 subproject/subprojects/sublib/meson.build
+++ b/test cases/common/43 subproject/subprojects/sublib/meson.build
diff --git a/test cases/common/45 subproject/subprojects/sublib/simpletest.c b/test cases/common/43 subproject/subprojects/sublib/simpletest.c
index 2184bc68c..2184bc68c 100644
--- a/test cases/common/45 subproject/subprojects/sublib/simpletest.c
+++ b/test cases/common/43 subproject/subprojects/sublib/simpletest.c
diff --git a/test cases/common/45 subproject/subprojects/sublib/sublib.c b/test cases/common/43 subproject/subprojects/sublib/sublib.c
index f71564f14..f71564f14 100644
--- a/test cases/common/45 subproject/subprojects/sublib/sublib.c
+++ b/test cases/common/43 subproject/subprojects/sublib/sublib.c
diff --git a/test cases/common/45 subproject/test.json b/test cases/common/43 subproject/test.json
index a56106fe1..a56106fe1 100644
--- a/test cases/common/45 subproject/test.json
+++ b/test cases/common/43 subproject/test.json
diff --git a/test cases/common/45 subproject/user.c b/test cases/common/43 subproject/user.c
index 918162266..918162266 100644
--- a/test cases/common/45 subproject/user.c
+++ b/test cases/common/43 subproject/user.c
diff --git a/test cases/common/46 subproject options/meson.build b/test cases/common/44 subproject options/meson.build
index d4598b639..d4598b639 100644
--- a/test cases/common/46 subproject options/meson.build
+++ b/test cases/common/44 subproject options/meson.build
diff --git a/test cases/common/46 subproject options/meson_options.txt b/test cases/common/44 subproject options/meson_options.txt
index c295dddd6..c295dddd6 100644
--- a/test cases/common/46 subproject options/meson_options.txt
+++ b/test cases/common/44 subproject options/meson_options.txt
diff --git a/test cases/common/46 subproject options/subprojects/subproject/meson.build b/test cases/common/44 subproject options/subprojects/subproject/meson.build
index 5000b8643..5000b8643 100644
--- a/test cases/common/46 subproject options/subprojects/subproject/meson.build
+++ b/test cases/common/44 subproject options/subprojects/subproject/meson.build
diff --git a/test cases/common/46 subproject options/subprojects/subproject/meson_options.txt b/test cases/common/44 subproject options/subprojects/subproject/meson_options.txt
index ac78533e1..ac78533e1 100644
--- a/test cases/common/46 subproject options/subprojects/subproject/meson_options.txt
+++ b/test cases/common/44 subproject options/subprojects/subproject/meson_options.txt
diff --git a/test cases/common/47 pkgconfig-gen/dependencies/custom.c b/test cases/common/45 pkgconfig-gen/dependencies/custom.c
index 1d3deca18..1d3deca18 100644
--- a/test cases/common/47 pkgconfig-gen/dependencies/custom.c
+++ b/test cases/common/45 pkgconfig-gen/dependencies/custom.c
diff --git a/test cases/common/47 pkgconfig-gen/dependencies/exposed.c b/test cases/common/45 pkgconfig-gen/dependencies/exposed.c
index caa45912e..caa45912e 100644
--- a/test cases/common/47 pkgconfig-gen/dependencies/exposed.c
+++ b/test cases/common/45 pkgconfig-gen/dependencies/exposed.c
diff --git a/test cases/common/47 pkgconfig-gen/dependencies/internal.c b/test cases/common/45 pkgconfig-gen/dependencies/internal.c
index 23b07ecd4..23b07ecd4 100644
--- a/test cases/common/47 pkgconfig-gen/dependencies/internal.c
+++ b/test cases/common/45 pkgconfig-gen/dependencies/internal.c
diff --git a/test cases/common/47 pkgconfig-gen/dependencies/main.c b/test cases/common/45 pkgconfig-gen/dependencies/main.c
index 397d40c1c..397d40c1c 100644
--- a/test cases/common/47 pkgconfig-gen/dependencies/main.c
+++ b/test cases/common/45 pkgconfig-gen/dependencies/main.c
diff --git a/test cases/common/47 pkgconfig-gen/dependencies/meson.build b/test cases/common/45 pkgconfig-gen/dependencies/meson.build
index fb4e6b47c..fb4e6b47c 100644
--- a/test cases/common/47 pkgconfig-gen/dependencies/meson.build
+++ b/test cases/common/45 pkgconfig-gen/dependencies/meson.build
diff --git a/test cases/common/47 pkgconfig-gen/meson.build b/test cases/common/45 pkgconfig-gen/meson.build
index 4638123cf..4638123cf 100644
--- a/test cases/common/47 pkgconfig-gen/meson.build
+++ b/test cases/common/45 pkgconfig-gen/meson.build
diff --git a/test cases/common/47 pkgconfig-gen/simple.c b/test cases/common/45 pkgconfig-gen/simple.c
index ff86f3110..ff86f3110 100644
--- a/test cases/common/47 pkgconfig-gen/simple.c
+++ b/test cases/common/45 pkgconfig-gen/simple.c
diff --git a/test cases/common/47 pkgconfig-gen/simple.h b/test cases/common/45 pkgconfig-gen/simple.h
index 6896bfd17..6896bfd17 100644
--- a/test cases/common/47 pkgconfig-gen/simple.h
+++ b/test cases/common/45 pkgconfig-gen/simple.h
diff --git a/test cases/common/47 pkgconfig-gen/simple5.c b/test cases/common/45 pkgconfig-gen/simple5.c
index 9f924bd5e..9f924bd5e 100644
--- a/test cases/common/47 pkgconfig-gen/simple5.c
+++ b/test cases/common/45 pkgconfig-gen/simple5.c
diff --git a/test cases/common/47 pkgconfig-gen/test.json b/test cases/common/45 pkgconfig-gen/test.json
index 702e7fee4..702e7fee4 100644
--- a/test cases/common/47 pkgconfig-gen/test.json
+++ b/test cases/common/45 pkgconfig-gen/test.json
diff --git a/test cases/common/48 custom install dirs/datafile.cat b/test cases/common/46 custom install dirs/datafile.cat
index 53d81fc2a..53d81fc2a 100644
--- a/test cases/common/48 custom install dirs/datafile.cat
+++ b/test cases/common/46 custom install dirs/datafile.cat
diff --git a/test cases/common/48 custom install dirs/meson.build b/test cases/common/46 custom install dirs/meson.build
index 494ff0ec2..494ff0ec2 100644
--- a/test cases/common/48 custom install dirs/meson.build
+++ b/test cases/common/46 custom install dirs/meson.build
diff --git a/test cases/common/48 custom install dirs/prog.1 b/test cases/common/46 custom install dirs/prog.1
index 08ef7da62..08ef7da62 100644
--- a/test cases/common/48 custom install dirs/prog.1
+++ b/test cases/common/46 custom install dirs/prog.1
diff --git a/test cases/common/48 custom install dirs/prog.c b/test cases/common/46 custom install dirs/prog.c
index 9b6bdc2ec..9b6bdc2ec 100644
--- a/test cases/common/48 custom install dirs/prog.c
+++ b/test cases/common/46 custom install dirs/prog.c
diff --git a/test cases/common/48 custom install dirs/sample.h b/test cases/common/46 custom install dirs/sample.h
index dc030dac1..dc030dac1 100644
--- a/test cases/common/48 custom install dirs/sample.h
+++ b/test cases/common/46 custom install dirs/sample.h
diff --git a/test cases/common/48 custom install dirs/subdir/datafile.dog b/test cases/common/46 custom install dirs/subdir/datafile.dog
index 7a5bcb765..7a5bcb765 100644
--- a/test cases/common/48 custom install dirs/subdir/datafile.dog
+++ b/test cases/common/46 custom install dirs/subdir/datafile.dog
diff --git a/test cases/common/48 custom install dirs/test.json b/test cases/common/46 custom install dirs/test.json
index ac82fdb98..ac82fdb98 100644
--- a/test cases/common/48 custom install dirs/test.json
+++ b/test cases/common/46 custom install dirs/test.json
diff --git a/test cases/common/49 subproject subproject/meson.build b/test cases/common/47 subproject subproject/meson.build
index d8735a1cd..d8735a1cd 100644
--- a/test cases/common/49 subproject subproject/meson.build
+++ b/test cases/common/47 subproject subproject/meson.build
diff --git a/test cases/common/49 subproject subproject/prog.c b/test cases/common/47 subproject subproject/prog.c
index 27162c5e0..27162c5e0 100644
--- a/test cases/common/49 subproject subproject/prog.c
+++ b/test cases/common/47 subproject subproject/prog.c
diff --git a/test cases/common/49 subproject subproject/subprojects/a/a.c b/test cases/common/47 subproject subproject/subprojects/a/a.c
index f9848c136..f9848c136 100644
--- a/test cases/common/49 subproject subproject/subprojects/a/a.c
+++ b/test cases/common/47 subproject subproject/subprojects/a/a.c
diff --git a/test cases/common/49 subproject subproject/subprojects/a/meson.build b/test cases/common/47 subproject subproject/subprojects/a/meson.build
index f0dfc449e..f0dfc449e 100644
--- a/test cases/common/49 subproject subproject/subprojects/a/meson.build
+++ b/test cases/common/47 subproject subproject/subprojects/a/meson.build
diff --git a/test cases/common/49 subproject subproject/subprojects/b/b.c b/test cases/common/47 subproject subproject/subprojects/b/b.c
index 8c07177a6..8c07177a6 100644
--- a/test cases/common/49 subproject subproject/subprojects/b/b.c
+++ b/test cases/common/47 subproject subproject/subprojects/b/b.c
diff --git a/test cases/common/49 subproject subproject/subprojects/b/meson.build b/test cases/common/47 subproject subproject/subprojects/b/meson.build
index e7af6067a..e7af6067a 100644
--- a/test cases/common/49 subproject subproject/subprojects/b/meson.build
+++ b/test cases/common/47 subproject subproject/subprojects/b/meson.build
diff --git a/test cases/common/49 subproject subproject/subprojects/c/meson.build b/test cases/common/47 subproject subproject/subprojects/c/meson.build
index 97a5be1d0..97a5be1d0 100644
--- a/test cases/common/49 subproject subproject/subprojects/c/meson.build
+++ b/test cases/common/47 subproject subproject/subprojects/c/meson.build
diff --git a/test cases/common/50 same file name/d1/file.c b/test cases/common/48 same file name/d1/file.c
index 46e51723b..46e51723b 100644
--- a/test cases/common/50 same file name/d1/file.c
+++ b/test cases/common/48 same file name/d1/file.c
diff --git a/test cases/common/50 same file name/d2/file.c b/test cases/common/48 same file name/d2/file.c
index 3d367f16e..3d367f16e 100644
--- a/test cases/common/50 same file name/d2/file.c
+++ b/test cases/common/48 same file name/d2/file.c
diff --git a/test cases/common/50 same file name/meson.build b/test cases/common/48 same file name/meson.build
index 3f351afc1..3f351afc1 100644
--- a/test cases/common/50 same file name/meson.build
+++ b/test cases/common/48 same file name/meson.build
diff --git a/test cases/common/50 same file name/prog.c b/test cases/common/48 same file name/prog.c
index 1eee6c2f6..1eee6c2f6 100644
--- a/test cases/common/50 same file name/prog.c
+++ b/test cases/common/48 same file name/prog.c
diff --git a/test cases/common/51 file grabber/a.c b/test cases/common/49 file grabber/a.c
index 8f63c2de5..8f63c2de5 100644
--- a/test cases/common/51 file grabber/a.c
+++ b/test cases/common/49 file grabber/a.c
diff --git a/test cases/common/51 file grabber/b.c b/test cases/common/49 file grabber/b.c
index f38baca8c..f38baca8c 100644
--- a/test cases/common/51 file grabber/b.c
+++ b/test cases/common/49 file grabber/b.c
diff --git a/test cases/common/51 file grabber/c.c b/test cases/common/49 file grabber/c.c
index 2e8abbfc9..2e8abbfc9 100644
--- a/test cases/common/51 file grabber/c.c
+++ b/test cases/common/49 file grabber/c.c
diff --git a/test cases/common/51 file grabber/grabber.bat b/test cases/common/49 file grabber/grabber.bat
index 86603145c..86603145c 100644
--- a/test cases/common/51 file grabber/grabber.bat
+++ b/test cases/common/49 file grabber/grabber.bat
diff --git a/test cases/common/51 file grabber/grabber.sh b/test cases/common/49 file grabber/grabber.sh
index 5e8f4b947..5e8f4b947 100755
--- a/test cases/common/51 file grabber/grabber.sh
+++ b/test cases/common/49 file grabber/grabber.sh
diff --git a/test cases/common/51 file grabber/grabber2.bat b/test cases/common/49 file grabber/grabber2.bat
index d1a3f98ba..d1a3f98ba 100644
--- a/test cases/common/51 file grabber/grabber2.bat
+++ b/test cases/common/49 file grabber/grabber2.bat
diff --git a/test cases/common/51 file grabber/meson.build b/test cases/common/49 file grabber/meson.build
index e332c0b1e..e332c0b1e 100644
--- a/test cases/common/51 file grabber/meson.build
+++ b/test cases/common/49 file grabber/meson.build
diff --git a/test cases/common/51 file grabber/prog.c b/test cases/common/49 file grabber/prog.c
index ff55723e1..ff55723e1 100644
--- a/test cases/common/51 file grabber/prog.c
+++ b/test cases/common/49 file grabber/prog.c
diff --git a/test cases/common/51 file grabber/subdir/meson.build b/test cases/common/49 file grabber/subdir/meson.build
index 230d6f7de..230d6f7de 100644
--- a/test cases/common/51 file grabber/subdir/meson.build
+++ b/test cases/common/49 file grabber/subdir/meson.build
diff --git a/test cases/common/51 file grabber/subdir/suba.c b/test cases/common/49 file grabber/subdir/suba.c
index 8f63c2de5..8f63c2de5 100644
--- a/test cases/common/51 file grabber/subdir/suba.c
+++ b/test cases/common/49 file grabber/subdir/suba.c
diff --git a/test cases/common/51 file grabber/subdir/subb.c b/test cases/common/49 file grabber/subdir/subb.c
index f38baca8c..f38baca8c 100644
--- a/test cases/common/51 file grabber/subdir/subb.c
+++ b/test cases/common/49 file grabber/subdir/subb.c
diff --git a/test cases/common/51 file grabber/subdir/subc.c b/test cases/common/49 file grabber/subdir/subc.c
index 2e8abbfc9..2e8abbfc9 100644
--- a/test cases/common/51 file grabber/subdir/subc.c
+++ b/test cases/common/49 file grabber/subdir/subc.c
diff --git a/test cases/common/51 file grabber/subdir/subprog.c b/test cases/common/49 file grabber/subdir/subprog.c
index ff55723e1..ff55723e1 100644
--- a/test cases/common/51 file grabber/subdir/subprog.c
+++ b/test cases/common/49 file grabber/subdir/subprog.c
diff --git a/test cases/common/52 custom target/data_source.txt b/test cases/common/50 custom target/data_source.txt
index 0c23cc0c3..0c23cc0c3 100644
--- a/test cases/common/52 custom target/data_source.txt
+++ b/test cases/common/50 custom target/data_source.txt
diff --git a/test cases/common/52 custom target/depfile/dep.py b/test cases/common/50 custom target/depfile/dep.py
index dc6e6b6a4..dc6e6b6a4 100755
--- a/test cases/common/52 custom target/depfile/dep.py
+++ b/test cases/common/50 custom target/depfile/dep.py
diff --git a/test cases/common/52 custom target/depfile/meson.build b/test cases/common/50 custom target/depfile/meson.build
index 46bca7405..46bca7405 100644
--- a/test cases/common/52 custom target/depfile/meson.build
+++ b/test cases/common/50 custom target/depfile/meson.build
diff --git a/test cases/common/52 custom target/meson.build b/test cases/common/50 custom target/meson.build
index 5c7cfaee8..5c7cfaee8 100644
--- a/test cases/common/52 custom target/meson.build
+++ b/test cases/common/50 custom target/meson.build
diff --git a/test cases/common/52 custom target/my_compiler.py b/test cases/common/50 custom target/my_compiler.py
index f46d23a91..f46d23a91 100755
--- a/test cases/common/52 custom target/my_compiler.py
+++ b/test cases/common/50 custom target/my_compiler.py
diff --git a/test cases/common/52 custom target/test.json b/test cases/common/50 custom target/test.json
index ba66b024a..ba66b024a 100644
--- a/test cases/common/52 custom target/test.json
+++ b/test cases/common/50 custom target/test.json
diff --git a/test cases/common/53 custom target chain/data_source.txt b/test cases/common/51 custom target chain/data_source.txt
index 0c23cc0c3..0c23cc0c3 100644
--- a/test cases/common/53 custom target chain/data_source.txt
+++ b/test cases/common/51 custom target chain/data_source.txt
diff --git a/test cases/common/53 custom target chain/meson.build b/test cases/common/51 custom target chain/meson.build
index 138f795bd..138f795bd 100644
--- a/test cases/common/53 custom target chain/meson.build
+++ b/test cases/common/51 custom target chain/meson.build
diff --git a/test cases/common/53 custom target chain/my_compiler.py b/test cases/common/51 custom target chain/my_compiler.py
index d99029bcc..d99029bcc 100755
--- a/test cases/common/53 custom target chain/my_compiler.py
+++ b/test cases/common/51 custom target chain/my_compiler.py
diff --git a/test cases/common/53 custom target chain/my_compiler2.py b/test cases/common/51 custom target chain/my_compiler2.py
index 22ec7897b..22ec7897b 100755
--- a/test cases/common/53 custom target chain/my_compiler2.py
+++ b/test cases/common/51 custom target chain/my_compiler2.py
diff --git a/test cases/common/53 custom target chain/test.json b/test cases/common/51 custom target chain/test.json
index d6b0fa9b8..d6b0fa9b8 100644
--- a/test cases/common/53 custom target chain/test.json
+++ b/test cases/common/51 custom target chain/test.json
diff --git a/test cases/common/53 custom target chain/usetarget/meson.build b/test cases/common/51 custom target chain/usetarget/meson.build
index 9aece8ce9..9aece8ce9 100644
--- a/test cases/common/53 custom target chain/usetarget/meson.build
+++ b/test cases/common/51 custom target chain/usetarget/meson.build
diff --git a/test cases/common/53 custom target chain/usetarget/myexe.c b/test cases/common/51 custom target chain/usetarget/myexe.c
index 33311332e..33311332e 100644
--- a/test cases/common/53 custom target chain/usetarget/myexe.c
+++ b/test cases/common/51 custom target chain/usetarget/myexe.c
diff --git a/test cases/common/53 custom target chain/usetarget/subcomp.py b/test cases/common/51 custom target chain/usetarget/subcomp.py
index 52dc0bbb5..52dc0bbb5 100755
--- a/test cases/common/53 custom target chain/usetarget/subcomp.py
+++ b/test cases/common/51 custom target chain/usetarget/subcomp.py
diff --git a/test cases/common/54 run target/check_exists.py b/test cases/common/52 run target/check_exists.py
index b6fc967eb..b6fc967eb 100755
--- a/test cases/common/54 run target/check_exists.py
+++ b/test cases/common/52 run target/check_exists.py
diff --git a/test cases/common/54 run target/configure.in b/test cases/common/52 run target/configure.in
index 0d42d0441..0d42d0441 100755
--- a/test cases/common/54 run target/configure.in
+++ b/test cases/common/52 run target/configure.in
diff --git a/test cases/common/54 run target/converter.py b/test cases/common/52 run target/converter.py
index 8dd31fe2f..8dd31fe2f 100644
--- a/test cases/common/54 run target/converter.py
+++ b/test cases/common/52 run target/converter.py
diff --git a/test cases/common/54 run target/fakeburner.py b/test cases/common/52 run target/fakeburner.py
index da3d0ac1e..da3d0ac1e 100755
--- a/test cases/common/54 run target/fakeburner.py
+++ b/test cases/common/52 run target/fakeburner.py
diff --git a/test cases/common/54 run target/helloprinter.c b/test cases/common/52 run target/helloprinter.c
index 4a6e0ac5d..4a6e0ac5d 100644
--- a/test cases/common/54 run target/helloprinter.c
+++ b/test cases/common/52 run target/helloprinter.c
diff --git a/test cases/common/54 run target/meson.build b/test cases/common/52 run target/meson.build
index 9abe69872..9abe69872 100644
--- a/test cases/common/54 run target/meson.build
+++ b/test cases/common/52 run target/meson.build
diff --git a/test cases/common/55 object generator/meson.build b/test cases/common/53 object generator/meson.build
index e20da6f46..e20da6f46 100644
--- a/test cases/common/55 object generator/meson.build
+++ b/test cases/common/53 object generator/meson.build
diff --git a/test cases/common/55 object generator/obj_generator.py b/test cases/common/53 object generator/obj_generator.py
index a33872aac..a33872aac 100755
--- a/test cases/common/55 object generator/obj_generator.py
+++ b/test cases/common/53 object generator/obj_generator.py
diff --git a/test cases/common/55 object generator/prog.c b/test cases/common/53 object generator/prog.c
index 9841180d0..9841180d0 100644
--- a/test cases/common/55 object generator/prog.c
+++ b/test cases/common/53 object generator/prog.c
diff --git a/test cases/common/55 object generator/source.c b/test cases/common/53 object generator/source.c
index 1dc08e168..1dc08e168 100644
--- a/test cases/common/55 object generator/source.c
+++ b/test cases/common/53 object generator/source.c
diff --git a/test cases/common/55 object generator/source2.c b/test cases/common/53 object generator/source2.c
index 8024b9714..8024b9714 100644
--- a/test cases/common/55 object generator/source2.c
+++ b/test cases/common/53 object generator/source2.c
diff --git a/test cases/common/55 object generator/source3.c b/test cases/common/53 object generator/source3.c
index c4362c4d6..c4362c4d6 100644
--- a/test cases/common/55 object generator/source3.c
+++ b/test cases/common/53 object generator/source3.c
diff --git a/test cases/common/56 install script/customtarget.py b/test cases/common/54 install script/customtarget.py
index e28373a39..e28373a39 100755
--- a/test cases/common/56 install script/customtarget.py
+++ b/test cases/common/54 install script/customtarget.py
diff --git a/test cases/common/56 install script/meson.build b/test cases/common/54 install script/meson.build
index 696e3f632..696e3f632 100644
--- a/test cases/common/56 install script/meson.build
+++ b/test cases/common/54 install script/meson.build
diff --git a/test cases/common/56 install script/myinstall.py b/test cases/common/54 install script/myinstall.py
index a57334242..a57334242 100644
--- a/test cases/common/56 install script/myinstall.py
+++ b/test cases/common/54 install script/myinstall.py
diff --git a/test cases/common/56 install script/prog.c b/test cases/common/54 install script/prog.c
index 3bbf08ed5..3bbf08ed5 100644
--- a/test cases/common/56 install script/prog.c
+++ b/test cases/common/54 install script/prog.c
diff --git a/test cases/common/56 install script/src/a file.txt b/test cases/common/54 install script/src/a file.txt
index e69de29bb..e69de29bb 100644
--- a/test cases/common/56 install script/src/a file.txt
+++ b/test cases/common/54 install script/src/a file.txt
diff --git a/test cases/common/56 install script/src/meson.build b/test cases/common/54 install script/src/meson.build
index 123fe1862..123fe1862 100644
--- a/test cases/common/56 install script/src/meson.build
+++ b/test cases/common/54 install script/src/meson.build
diff --git a/test cases/common/56 install script/src/myinstall.py b/test cases/common/54 install script/src/myinstall.py
index 3a9d89b50..3a9d89b50 100644
--- a/test cases/common/56 install script/src/myinstall.py
+++ b/test cases/common/54 install script/src/myinstall.py
diff --git a/test cases/common/56 install script/test.json b/test cases/common/54 install script/test.json
index 3804fe148..3804fe148 100644
--- a/test cases/common/56 install script/test.json
+++ b/test cases/common/54 install script/test.json
diff --git a/test cases/common/57 custom target source output/generator.py b/test cases/common/55 custom target source output/generator.py
index 1bec8e855..1bec8e855 100755
--- a/test cases/common/57 custom target source output/generator.py
+++ b/test cases/common/55 custom target source output/generator.py
diff --git a/test cases/common/57 custom target source output/main.c b/test cases/common/55 custom target source output/main.c
index bca138713..bca138713 100644
--- a/test cases/common/57 custom target source output/main.c
+++ b/test cases/common/55 custom target source output/main.c
diff --git a/test cases/common/57 custom target source output/meson.build b/test cases/common/55 custom target source output/meson.build
index f9d039df0..f9d039df0 100644
--- a/test cases/common/57 custom target source output/meson.build
+++ b/test cases/common/55 custom target source output/meson.build
diff --git a/test cases/common/58 exe static shared/meson.build b/test cases/common/56 exe static shared/meson.build
index 69ede5e87..69ede5e87 100644
--- a/test cases/common/58 exe static shared/meson.build
+++ b/test cases/common/56 exe static shared/meson.build
diff --git a/test cases/common/58 exe static shared/prog.c b/test cases/common/56 exe static shared/prog.c
index 6dba60d7c..6dba60d7c 100644
--- a/test cases/common/58 exe static shared/prog.c
+++ b/test cases/common/56 exe static shared/prog.c
diff --git a/test cases/common/58 exe static shared/shlib2.c b/test cases/common/56 exe static shared/shlib2.c
index 12bc913d7..12bc913d7 100644
--- a/test cases/common/58 exe static shared/shlib2.c
+++ b/test cases/common/56 exe static shared/shlib2.c
diff --git a/test cases/common/58 exe static shared/stat.c b/test cases/common/56 exe static shared/stat.c
index eddc4d816..eddc4d816 100644
--- a/test cases/common/58 exe static shared/stat.c
+++ b/test cases/common/56 exe static shared/stat.c
diff --git a/test cases/common/58 exe static shared/stat2.c b/test cases/common/56 exe static shared/stat2.c
index 4abb49ffd..4abb49ffd 100644
--- a/test cases/common/58 exe static shared/stat2.c
+++ b/test cases/common/56 exe static shared/stat2.c
diff --git a/test cases/common/58 exe static shared/subdir/exports.h b/test cases/common/56 exe static shared/subdir/exports.h
index c89ccb23b..c89ccb23b 100644
--- a/test cases/common/58 exe static shared/subdir/exports.h
+++ b/test cases/common/56 exe static shared/subdir/exports.h
diff --git a/test cases/common/58 exe static shared/subdir/meson.build b/test cases/common/56 exe static shared/subdir/meson.build
index 2b7393b4e..2b7393b4e 100644
--- a/test cases/common/58 exe static shared/subdir/meson.build
+++ b/test cases/common/56 exe static shared/subdir/meson.build
diff --git a/test cases/common/58 exe static shared/subdir/shlib.c b/test cases/common/56 exe static shared/subdir/shlib.c
index dd9c6b2db..dd9c6b2db 100644
--- a/test cases/common/58 exe static shared/subdir/shlib.c
+++ b/test cases/common/56 exe static shared/subdir/shlib.c
diff --git a/test cases/common/59 array methods/meson.build b/test cases/common/57 array methods/meson.build
index cdda41dbf..cdda41dbf 100644
--- a/test cases/common/59 array methods/meson.build
+++ b/test cases/common/57 array methods/meson.build
diff --git a/test cases/common/60 custom header generator/input.def b/test cases/common/58 custom header generator/input.def
index 573541ac9..573541ac9 100644
--- a/test cases/common/60 custom header generator/input.def
+++ b/test cases/common/58 custom header generator/input.def
diff --git a/test cases/common/60 custom header generator/makeheader.py b/test cases/common/58 custom header generator/makeheader.py
index f15683447..f15683447 100644
--- a/test cases/common/60 custom header generator/makeheader.py
+++ b/test cases/common/58 custom header generator/makeheader.py
diff --git a/test cases/common/60 custom header generator/meson.build b/test cases/common/58 custom header generator/meson.build
index d43915a3c..d43915a3c 100644
--- a/test cases/common/60 custom header generator/meson.build
+++ b/test cases/common/58 custom header generator/meson.build
diff --git a/test cases/common/60 custom header generator/prog.c b/test cases/common/58 custom header generator/prog.c
index acd0ff79b..acd0ff79b 100644
--- a/test cases/common/60 custom header generator/prog.c
+++ b/test cases/common/58 custom header generator/prog.c
diff --git a/test cases/common/60 custom header generator/somefile.txt b/test cases/common/58 custom header generator/somefile.txt
index e69de29bb..e69de29bb 100644
--- a/test cases/common/60 custom header generator/somefile.txt
+++ b/test cases/common/58 custom header generator/somefile.txt
diff --git a/test cases/common/61 multiple generators/data2.dat b/test cases/common/59 multiple generators/data2.dat
index 0cfbf0888..0cfbf0888 100644
--- a/test cases/common/61 multiple generators/data2.dat
+++ b/test cases/common/59 multiple generators/data2.dat
diff --git a/test cases/common/61 multiple generators/main.cpp b/test cases/common/59 multiple generators/main.cpp
index f1a01bd5f..f1a01bd5f 100644
--- a/test cases/common/61 multiple generators/main.cpp
+++ b/test cases/common/59 multiple generators/main.cpp
diff --git a/test cases/common/61 multiple generators/meson.build b/test cases/common/59 multiple generators/meson.build
index 66f7fa9c1..66f7fa9c1 100644
--- a/test cases/common/61 multiple generators/meson.build
+++ b/test cases/common/59 multiple generators/meson.build
diff --git a/test cases/common/61 multiple generators/mygen.py b/test cases/common/59 multiple generators/mygen.py
index 99dc33136..99dc33136 100755
--- a/test cases/common/61 multiple generators/mygen.py
+++ b/test cases/common/59 multiple generators/mygen.py
diff --git a/test cases/common/61 multiple generators/subdir/data.dat b/test cases/common/59 multiple generators/subdir/data.dat
index d00491fd7..d00491fd7 100644
--- a/test cases/common/61 multiple generators/subdir/data.dat
+++ b/test cases/common/59 multiple generators/subdir/data.dat
diff --git a/test cases/common/61 multiple generators/subdir/meson.build b/test cases/common/59 multiple generators/subdir/meson.build
index 2456ecb6d..2456ecb6d 100644
--- a/test cases/common/61 multiple generators/subdir/meson.build
+++ b/test cases/common/59 multiple generators/subdir/meson.build
diff --git a/test cases/common/62 install subdir/meson.build b/test cases/common/60 install subdir/meson.build
index 6f92efdb8..6f92efdb8 100644
--- a/test cases/common/62 install subdir/meson.build
+++ b/test cases/common/60 install subdir/meson.build
diff --git a/test cases/common/62 install subdir/nested_elided/sub/dircheck/ninth.dat b/test cases/common/60 install subdir/nested_elided/sub/dircheck/ninth.dat
index c4eaca780..c4eaca780 100644
--- a/test cases/common/62 install subdir/nested_elided/sub/dircheck/ninth.dat
+++ b/test cases/common/60 install subdir/nested_elided/sub/dircheck/ninth.dat
diff --git a/test cases/common/62 install subdir/nested_elided/sub/eighth.dat b/test cases/common/60 install subdir/nested_elided/sub/eighth.dat
index fa9b7b77f..fa9b7b77f 100644
--- a/test cases/common/62 install subdir/nested_elided/sub/eighth.dat
+++ b/test cases/common/60 install subdir/nested_elided/sub/eighth.dat
diff --git a/test cases/common/62 install subdir/sub/sub1/third.dat b/test cases/common/60 install subdir/sub/sub1/third.dat
index 5ccbc43c7..5ccbc43c7 100644
--- a/test cases/common/62 install subdir/sub/sub1/third.dat
+++ b/test cases/common/60 install subdir/sub/sub1/third.dat
diff --git a/test cases/common/62 install subdir/sub1/second.dat b/test cases/common/60 install subdir/sub1/second.dat
index 48857a8b6..48857a8b6 100644
--- a/test cases/common/62 install subdir/sub1/second.dat
+++ b/test cases/common/60 install subdir/sub1/second.dat
diff --git a/test cases/common/62 install subdir/sub2/dircheck/excluded-three.dat b/test cases/common/60 install subdir/sub2/dircheck/excluded-three.dat
index e69de29bb..e69de29bb 100644
--- a/test cases/common/62 install subdir/sub2/dircheck/excluded-three.dat
+++ b/test cases/common/60 install subdir/sub2/dircheck/excluded-three.dat
diff --git a/test cases/common/62 install subdir/sub2/excluded-three.dat b/test cases/common/60 install subdir/sub2/excluded-three.dat
index e69de29bb..e69de29bb 100644
--- a/test cases/common/62 install subdir/sub2/excluded-three.dat
+++ b/test cases/common/60 install subdir/sub2/excluded-three.dat
diff --git a/test cases/common/62 install subdir/sub2/excluded/two.dat b/test cases/common/60 install subdir/sub2/excluded/two.dat
index e69de29bb..e69de29bb 100644
--- a/test cases/common/62 install subdir/sub2/excluded/two.dat
+++ b/test cases/common/60 install subdir/sub2/excluded/two.dat
diff --git a/test cases/common/62 install subdir/sub2/one.dat b/test cases/common/60 install subdir/sub2/one.dat
index e69de29bb..e69de29bb 100644
--- a/test cases/common/62 install subdir/sub2/one.dat
+++ b/test cases/common/60 install subdir/sub2/one.dat
diff --git a/test cases/common/62 install subdir/sub_elided/dircheck/fifth.dat b/test cases/common/60 install subdir/sub_elided/dircheck/fifth.dat
index b6ca0098f..b6ca0098f 100644
--- a/test cases/common/62 install subdir/sub_elided/dircheck/fifth.dat
+++ b/test cases/common/60 install subdir/sub_elided/dircheck/fifth.dat
diff --git a/test cases/common/62 install subdir/sub_elided/fourth.dat b/test cases/common/60 install subdir/sub_elided/fourth.dat
index ca5f26a62..ca5f26a62 100644
--- a/test cases/common/62 install subdir/sub_elided/fourth.dat
+++ b/test cases/common/60 install subdir/sub_elided/fourth.dat
diff --git a/test cases/common/62 install subdir/subdir/meson.build b/test cases/common/60 install subdir/subdir/meson.build
index 0f81cdb8f..0f81cdb8f 100644
--- a/test cases/common/62 install subdir/subdir/meson.build
+++ b/test cases/common/60 install subdir/subdir/meson.build
diff --git a/test cases/common/62 install subdir/subdir/sub1/data1.dat b/test cases/common/60 install subdir/subdir/sub1/data1.dat
index d83c370e3..d83c370e3 100644
--- a/test cases/common/62 install subdir/subdir/sub1/data1.dat
+++ b/test cases/common/60 install subdir/subdir/sub1/data1.dat
diff --git a/test cases/common/62 install subdir/subdir/sub1/sub2/data2.dat b/test cases/common/60 install subdir/subdir/sub1/sub2/data2.dat
index 8ce1392b0..8ce1392b0 100644
--- a/test cases/common/62 install subdir/subdir/sub1/sub2/data2.dat
+++ b/test cases/common/60 install subdir/subdir/sub1/sub2/data2.dat
diff --git a/test cases/common/62 install subdir/subdir/sub_elided/dircheck/seventh.dat b/test cases/common/60 install subdir/subdir/sub_elided/dircheck/seventh.dat
index ea0b8dc5c..ea0b8dc5c 100644
--- a/test cases/common/62 install subdir/subdir/sub_elided/dircheck/seventh.dat
+++ b/test cases/common/60 install subdir/subdir/sub_elided/dircheck/seventh.dat
diff --git a/test cases/common/62 install subdir/subdir/sub_elided/sixth.dat b/test cases/common/60 install subdir/subdir/sub_elided/sixth.dat
index 140f07560..140f07560 100644
--- a/test cases/common/62 install subdir/subdir/sub_elided/sixth.dat
+++ b/test cases/common/60 install subdir/subdir/sub_elided/sixth.dat
diff --git a/test cases/common/62 install subdir/test.json b/test cases/common/60 install subdir/test.json
index 88c6f4bda..88c6f4bda 100644
--- a/test cases/common/62 install subdir/test.json
+++ b/test cases/common/60 install subdir/test.json
diff --git a/test cases/common/63 foreach/meson.build b/test cases/common/61 foreach/meson.build
index 7084e8003..7084e8003 100644
--- a/test cases/common/63 foreach/meson.build
+++ b/test cases/common/61 foreach/meson.build
diff --git a/test cases/common/63 foreach/prog1.c b/test cases/common/61 foreach/prog1.c
index 339dc494b..339dc494b 100644
--- a/test cases/common/63 foreach/prog1.c
+++ b/test cases/common/61 foreach/prog1.c
diff --git a/test cases/common/63 foreach/prog2.c b/test cases/common/61 foreach/prog2.c
index c2132883a..c2132883a 100644
--- a/test cases/common/63 foreach/prog2.c
+++ b/test cases/common/61 foreach/prog2.c
diff --git a/test cases/common/63 foreach/prog3.c b/test cases/common/61 foreach/prog3.c
index 905a530c7..905a530c7 100644
--- a/test cases/common/63 foreach/prog3.c
+++ b/test cases/common/61 foreach/prog3.c
diff --git a/test cases/common/63 foreach/test.json b/test cases/common/61 foreach/test.json
index 2fc952d2c..2fc952d2c 100644
--- a/test cases/common/63 foreach/test.json
+++ b/test cases/common/61 foreach/test.json
diff --git a/test cases/common/64 number arithmetic/meson.build b/test cases/common/62 number arithmetic/meson.build
index e31d7e4e9..e31d7e4e9 100644
--- a/test cases/common/64 number arithmetic/meson.build
+++ b/test cases/common/62 number arithmetic/meson.build
diff --git a/test cases/common/65 string arithmetic/meson.build b/test cases/common/63 string arithmetic/meson.build
index 59567de49..59567de49 100644
--- a/test cases/common/65 string arithmetic/meson.build
+++ b/test cases/common/63 string arithmetic/meson.build
diff --git a/test cases/common/66 array arithmetic/meson.build b/test cases/common/64 array arithmetic/meson.build
index 8b8785afc..8b8785afc 100644
--- a/test cases/common/66 array arithmetic/meson.build
+++ b/test cases/common/64 array arithmetic/meson.build
diff --git a/test cases/common/67 arithmetic bidmas/meson.build b/test cases/common/65 arithmetic bidmas/meson.build
index c7334b48f..c7334b48f 100644
--- a/test cases/common/67 arithmetic bidmas/meson.build
+++ b/test cases/common/65 arithmetic bidmas/meson.build
diff --git a/test cases/common/68 build always/main.c b/test cases/common/66 build always/main.c
index a9ee55ea1..a9ee55ea1 100644
--- a/test cases/common/68 build always/main.c
+++ b/test cases/common/66 build always/main.c
diff --git a/test cases/common/68 build always/meson.build b/test cases/common/66 build always/meson.build
index f720c8943..f720c8943 100644
--- a/test cases/common/68 build always/meson.build
+++ b/test cases/common/66 build always/meson.build
diff --git a/test cases/common/68 build always/version.c.in b/test cases/common/66 build always/version.c.in
index 619e51786..619e51786 100644
--- a/test cases/common/68 build always/version.c.in
+++ b/test cases/common/66 build always/version.c.in
diff --git a/test cases/common/68 build always/version.h b/test cases/common/66 build always/version.h
index 7d433f035..7d433f035 100644
--- a/test cases/common/68 build always/version.h
+++ b/test cases/common/66 build always/version.h
diff --git a/test cases/common/68 build always/version_gen.py b/test cases/common/66 build always/version_gen.py
index fbe2df93f..fbe2df93f 100755
--- a/test cases/common/68 build always/version_gen.py
+++ b/test cases/common/66 build always/version_gen.py
diff --git a/test cases/common/69 vcstag/meson.build b/test cases/common/67 vcstag/meson.build
index 7e5983aaa..7e5983aaa 100644
--- a/test cases/common/69 vcstag/meson.build
+++ b/test cases/common/67 vcstag/meson.build
diff --git a/test cases/common/69 vcstag/tagprog.c b/test cases/common/67 vcstag/tagprog.c
index 27c3cc58d..27c3cc58d 100644
--- a/test cases/common/69 vcstag/tagprog.c
+++ b/test cases/common/67 vcstag/tagprog.c
diff --git a/test cases/common/69 vcstag/vcstag.c.in b/test cases/common/67 vcstag/vcstag.c.in
index 09192d90d..09192d90d 100644
--- a/test cases/common/69 vcstag/vcstag.c.in
+++ b/test cases/common/67 vcstag/vcstag.c.in
diff --git a/test cases/common/70 modules/meson.build b/test cases/common/68 modules/meson.build
index e9750cd97..e9750cd97 100644
--- a/test cases/common/70 modules/meson.build
+++ b/test cases/common/68 modules/meson.build
diff --git a/test cases/common/71 should fail/failing.c b/test cases/common/69 should fail/failing.c
index 3e70e5079..3e70e5079 100644
--- a/test cases/common/71 should fail/failing.c
+++ b/test cases/common/69 should fail/failing.c
diff --git a/test cases/common/71 should fail/meson.build b/test cases/common/69 should fail/meson.build
index dffbbb381..dffbbb381 100644
--- a/test cases/common/71 should fail/meson.build
+++ b/test cases/common/69 should fail/meson.build
diff --git a/test cases/common/72 configure file in custom target/inc/confdata.in b/test cases/common/70 configure file in custom target/inc/confdata.in
index e44cdea20..e44cdea20 100644
--- a/test cases/common/72 configure file in custom target/inc/confdata.in
+++ b/test cases/common/70 configure file in custom target/inc/confdata.in
diff --git a/test cases/common/72 configure file in custom target/inc/meson.build b/test cases/common/70 configure file in custom target/inc/meson.build
index 05d2dcb8a..05d2dcb8a 100644
--- a/test cases/common/72 configure file in custom target/inc/meson.build
+++ b/test cases/common/70 configure file in custom target/inc/meson.build
diff --git a/test cases/common/72 configure file in custom target/meson.build b/test cases/common/70 configure file in custom target/meson.build
index 0a850a1a6..0a850a1a6 100644
--- a/test cases/common/72 configure file in custom target/meson.build
+++ b/test cases/common/70 configure file in custom target/meson.build
diff --git a/test cases/common/72 configure file in custom target/src/meson.build b/test cases/common/70 configure file in custom target/src/meson.build
index e0ab9ebb2..e0ab9ebb2 100644
--- a/test cases/common/72 configure file in custom target/src/meson.build
+++ b/test cases/common/70 configure file in custom target/src/meson.build
diff --git a/test cases/common/72 configure file in custom target/src/mycompiler.py b/test cases/common/70 configure file in custom target/src/mycompiler.py
index b00c862db..b00c862db 100644
--- a/test cases/common/72 configure file in custom target/src/mycompiler.py
+++ b/test cases/common/70 configure file in custom target/src/mycompiler.py
diff --git a/test cases/common/73 external test program/meson.build b/test cases/common/71 external test program/meson.build
index d18ddcde5..d18ddcde5 100644
--- a/test cases/common/73 external test program/meson.build
+++ b/test cases/common/71 external test program/meson.build
diff --git a/test cases/common/73 external test program/mytest.py b/test cases/common/71 external test program/mytest.py
index 9947773f7..9947773f7 100755
--- a/test cases/common/73 external test program/mytest.py
+++ b/test cases/common/71 external test program/mytest.py
diff --git a/test cases/common/74 ctarget dependency/gen1.py b/test cases/common/72 ctarget dependency/gen1.py
index 0fa6ea1eb..0fa6ea1eb 100755
--- a/test cases/common/74 ctarget dependency/gen1.py
+++ b/test cases/common/72 ctarget dependency/gen1.py
diff --git a/test cases/common/74 ctarget dependency/gen2.py b/test cases/common/72 ctarget dependency/gen2.py
index b087b02cc..b087b02cc 100755
--- a/test cases/common/74 ctarget dependency/gen2.py
+++ b/test cases/common/72 ctarget dependency/gen2.py
diff --git a/test cases/common/74 ctarget dependency/input.dat b/test cases/common/72 ctarget dependency/input.dat
index 7af91e29a..7af91e29a 100644
--- a/test cases/common/74 ctarget dependency/input.dat
+++ b/test cases/common/72 ctarget dependency/input.dat
diff --git a/test cases/common/74 ctarget dependency/meson.build b/test cases/common/72 ctarget dependency/meson.build
index cd11951b2..cd11951b2 100644
--- a/test cases/common/74 ctarget dependency/meson.build
+++ b/test cases/common/72 ctarget dependency/meson.build
diff --git a/test cases/common/75 shared subproject/a.c b/test cases/common/73 shared subproject/a.c
index 7510a1b55..7510a1b55 100644
--- a/test cases/common/75 shared subproject/a.c
+++ b/test cases/common/73 shared subproject/a.c
diff --git a/test cases/common/75 shared subproject/meson.build b/test cases/common/73 shared subproject/meson.build
index 6803d519d..6803d519d 100644
--- a/test cases/common/75 shared subproject/meson.build
+++ b/test cases/common/73 shared subproject/meson.build
diff --git a/test cases/common/75 shared subproject/subprojects/B/b.c b/test cases/common/73 shared subproject/subprojects/B/b.c
index b8c7d83a1..b8c7d83a1 100644
--- a/test cases/common/75 shared subproject/subprojects/B/b.c
+++ b/test cases/common/73 shared subproject/subprojects/B/b.c
diff --git a/test cases/common/75 shared subproject/subprojects/B/meson.build b/test cases/common/73 shared subproject/subprojects/B/meson.build
index 280c60ce2..280c60ce2 100644
--- a/test cases/common/75 shared subproject/subprojects/B/meson.build
+++ b/test cases/common/73 shared subproject/subprojects/B/meson.build
diff --git a/test cases/common/75 shared subproject/subprojects/C/c.c b/test cases/common/73 shared subproject/subprojects/C/c.c
index facd19943..facd19943 100644
--- a/test cases/common/75 shared subproject/subprojects/C/c.c
+++ b/test cases/common/73 shared subproject/subprojects/C/c.c
diff --git a/test cases/common/75 shared subproject/subprojects/C/meson.build b/test cases/common/73 shared subproject/subprojects/C/meson.build
index abf0b1e26..abf0b1e26 100644
--- a/test cases/common/75 shared subproject/subprojects/C/meson.build
+++ b/test cases/common/73 shared subproject/subprojects/C/meson.build
diff --git a/test cases/common/76 shared subproject 2/a.c b/test cases/common/74 shared subproject 2/a.c
index 7510a1b55..7510a1b55 100644
--- a/test cases/common/76 shared subproject 2/a.c
+++ b/test cases/common/74 shared subproject 2/a.c
diff --git a/test cases/common/76 shared subproject 2/meson.build b/test cases/common/74 shared subproject 2/meson.build
index 064732597..064732597 100644
--- a/test cases/common/76 shared subproject 2/meson.build
+++ b/test cases/common/74 shared subproject 2/meson.build
diff --git a/test cases/common/76 shared subproject 2/subprojects/B/b.c b/test cases/common/74 shared subproject 2/subprojects/B/b.c
index 4d71c0f9d..4d71c0f9d 100644
--- a/test cases/common/76 shared subproject 2/subprojects/B/b.c
+++ b/test cases/common/74 shared subproject 2/subprojects/B/b.c
diff --git a/test cases/common/76 shared subproject 2/subprojects/B/meson.build b/test cases/common/74 shared subproject 2/subprojects/B/meson.build
index 280c60ce2..280c60ce2 100644
--- a/test cases/common/76 shared subproject 2/subprojects/B/meson.build
+++ b/test cases/common/74 shared subproject 2/subprojects/B/meson.build
diff --git a/test cases/common/76 shared subproject 2/subprojects/C/c.c b/test cases/common/74 shared subproject 2/subprojects/C/c.c
index facd19943..facd19943 100644
--- a/test cases/common/76 shared subproject 2/subprojects/C/c.c
+++ b/test cases/common/74 shared subproject 2/subprojects/C/c.c
diff --git a/test cases/common/76 shared subproject 2/subprojects/C/meson.build b/test cases/common/74 shared subproject 2/subprojects/C/meson.build
index abf0b1e26..abf0b1e26 100644
--- a/test cases/common/76 shared subproject 2/subprojects/C/meson.build
+++ b/test cases/common/74 shared subproject 2/subprojects/C/meson.build
diff --git a/test cases/common/77 file object/lib.c b/test cases/common/75 file object/lib.c
index 91800303c..91800303c 100644
--- a/test cases/common/77 file object/lib.c
+++ b/test cases/common/75 file object/lib.c
diff --git a/test cases/common/77 file object/meson.build b/test cases/common/75 file object/meson.build
index c3ecb7be9..c3ecb7be9 100644
--- a/test cases/common/77 file object/meson.build
+++ b/test cases/common/75 file object/meson.build
diff --git a/test cases/common/77 file object/prog.c b/test cases/common/75 file object/prog.c
index 78c6acc27..78c6acc27 100644
--- a/test cases/common/77 file object/prog.c
+++ b/test cases/common/75 file object/prog.c
diff --git a/test cases/common/77 file object/subdir1/lib.c b/test cases/common/75 file object/subdir1/lib.c
index 8c13c2126..8c13c2126 100644
--- a/test cases/common/77 file object/subdir1/lib.c
+++ b/test cases/common/75 file object/subdir1/lib.c
diff --git a/test cases/common/77 file object/subdir1/meson.build b/test cases/common/75 file object/subdir1/meson.build
index f5066f00f..f5066f00f 100644
--- a/test cases/common/77 file object/subdir1/meson.build
+++ b/test cases/common/75 file object/subdir1/meson.build
diff --git a/test cases/common/77 file object/subdir1/prog.c b/test cases/common/75 file object/subdir1/prog.c
index 38d13d242..38d13d242 100644
--- a/test cases/common/77 file object/subdir1/prog.c
+++ b/test cases/common/75 file object/subdir1/prog.c
diff --git a/test cases/common/77 file object/subdir2/lib.c b/test cases/common/75 file object/subdir2/lib.c
index 8e2b4ebfb..8e2b4ebfb 100644
--- a/test cases/common/77 file object/subdir2/lib.c
+++ b/test cases/common/75 file object/subdir2/lib.c
diff --git a/test cases/common/77 file object/subdir2/meson.build b/test cases/common/75 file object/subdir2/meson.build
index 588651019..588651019 100644
--- a/test cases/common/77 file object/subdir2/meson.build
+++ b/test cases/common/75 file object/subdir2/meson.build
diff --git a/test cases/common/77 file object/subdir2/prog.c b/test cases/common/75 file object/subdir2/prog.c
index 8a8f0d016..8a8f0d016 100644
--- a/test cases/common/77 file object/subdir2/prog.c
+++ b/test cases/common/75 file object/subdir2/prog.c
diff --git a/test cases/common/78 custom subproject dir/a.c b/test cases/common/76 custom subproject dir/a.c
index 7510a1b55..7510a1b55 100644
--- a/test cases/common/78 custom subproject dir/a.c
+++ b/test cases/common/76 custom subproject dir/a.c
diff --git a/test cases/common/78 custom subproject dir/custom_subproject_dir/B/b.c b/test cases/common/76 custom subproject dir/custom_subproject_dir/B/b.c
index 4d71c0f9d..4d71c0f9d 100644
--- a/test cases/common/78 custom subproject dir/custom_subproject_dir/B/b.c
+++ b/test cases/common/76 custom subproject dir/custom_subproject_dir/B/b.c
diff --git a/test cases/common/78 custom subproject dir/custom_subproject_dir/B/meson.build b/test cases/common/76 custom subproject dir/custom_subproject_dir/B/meson.build
index 280c60ce2..280c60ce2 100644
--- a/test cases/common/78 custom subproject dir/custom_subproject_dir/B/meson.build
+++ b/test cases/common/76 custom subproject dir/custom_subproject_dir/B/meson.build
diff --git a/test cases/common/78 custom subproject dir/custom_subproject_dir/C/c.c b/test cases/common/76 custom subproject dir/custom_subproject_dir/C/c.c
index facd19943..facd19943 100644
--- a/test cases/common/78 custom subproject dir/custom_subproject_dir/C/c.c
+++ b/test cases/common/76 custom subproject dir/custom_subproject_dir/C/c.c
diff --git a/test cases/common/78 custom subproject dir/custom_subproject_dir/C/meson.build b/test cases/common/76 custom subproject dir/custom_subproject_dir/C/meson.build
index abf0b1e26..abf0b1e26 100644
--- a/test cases/common/78 custom subproject dir/custom_subproject_dir/C/meson.build
+++ b/test cases/common/76 custom subproject dir/custom_subproject_dir/C/meson.build
diff --git a/test cases/common/78 custom subproject dir/meson.build b/test cases/common/76 custom subproject dir/meson.build
index d9ba649b1..d9ba649b1 100644
--- a/test cases/common/78 custom subproject dir/meson.build
+++ b/test cases/common/76 custom subproject dir/meson.build
diff --git a/test cases/common/79 has type/meson.build b/test cases/common/77 has type/meson.build
index de8dbc834..de8dbc834 100644
--- a/test cases/common/79 has type/meson.build
+++ b/test cases/common/77 has type/meson.build
diff --git a/test cases/common/80 extract from nested subdir/meson.build b/test cases/common/78 extract from nested subdir/meson.build
index 3a42806f0..3a42806f0 100644
--- a/test cases/common/80 extract from nested subdir/meson.build
+++ b/test cases/common/78 extract from nested subdir/meson.build
diff --git a/test cases/common/80 extract from nested subdir/src/first/lib_first.c b/test cases/common/78 extract from nested subdir/src/first/lib_first.c
index 5fc32678c..5fc32678c 100644
--- a/test cases/common/80 extract from nested subdir/src/first/lib_first.c
+++ b/test cases/common/78 extract from nested subdir/src/first/lib_first.c
diff --git a/test cases/common/80 extract from nested subdir/src/first/meson.build b/test cases/common/78 extract from nested subdir/src/first/meson.build
index b97aef44e..b97aef44e 100644
--- a/test cases/common/80 extract from nested subdir/src/first/meson.build
+++ b/test cases/common/78 extract from nested subdir/src/first/meson.build
diff --git a/test cases/common/80 extract from nested subdir/src/meson.build b/test cases/common/78 extract from nested subdir/src/meson.build
index 3f5ec3200..3f5ec3200 100644
--- a/test cases/common/80 extract from nested subdir/src/meson.build
+++ b/test cases/common/78 extract from nested subdir/src/meson.build
diff --git a/test cases/common/80 extract from nested subdir/tst/first/exe_first.c b/test cases/common/78 extract from nested subdir/tst/first/exe_first.c
index e8188cd25..e8188cd25 100644
--- a/test cases/common/80 extract from nested subdir/tst/first/exe_first.c
+++ b/test cases/common/78 extract from nested subdir/tst/first/exe_first.c
diff --git a/test cases/common/80 extract from nested subdir/tst/first/meson.build b/test cases/common/78 extract from nested subdir/tst/first/meson.build
index a6fa7da1b..a6fa7da1b 100644
--- a/test cases/common/80 extract from nested subdir/tst/first/meson.build
+++ b/test cases/common/78 extract from nested subdir/tst/first/meson.build
diff --git a/test cases/common/80 extract from nested subdir/tst/meson.build b/test cases/common/78 extract from nested subdir/tst/meson.build
index 3f5ec3200..3f5ec3200 100644
--- a/test cases/common/80 extract from nested subdir/tst/meson.build
+++ b/test cases/common/78 extract from nested subdir/tst/meson.build
diff --git a/test cases/common/81 internal dependency/meson.build b/test cases/common/79 internal dependency/meson.build
index 6faedb09e..6faedb09e 100644
--- a/test cases/common/81 internal dependency/meson.build
+++ b/test cases/common/79 internal dependency/meson.build
diff --git a/test cases/common/81 internal dependency/proj1/include/proj1.h b/test cases/common/79 internal dependency/proj1/include/proj1.h
index ecb1e4b6f..ecb1e4b6f 100644
--- a/test cases/common/81 internal dependency/proj1/include/proj1.h
+++ b/test cases/common/79 internal dependency/proj1/include/proj1.h
diff --git a/test cases/common/81 internal dependency/proj1/meson.build b/test cases/common/79 internal dependency/proj1/meson.build
index 422021edb..422021edb 100644
--- a/test cases/common/81 internal dependency/proj1/meson.build
+++ b/test cases/common/79 internal dependency/proj1/meson.build
diff --git a/test cases/common/81 internal dependency/proj1/proj1f1.c b/test cases/common/79 internal dependency/proj1/proj1f1.c
index 69fa823e1..69fa823e1 100644
--- a/test cases/common/81 internal dependency/proj1/proj1f1.c
+++ b/test cases/common/79 internal dependency/proj1/proj1f1.c
diff --git a/test cases/common/81 internal dependency/proj1/proj1f2.c b/test cases/common/79 internal dependency/proj1/proj1f2.c
index 7dd621c3a..7dd621c3a 100644
--- a/test cases/common/81 internal dependency/proj1/proj1f2.c
+++ b/test cases/common/79 internal dependency/proj1/proj1f2.c
diff --git a/test cases/common/81 internal dependency/proj1/proj1f3.c b/test cases/common/79 internal dependency/proj1/proj1f3.c
index 2861ddcf6..2861ddcf6 100644
--- a/test cases/common/81 internal dependency/proj1/proj1f3.c
+++ b/test cases/common/79 internal dependency/proj1/proj1f3.c
diff --git a/test cases/common/81 internal dependency/src/main.c b/test cases/common/79 internal dependency/src/main.c
index dbb7c4a06..dbb7c4a06 100644
--- a/test cases/common/81 internal dependency/src/main.c
+++ b/test cases/common/79 internal dependency/src/main.c
diff --git a/test cases/common/81 internal dependency/src/meson.build b/test cases/common/79 internal dependency/src/meson.build
index 89f99abd1..89f99abd1 100644
--- a/test cases/common/81 internal dependency/src/meson.build
+++ b/test cases/common/79 internal dependency/src/meson.build
diff --git a/test cases/common/82 same basename/exe1.c b/test cases/common/80 same basename/exe1.c
index 128f2bb15..128f2bb15 100644
--- a/test cases/common/82 same basename/exe1.c
+++ b/test cases/common/80 same basename/exe1.c
diff --git a/test cases/common/82 same basename/exe2.c b/test cases/common/80 same basename/exe2.c
index d2d89956d..d2d89956d 100644
--- a/test cases/common/82 same basename/exe2.c
+++ b/test cases/common/80 same basename/exe2.c
diff --git a/test cases/common/82 same basename/lib.c b/test cases/common/80 same basename/lib.c
index b3798e99e..b3798e99e 100644
--- a/test cases/common/82 same basename/lib.c
+++ b/test cases/common/80 same basename/lib.c
diff --git a/test cases/common/82 same basename/meson.build b/test cases/common/80 same basename/meson.build
index 856c536c0..856c536c0 100644
--- a/test cases/common/82 same basename/meson.build
+++ b/test cases/common/80 same basename/meson.build
diff --git a/test cases/common/82 same basename/sharedsub/meson.build b/test cases/common/80 same basename/sharedsub/meson.build
index 29654a94d..29654a94d 100644
--- a/test cases/common/82 same basename/sharedsub/meson.build
+++ b/test cases/common/80 same basename/sharedsub/meson.build
diff --git a/test cases/common/82 same basename/staticsub/meson.build b/test cases/common/80 same basename/staticsub/meson.build
index 5e5242e06..5e5242e06 100644
--- a/test cases/common/82 same basename/staticsub/meson.build
+++ b/test cases/common/80 same basename/staticsub/meson.build
diff --git a/test cases/common/83 declare dep/entity/entity.h b/test cases/common/81 declare dep/entity/entity.h
index 959a8c30d..959a8c30d 100644
--- a/test cases/common/83 declare dep/entity/entity.h
+++ b/test cases/common/81 declare dep/entity/entity.h
diff --git a/test cases/common/83 declare dep/entity/entity1.c b/test cases/common/81 declare dep/entity/entity1.c
index d124e24e8..d124e24e8 100644
--- a/test cases/common/83 declare dep/entity/entity1.c
+++ b/test cases/common/81 declare dep/entity/entity1.c
diff --git a/test cases/common/83 declare dep/entity/entity2.c b/test cases/common/81 declare dep/entity/entity2.c
index 4e8bb07e1..4e8bb07e1 100644
--- a/test cases/common/83 declare dep/entity/entity2.c
+++ b/test cases/common/81 declare dep/entity/entity2.c
diff --git a/test cases/common/83 declare dep/entity/meson.build b/test cases/common/81 declare dep/entity/meson.build
index 469ecd3cb..469ecd3cb 100644
--- a/test cases/common/83 declare dep/entity/meson.build
+++ b/test cases/common/81 declare dep/entity/meson.build
diff --git a/test cases/common/83 declare dep/main.c b/test cases/common/81 declare dep/main.c
index 62200c943..62200c943 100644
--- a/test cases/common/83 declare dep/main.c
+++ b/test cases/common/81 declare dep/main.c
diff --git a/test cases/common/83 declare dep/meson.build b/test cases/common/81 declare dep/meson.build
index e427defaf..e427defaf 100644
--- a/test cases/common/83 declare dep/meson.build
+++ b/test cases/common/81 declare dep/meson.build
diff --git a/test cases/common/84 extract all/extractor.h b/test cases/common/82 extract all/extractor.h
index cfb7ff6d6..cfb7ff6d6 100644
--- a/test cases/common/84 extract all/extractor.h
+++ b/test cases/common/82 extract all/extractor.h
diff --git a/test cases/common/84 extract all/four.c b/test cases/common/82 extract all/four.c
index f67a85e68..f67a85e68 100644
--- a/test cases/common/84 extract all/four.c
+++ b/test cases/common/82 extract all/four.c
diff --git a/test cases/common/84 extract all/meson.build b/test cases/common/82 extract all/meson.build
index 4f08a4fa6..4f08a4fa6 100644
--- a/test cases/common/84 extract all/meson.build
+++ b/test cases/common/82 extract all/meson.build
diff --git a/test cases/common/84 extract all/one.c b/test cases/common/82 extract all/one.c
index 152a1455d..152a1455d 100644
--- a/test cases/common/84 extract all/one.c
+++ b/test cases/common/82 extract all/one.c
diff --git a/test cases/common/84 extract all/prog.c b/test cases/common/82 extract all/prog.c
index de0cc7f8e..de0cc7f8e 100644
--- a/test cases/common/84 extract all/prog.c
+++ b/test cases/common/82 extract all/prog.c
diff --git a/test cases/common/84 extract all/three.c b/test cases/common/82 extract all/three.c
index 24604ed72..24604ed72 100644
--- a/test cases/common/84 extract all/three.c
+++ b/test cases/common/82 extract all/three.c
diff --git a/test cases/common/84 extract all/two.c b/test cases/common/82 extract all/two.c
index 800cd2dfb..800cd2dfb 100644
--- a/test cases/common/84 extract all/two.c
+++ b/test cases/common/82 extract all/two.c
diff --git a/test cases/common/85 add language/meson.build b/test cases/common/83 add language/meson.build
index e99f33a81..e99f33a81 100644
--- a/test cases/common/85 add language/meson.build
+++ b/test cases/common/83 add language/meson.build
diff --git a/test cases/common/85 add language/prog.c b/test cases/common/83 add language/prog.c
index 9d747f00d..9d747f00d 100644
--- a/test cases/common/85 add language/prog.c
+++ b/test cases/common/83 add language/prog.c
diff --git a/test cases/common/85 add language/prog.cc b/test cases/common/83 add language/prog.cc
index 03647dde4..03647dde4 100644
--- a/test cases/common/85 add language/prog.cc
+++ b/test cases/common/83 add language/prog.cc
diff --git a/test cases/common/86 identical target name in subproject/bar.c b/test cases/common/84 identical target name in subproject/bar.c
index f1bd822dc..f1bd822dc 100644
--- a/test cases/common/86 identical target name in subproject/bar.c
+++ b/test cases/common/84 identical target name in subproject/bar.c
diff --git a/test cases/common/86 identical target name in subproject/meson.build b/test cases/common/84 identical target name in subproject/meson.build
index c5be5b7d8..c5be5b7d8 100644
--- a/test cases/common/86 identical target name in subproject/meson.build
+++ b/test cases/common/84 identical target name in subproject/meson.build
diff --git a/test cases/common/86 identical target name in subproject/subprojects/foo/bar.c b/test cases/common/84 identical target name in subproject/subprojects/foo/bar.c
index 5e7006baf..5e7006baf 100644
--- a/test cases/common/86 identical target name in subproject/subprojects/foo/bar.c
+++ b/test cases/common/84 identical target name in subproject/subprojects/foo/bar.c
diff --git a/test cases/common/86 identical target name in subproject/subprojects/foo/meson.build b/test cases/common/84 identical target name in subproject/subprojects/foo/meson.build
index 06addb4cf..06addb4cf 100644
--- a/test cases/common/86 identical target name in subproject/subprojects/foo/meson.build
+++ b/test cases/common/84 identical target name in subproject/subprojects/foo/meson.build
diff --git a/test cases/common/87 plusassign/meson.build b/test cases/common/85 plusassign/meson.build
index ac477e740..ac477e740 100644
--- a/test cases/common/87 plusassign/meson.build
+++ b/test cases/common/85 plusassign/meson.build
diff --git a/test cases/common/88 skip subdir/meson.build b/test cases/common/86 skip subdir/meson.build
index 30ede0ea2..30ede0ea2 100644
--- a/test cases/common/88 skip subdir/meson.build
+++ b/test cases/common/86 skip subdir/meson.build
diff --git a/test cases/common/88 skip subdir/subdir1/meson.build b/test cases/common/86 skip subdir/subdir1/meson.build
index 51cb003e1..51cb003e1 100644
--- a/test cases/common/88 skip subdir/subdir1/meson.build
+++ b/test cases/common/86 skip subdir/subdir1/meson.build
diff --git a/test cases/common/88 skip subdir/subdir1/subdir2/meson.build b/test cases/common/86 skip subdir/subdir1/subdir2/meson.build
index e37cad6b6..e37cad6b6 100644
--- a/test cases/common/88 skip subdir/subdir1/subdir2/meson.build
+++ b/test cases/common/86 skip subdir/subdir1/subdir2/meson.build
diff --git a/test cases/common/89 private include/meson.build b/test cases/common/87 private include/meson.build
index 2485fbf74..2485fbf74 100644
--- a/test cases/common/89 private include/meson.build
+++ b/test cases/common/87 private include/meson.build
diff --git a/test cases/common/89 private include/stlib/compiler.py b/test cases/common/87 private include/stlib/compiler.py
index c8597ddc1..c8597ddc1 100755
--- a/test cases/common/89 private include/stlib/compiler.py
+++ b/test cases/common/87 private include/stlib/compiler.py
diff --git a/test cases/common/89 private include/stlib/foo1.def b/test cases/common/87 private include/stlib/foo1.def
index e69de29bb..e69de29bb 100644
--- a/test cases/common/89 private include/stlib/foo1.def
+++ b/test cases/common/87 private include/stlib/foo1.def
diff --git a/test cases/common/89 private include/stlib/foo2.def b/test cases/common/87 private include/stlib/foo2.def
index e69de29bb..e69de29bb 100644
--- a/test cases/common/89 private include/stlib/foo2.def
+++ b/test cases/common/87 private include/stlib/foo2.def
diff --git a/test cases/common/89 private include/stlib/meson.build b/test cases/common/87 private include/stlib/meson.build
index 8d70650d8..8d70650d8 100644
--- a/test cases/common/89 private include/stlib/meson.build
+++ b/test cases/common/87 private include/stlib/meson.build
diff --git a/test cases/common/89 private include/user/libuser.c b/test cases/common/87 private include/user/libuser.c
index c1724867b..c1724867b 100644
--- a/test cases/common/89 private include/user/libuser.c
+++ b/test cases/common/87 private include/user/libuser.c
diff --git a/test cases/common/89 private include/user/meson.build b/test cases/common/87 private include/user/meson.build
index ab88b1dbd..ab88b1dbd 100644
--- a/test cases/common/89 private include/user/meson.build
+++ b/test cases/common/87 private include/user/meson.build
diff --git a/test cases/common/90 default options/meson.build b/test cases/common/88 default options/meson.build
index 51b5cdac9..51b5cdac9 100644
--- a/test cases/common/90 default options/meson.build
+++ b/test cases/common/88 default options/meson.build
diff --git a/test cases/common/90 default options/subprojects/sub1/meson.build b/test cases/common/88 default options/subprojects/sub1/meson.build
index de0dc216c..de0dc216c 100644
--- a/test cases/common/90 default options/subprojects/sub1/meson.build
+++ b/test cases/common/88 default options/subprojects/sub1/meson.build
diff --git a/test cases/common/90 default options/subprojects/sub1/meson_options.txt b/test cases/common/88 default options/subprojects/sub1/meson_options.txt
index fc96f5e09..fc96f5e09 100644
--- a/test cases/common/90 default options/subprojects/sub1/meson_options.txt
+++ b/test cases/common/88 default options/subprojects/sub1/meson_options.txt
diff --git a/test cases/common/91 dep fallback/gensrc.py b/test cases/common/89 dep fallback/gensrc.py
index ff42ac359..ff42ac359 100644
--- a/test cases/common/91 dep fallback/gensrc.py
+++ b/test cases/common/89 dep fallback/gensrc.py
diff --git a/test cases/common/91 dep fallback/meson.build b/test cases/common/89 dep fallback/meson.build
index a96520e21..a96520e21 100644
--- a/test cases/common/91 dep fallback/meson.build
+++ b/test cases/common/89 dep fallback/meson.build
diff --git a/test cases/common/91 dep fallback/subprojects/boblib/bob.c b/test cases/common/89 dep fallback/subprojects/boblib/bob.c
index 52cf4795e..52cf4795e 100644
--- a/test cases/common/91 dep fallback/subprojects/boblib/bob.c
+++ b/test cases/common/89 dep fallback/subprojects/boblib/bob.c
diff --git a/test cases/common/91 dep fallback/subprojects/boblib/bob.h b/test cases/common/89 dep fallback/subprojects/boblib/bob.h
index 8dd4b334d..8dd4b334d 100644
--- a/test cases/common/91 dep fallback/subprojects/boblib/bob.h
+++ b/test cases/common/89 dep fallback/subprojects/boblib/bob.h
diff --git a/test cases/common/91 dep fallback/subprojects/boblib/genbob.py b/test cases/common/89 dep fallback/subprojects/boblib/genbob.py
index 34af7790e..34af7790e 100644
--- a/test cases/common/91 dep fallback/subprojects/boblib/genbob.py
+++ b/test cases/common/89 dep fallback/subprojects/boblib/genbob.py
diff --git a/test cases/common/91 dep fallback/subprojects/boblib/meson.build b/test cases/common/89 dep fallback/subprojects/boblib/meson.build
index bb250e42f..bb250e42f 100644
--- a/test cases/common/91 dep fallback/subprojects/boblib/meson.build
+++ b/test cases/common/89 dep fallback/subprojects/boblib/meson.build
diff --git a/test cases/common/91 dep fallback/subprojects/dummylib/meson.build b/test cases/common/89 dep fallback/subprojects/dummylib/meson.build
index 3ad33e7b9..3ad33e7b9 100644
--- a/test cases/common/91 dep fallback/subprojects/dummylib/meson.build
+++ b/test cases/common/89 dep fallback/subprojects/dummylib/meson.build
diff --git a/test cases/common/91 dep fallback/tester.c b/test cases/common/89 dep fallback/tester.c
index a46f3f629..a46f3f629 100644
--- a/test cases/common/91 dep fallback/tester.c
+++ b/test cases/common/89 dep fallback/tester.c
diff --git a/test cases/common/92 default library/ef.cpp b/test cases/common/90 default library/ef.cpp
index 34784f88a..34784f88a 100644
--- a/test cases/common/92 default library/ef.cpp
+++ b/test cases/common/90 default library/ef.cpp
diff --git a/test cases/common/92 default library/ef.h b/test cases/common/90 default library/ef.h
index 21704b557..21704b557 100644
--- a/test cases/common/92 default library/ef.h
+++ b/test cases/common/90 default library/ef.h
diff --git a/test cases/common/92 default library/eftest.cpp b/test cases/common/90 default library/eftest.cpp
index 4d4412d75..4d4412d75 100644
--- a/test cases/common/92 default library/eftest.cpp
+++ b/test cases/common/90 default library/eftest.cpp
diff --git a/test cases/common/92 default library/meson.build b/test cases/common/90 default library/meson.build
index 508f25f5b..508f25f5b 100644
--- a/test cases/common/92 default library/meson.build
+++ b/test cases/common/90 default library/meson.build
diff --git a/test cases/common/94 gen extra/meson.build b/test cases/common/91 gen extra/meson.build
index cbbdceb2e..cbbdceb2e 100644
--- a/test cases/common/94 gen extra/meson.build
+++ b/test cases/common/91 gen extra/meson.build
diff --git a/test cases/common/94 gen extra/name.dat b/test cases/common/91 gen extra/name.dat
index caf5b1caf..caf5b1caf 100644
--- a/test cases/common/94 gen extra/name.dat
+++ b/test cases/common/91 gen extra/name.dat
diff --git a/test cases/common/94 gen extra/name.l b/test cases/common/91 gen extra/name.l
index c4ba277d2..c4ba277d2 100644
--- a/test cases/common/94 gen extra/name.l
+++ b/test cases/common/91 gen extra/name.l
diff --git a/test cases/common/94 gen extra/plain.c b/test cases/common/91 gen extra/plain.c
index c068a023e..c068a023e 100644
--- a/test cases/common/94 gen extra/plain.c
+++ b/test cases/common/91 gen extra/plain.c
diff --git a/test cases/common/94 gen extra/srcgen.py b/test cases/common/91 gen extra/srcgen.py
index c64f54000..c64f54000 100755
--- a/test cases/common/94 gen extra/srcgen.py
+++ b/test cases/common/91 gen extra/srcgen.py
diff --git a/test cases/common/94 gen extra/srcgen2.py b/test cases/common/91 gen extra/srcgen2.py
index 9cdf12d59..9cdf12d59 100644
--- a/test cases/common/94 gen extra/srcgen2.py
+++ b/test cases/common/91 gen extra/srcgen2.py
diff --git a/test cases/common/94 gen extra/srcgen3.py b/test cases/common/91 gen extra/srcgen3.py
index b7371143a..b7371143a 100644
--- a/test cases/common/94 gen extra/srcgen3.py
+++ b/test cases/common/91 gen extra/srcgen3.py
diff --git a/test cases/common/94 gen extra/upper.c b/test cases/common/91 gen extra/upper.c
index 82c32529e..82c32529e 100644
--- a/test cases/common/94 gen extra/upper.c
+++ b/test cases/common/91 gen extra/upper.c
diff --git a/test cases/common/95 benchmark/delayer.c b/test cases/common/92 benchmark/delayer.c
index b410c4605..b410c4605 100644
--- a/test cases/common/95 benchmark/delayer.c
+++ b/test cases/common/92 benchmark/delayer.c
diff --git a/test cases/common/95 benchmark/meson.build b/test cases/common/92 benchmark/meson.build
index 9d583d2e1..9d583d2e1 100644
--- a/test cases/common/95 benchmark/meson.build
+++ b/test cases/common/92 benchmark/meson.build
diff --git a/test cases/common/96 test workdir/meson.build b/test cases/common/93 test workdir/meson.build
index a8290f7e0..a8290f7e0 100644
--- a/test cases/common/96 test workdir/meson.build
+++ b/test cases/common/93 test workdir/meson.build
diff --git a/test cases/common/96 test workdir/opener.c b/test cases/common/93 test workdir/opener.c
index c946e18c2..c946e18c2 100644
--- a/test cases/common/96 test workdir/opener.c
+++ b/test cases/common/93 test workdir/opener.c
diff --git a/test cases/common/96 test workdir/subdir/checker.py b/test cases/common/93 test workdir/subdir/checker.py
index 66e287d4a..66e287d4a 100755
--- a/test cases/common/96 test workdir/subdir/checker.py
+++ b/test cases/common/93 test workdir/subdir/checker.py
diff --git a/test cases/common/96 test workdir/subdir/meson.build b/test cases/common/93 test workdir/subdir/meson.build
index 687a1cf23..687a1cf23 100644
--- a/test cases/common/96 test workdir/subdir/meson.build
+++ b/test cases/common/93 test workdir/subdir/meson.build
diff --git a/test cases/common/97 suites/exe1.c b/test cases/common/94 suites/exe1.c
index 6e3236221..6e3236221 100644
--- a/test cases/common/97 suites/exe1.c
+++ b/test cases/common/94 suites/exe1.c
diff --git a/test cases/common/97 suites/exe2.c b/test cases/common/94 suites/exe2.c
index 21a9dd61f..21a9dd61f 100644
--- a/test cases/common/97 suites/exe2.c
+++ b/test cases/common/94 suites/exe2.c
diff --git a/test cases/common/97 suites/meson.build b/test cases/common/94 suites/meson.build
index 057e0594d..057e0594d 100644
--- a/test cases/common/97 suites/meson.build
+++ b/test cases/common/94 suites/meson.build
diff --git a/test cases/common/97 suites/subprojects/sub/meson.build b/test cases/common/94 suites/subprojects/sub/meson.build
index 697d95f1c..697d95f1c 100644
--- a/test cases/common/97 suites/subprojects/sub/meson.build
+++ b/test cases/common/94 suites/subprojects/sub/meson.build
diff --git a/test cases/common/97 suites/subprojects/sub/sub1.c b/test cases/common/94 suites/subprojects/sub/sub1.c
index e06762443..e06762443 100644
--- a/test cases/common/97 suites/subprojects/sub/sub1.c
+++ b/test cases/common/94 suites/subprojects/sub/sub1.c
diff --git a/test cases/common/97 suites/subprojects/sub/sub2.c b/test cases/common/94 suites/subprojects/sub/sub2.c
index 0b457dc01..0b457dc01 100644
--- a/test cases/common/97 suites/subprojects/sub/sub2.c
+++ b/test cases/common/94 suites/subprojects/sub/sub2.c
diff --git a/test cases/common/98 threads/meson.build b/test cases/common/95 threads/meson.build
index 1fbb15ac7..1fbb15ac7 100644
--- a/test cases/common/98 threads/meson.build
+++ b/test cases/common/95 threads/meson.build
diff --git a/test cases/common/98 threads/threadprog.c b/test cases/common/95 threads/threadprog.c
index 7bfb7c444..7bfb7c444 100644
--- a/test cases/common/98 threads/threadprog.c
+++ b/test cases/common/95 threads/threadprog.c
diff --git a/test cases/common/98 threads/threadprog.cpp b/test cases/common/95 threads/threadprog.cpp
index 3c69dc3a8..3c69dc3a8 100644
--- a/test cases/common/98 threads/threadprog.cpp
+++ b/test cases/common/95 threads/threadprog.cpp
diff --git a/test cases/common/99 manygen/depuser.c b/test cases/common/96 manygen/depuser.c
index 1ab248748..1ab248748 100644
--- a/test cases/common/99 manygen/depuser.c
+++ b/test cases/common/96 manygen/depuser.c
diff --git a/test cases/common/99 manygen/meson.build b/test cases/common/96 manygen/meson.build
index e70a55a17..e70a55a17 100644
--- a/test cases/common/99 manygen/meson.build
+++ b/test cases/common/96 manygen/meson.build
diff --git a/test cases/common/99 manygen/subdir/funcinfo.def b/test cases/common/96 manygen/subdir/funcinfo.def
index b0741862e..b0741862e 100644
--- a/test cases/common/99 manygen/subdir/funcinfo.def
+++ b/test cases/common/96 manygen/subdir/funcinfo.def
diff --git a/test cases/common/99 manygen/subdir/manygen.py b/test cases/common/96 manygen/subdir/manygen.py
index 32ea63c73..32ea63c73 100755
--- a/test cases/common/99 manygen/subdir/manygen.py
+++ b/test cases/common/96 manygen/subdir/manygen.py
diff --git a/test cases/common/99 manygen/subdir/meson.build b/test cases/common/96 manygen/subdir/meson.build
index 56f60e6c1..56f60e6c1 100644
--- a/test cases/common/99 manygen/subdir/meson.build
+++ b/test cases/common/96 manygen/subdir/meson.build
diff --git a/test cases/common/100 stringdef/meson.build b/test cases/common/97 stringdef/meson.build
index 3f9170e20..3f9170e20 100644
--- a/test cases/common/100 stringdef/meson.build
+++ b/test cases/common/97 stringdef/meson.build
diff --git a/test cases/common/100 stringdef/stringdef.c b/test cases/common/97 stringdef/stringdef.c
index 17e29fdc1..17e29fdc1 100644
--- a/test cases/common/100 stringdef/stringdef.c
+++ b/test cases/common/97 stringdef/stringdef.c
diff --git a/test cases/common/101 find program path/meson.build b/test cases/common/98 find program path/meson.build
index 0a812499a..0a812499a 100644
--- a/test cases/common/101 find program path/meson.build
+++ b/test cases/common/98 find program path/meson.build
diff --git a/test cases/common/101 find program path/program.py b/test cases/common/98 find program path/program.py
index 2ebc56419..2ebc56419 100755
--- a/test cases/common/101 find program path/program.py
+++ b/test cases/common/98 find program path/program.py
diff --git a/test cases/common/102 subproject subdir/meson.build b/test cases/common/99 subproject subdir/meson.build
index 36e48a7fa..36e48a7fa 100644
--- a/test cases/common/102 subproject subdir/meson.build
+++ b/test cases/common/99 subproject subdir/meson.build
diff --git a/test cases/common/116 subdir subproject/prog/prog.c b/test cases/common/99 subproject subdir/prog.c
index 9035ff114..9035ff114 100644
--- a/test cases/common/116 subdir subproject/prog/prog.c
+++ b/test cases/common/99 subproject subdir/prog.c
diff --git a/test cases/common/102 subproject subdir/subprojects/sub/lib/meson.build b/test cases/common/99 subproject subdir/subprojects/sub/lib/meson.build
index 53233ab4e..53233ab4e 100644
--- a/test cases/common/102 subproject subdir/subprojects/sub/lib/meson.build
+++ b/test cases/common/99 subproject subdir/subprojects/sub/lib/meson.build
diff --git a/test cases/common/202 subproject with features/subprojects/disabled_sub/lib/sub.c b/test cases/common/99 subproject subdir/subprojects/sub/lib/sub.c
index e748ac750..e748ac750 100644
--- a/test cases/common/202 subproject with features/subprojects/disabled_sub/lib/sub.c
+++ b/test cases/common/99 subproject subdir/subprojects/sub/lib/sub.c
diff --git a/test cases/common/202 subproject with features/subprojects/sub/lib/sub.h b/test cases/common/99 subproject subdir/subprojects/sub/lib/sub.h
index 2b59a3a32..2b59a3a32 100644
--- a/test cases/common/202 subproject with features/subprojects/sub/lib/sub.h
+++ b/test cases/common/99 subproject subdir/subprojects/sub/lib/sub.h
diff --git a/test cases/common/102 subproject subdir/subprojects/sub/meson.build b/test cases/common/99 subproject subdir/subprojects/sub/meson.build
index d8c4dce70..d8c4dce70 100644
--- a/test cases/common/102 subproject subdir/subprojects/sub/meson.build
+++ b/test cases/common/99 subproject subdir/subprojects/sub/meson.build
diff --git a/test cases/common/102 subproject subdir/subprojects/sub_implicit.wrap b/test cases/common/99 subproject subdir/subprojects/sub_implicit.wrap
index a809c43b1..a809c43b1 100644
--- a/test cases/common/102 subproject subdir/subprojects/sub_implicit.wrap
+++ b/test cases/common/99 subproject subdir/subprojects/sub_implicit.wrap
diff --git a/test cases/common/102 subproject subdir/subprojects/sub_implicit/meson.build b/test cases/common/99 subproject subdir/subprojects/sub_implicit/meson.build
index 24609ae09..24609ae09 100644
--- a/test cases/common/102 subproject subdir/subprojects/sub_implicit/meson.build
+++ b/test cases/common/99 subproject subdir/subprojects/sub_implicit/meson.build
diff --git a/test cases/common/102 subproject subdir/subprojects/sub_implicit/subprojects/subsub/meson.build b/test cases/common/99 subproject subdir/subprojects/sub_implicit/subprojects/subsub/meson.build
index 18e2ceace..18e2ceace 100644
--- a/test cases/common/102 subproject subdir/subprojects/sub_implicit/subprojects/subsub/meson.build
+++ b/test cases/common/99 subproject subdir/subprojects/sub_implicit/subprojects/subsub/meson.build
diff --git a/test cases/common/102 subproject subdir/subprojects/sub_implicit/subprojects/subsub/subprojects/packagefiles/subsubsub-1.0.zip b/test cases/common/99 subproject subdir/subprojects/sub_implicit/subprojects/subsub/subprojects/packagefiles/subsubsub-1.0.zip
index dfb7576f3..dfb7576f3 100644
--- a/test cases/common/102 subproject subdir/subprojects/sub_implicit/subprojects/subsub/subprojects/packagefiles/subsubsub-1.0.zip
+++ b/test cases/common/99 subproject subdir/subprojects/sub_implicit/subprojects/subsub/subprojects/packagefiles/subsubsub-1.0.zip
diff --git a/test cases/common/102 subproject subdir/subprojects/sub_implicit/subprojects/subsub/subprojects/subsubsub.wrap b/test cases/common/99 subproject subdir/subprojects/sub_implicit/subprojects/subsub/subprojects/subsubsub.wrap
index 6567ed010..6567ed010 100644
--- a/test cases/common/102 subproject subdir/subprojects/sub_implicit/subprojects/subsub/subprojects/subsubsub.wrap
+++ b/test cases/common/99 subproject subdir/subprojects/sub_implicit/subprojects/subsub/subprojects/subsubsub.wrap
diff --git a/test cases/common/102 subproject subdir/subprojects/sub_novar/meson.build b/test cases/common/99 subproject subdir/subprojects/sub_novar/meson.build
index 6450a1032..6450a1032 100644
--- a/test cases/common/102 subproject subdir/subprojects/sub_novar/meson.build
+++ b/test cases/common/99 subproject subdir/subprojects/sub_novar/meson.build
diff --git a/test cases/native/21 global arg/meson.build b/test cases/native/2 global arg/meson.build
index c303a02da..c303a02da 100644
--- a/test cases/native/21 global arg/meson.build
+++ b/test cases/native/2 global arg/meson.build
diff --git a/test cases/native/21 global arg/prog.c b/test cases/native/2 global arg/prog.c
index 2a71236b6..2a71236b6 100644
--- a/test cases/native/21 global arg/prog.c
+++ b/test cases/native/2 global arg/prog.c
diff --git a/test cases/native/21 global arg/prog.cc b/test cases/native/2 global arg/prog.cc
index 5c3220992..5c3220992 100644
--- a/test cases/native/21 global arg/prog.cc
+++ b/test cases/native/2 global arg/prog.cc
diff --git a/test cases/native/27 pipeline/depends/copyrunner.py b/test cases/native/3 pipeline/depends/copyrunner.py
index 0ef6a6d68..0ef6a6d68 100755
--- a/test cases/native/27 pipeline/depends/copyrunner.py
+++ b/test cases/native/3 pipeline/depends/copyrunner.py
diff --git a/test cases/native/27 pipeline/depends/filecopier.c b/test cases/native/3 pipeline/depends/filecopier.c
index e10e4e773..e10e4e773 100644
--- a/test cases/native/27 pipeline/depends/filecopier.c
+++ b/test cases/native/3 pipeline/depends/filecopier.c
diff --git a/test cases/native/27 pipeline/depends/libsrc.c.in b/test cases/native/3 pipeline/depends/libsrc.c.in
index 81805512f..81805512f 100644
--- a/test cases/native/27 pipeline/depends/libsrc.c.in
+++ b/test cases/native/3 pipeline/depends/libsrc.c.in
diff --git a/test cases/native/27 pipeline/depends/meson.build b/test cases/native/3 pipeline/depends/meson.build
index 5111fee7a..5111fee7a 100644
--- a/test cases/native/27 pipeline/depends/meson.build
+++ b/test cases/native/3 pipeline/depends/meson.build
diff --git a/test cases/native/27 pipeline/depends/prog.c b/test cases/native/3 pipeline/depends/prog.c
index 54c40e162..54c40e162 100644
--- a/test cases/native/27 pipeline/depends/prog.c
+++ b/test cases/native/3 pipeline/depends/prog.c
diff --git a/test cases/native/27 pipeline/input_src.dat b/test cases/native/3 pipeline/input_src.dat
index a324dca21..a324dca21 100644
--- a/test cases/native/27 pipeline/input_src.dat
+++ b/test cases/native/3 pipeline/input_src.dat
diff --git a/test cases/native/27 pipeline/meson.build b/test cases/native/3 pipeline/meson.build
index e12cb7b58..e12cb7b58 100644
--- a/test cases/native/27 pipeline/meson.build
+++ b/test cases/native/3 pipeline/meson.build
diff --git a/test cases/native/27 pipeline/prog.c b/test cases/native/3 pipeline/prog.c
index 128f2bb15..128f2bb15 100644
--- a/test cases/native/27 pipeline/prog.c
+++ b/test cases/native/3 pipeline/prog.c
diff --git a/test cases/native/27 pipeline/src/input_src.dat b/test cases/native/3 pipeline/src/input_src.dat
index 354499acd..354499acd 100644
--- a/test cases/native/27 pipeline/src/input_src.dat
+++ b/test cases/native/3 pipeline/src/input_src.dat
diff --git a/test cases/native/27 pipeline/src/meson.build b/test cases/native/3 pipeline/src/meson.build
index 4e9ac116a..4e9ac116a 100644
--- a/test cases/native/27 pipeline/src/meson.build
+++ b/test cases/native/3 pipeline/src/meson.build
diff --git a/test cases/native/27 pipeline/src/prog.c b/test cases/native/3 pipeline/src/prog.c
index 83121b5ef..83121b5ef 100644
--- a/test cases/native/27 pipeline/src/prog.c
+++ b/test cases/native/3 pipeline/src/prog.c
diff --git a/test cases/native/27 pipeline/src/srcgen.c b/test cases/native/3 pipeline/src/srcgen.c
index 26761d225..26761d225 100644
--- a/test cases/native/27 pipeline/src/srcgen.c
+++ b/test cases/native/3 pipeline/src/srcgen.c
diff --git a/test cases/native/27 pipeline/srcgen.c b/test cases/native/3 pipeline/srcgen.c
index ceb9eccee..ceb9eccee 100644
--- a/test cases/native/27 pipeline/srcgen.c
+++ b/test cases/native/3 pipeline/srcgen.c
diff --git a/test cases/native/36 tryrun/error.c b/test cases/native/4 tryrun/error.c
index 53ef08e03..53ef08e03 100644
--- a/test cases/native/36 tryrun/error.c
+++ b/test cases/native/4 tryrun/error.c
diff --git a/test cases/native/36 tryrun/meson.build b/test cases/native/4 tryrun/meson.build
index 558097451..558097451 100644
--- a/test cases/native/36 tryrun/meson.build
+++ b/test cases/native/4 tryrun/meson.build
diff --git a/test cases/native/36 tryrun/no_compile.c b/test cases/native/4 tryrun/no_compile.c
index 496c2e837..496c2e837 100644
--- a/test cases/native/36 tryrun/no_compile.c
+++ b/test cases/native/4 tryrun/no_compile.c
diff --git a/test cases/native/36 tryrun/ok.c b/test cases/native/4 tryrun/ok.c
index e2a36c8b5..e2a36c8b5 100644
--- a/test cases/native/36 tryrun/ok.c
+++ b/test cases/native/4 tryrun/ok.c
diff --git a/test cases/native/56 install script/file.txt b/test cases/native/5 install script/file.txt
index e69de29bb..e69de29bb 100644
--- a/test cases/native/56 install script/file.txt
+++ b/test cases/native/5 install script/file.txt
diff --git a/test cases/native/56 install script/meson.build b/test cases/native/5 install script/meson.build
index 8a69a0d15..8a69a0d15 100644
--- a/test cases/native/56 install script/meson.build
+++ b/test cases/native/5 install script/meson.build
diff --git a/test cases/native/56 install script/src/exe.c b/test cases/native/5 install script/src/exe.c
index 2df3ee885..2df3ee885 100644
--- a/test cases/native/56 install script/src/exe.c
+++ b/test cases/native/5 install script/src/exe.c
diff --git a/test cases/native/56 install script/src/meson.build b/test cases/native/5 install script/src/meson.build
index f60c995e3..f60c995e3 100644
--- a/test cases/native/56 install script/src/meson.build
+++ b/test cases/native/5 install script/src/meson.build
diff --git a/test cases/native/56 install script/test.json b/test cases/native/5 install script/test.json
index c41c27c6a..c41c27c6a 100644
--- a/test cases/native/56 install script/test.json
+++ b/test cases/native/5 install script/test.json
diff --git a/test cases/native/56 install script/wrap.py b/test cases/native/5 install script/wrap.py
index 87508e008..87508e008 100755
--- a/test cases/native/56 install script/wrap.py
+++ b/test cases/native/5 install script/wrap.py
diff --git a/test cases/native/85 add language/meson.build b/test cases/native/6 add language/meson.build
index a7aad7367..a7aad7367 100644
--- a/test cases/native/85 add language/meson.build
+++ b/test cases/native/6 add language/meson.build
diff --git a/test cases/native/85 add language/prog.cc b/test cases/native/6 add language/prog.cc
index 03647dde4..03647dde4 100644
--- a/test cases/native/85 add language/prog.cc
+++ b/test cases/native/6 add language/prog.cc
diff --git a/test cases/native/93 selfbuilt custom/checkarg.cpp b/test cases/native/7 selfbuilt custom/checkarg.cpp
index 99092eea0..99092eea0 100644
--- a/test cases/native/93 selfbuilt custom/checkarg.cpp
+++ b/test cases/native/7 selfbuilt custom/checkarg.cpp
diff --git a/test cases/native/93 selfbuilt custom/data.dat b/test cases/native/7 selfbuilt custom/data.dat
index 83fd1d90d..83fd1d90d 100644
--- a/test cases/native/93 selfbuilt custom/data.dat
+++ b/test cases/native/7 selfbuilt custom/data.dat
diff --git a/test cases/native/93 selfbuilt custom/mainprog.cpp b/test cases/native/7 selfbuilt custom/mainprog.cpp
index bb45dcae8..bb45dcae8 100644
--- a/test cases/native/93 selfbuilt custom/mainprog.cpp
+++ b/test cases/native/7 selfbuilt custom/mainprog.cpp
diff --git a/test cases/native/93 selfbuilt custom/meson.build b/test cases/native/7 selfbuilt custom/meson.build
index b53635218..b53635218 100644
--- a/test cases/native/93 selfbuilt custom/meson.build
+++ b/test cases/native/7 selfbuilt custom/meson.build
diff --git a/test cases/native/93 selfbuilt custom/tool.cpp b/test cases/native/7 selfbuilt custom/tool.cpp
index 6a28dd800..6a28dd800 100644
--- a/test cases/native/93 selfbuilt custom/tool.cpp
+++ b/test cases/native/7 selfbuilt custom/tool.cpp
diff --git a/test cases/native/162 external program shebang parsing/input.txt b/test cases/native/8 external program shebang parsing/input.txt
index 40e30d4b2..40e30d4b2 100644
--- a/test cases/native/162 external program shebang parsing/input.txt
+++ b/test cases/native/8 external program shebang parsing/input.txt
diff --git a/test cases/native/162 external program shebang parsing/main.c b/test cases/native/8 external program shebang parsing/main.c
index 48b080e1f..48b080e1f 100644
--- a/test cases/native/162 external program shebang parsing/main.c
+++ b/test cases/native/8 external program shebang parsing/main.c
diff --git a/test cases/native/162 external program shebang parsing/meson.build b/test cases/native/8 external program shebang parsing/meson.build
index c1cc5af9d..c1cc5af9d 100644
--- a/test cases/native/162 external program shebang parsing/meson.build
+++ b/test cases/native/8 external program shebang parsing/meson.build
diff --git a/test cases/native/162 external program shebang parsing/script.int.in b/test cases/native/8 external program shebang parsing/script.int.in
index 77ff90907..77ff90907 100644
--- a/test cases/native/162 external program shebang parsing/script.int.in
+++ b/test cases/native/8 external program shebang parsing/script.int.in
diff --git a/test cases/native/201 override with exe/main2.input b/test cases/native/9 override with exe/main2.input
index e69de29bb..e69de29bb 100644
--- a/test cases/native/201 override with exe/main2.input
+++ b/test cases/native/9 override with exe/main2.input
diff --git a/test cases/native/201 override with exe/meson.build b/test cases/native/9 override with exe/meson.build
index 62d2f32a9..62d2f32a9 100644
--- a/test cases/native/201 override with exe/meson.build
+++ b/test cases/native/9 override with exe/meson.build
diff --git a/test cases/native/201 override with exe/subprojects/sub/foobar.c b/test cases/native/9 override with exe/subprojects/sub/foobar.c
index c21d45028..c21d45028 100644
--- a/test cases/native/201 override with exe/subprojects/sub/foobar.c
+++ b/test cases/native/9 override with exe/subprojects/sub/foobar.c
diff --git a/test cases/native/201 override with exe/subprojects/sub/meson.build b/test cases/native/9 override with exe/subprojects/sub/meson.build
index f0343b2c0..f0343b2c0 100644
--- a/test cases/native/201 override with exe/subprojects/sub/meson.build
+++ b/test cases/native/9 override with exe/subprojects/sub/meson.build
diff --git a/test cases/unit/77 pkgconfig prefixes/client/client.c b/test cases/unit/76 pkgconfig prefixes/client/client.c
index be9beadb0..be9beadb0 100644
--- a/test cases/unit/77 pkgconfig prefixes/client/client.c
+++ b/test cases/unit/76 pkgconfig prefixes/client/client.c
diff --git a/test cases/unit/77 pkgconfig prefixes/client/meson.build b/test cases/unit/76 pkgconfig prefixes/client/meson.build
index 491937b7b..491937b7b 100644
--- a/test cases/unit/77 pkgconfig prefixes/client/meson.build
+++ b/test cases/unit/76 pkgconfig prefixes/client/meson.build
diff --git a/test cases/unit/77 pkgconfig prefixes/val1/meson.build b/test cases/unit/76 pkgconfig prefixes/val1/meson.build
index cc63e3143..cc63e3143 100644
--- a/test cases/unit/77 pkgconfig prefixes/val1/meson.build
+++ b/test cases/unit/76 pkgconfig prefixes/val1/meson.build
diff --git a/test cases/unit/77 pkgconfig prefixes/val1/val1.c b/test cases/unit/76 pkgconfig prefixes/val1/val1.c
index 591e52162..591e52162 100644
--- a/test cases/unit/77 pkgconfig prefixes/val1/val1.c
+++ b/test cases/unit/76 pkgconfig prefixes/val1/val1.c
diff --git a/test cases/unit/77 pkgconfig prefixes/val1/val1.h b/test cases/unit/76 pkgconfig prefixes/val1/val1.h
index 6bd435eb9..6bd435eb9 100644
--- a/test cases/unit/77 pkgconfig prefixes/val1/val1.h
+++ b/test cases/unit/76 pkgconfig prefixes/val1/val1.h
diff --git a/test cases/unit/77 pkgconfig prefixes/val2/meson.build b/test cases/unit/76 pkgconfig prefixes/val2/meson.build
index ce69481ec..ce69481ec 100644
--- a/test cases/unit/77 pkgconfig prefixes/val2/meson.build
+++ b/test cases/unit/76 pkgconfig prefixes/val2/meson.build
diff --git a/test cases/unit/77 pkgconfig prefixes/val2/val2.c b/test cases/unit/76 pkgconfig prefixes/val2/val2.c
index d7d485730..d7d485730 100644
--- a/test cases/unit/77 pkgconfig prefixes/val2/val2.c
+++ b/test cases/unit/76 pkgconfig prefixes/val2/val2.c
diff --git a/test cases/unit/77 pkgconfig prefixes/val2/val2.h b/test cases/unit/76 pkgconfig prefixes/val2/val2.h
index 995023da2..995023da2 100644
--- a/test cases/unit/77 pkgconfig prefixes/val2/val2.h
+++ b/test cases/unit/76 pkgconfig prefixes/val2/val2.h
diff --git a/test cases/unit/78 subdir libdir/meson.build b/test cases/unit/77 subdir libdir/meson.build
index 5099c91c7..5099c91c7 100644
--- a/test cases/unit/78 subdir libdir/meson.build
+++ b/test cases/unit/77 subdir libdir/meson.build
diff --git a/test cases/unit/78 subdir libdir/subprojects/flub/meson.build b/test cases/unit/77 subdir libdir/subprojects/flub/meson.build
index 7bfd2c553..7bfd2c553 100644
--- a/test cases/unit/78 subdir libdir/subprojects/flub/meson.build
+++ b/test cases/unit/77 subdir libdir/subprojects/flub/meson.build
diff --git a/test cases/unit/79 as link whole/bar.c b/test cases/unit/78 as link whole/bar.c
index 79dea9d0f..79dea9d0f 100644
--- a/test cases/unit/79 as link whole/bar.c
+++ b/test cases/unit/78 as link whole/bar.c
diff --git a/test cases/unit/79 as link whole/foo.c b/test cases/unit/78 as link whole/foo.c
index ffeee82fe..ffeee82fe 100644
--- a/test cases/unit/79 as link whole/foo.c
+++ b/test cases/unit/78 as link whole/foo.c
diff --git a/test cases/unit/79 as link whole/meson.build b/test cases/unit/78 as link whole/meson.build
index 6bc208f1b..6bc208f1b 100644
--- a/test cases/unit/79 as link whole/meson.build
+++ b/test cases/unit/78 as link whole/meson.build
diff --git a/test cases/unit/79 user options for subproject/.gitignore b/test cases/unit/80 user options for subproject/.gitignore
index 0bec5eac1..0bec5eac1 100644
--- a/test cases/unit/79 user options for subproject/.gitignore
+++ b/test cases/unit/80 user options for subproject/.gitignore
diff --git a/test cases/unit/79 user options for subproject/75 user options for subproject/.gitignore b/test cases/unit/80 user options for subproject/75 user options for subproject/.gitignore
index 4976afc58..4976afc58 100644
--- a/test cases/unit/79 user options for subproject/75 user options for subproject/.gitignore
+++ b/test cases/unit/80 user options for subproject/75 user options for subproject/.gitignore
diff --git a/test cases/unit/79 user options for subproject/75 user options for subproject/meson.build b/test cases/unit/80 user options for subproject/75 user options for subproject/meson.build
index 0bc395b4b..0bc395b4b 100644
--- a/test cases/unit/79 user options for subproject/75 user options for subproject/meson.build
+++ b/test cases/unit/80 user options for subproject/75 user options for subproject/meson.build
diff --git a/test cases/unit/80 global-rpath/meson.build b/test cases/unit/81 global-rpath/meson.build
index c67d9e08b..c67d9e08b 100644
--- a/test cases/unit/80 global-rpath/meson.build
+++ b/test cases/unit/81 global-rpath/meson.build
diff --git a/test cases/unit/80 global-rpath/rpathified.cpp b/test cases/unit/81 global-rpath/rpathified.cpp
index 3788906dc..3788906dc 100644
--- a/test cases/unit/80 global-rpath/rpathified.cpp
+++ b/test cases/unit/81 global-rpath/rpathified.cpp
diff --git a/test cases/unit/80 global-rpath/yonder/meson.build b/test cases/unit/81 global-rpath/yonder/meson.build
index e32f38330..e32f38330 100644
--- a/test cases/unit/80 global-rpath/yonder/meson.build
+++ b/test cases/unit/81 global-rpath/yonder/meson.build
diff --git a/test cases/unit/80 global-rpath/yonder/yonder.cpp b/test cases/unit/81 global-rpath/yonder/yonder.cpp
index b182d34e3..b182d34e3 100644
--- a/test cases/unit/80 global-rpath/yonder/yonder.cpp
+++ b/test cases/unit/81 global-rpath/yonder/yonder.cpp
diff --git a/test cases/unit/80 global-rpath/yonder/yonder.h b/test cases/unit/81 global-rpath/yonder/yonder.h
index 9d9ad1617..9d9ad1617 100644
--- a/test cases/unit/80 global-rpath/yonder/yonder.h
+++ b/test cases/unit/81 global-rpath/yonder/yonder.h
diff --git a/test cases/unit/81 wrap-git/meson.build b/test cases/unit/82 wrap-git/meson.build
index b0af30a3f..b0af30a3f 100644
--- a/test cases/unit/81 wrap-git/meson.build
+++ b/test cases/unit/82 wrap-git/meson.build
diff --git a/test cases/unit/81 wrap-git/subprojects/packagefiles/wrap_git_builddef/meson.build b/test cases/unit/82 wrap-git/subprojects/packagefiles/wrap_git_builddef/meson.build
index 2570f7777..2570f7777 100644
--- a/test cases/unit/81 wrap-git/subprojects/packagefiles/wrap_git_builddef/meson.build
+++ b/test cases/unit/82 wrap-git/subprojects/packagefiles/wrap_git_builddef/meson.build
diff --git a/test cases/unit/81 wrap-git/subprojects/wrap_git_upstream/main.c b/test cases/unit/82 wrap-git/subprojects/wrap_git_upstream/main.c
index 8488f4e58..8488f4e58 100644
--- a/test cases/unit/81 wrap-git/subprojects/wrap_git_upstream/main.c
+++ b/test cases/unit/82 wrap-git/subprojects/wrap_git_upstream/main.c
diff --git a/test cases/unit/82 meson version compare/meson.build b/test cases/unit/83 meson version compare/meson.build
index ed69a8b48..ed69a8b48 100644
--- a/test cases/unit/82 meson version compare/meson.build
+++ b/test cases/unit/83 meson version compare/meson.build
diff --git a/test cases/unit/83 cross only introspect/meson.build b/test cases/unit/84 cross only introspect/meson.build
index ed25441bf..ed25441bf 100644
--- a/test cases/unit/83 cross only introspect/meson.build
+++ b/test cases/unit/84 cross only introspect/meson.build
diff --git a/test cases/unit/84 change option choices/meson.build b/test cases/unit/85 change option choices/meson.build
index d056d6594..d056d6594 100644
--- a/test cases/unit/84 change option choices/meson.build
+++ b/test cases/unit/85 change option choices/meson.build
diff --git a/test cases/unit/84 change option choices/meson_options.1.txt b/test cases/unit/85 change option choices/meson_options.1.txt
index d0326a55b..d0326a55b 100644
--- a/test cases/unit/84 change option choices/meson_options.1.txt
+++ b/test cases/unit/85 change option choices/meson_options.1.txt
diff --git a/test cases/unit/84 change option choices/meson_options.2.txt b/test cases/unit/85 change option choices/meson_options.2.txt
index 4684673e1..4684673e1 100644
--- a/test cases/unit/84 change option choices/meson_options.2.txt
+++ b/test cases/unit/85 change option choices/meson_options.2.txt
diff --git a/test cases/unit/85 nested subproject regenerate depends/main.c b/test cases/unit/86 nested subproject regenerate depends/main.c
index 9b6bdc2ec..9b6bdc2ec 100644
--- a/test cases/unit/85 nested subproject regenerate depends/main.c
+++ b/test cases/unit/86 nested subproject regenerate depends/main.c
diff --git a/test cases/unit/85 nested subproject regenerate depends/meson.build b/test cases/unit/86 nested subproject regenerate depends/meson.build
index 569888164..569888164 100644
--- a/test cases/unit/85 nested subproject regenerate depends/meson.build
+++ b/test cases/unit/86 nested subproject regenerate depends/meson.build
diff --git a/test cases/unit/85 nested subproject regenerate depends/subprojects/sub1/meson.build b/test cases/unit/86 nested subproject regenerate depends/subprojects/sub1/meson.build
index a31db4ade..a31db4ade 100644
--- a/test cases/unit/85 nested subproject regenerate depends/subprojects/sub1/meson.build
+++ b/test cases/unit/86 nested subproject regenerate depends/subprojects/sub1/meson.build
diff --git a/test cases/unit/85 nested subproject regenerate depends/subprojects/sub2/CMakeLists.txt b/test cases/unit/86 nested subproject regenerate depends/subprojects/sub2/CMakeLists.txt
index f91473a6a..f91473a6a 100644
--- a/test cases/unit/85 nested subproject regenerate depends/subprojects/sub2/CMakeLists.txt
+++ b/test cases/unit/86 nested subproject regenerate depends/subprojects/sub2/CMakeLists.txt