1076 files changed, 74 insertions, 74 deletions

diff --git a/run_unittests.py b/run_unittests.py
index 85292d1..f0c2f65 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 12b3c5b..12b3c5b 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 950c706..950c706 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 85a25a3..85a25a3 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 ec63514..ec63514 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 a34502c..a34502c 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 cef7f79..cef7f79 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 5db9d17..5db9d17 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 ec63514..ec63514 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 827bae7..827bae7 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 653dd75..653dd75 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 65bf3c0..65bf3c0 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 f3d0417..f3d0417 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 e5a0c1e..e5a0c1e 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 0bfbb4d..0bfbb4d 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 a7d7e77..a7d7e77 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 54cedce..54cedce 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 ba07311..ba07311 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 198fa98..198fa98 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 c1e34ed..c1e34ed 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 4b6857d..4b6857d 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 b3f50bb..b3f50bb 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 6487c56..6487c56 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 0a8879d..0a8879d 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 a4615fa..a4615fa 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 e69de29..e69de29 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 503df96..503df96 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 e69de29..e69de29 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 b5f13f5..b5f13f5 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 8b8190f..8b8190f 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 8cff1b1..8cff1b1 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 7e3033e..7e3033e 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 624d96c..624d96c 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 d590494..d590494 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 7539d56..7539d56 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 0c23cc0..0c23cc0 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 58a69ca..58a69ca 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 b60722a..b60722a 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 ba66b02..ba66b02 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 f8e2ca0..f8e2ca0 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 32e1261..32e1261 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 049e849..049e849 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 d3957dd..d3957dd 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 54ecfe0..54ecfe0 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 360b5f5..360b5f5 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 9035ff1..9035ff1 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 94e9eec..94e9eec 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 e748ac7..e748ac7 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 2b59a3a..2b59a3a 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 8b15357..8b15357 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 1adedb6..1adedb6 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 e8f2271..e8f2271 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 9cfaec4..9cfaec4 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 90d4c05..90d4c05 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 ef141dc..ef141dc 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 bd5316d..bd5316d 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 568527f..568527f 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 59c134b..59c134b 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 936c839..936c839 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 5dd26d7..5dd26d7 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 3432b1c..3432b1c 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 4741185..4741185 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 03bde86..03bde86 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 33bfeff..33bfeff 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 35e8ed6..35e8ed6 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 aac3cbf..aac3cbf 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 fd07d87..fd07d87 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 ebe74e7..ebe74e7 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 aea3f1f..aea3f1f 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 18284c1..18284c1 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 5678d00..5678d00 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 7c321aa..7c321aa 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 d0f3ef9..d0f3ef9 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 ec7c466..ec7c466 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 a892362..a892362 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 f9e8190..f9e8190 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 1a5f3eb..1a5f3eb 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 d0f3ef9..d0f3ef9 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 19d5e94..19d5e94 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 cfb7ff6..cfb7ff6 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 f67a85e..f67a85e 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 d62c08d..d62c08d 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 7c24fde..7c24fde 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 152a145..152a145 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 de0cc7f..de0cc7f 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 24604ed..24604ed 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 800cd2d..800cd2d 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 d83a658..d83a658 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 afdbc09..afdbc09 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 9841180..9841180 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 1dc08e1..1dc08e1 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 8024b97..8024b97 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 a993ab8..a993ab8 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 c4362c4..c4362c4 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 135300d..135300d 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 1170ee3..1170ee3 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 53f1a7f..53f1a7f 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 b356f65..b356f65 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 97a3f90..97a3f90 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 ada9ae1..ada9ae1 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 c7eebf5..c7eebf5 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 03b2213..03b2213 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 b5ee47b..b5ee47b 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 e44cdea..e44cdea 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 05d2dcb..05d2dcb 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 e1c26b6..e1c26b6 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 99b7cdd..99b7cdd 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 6329e47..6329e47 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 2fb804e..2fb804e 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 4099407..4099407 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 ff42ac3..ff42ac3 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 35e8ed6..35e8ed6 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 111cdc0..111cdc0 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 7c321aa..7c321aa 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 ff42ac3..ff42ac3 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 fb38f9d..fb38f9d 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 2837747..2837747 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 d2fb7ac..d2fb7ac 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 ee77b81..ee77b81 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 b2cf3eb..b2cf3eb 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 d0f3ef9..d0f3ef9 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 03b2213..03b2213 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 5cc5055..5cc5055 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 ff9c224..ff9c224 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 6664f72..6664f72 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 0322828..0322828 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 b28b634..b28b634 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 5a74153..5a74153 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 3573f4b..3573f4b 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 ff42ac3..ff42ac3 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 e69de29..e69de29 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 9d9acf3..9d9acf3 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 a242e07..a242e07 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 9d755a8..9d755a8 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 2ebcaca..2ebcaca 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 9f275b8..9f275b8 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 775e34f..775e34f 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 acf4a35..acf4a35 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 9672945..9672945 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 1ab0db4..1ab0db4 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 6479492..6479492 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 b9c0da9..b9c0da9 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 b1e6190..b1e6190 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 1ab7231..1ab7231 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 0bd3906..0bd3906 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 89226a4..89226a4 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 194d7fe..194d7fe 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 c01edaa..c01edaa 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 44e344f..44e344f 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 4dd8d79..4dd8d79 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 6120d48..6120d48 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 094260e..094260e 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 0f8048c..0f8048c 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 6eb3e5e..6eb3e5e 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 df3d02a..df3d02a 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 7d34a2e..7d34a2e 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 293258f..293258f 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 debb97a..debb97a 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 ca820e2..ca820e2 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 a892362..a892362 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 3cb0237..3cb0237 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 1a5f3eb..1a5f3eb 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 e585b8e..e585b8e 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 d0f3ef9..d0f3ef9 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 0de63ab..0de63ab 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 fd3cb5e..fd3cb5e 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 89f4746..89f4746 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 0983aff..0983aff 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 ede165b..ede165b 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 a33872a..a33872a 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 0d7f6c2..0d7f6c2 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 1dc08e1..1dc08e1 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 4216c24..4216c24 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 bc3caf3..bc3caf3 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 73d0397..73d0397 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 e69de29..e69de29 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 91d298d..91d298d 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 9184864..9184864 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 82cf57e..82cf57e 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 0781250..0781250 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 161c5da..161c5da 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 4fe7150..4fe7150 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 012df33..012df33 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 79ce585..79ce585 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 1f553e5..1f553e5 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 92baca6..92baca6 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 2858f65..2858f65 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 0703077..0703077 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 64baabd..64baabd 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 c84d781..c84d781 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 2732f96..2732f96 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 e69de29..e69de29 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 77c7e39..77c7e39 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 9db7fb2..9db7fb2 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 1ed8ce9..1ed8ce9 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 e47f01d..e47f01d 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 27928bf..27928bf 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 6dcb096..6dcb096 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 a93a981..a93a981 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 7c078f8..7c078f8 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 5b02e17..5b02e17 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 2d46d88..2d46d88 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 851a415..851a415 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 1117672..1117672 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 39dbd11..39dbd11 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 382c9b2..382c9b2 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 e59cb9f..e59cb9f 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 04e02f8..04e02f8 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 199fd79..199fd79 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 7f679ca..7f679ca 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 d6e50ea..d6e50ea 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 579601e..579601e 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 9709e5b..9709e5b 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 0821b03..0821b03 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 9b6bdc2..9b6bdc2 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 7b57bd2..7b57bd2 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 2337d3d..2337d3d 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 819509d..819509d 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 58c86a6..58c86a6 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 ceb6e19..ceb6e19 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 ee7a865..ee7a865 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 461f859..461f859 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 643c246..643c246 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 4c5ac73..4c5ac73 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 38889cf..38889cf 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 31cd37c..31cd37c 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 67d473a..67d473a 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 164abdf..164abdf 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 b7a70a8..b7a70a8 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 4e571f5..4e571f5 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 ceabba0..ceabba0 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 246206c..246206c 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 93f46a8..93f46a8 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 6a46266..6a46266 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 334f867..334f867 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 9cc15bc..9cc15bc 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 a16a89b..a16a89b 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 b54bf36..b54bf36 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 cf091d0..cf091d0 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 2ca7151..2ca7151 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 a3b7993..a3b7993 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 66cfd9b..66cfd9b 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 715d120..715d120 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 020b481..020b481 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 5da8d0b..5da8d0b 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 008f9f8..008f9f8 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 4bc50be..4bc50be 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 77f7129..77f7129 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 3cfa12b..3cfa12b 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 0967c1c..0967c1c 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 fca8706..fca8706 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 3602442..3602442 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 a5b3dc3..a5b3dc3 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 eadf7e8..eadf7e8 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 557378a..557378a 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 bfdd869..bfdd869 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 ab435f4..ab435f4 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 6515e41..6515e41 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 2628a12..2628a12 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 5f45a4e..5f45a4e 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 c79819b..c79819b 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 7605442..7605442 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 2834b30..2834b30 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 6014e0c..6014e0c 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 445afb6..445afb6 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 29a35e6..29a35e6 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 29f2555..29f2555 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 f1564e2..f1564e2 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 fa557f4..fa557f4 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 c7a0a97..c7a0a97 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 d820f25..d820f25 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 4e5188f..4e5188f 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 64374d5..64374d5 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 b2abcdb..b2abcdb 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 f48c330..f48c330 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 e0c2cd7..e0c2cd7 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 b6bd09f..b6bd09f 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 adee882..adee882 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 242cc23..242cc23 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 75eb207..75eb207 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 488a527..488a527 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 eec789a..eec789a 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 4e27b6c..4e27b6c 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 10a4cc8..10a4cc8 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 21dcae5..21dcae5 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 44d7bfb..44d7bfb 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 b401055..b401055 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 951bbb4..951bbb4 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 12b9328..12b9328 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 4839901..4839901 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 24fd937..24fd937 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 6710fc1..6710fc1 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 c3ea3da..c3ea3da 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 52c371b..52c371b 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 1002053..1002053 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 03b2213..03b2213 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 4ab123c..4ab123c 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 21c6ca6..21c6ca6 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 1c4753e..1c4753e 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 00bc85d..00bc85d 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 5aac8e5..5aac8e5 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 6cf8d66..6cf8d66 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 f116a02..f116a02 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 04667c2..04667c2 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 d16d0a8..d16d0a8 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 70ddbf2..70ddbf2 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 cac5194..cac5194 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 8663a6f..8663a6f 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 0bdb529..0bdb529 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 17117d5..17117d5 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 efddfac..efddfac 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 c620a11..c620a11 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 47bcd32..47bcd32 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 48d1068..48d1068 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 0c82165..0c82165 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 849b400..849b400 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 849b400..849b400 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 34cf991..34cf991 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 aabded6..aabded6 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 4e8f7e3..4e8f7e3 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 c67c5e5..c67c5e5 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 e26b8e0..e26b8e0 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 37eb6cc..37eb6cc 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 421376d..421376d 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 421376d..421376d 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 f257a19..f257a19 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 d90a9e8..d90a9e8 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 dbaf91f..dbaf91f 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 1a2134c..1a2134c 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 267b43a..267b43a 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 8d8008e..8d8008e 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 6d5896f..6d5896f 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 b3de5af..b3de5af 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 03b2213..03b2213 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 ec740da..ec740da 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 74aabcb..74aabcb 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 7510a1b..7510a1b 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 4d71c0f..4d71c0f 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 280c60c..280c60c 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 facd199..facd199 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 abf0b1e..abf0b1e 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 5531217..5531217 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 fa1953e..fa1953e 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 90cb67a..90cb67a 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 9584117..9584117 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 ff42ac3..ff42ac3 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 44f5c71..44f5c71 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 5daee49..5daee49 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 a867b32..a867b32 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 f9d31c4..f9d31c4 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 d132e2b..d132e2b 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 034b9a5..034b9a5 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 7ed0ac1..7ed0ac1 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 ab9f436..ab9f436 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 a867b32..a867b32 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 737408e..737408e 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 02072b6..02072b6 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 2a33cae..2a33cae 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 8769c70..8769c70 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 cb0c02f..cb0c02f 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 e69de29..e69de29 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 2c640cf..2c640cf 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 1030e25..1030e25 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 9ca4ec5..9ca4ec5 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 2de0f0e..2de0f0e 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 f1bd822..f1bd822 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 37303e3..37303e3 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 9b11569..9b11569 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 9f58fbb..9f58fbb 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 832c13c..832c13c 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 101122e..101122e 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 f9848c1..f9848c1 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 12f6564..12f6564 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 8d1c8b6..8d1c8b6 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 8c07177..8c07177 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 1720d3e..1720d3e 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 875eed3..875eed3 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 27162c5..27162c5 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 df967b9..df967b9 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 df0f4e9..df0f4e9 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 a50642b..a50642b 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 ce219f0..ce219f0 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 b6a9926..b6a9926 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 2ea623b..2ea623b 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 c1be8d0..c1be8d0 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 79f3c86..79f3c86 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 489db23..489db23 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 1ab980a..1ab980a 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 2862709..2862709 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 7111ba1..7111ba1 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 f4f6f45..f4f6f45 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 18a6cc2..18a6cc2 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 7605022..7605022 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 30ae9c6..30ae9c6 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 e69de29..e69de29 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 23d24ac..23d24ac 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 638f8c2..638f8c2 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 f9b73a4..f9b73a4 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 ed42789..ed42789 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 6f02aeb..6f02aeb 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 d859fda..d859fda 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 f334292..f334292 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 c927194..c927194 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 b8fb60f..b8fb60f 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 5f45bc0..5f45bc0 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 8e76d22..8e76d22 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 a872394..a872394 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 a893431..a893431 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 3b54aaa..3b54aaa 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 984ebca..984ebca 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 be26375..be26375 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 cb3ec3f..cb3ec3f 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 a9a79ea..a9a79ea 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 bd8fc03..bd8fc03 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 dae3130..dae3130 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 457e613..457e613 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 f5e228e..f5e228e 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 8237bae..8237bae 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 0bfba76..0bfba76 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 1038a01..1038a01 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 5dd6e50..5dd6e50 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 40fa7ca..40fa7ca 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 34a3eb8..34a3eb8 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 c5634d8..c5634d8 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 6137ad7..6137ad7 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 e4fe628..e4fe628 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 6bfbd59..6bfbd59 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 ed42789..ed42789 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 6f02aeb..6f02aeb 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 a3c95fa..a3c95fa 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 f334292..f334292 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 223a5ef..223a5ef 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 b277459..b277459 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 5fb6371..5fb6371 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 80a3009..80a3009 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 5cefc88..5cefc88 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 8b19c9c..8b19c9c 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 965f868..965f868 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 efe0464..efe0464 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 78ebb2f..78ebb2f 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 e5de34d..e5de34d 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 17aa332..17aa332 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 640f270..640f270 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 215112c..215112c 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 28c81c9..28c81c9 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 057b713..057b713 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 3783f66..3783f66 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 b1e199e..b1e199e 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 e908487..e908487 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 cc81f48..cc81f48 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 b12be3f..b12be3f 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 d80f90f..d80f90f 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 a1154c2..a1154c2 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 9180030..9180030 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 4e585d5..4e585d5 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 3d1a1c3..3d1a1c3 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 610a4a3..610a4a3 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 ee4ed98..ee4ed98 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 78f2de1..78f2de1 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 888c451..888c451 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 5b9f65c..5b9f65c 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 1dac2f9..1dac2f9 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 dacf01d..dacf01d 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 bf0999d..bf0999d 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 98b395d..98b395d 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 2f76c49..2f76c49 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 14a1558..14a1558 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 0c23cc0..0c23cc0 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 647c097..647c097 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 cae1e91..cae1e91 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 72fb132..72fb132 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 8bc5ca6..8bc5ca6 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 4825cef..4825cef 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 48857a8..48857a8 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 e69de29..e69de29 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 3614dbc..3614dbc 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 96612d4..96612d4 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 0870bc4..0870bc4 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 f4ff535..f4ff535 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 ef3fa22..ef3fa22 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 063a35f..063a35f 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 1a83187..1a83187 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 063a35f..063a35f 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 1aa786c..1aa786c 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 e988814..e988814 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 4279200..4279200 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 14a7c76..14a7c76 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 a50642b..a50642b 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 4808743..4808743 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 df0f4e9..df0f4e9 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 7a7cdf7..7a7cdf7 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 9b8eb7c..9b8eb7c 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 5bdfefb..5bdfefb 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 a46e5fb..a46e5fb 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 58fe692..58fe692 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 fa6b011..fa6b011 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 933001a..933001a 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 e748ac7..e748ac7 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 f1ab0e1..f1ab0e1 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 65fef03..65fef03 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 731d22b..731d22b 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 768ed36..768ed36 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 2b59a3a..2b59a3a 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 31882ac..31882ac 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 9817309..9817309 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 4a1d87c..4a1d87c 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 d06a24a..d06a24a 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 e3a6cae..e3a6cae 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 a9fc4b1..a9fc4b1 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 2d64fde..2d64fde 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 b97ca74..b97ca74 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 91489b2..91489b2 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 044f915..044f915 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 b92a985..b92a985 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 665521d..665521d 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 564ec37..564ec37 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 2eec26b..2eec26b 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 135300d..135300d 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 f343f21..f343f21 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 7c81aa2..7c81aa2 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 df8bcb9..df8bcb9 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 014e06e..014e06e 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 bcd71f1..bcd71f1 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 16c72f9..16c72f9 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 91bc809..91bc809 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 142ca1c..142ca1c 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 1c295c7..1c295c7 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 7954c8e..7954c8e 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 4b92010..4b92010 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 ca85637..ca85637 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 5221319..5221319 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 ac582e7..ac582e7 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 954d9ce..954d9ce 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 f2bd339..f2bd339 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 6a090f3..6a090f3 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 1bbe82c..1bbe82c 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 c246344..c246344 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 53a4a40..53a4a40 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 585b6c9..585b6c9 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 837e960..837e960 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 6861f8d..6861f8d 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 efecbef..efecbef 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 42d6631..42d6631 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 eee1fe1..eee1fe1 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 040672a..040672a 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 5292006..5292006 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 e5236e5..e5236e5 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 7b0c5cf..7b0c5cf 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 9f60836..9f60836 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 0570dff..0570dff 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 e3547df..e3547df 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 33d2f18..33d2f18 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 4a6f253..4a6f253 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 104f39d..104f39d 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 0ce1d3b..0ce1d3b 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 31c3789..31c3789 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 b497de5..b497de5 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 0570dff..0570dff 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 e3547df..e3547df 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 9c5bb1c..9c5bb1c 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 4a6f253..4a6f253 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 9a34507..9a34507 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 0ce1d3b..0ce1d3b 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 31c3789..31c3789 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 b497de5..b497de5 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 39a3b6b..39a3b6b 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 5885e32..5885e32 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 cb09cf3..cb09cf3 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 a50ecda..a50ecda 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 7098584..7098584 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 fe6e6e1..fe6e6e1 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 386c771..386c771 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 b463ebe..b463ebe 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 4dd6b69..4dd6b69 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 72a2427..72a2427 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 3d1a9fe..3d1a9fe 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 6f9a1ca..6f9a1ca 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 8921e00..8921e00 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 41ead4c..41ead4c 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 04ec392..04ec392 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 6e325c7..6e325c7 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 55b90eb..55b90eb 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 d3f7ac7..d3f7ac7 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 6caa3e2..6caa3e2 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 68ee68e..68ee68e 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 5dab97e..5dab97e 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 7df7a82..7df7a82 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 fc51275..fc51275 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 a157731..a157731 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 2b55217..2b55217 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 d986b99..d986b99 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 955a7a2..955a7a2 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 f1eaf1e..f1eaf1e 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 434e0b7..434e0b7 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 bafcf2c..bafcf2c 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 7f83311..7f83311 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 1dc08e1..1dc08e1 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 579308c..579308c 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 33c6fa3..33c6fa3 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 470f28c..470f28c 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 71f7189..71f7189 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 48d7a79..48d7a79 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 192b783..192b783 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 fcbefb0..fcbefb0 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 63cb0d3..63cb0d3 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 bf8c4a4..bf8c4a4 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 fe21dbb..fe21dbb 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 0d40fe1..0d40fe1 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 c3e87c4..c3e87c4 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 f090d35..f090d35 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 dc04b41..dc04b41 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 bcf7cc0..bcf7cc0 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 ca6d36b..ca6d36b 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 bedb84c..bedb84c 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 4ac68ae..4ac68ae 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 2d5120d..2d5120d 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 c53f71e..c53f71e 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 62d63ed..62d63ed 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 64da410..64da410 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 03c1e03..03c1e03 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 63e4de6..63e4de6 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 f76a70c..f76a70c 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 82ad2c2..82ad2c2 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 4e4bc1b..4e4bc1b 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 cf7201b..cf7201b 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 f1226b8..f1226b8 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 a904bd0..a904bd0 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 dc006b9..dc006b9 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 1609f47..1609f47 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 ab43828..ab43828 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 5a167e7..5a167e7 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 f9af6cd..f9af6cd 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 2e09f35..2e09f35 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 58c86a6..58c86a6 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 6a43b7d..6a43b7d 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 c41c4c1..c41c4c1 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 b1de607..b1de607 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 78f2de1..78f2de1 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 70058e6..70058e6 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 8435298..8435298 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 e69de29..e69de29 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 98b9d26..98b9d26 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 12f40c8..12f40c8 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 231f76a..231f76a 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 e9a7aac..e9a7aac 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 166f007..166f007 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 5e8f933..5e8f933 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 340b82a..340b82a 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 a867b48..a867b48 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 3f62282..3f62282 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 8981f18..8981f18 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 941e13f..941e13f 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 d1ed797..d1ed797 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 4888e87..4888e87 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 eb472f3..eb472f3 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 70909c7..70909c7 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 78f2de1..78f2de1 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 b189faf..b189faf 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 b2c4814..b2c4814 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 9fdb188..9fdb188 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 3b59caa..3b59caa 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 520e0ba..520e0ba 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 4a78e5b..4a78e5b 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 947ffe4..947ffe4 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 03b2213..03b2213 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 9cec114..9cec114 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 6c9cfb8..6c9cfb8 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 cb41e1d..cb41e1d 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 f8e76f4..f8e76f4 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 280d4f7..280d4f7 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 a442e8a..a442e8a 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 9de5b78..9de5b78 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 44918ec..44918ec 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 dc77346..dc77346 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 a28e7e4..a28e7e4 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 519b40d..519b40d 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 8096763..8096763 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 2f76c49..2f76c49 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 a22d559..a22d559 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 93897e3..93897e3 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 cbc346b..cbc346b 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 2a22daa..2a22daa 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 897054e..897054e 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 8a06a82..8a06a82 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 26f13d6..26f13d6 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 4e61956..4e61956 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 a9bd65b..a9bd65b 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 9c88e73..9c88e73 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 77528d7..77528d7 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 88436b2..88436b2 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 ab71bda..ab71bda 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 e788f07..e788f07 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 befd94d..befd94d 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 a99c64e..a99c64e 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 7bd249a..7bd249a 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 135300d..135300d 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 2eccef7..2eccef7 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 8067eae..8067eae 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 545b795..545b795 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 ff42ac3..ff42ac3 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 e940c9a..e940c9a 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 086b0be..086b0be 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 81d3491..81d3491 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 419277e..419277e 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 0b4010a..0b4010a 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 12f00e9..12f00e9 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 2b939d1..2b939d1 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 6ae8462..6ae8462 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 acaf1bf..acaf1bf 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 2184bc6..2184bc6 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 f71564f..f71564f 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 a56106f..a56106f 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 9181622..9181622 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 d4598b6..d4598b6 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 c295ddd..c295ddd 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 5000b86..5000b86 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 ac78533..ac78533 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 1d3deca..1d3deca 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 caa4591..caa4591 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 23b07ec..23b07ec 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 397d40c..397d40c 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 fb4e6b4..fb4e6b4 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 4638123..4638123 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 ff86f31..ff86f31 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 6896bfd..6896bfd 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 9f924bd..9f924bd 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 702e7fe..702e7fe 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 53d81fc..53d81fc 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 494ff0e..494ff0e 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 08ef7da..08ef7da 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 9b6bdc2..9b6bdc2 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 dc030da..dc030da 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 7a5bcb7..7a5bcb7 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 ac82fdb..ac82fdb 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 d8735a1..d8735a1 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 27162c5..27162c5 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 f9848c1..f9848c1 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 f0dfc44..f0dfc44 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 8c07177..8c07177 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 e7af606..e7af606 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 97a5be1..97a5be1 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 46e5172..46e5172 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 3d367f1..3d367f1 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 3f351af..3f351af 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 1eee6c2..1eee6c2 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 8f63c2d..8f63c2d 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 f38baca..f38baca 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 2e8abbf..2e8abbf 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 8660314..8660314 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 5e8f4b9..5e8f4b9 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 d1a3f98..d1a3f98 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 e332c0b..e332c0b 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 ff55723..ff55723 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 230d6f7..230d6f7 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 8f63c2d..8f63c2d 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 f38baca..f38baca 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 2e8abbf..2e8abbf 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 ff55723..ff55723 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 0c23cc0..0c23cc0 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 dc6e6b6..dc6e6b6 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 46bca74..46bca74 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 5c7cfae..5c7cfae 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 f46d23a..f46d23a 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 ba66b02..ba66b02 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 0c23cc0..0c23cc0 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 138f795..138f795 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 d99029b..d99029b 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 22ec789..22ec789 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 d6b0fa9..d6b0fa9 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 9aece8c..9aece8c 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 3331133..3331133 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 52dc0bb..52dc0bb 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 b6fc967..b6fc967 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 0d42d04..0d42d04 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 8dd31fe..8dd31fe 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 da3d0ac..da3d0ac 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 4a6e0ac..4a6e0ac 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 9abe698..9abe698 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 e20da6f..e20da6f 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 a33872a..a33872a 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 9841180..9841180 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 1dc08e1..1dc08e1 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 8024b97..8024b97 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 c4362c4..c4362c4 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 e28373a..e28373a 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 696e3f6..696e3f6 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 a573342..a573342 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 3bbf08e..3bbf08e 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 e69de29..e69de29 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 123fe18..123fe18 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 3a9d89b..3a9d89b 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 3804fe1..3804fe1 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 1bec8e8..1bec8e8 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 bca1387..bca1387 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 f9d039d..f9d039d 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 69ede5e..69ede5e 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 6dba60d..6dba60d 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 12bc913..12bc913 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 eddc4d8..eddc4d8 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 4abb49f..4abb49f 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 c89ccb2..c89ccb2 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 2b7393b..2b7393b 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 dd9c6b2..dd9c6b2 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 cdda41d..cdda41d 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 573541a..573541a 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 f156834..f156834 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 d43915a..d43915a 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 acd0ff7..acd0ff7 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 e69de29..e69de29 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 0cfbf08..0cfbf08 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 f1a01bd..f1a01bd 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 66f7fa9..66f7fa9 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 99dc331..99dc331 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 d00491f..d00491f 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 2456ecb..2456ecb 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 6f92efd..6f92efd 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 c4eaca7..c4eaca7 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 fa9b7b7..fa9b7b7 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 5ccbc43..5ccbc43 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 48857a8..48857a8 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 e69de29..e69de29 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 e69de29..e69de29 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 e69de29..e69de29 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 e69de29..e69de29 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 b6ca009..b6ca009 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 ca5f26a..ca5f26a 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 0f81cdb..0f81cdb 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 d83c370..d83c370 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 8ce1392..8ce1392 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 ea0b8dc..ea0b8dc 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 140f075..140f075 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 88c6f4b..88c6f4b 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 7084e80..7084e80 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 339dc49..339dc49 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 c213288..c213288 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 905a530..905a530 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 2fc952d..2fc952d 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 e31d7e4..e31d7e4 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 59567de..59567de 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 8b8785a..8b8785a 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 c7334b4..c7334b4 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 a9ee55e..a9ee55e 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 f720c89..f720c89 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 619e517..619e517 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 7d433f0..7d433f0 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 fbe2df9..fbe2df9 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 7e5983a..7e5983a 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 27c3cc5..27c3cc5 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 09192d9..09192d9 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 e9750cd..e9750cd 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 3e70e50..3e70e50 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 dffbbb3..dffbbb3 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 e44cdea..e44cdea 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 05d2dcb..05d2dcb 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 0a850a1..0a850a1 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 e0ab9eb..e0ab9eb 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 b00c862..b00c862 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 d18ddcd..d18ddcd 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 9947773..9947773 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 0fa6ea1..0fa6ea1 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 b087b02..b087b02 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 7af91e2..7af91e2 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 cd11951..cd11951 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 7510a1b..7510a1b 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 6803d51..6803d51 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 b8c7d83..b8c7d83 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 280c60c..280c60c 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 facd199..facd199 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 abf0b1e..abf0b1e 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 7510a1b..7510a1b 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 0647325..0647325 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 4d71c0f..4d71c0f 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 280c60c..280c60c 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 facd199..facd199 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 abf0b1e..abf0b1e 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 9180030..9180030 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 c3ecb7b..c3ecb7b 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 78c6acc..78c6acc 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 8c13c21..8c13c21 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 f5066f0..f5066f0 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 38d13d2..38d13d2 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 8e2b4eb..8e2b4eb 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 5886510..5886510 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 8a8f0d0..8a8f0d0 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 7510a1b..7510a1b 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 4d71c0f..4d71c0f 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 280c60c..280c60c 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 facd199..facd199 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 abf0b1e..abf0b1e 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 d9ba649..d9ba649 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 de8dbc8..de8dbc8 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 3a42806..3a42806 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 5fc3267..5fc3267 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 b97aef4..b97aef4 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 3f5ec32..3f5ec32 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 e8188cd..e8188cd 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 a6fa7da..a6fa7da 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 3f5ec32..3f5ec32 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 6faedb0..6faedb0 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 ecb1e4b..ecb1e4b 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 422021e..422021e 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 69fa823..69fa823 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 7dd621c..7dd621c 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 2861ddc..2861ddc 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 dbb7c4a..dbb7c4a 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 89f99ab..89f99ab 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 128f2bb..128f2bb 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 d2d8995..d2d8995 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 b3798e9..b3798e9 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 856c536..856c536 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 29654a9..29654a9 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 5e5242e..5e5242e 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 959a8c3..959a8c3 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 d124e24..d124e24 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 4e8bb07..4e8bb07 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 469ecd3..469ecd3 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 62200c9..62200c9 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 e427def..e427def 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 cfb7ff6..cfb7ff6 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 f67a85e..f67a85e 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 4f08a4f..4f08a4f 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 152a145..152a145 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 de0cc7f..de0cc7f 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 24604ed..24604ed 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 800cd2d..800cd2d 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 e99f33a..e99f33a 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 9d747f0..9d747f0 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 03647dd..03647dd 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 f1bd822..f1bd822 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 c5be5b7..c5be5b7 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 5e7006b..5e7006b 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 06addb4..06addb4 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 ac477e7..ac477e7 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 30ede0e..30ede0e 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 51cb003..51cb003 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 e37cad6..e37cad6 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 2485fbf..2485fbf 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 c8597dd..c8597dd 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 e69de29..e69de29 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 e69de29..e69de29 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 8d70650..8d70650 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 c172486..c172486 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 ab88b1d..ab88b1d 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 51b5cda..51b5cda 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 de0dc21..de0dc21 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 fc96f5e..fc96f5e 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 ff42ac3..ff42ac3 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 a96520e..a96520e 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 52cf479..52cf479 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 8dd4b33..8dd4b33 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 34af779..34af779 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 bb250e4..bb250e4 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 3ad33e7..3ad33e7 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 a46f3f6..a46f3f6 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 34784f8..34784f8 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 21704b5..21704b5 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 4d4412d..4d4412d 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 508f25f..508f25f 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 cbbdceb..cbbdceb 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 caf5b1c..caf5b1c 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 c4ba277..c4ba277 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 c068a02..c068a02 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 c64f540..c64f540 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 9cdf12d..9cdf12d 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 b737114..b737114 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 82c3252..82c3252 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 b410c46..b410c46 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 9d583d2..9d583d2 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 a8290f7..a8290f7 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 c946e18..c946e18 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 66e287d..66e287d 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 687a1cf..687a1cf 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 6e32362..6e32362 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 21a9dd6..21a9dd6 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 057e059..057e059 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 697d95f..697d95f 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 e067624..e067624 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 0b457dc..0b457dc 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 1fbb15a..1fbb15a 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 7bfb7c4..7bfb7c4 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 3c69dc3..3c69dc3 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 1ab2487..1ab2487 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 e70a55a..e70a55a 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 b074186..b074186 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 32ea63c..32ea63c 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 56f60e6..56f60e6 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 3f9170e..3f9170e 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 17e29fd..17e29fd 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 0a81249..0a81249 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 2ebc564..2ebc564 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 36e48a7..36e48a7 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 9035ff1..9035ff1 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 53233ab..53233ab 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 e748ac7..e748ac7 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 2b59a3a..2b59a3a 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 d8c4dce..d8c4dce 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 a809c43..a809c43 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 24609ae..24609ae 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 18e2cea..18e2cea 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 dfb7576..dfb7576 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 6567ed0..6567ed0 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 6450a10..6450a10 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 c303a02..c303a02 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 2a71236..2a71236 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 5c32209..5c32209 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 0ef6a6d..0ef6a6d 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 e10e4e7..e10e4e7 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 8180551..8180551 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 5111fee..5111fee 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 54c40e1..54c40e1 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 a324dca..a324dca 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 e12cb7b..e12cb7b 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 128f2bb..128f2bb 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 354499a..354499a 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 4e9ac11..4e9ac11 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 83121b5..83121b5 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 26761d2..26761d2 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 ceb9ecc..ceb9ecc 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 53ef08e..53ef08e 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 5580974..5580974 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 496c2e8..496c2e8 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 e2a36c8..e2a36c8 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 e69de29..e69de29 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 8a69a0d..8a69a0d 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 2df3ee8..2df3ee8 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 f60c995..f60c995 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 c41c27c..c41c27c 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 87508e0..87508e0 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 a7aad73..a7aad73 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 03647dd..03647dd 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 99092ee..99092ee 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 83fd1d9..83fd1d9 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 bb45dca..bb45dca 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 b536352..b536352 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 6a28dd8..6a28dd8 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 40e30d4..40e30d4 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 48b080e..48b080e 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 c1cc5af..c1cc5af 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 77ff909..77ff909 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 e69de29..e69de29 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 62d2f32..62d2f32 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 c21d450..c21d450 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 f0343b2..f0343b2 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 be9bead..be9bead 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 491937b..491937b 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 cc63e31..cc63e31 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 591e521..591e521 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 6bd435e..6bd435e 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 ce69481..ce69481 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 d7d4857..d7d4857 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 995023d..995023d 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 5099c91..5099c91 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 7bfd2c5..7bfd2c5 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 79dea9d..79dea9d 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 ffeee82..ffeee82 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 6bc208f..6bc208f 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 0bec5ea..0bec5ea 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 4976afc..4976afc 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 0bc395b..0bc395b 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 c67d9e0..c67d9e0 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 3788906..3788906 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 e32f383..e32f383 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 b182d34..b182d34 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 9d9ad16..9d9ad16 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 b0af30a..b0af30a 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 2570f77..2570f77 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 8488f4e..8488f4e 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 ed69a8b..ed69a8b 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 ed25441..ed25441 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 d056d65..d056d65 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 d0326a5..d0326a5 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 4684673..4684673 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 9b6bdc2..9b6bdc2 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 5698881..5698881 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 a31db4a..a31db4a 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 f91473a..f91473a 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