Condense test directory names again.
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
'''
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
'''
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 @@
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 @@
@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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
# 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 @@
# 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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
# 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 @@
'''
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 @@
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 @@
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 @@
'''
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 @@
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 @@
@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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
'''
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 @@
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 @@
'''
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 @@
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 @@
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 @@
# 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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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
similarity index 100%
rename from test cases/common/103 postconf/meson.build
rename to 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
similarity index 100%
rename from test cases/common/103 postconf/postconf.py
rename to 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
similarity index 100%
rename from test cases/common/103 postconf/prog.c
rename to 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
similarity index 100%
rename from test cases/common/103 postconf/raw.dat
rename to 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
similarity index 100%
rename from test cases/common/104 postconf with args/meson.build
rename to 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
similarity index 100%
rename from test cases/common/104 postconf with args/postconf.py
rename to 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
similarity index 100%
rename from test cases/common/104 postconf with args/prog.c
rename to 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
similarity index 100%
rename from test cases/common/104 postconf with args/raw.dat
rename to 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
similarity index 100%
rename from test cases/common/105 testframework options/meson.build
rename to 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
similarity index 100%
rename from test cases/common/105 testframework options/meson_options.txt
rename to 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
similarity index 100%
rename from test cases/common/105 testframework options/test.json
rename to 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
similarity index 100%
rename from test cases/common/106 extract same name/lib.c
rename to 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
similarity index 100%
rename from test cases/common/106 extract same name/main.c
rename to 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
similarity index 100%
rename from test cases/common/106 extract same name/meson.build
rename to 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
similarity index 100%
rename from test cases/common/106 extract same name/src/lib.c
rename to 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
similarity index 100%
rename from test cases/common/107 has header symbol/meson.build
rename to 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
similarity index 100%
rename from test cases/common/108 has arg/meson.build
rename to 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
similarity index 100%
rename from test cases/common/109 generatorcustom/catter.py
rename to 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
similarity index 100%
rename from test cases/common/109 generatorcustom/gen.py
rename to 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
similarity index 100%
rename from test cases/common/109 generatorcustom/main.c
rename to 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
similarity index 100%
rename from test cases/common/109 generatorcustom/meson.build
rename to 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
similarity index 100%
rename from test cases/common/109 generatorcustom/res1.txt
rename to 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
similarity index 100%
rename from test cases/common/109 generatorcustom/res2.txt
rename to 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
similarity index 100%
rename from test cases/common/110 multiple dir configure file/meson.build
rename to 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
similarity index 100%
rename from test cases/common/110 multiple dir configure file/subdir/foo.txt
rename to 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
similarity index 100%
rename from test cases/common/110 multiple dir configure file/subdir/meson.build
rename to 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
similarity index 100%
rename from test cases/common/110 multiple dir configure file/subdir/someinput.in
rename to 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
similarity index 100%
rename from test cases/common/111 spaces backslash/asm output/meson.build
rename to 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
similarity index 100%
rename from test cases/common/111 spaces backslash/comparer-end-notstring.c
rename to 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
similarity index 100%
rename from test cases/common/111 spaces backslash/comparer-end.c
rename to 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
similarity index 100%
rename from test cases/common/111 spaces backslash/comparer.c
rename to 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
similarity index 100%
rename from test cases/common/111 spaces backslash/include/comparer.h
rename to 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
similarity index 100%
rename from test cases/common/111 spaces backslash/meson.build
rename to 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
similarity index 100%
rename from test cases/common/112 ternary/meson.build
rename to 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
similarity index 100%
rename from test cases/common/113 custom target capture/data_source.txt
rename to 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
similarity index 100%
rename from test cases/common/113 custom target capture/meson.build
rename to 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
similarity index 100%
rename from test cases/common/113 custom target capture/my_compiler.py
rename to 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
similarity index 100%
rename from test cases/common/113 custom target capture/test.json
rename to 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
similarity index 100%
rename from test cases/common/114 allgenerate/converter.py
rename to 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
similarity index 100%
rename from test cases/common/114 allgenerate/foobar.cpp.in
rename to 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
similarity index 100%
rename from test cases/common/114 allgenerate/meson.build
rename to 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
similarity index 100%
rename from test cases/common/115 pathjoin/meson.build
rename to 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
similarity index 100%
rename from test cases/common/116 subdir subproject/meson.build
rename to 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
similarity index 100%
rename from test cases/common/116 subdir subproject/prog/meson.build
rename to test cases/common/113 subdir subproject/prog/meson.build
diff --git a/test cases/common/116 subdir subproject/prog/prog.c b/test cases/common/113 subdir subproject/prog/prog.c
similarity index 100%
rename from test cases/common/116 subdir subproject/prog/prog.c
rename to 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
similarity index 100%
rename from test cases/common/116 subdir subproject/subprojects/sub/meson.build
rename to test cases/common/113 subdir subproject/subprojects/sub/meson.build
diff --git a/test cases/common/116 subdir subproject/subprojects/sub/sub.c b/test cases/common/113 subdir subproject/subprojects/sub/sub.c
similarity index 100%
rename from test cases/common/116 subdir subproject/subprojects/sub/sub.c
rename to test cases/common/113 subdir subproject/subprojects/sub/sub.c
diff --git a/test cases/common/116 subdir subproject/subprojects/sub/sub.h b/test cases/common/113 subdir subproject/subprojects/sub/sub.h
similarity index 100%
rename from test cases/common/116 subdir subproject/subprojects/sub/sub.h
rename to 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
similarity index 100%
rename from test cases/common/117 interpreter copy mutable var on assignment/meson.build
rename to 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
similarity index 100%
rename from test cases/common/118 skip/meson.build
rename to 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
similarity index 100%
rename from test cases/common/119 subproject project arguments/exe.c
rename to 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
similarity index 100%
rename from test cases/common/119 subproject project arguments/exe.cpp
rename to 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
similarity index 100%
rename from test cases/common/119 subproject project arguments/meson.build
rename to 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
similarity index 100%
rename from test cases/common/119 subproject project arguments/subprojects/subexe/meson.build
rename to 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
similarity index 100%
rename from test cases/common/119 subproject project arguments/subprojects/subexe/subexe.c
rename to 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
similarity index 100%
rename from test cases/common/120 test skip/meson.build
rename to 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
similarity index 100%
rename from test cases/common/120 test skip/test_skip.c
rename to 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
similarity index 100%
rename from test cases/common/121 shared module/meson.build
rename to 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
similarity index 100%
rename from test cases/common/121 shared module/module.c
rename to 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
similarity index 100%
rename from test cases/common/121 shared module/nosyms.c
rename to 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
similarity index 100%
rename from test cases/common/121 shared module/prog.c
rename to 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
similarity index 100%
rename from test cases/common/121 shared module/runtime.c
rename to 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
similarity index 100%
rename from test cases/common/121 shared module/test.json
rename to 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
similarity index 100%
rename from test cases/common/122 llvm ir and assembly/main.c
rename to 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
similarity index 100%
rename from test cases/common/122 llvm ir and assembly/main.cpp
rename to 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
similarity index 100%
rename from test cases/common/122 llvm ir and assembly/meson.build
rename to 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
similarity index 100%
rename from test cases/common/122 llvm ir and assembly/square-aarch64.S
rename to 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
similarity index 100%
rename from test cases/common/122 llvm ir and assembly/square-arm.S
rename to 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
similarity index 100%
rename from test cases/common/122 llvm ir and assembly/square-x86.S
rename to 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
similarity index 100%
rename from test cases/common/122 llvm ir and assembly/square-x86_64.S
rename to 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
similarity index 100%
rename from test cases/common/122 llvm ir and assembly/square.ll
rename to 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
similarity index 100%
rename from test cases/common/122 llvm ir and assembly/symbol-underscore.h
rename to 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
similarity index 100%
rename from test cases/common/123 cpp and asm/meson.build
rename to 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
similarity index 100%
rename from test cases/common/123 cpp and asm/retval-arm.S
rename to 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
similarity index 100%
rename from test cases/common/123 cpp and asm/retval-x86.S
rename to 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
similarity index 100%
rename from test cases/common/123 cpp and asm/retval-x86_64.S
rename to 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
similarity index 100%
rename from test cases/common/123 cpp and asm/symbol-underscore.h
rename to 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
similarity index 100%
rename from test cases/common/123 cpp and asm/trivial.cc
rename to 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
similarity index 100%
rename from test cases/common/124 extract all shared library/extractor.h
rename to 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
similarity index 100%
rename from test cases/common/124 extract all shared library/four.c
rename to 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
similarity index 100%
rename from test cases/common/124 extract all shared library/func1234.def
rename to 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
similarity index 100%
rename from test cases/common/124 extract all shared library/meson.build
rename to 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
similarity index 100%
rename from test cases/common/124 extract all shared library/one.c
rename to 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
similarity index 100%
rename from test cases/common/124 extract all shared library/prog.c
rename to 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
similarity index 100%
rename from test cases/common/124 extract all shared library/three.c
rename to 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
similarity index 100%
rename from test cases/common/124 extract all shared library/two.c
rename to 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
similarity index 100%
rename from test cases/common/125 object only target/meson.build
rename to 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
similarity index 100%
rename from test cases/common/125 object only target/obj_generator.py
rename to 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
similarity index 100%
rename from test cases/common/125 object only target/prog.c
rename to 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
similarity index 100%
rename from test cases/common/125 object only target/source.c
rename to 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
similarity index 100%
rename from test cases/common/125 object only target/source2.c
rename to 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
similarity index 100%
rename from test cases/common/125 object only target/source2.def
rename to 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
similarity index 100%
rename from test cases/common/125 object only target/source3.c
rename to 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
similarity index 100%
rename from test cases/common/125 object only target/test.json
rename to 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
similarity index 100%
rename from test cases/common/126 no buildincdir/include/header.h
rename to 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
similarity index 100%
rename from test cases/common/126 no buildincdir/meson.build
rename to 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
similarity index 100%
rename from test cases/common/126 no buildincdir/prog.c
rename to 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
similarity index 100%
rename from test cases/common/127 custom target directory install/docgen.py
rename to 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
similarity index 100%
rename from test cases/common/127 custom target directory install/meson.build
rename to 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
similarity index 100%
rename from test cases/common/127 custom target directory install/test.json
rename to 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
similarity index 100%
rename from test cases/common/128 dependency file generation/main .c
rename to 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
similarity index 100%
rename from test cases/common/128 dependency file generation/meson.build
rename to 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
similarity index 100%
rename from test cases/common/129 configure file in generator/inc/confdata.in
rename to 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
similarity index 100%
rename from test cases/common/129 configure file in generator/inc/meson.build
rename to 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
similarity index 100%
rename from test cases/common/129 configure file in generator/meson.build
rename to 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
similarity index 100%
rename from test cases/common/129 configure file in generator/src/gen.py
rename to 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
similarity index 100%
rename from test cases/common/129 configure file in generator/src/main.c
rename to 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
similarity index 100%
rename from test cases/common/129 configure file in generator/src/meson.build
rename to 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
similarity index 100%
rename from test cases/common/129 configure file in generator/src/source
rename to 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
similarity index 100%
rename from test cases/common/130 generated llvm ir/copyfile.py
rename to 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
similarity index 100%
rename from test cases/common/130 generated llvm ir/main.c
rename to 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
similarity index 100%
rename from test cases/common/130 generated llvm ir/meson.build
rename to 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
similarity index 100%
rename from test cases/common/130 generated llvm ir/square.ll.in
rename to 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
similarity index 100%
rename from test cases/common/131 generated assembly/copyfile.py
rename to 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
similarity index 100%
rename from test cases/common/131 generated assembly/main.c
rename to 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
similarity index 100%
rename from test cases/common/131 generated assembly/meson.build
rename to 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
similarity index 100%
rename from test cases/common/131 generated assembly/square-arm.S.in
rename to 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
similarity index 100%
rename from test cases/common/131 generated assembly/square-x86.S.in
rename to 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
similarity index 100%
rename from test cases/common/131 generated assembly/square-x86_64.S.in
rename to 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
similarity index 100%
rename from test cases/common/131 generated assembly/symbol-underscore.h
rename to 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
similarity index 100%
rename from test cases/common/132 build by default targets in tests/main.c
rename to 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
similarity index 100%
rename from test cases/common/132 build by default targets in tests/meson.build
rename to 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
similarity index 100%
rename from test cases/common/132 build by default targets in tests/write_file.py
rename to 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
similarity index 100%
rename from test cases/common/133 build by default/checkexists.py
rename to 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
similarity index 100%
rename from test cases/common/133 build by default/foo.c
rename to 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
similarity index 100%
rename from test cases/common/133 build by default/meson.build
rename to 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
similarity index 100%
rename from test cases/common/133 build by default/mygen.py
rename to 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
similarity index 100%
rename from test cases/common/133 build by default/source.txt
rename to 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
similarity index 100%
rename from test cases/common/134 include order/ctsub/copyfile.py
rename to 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
similarity index 100%
rename from test cases/common/134 include order/ctsub/emptyfile.c
rename to 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
similarity index 100%
rename from test cases/common/134 include order/ctsub/main.h
rename to 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
similarity index 100%
rename from test cases/common/134 include order/ctsub/meson.build
rename to 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
similarity index 100%
rename from test cases/common/134 include order/inc1/hdr.h
rename to 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
similarity index 100%
rename from test cases/common/134 include order/inc2/hdr.h
rename to 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
similarity index 100%
rename from test cases/common/134 include order/meson.build
rename to 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
similarity index 100%
rename from test cases/common/134 include order/ordertest.c
rename to 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
similarity index 100%
rename from test cases/common/134 include order/sub1/main.h
rename to 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
similarity index 100%
rename from test cases/common/134 include order/sub1/meson.build
rename to 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
similarity index 100%
rename from test cases/common/134 include order/sub1/some.c
rename to 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
similarity index 100%
rename from test cases/common/134 include order/sub1/some.h
rename to 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
similarity index 100%
rename from test cases/common/134 include order/sub2/main.h
rename to 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
similarity index 100%
rename from test cases/common/134 include order/sub2/meson.build
rename to 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
similarity index 100%
rename from test cases/common/134 include order/sub3/main.h
rename to 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
similarity index 100%
rename from test cases/common/134 include order/sub3/meson.build
rename to 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
similarity index 100%
rename from test cases/common/134 include order/sub4/main.c
rename to 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
similarity index 100%
rename from test cases/common/134 include order/sub4/main.h
rename to 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
similarity index 100%
rename from test cases/common/134 include order/sub4/meson.build
rename to 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
similarity index 100%
rename from test cases/common/135 override options/four.c
rename to 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
similarity index 100%
rename from test cases/common/135 override options/meson.build
rename to 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
similarity index 100%
rename from test cases/common/135 override options/one.c
rename to 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
similarity index 100%
rename from test cases/common/135 override options/three.c
rename to 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
similarity index 100%
rename from test cases/common/135 override options/two.c
rename to 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
similarity index 100%
rename from test cases/common/136 get define/concat.h
rename to 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
similarity index 100%
rename from test cases/common/136 get define/meson.build
rename to 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
similarity index 100%
rename from test cases/common/136 get define/meson_options.txt
rename to 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
similarity index 100%
rename from test cases/common/137 c cpp and asm/main.c
rename to 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
similarity index 100%
rename from test cases/common/137 c cpp and asm/main.cpp
rename to 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
similarity index 100%
rename from test cases/common/137 c cpp and asm/meson.build
rename to 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
similarity index 100%
rename from test cases/common/137 c cpp and asm/retval-arm.S
rename to 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
similarity index 100%
rename from test cases/common/137 c cpp and asm/retval-x86.S
rename to 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
similarity index 100%
rename from test cases/common/137 c cpp and asm/retval-x86_64.S
rename to 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
similarity index 100%
rename from test cases/common/137 c cpp and asm/somelib.c
rename to 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
similarity index 100%
rename from test cases/common/137 c cpp and asm/symbol-underscore.h
rename to 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
similarity index 100%
rename from test cases/common/138 compute int/config.h.in
rename to 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
similarity index 100%
rename from test cases/common/138 compute int/foobar.h
rename to 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
similarity index 100%
rename from test cases/common/138 compute int/meson.build
rename to 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
similarity index 100%
rename from test cases/common/138 compute int/prog.c.in
rename to 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
similarity index 100%
rename from test cases/common/139 custom target object output/meson.build
rename to 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
similarity index 100%
rename from test cases/common/139 custom target object output/obj_generator.py
rename to 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
similarity index 100%
rename from test cases/common/139 custom target object output/objdir/meson.build
rename to 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
similarity index 100%
rename from test cases/common/139 custom target object output/objdir/source.c
rename to 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
similarity index 100%
rename from test cases/common/139 custom target object output/progdir/meson.build
rename to 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
similarity index 100%
rename from test cases/common/139 custom target object output/progdir/prog.c
rename to 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
similarity index 100%
rename from test cases/common/140 empty build file/meson.build
rename to 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
similarity index 100%
rename from test cases/common/140 empty build file/subdir/meson.build
rename to 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
similarity index 100%
rename from test cases/common/141 whole archive/exe/meson.build
rename to 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
similarity index 100%
rename from test cases/common/141 whole archive/exe2/meson.build
rename to 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
similarity index 100%
rename from test cases/common/141 whole archive/exe3/meson.build
rename to 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
similarity index 100%
rename from test cases/common/141 whole archive/exe4/meson.build
rename to 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
similarity index 100%
rename from test cases/common/141 whole archive/func1.c
rename to 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
similarity index 100%
rename from test cases/common/141 whole archive/func2.c
rename to 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
similarity index 100%
rename from test cases/common/141 whole archive/meson.build
rename to 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
similarity index 100%
rename from test cases/common/141 whole archive/mylib.h
rename to 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
similarity index 100%
rename from test cases/common/141 whole archive/prog.c
rename to 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
similarity index 100%
rename from test cases/common/141 whole archive/sh_func2_dep_func1/meson.build
rename to 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
similarity index 100%
rename from test cases/common/141 whole archive/sh_func2_linked_func1/meson.build
rename to 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
similarity index 100%
rename from test cases/common/141 whole archive/sh_func2_transdep_func1/meson.build
rename to 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
similarity index 100%
rename from test cases/common/141 whole archive/sh_only_link_whole/meson.build
rename to 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
similarity index 100%
rename from test cases/common/141 whole archive/st_func1/meson.build
rename to 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
similarity index 100%
rename from test cases/common/141 whole archive/st_func2/meson.build
rename to 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
similarity index 100%
rename from test cases/common/142 C and CPP link/dummy.c
rename to 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
similarity index 100%
rename from test cases/common/142 C and CPP link/foo.c
rename to 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
similarity index 100%
rename from test cases/common/142 C and CPP link/foo.cpp
rename to 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
similarity index 100%
rename from test cases/common/142 C and CPP link/foo.h
rename to 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
similarity index 100%
rename from test cases/common/142 C and CPP link/foo.hpp
rename to 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
similarity index 100%
rename from test cases/common/142 C and CPP link/foobar.c
rename to 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
similarity index 100%
rename from test cases/common/142 C and CPP link/foobar.h
rename to 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
similarity index 100%
rename from test cases/common/142 C and CPP link/meson.build
rename to 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
similarity index 100%
rename from test cases/common/142 C and CPP link/sub.c
rename to 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
similarity index 100%
rename from test cases/common/142 C and CPP link/sub.h
rename to 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
similarity index 100%
rename from test cases/common/143 mesonintrospect from scripts/check_env.py
rename to 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
similarity index 100%
rename from test cases/common/143 mesonintrospect from scripts/check_introspection.py
rename to 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
similarity index 100%
rename from test cases/common/143 mesonintrospect from scripts/meson.build
rename to 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
similarity index 100%
rename from test cases/common/144 custom target multiple outputs/generator.py
rename to 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
similarity index 100%
rename from test cases/common/144 custom target multiple outputs/meson.build
rename to 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
similarity index 100%
rename from test cases/common/144 custom target multiple outputs/test.json
rename to 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
similarity index 100%
rename from test cases/common/145 special characters/arg-char-test.c
rename to 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
similarity index 100%
rename from test cases/common/145 special characters/arg-string-test.c
rename to 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
similarity index 100%
rename from test cases/common/145 special characters/arg-unquoted-test.c
rename to 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
similarity index 100%
rename from test cases/common/145 special characters/check_quoting.py
rename to 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
similarity index 100%
rename from test cases/common/145 special characters/meson.build
rename to 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
similarity index 100%
rename from test cases/common/145 special characters/test.json
rename to 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
similarity index 100%
rename from test cases/common/146 nested links/meson.build
rename to 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
similarity index 100%
rename from test cases/common/146 nested links/xephyr.c
rename to 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
similarity index 100%
rename from test cases/common/147 list of file sources/foo
rename to 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
similarity index 100%
rename from test cases/common/147 list of file sources/gen.py
rename to 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
similarity index 100%
rename from test cases/common/147 list of file sources/meson.build
rename to 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
similarity index 100%
rename from test cases/common/148 link depends custom target/foo.c
rename to 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
similarity index 100%
rename from test cases/common/148 link depends custom target/make_file.py
rename to 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
similarity index 100%
rename from test cases/common/148 link depends custom target/meson.build
rename to 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
similarity index 100%
rename from test cases/common/149 recursive linking/3rdorderdeps/lib.c.in
rename to 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
similarity index 100%
rename from test cases/common/149 recursive linking/3rdorderdeps/main.c.in
rename to 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
similarity index 100%
rename from test cases/common/149 recursive linking/3rdorderdeps/meson.build
rename to 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
similarity index 100%
rename from test cases/common/149 recursive linking/circular/lib1.c
rename to 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
similarity index 100%
rename from test cases/common/149 recursive linking/circular/lib2.c
rename to 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
similarity index 100%
rename from test cases/common/149 recursive linking/circular/lib3.c
rename to 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
similarity index 100%
rename from test cases/common/149 recursive linking/circular/main.c
rename to 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
similarity index 100%
rename from test cases/common/149 recursive linking/circular/meson.build
rename to 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
similarity index 100%
rename from test cases/common/149 recursive linking/circular/prop1.c
rename to 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
similarity index 100%
rename from test cases/common/149 recursive linking/circular/prop2.c
rename to 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
similarity index 100%
rename from test cases/common/149 recursive linking/circular/prop3.c
rename to 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
similarity index 100%
rename from test cases/common/149 recursive linking/edge-cases/libsto.c
rename to 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
similarity index 100%
rename from test cases/common/149 recursive linking/edge-cases/meson.build
rename to 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
similarity index 100%
rename from test cases/common/149 recursive linking/edge-cases/shstmain.c
rename to 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
similarity index 100%
rename from test cases/common/149 recursive linking/edge-cases/stobuilt.c
rename to 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
similarity index 100%
rename from test cases/common/149 recursive linking/edge-cases/stomain.c
rename to 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
similarity index 100%
rename from test cases/common/149 recursive linking/lib.h
rename to 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
similarity index 100%
rename from test cases/common/149 recursive linking/main.c
rename to 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
similarity index 100%
rename from test cases/common/149 recursive linking/meson.build
rename to 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
similarity index 100%
rename from test cases/common/149 recursive linking/shnodep/lib.c
rename to 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
similarity index 100%
rename from test cases/common/149 recursive linking/shnodep/meson.build
rename to 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
similarity index 100%
rename from test cases/common/149 recursive linking/shshdep/lib.c
rename to 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
similarity index 100%
rename from test cases/common/149 recursive linking/shshdep/meson.build
rename to 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
similarity index 100%
rename from test cases/common/149 recursive linking/shstdep/lib.c
rename to 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
similarity index 100%
rename from test cases/common/149 recursive linking/shstdep/meson.build
rename to 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
similarity index 100%
rename from test cases/common/149 recursive linking/stnodep/lib.c
rename to 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
similarity index 100%
rename from test cases/common/149 recursive linking/stnodep/meson.build
rename to 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
similarity index 100%
rename from test cases/common/149 recursive linking/stshdep/lib.c
rename to 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
similarity index 100%
rename from test cases/common/149 recursive linking/stshdep/meson.build
rename to 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
similarity index 100%
rename from test cases/common/149 recursive linking/ststdep/lib.c
rename to 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
similarity index 100%
rename from test cases/common/149 recursive linking/ststdep/meson.build
rename to 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
similarity index 100%
rename from test cases/common/150 library at root/lib.c
rename to 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
similarity index 100%
rename from test cases/common/150 library at root/main/main.c
rename to 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
similarity index 100%
rename from test cases/common/150 library at root/main/meson.build
rename to 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
similarity index 100%
rename from test cases/common/150 library at root/meson.build
rename to 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
similarity index 100%
rename from test cases/common/151 simd/fallback.c
rename to 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
similarity index 100%
rename from test cases/common/151 simd/include/simdheader.h
rename to 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
similarity index 100%
rename from test cases/common/151 simd/meson.build
rename to 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
similarity index 100%
rename from test cases/common/151 simd/simd_avx.c
rename to 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
similarity index 100%
rename from test cases/common/151 simd/simd_avx2.c
rename to 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
similarity index 100%
rename from test cases/common/151 simd/simd_mmx.c
rename to 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
similarity index 100%
rename from test cases/common/151 simd/simd_neon.c
rename to 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
similarity index 100%
rename from test cases/common/151 simd/simd_sse.c
rename to 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
similarity index 100%
rename from test cases/common/151 simd/simd_sse2.c
rename to 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
similarity index 100%
rename from test cases/common/151 simd/simd_sse3.c
rename to 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
similarity index 100%
rename from test cases/common/151 simd/simd_sse41.c
rename to 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
similarity index 100%
rename from test cases/common/151 simd/simd_sse42.c
rename to 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
similarity index 100%
rename from test cases/common/151 simd/simd_ssse3.c
rename to 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
similarity index 100%
rename from test cases/common/151 simd/simdchecker.c
rename to 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
similarity index 100%
rename from test cases/common/151 simd/simdfuncs.h
rename to 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
similarity index 100%
rename from test cases/common/152 shared module resolving symbol in executable/meson.build
rename to 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
similarity index 100%
rename from test cases/common/152 shared module resolving symbol in executable/module.c
rename to 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
similarity index 100%
rename from test cases/common/152 shared module resolving symbol in executable/prog.c
rename to 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
similarity index 100%
rename from test cases/common/153 dotinclude/dotproc.c
rename to 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
similarity index 100%
rename from test cases/common/153 dotinclude/meson.build
rename to 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
similarity index 100%
rename from test cases/common/153 dotinclude/stdio.h
rename to 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
similarity index 100%
rename from test cases/common/154 reserved targets/all/meson.build
rename to 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
similarity index 100%
rename from test cases/common/154 reserved targets/benchmark/meson.build
rename to 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
similarity index 100%
rename from test cases/common/154 reserved targets/clean-ctlist/meson.build
rename to 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
similarity index 100%
rename from test cases/common/154 reserved targets/clean-gcda/meson.build
rename to 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
similarity index 100%
rename from test cases/common/154 reserved targets/clean-gcno/meson.build
rename to 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
similarity index 100%
rename from test cases/common/154 reserved targets/clean/meson.build
rename to 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
similarity index 100%
rename from test cases/common/154 reserved targets/coverage-html/meson.build
rename to 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
similarity index 100%
rename from test cases/common/154 reserved targets/coverage-text/meson.build
rename to 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
similarity index 100%
rename from test cases/common/154 reserved targets/coverage-xml/meson.build
rename to 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
similarity index 100%
rename from test cases/common/154 reserved targets/coverage/meson.build
rename to 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
similarity index 100%
rename from test cases/common/154 reserved targets/dist/meson.build
rename to 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
similarity index 100%
rename from test cases/common/154 reserved targets/distcheck/meson.build
rename to 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
similarity index 100%
rename from test cases/common/154 reserved targets/install/meson.build
rename to 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
similarity index 100%
rename from test cases/common/154 reserved targets/meson.build
rename to 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
similarity index 100%
rename from test cases/common/154 reserved targets/phony/meson.build
rename to 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
similarity index 100%
rename from test cases/common/154 reserved targets/reconfigure/meson.build
rename to 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
similarity index 100%
rename from test cases/common/154 reserved targets/runtarget/meson.build
rename to 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
similarity index 100%
rename from test cases/common/154 reserved targets/scan-build/meson.build
rename to 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
similarity index 100%
rename from test cases/common/154 reserved targets/test.c
rename to 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
similarity index 100%
rename from test cases/common/154 reserved targets/test/meson.build
rename to 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
similarity index 100%
rename from test cases/common/154 reserved targets/uninstall/meson.build
rename to 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
similarity index 100%
rename from test cases/common/155 duplicate source names/dir1/file.c
rename to 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
similarity index 100%
rename from test cases/common/155 duplicate source names/dir1/meson.build
rename to 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
similarity index 100%
rename from test cases/common/155 duplicate source names/dir2/dir1/file.c
rename to 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
similarity index 100%
rename from test cases/common/155 duplicate source names/dir2/file.c
rename to 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
similarity index 100%
rename from test cases/common/155 duplicate source names/dir2/meson.build
rename to 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
similarity index 100%
rename from test cases/common/155 duplicate source names/dir3/dir1/file.c
rename to 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
similarity index 100%
rename from test cases/common/155 duplicate source names/dir3/file.c
rename to 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
similarity index 100%
rename from test cases/common/155 duplicate source names/dir3/meson.build
rename to 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
similarity index 100%
rename from test cases/common/155 duplicate source names/meson.build
rename to 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
similarity index 100%
rename from test cases/common/156 index customtarget/check_args.py
rename to 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
similarity index 100%
rename from test cases/common/156 index customtarget/gen_sources.py
rename to 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
similarity index 100%
rename from test cases/common/156 index customtarget/lib.c
rename to 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
similarity index 100%
rename from test cases/common/156 index customtarget/meson.build
rename to 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
similarity index 100%
rename from test cases/common/156 index customtarget/subdir/foo.c
rename to 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
similarity index 100%
rename from test cases/common/156 index customtarget/subdir/meson.build
rename to 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
similarity index 100%
rename from test cases/common/157 wrap file should not failed/meson.build
rename to 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
similarity index 100%
rename from test cases/common/157 wrap file should not failed/src/meson.build
rename to 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
similarity index 100%
rename from test cases/common/157 wrap file should not failed/src/subprojects/foo/prog2.c
rename to 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
similarity index 100%
rename from test cases/common/157 wrap file should not failed/src/subprojects/prog.c
rename to 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
similarity index 100%
rename from test cases/common/157 wrap file should not failed/src/test.c
rename to 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
similarity index 100%
rename from test cases/common/157 wrap file should not failed/subprojects/.gitignore
rename to 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
similarity index 100%
rename from test cases/common/157 wrap file should not failed/subprojects/bar.wrap
rename to 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
similarity index 100%
rename from test cases/common/157 wrap file should not failed/subprojects/foo.wrap
rename to 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
similarity index 100%
rename from test cases/common/157 wrap file should not failed/subprojects/packagecache/foo-1.0-patch.tar.xz
rename to test cases/common/154 wrap file should not failed/subprojects/packagecache/foo-1.0-patch.tar.xz
Binary files differ
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
similarity index 100%
rename from test cases/common/157 wrap file should not failed/subprojects/packagecache/foo-1.0.tar.xz
rename to test cases/common/154 wrap file should not failed/subprojects/packagecache/foo-1.0.tar.xz
Binary files differ
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
similarity index 100%
rename from test cases/common/157 wrap file should not failed/subprojects/packagecache/zlib-1.2.8-8-wrap.zip
rename to 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
similarity index 100%
rename from test cases/common/157 wrap file should not failed/subprojects/packagecache/zlib-1.2.8.tar.gz
rename to 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
similarity index 100%
rename from test cases/common/157 wrap file should not failed/subprojects/packagefiles/bar-1.0-patch.tar.xz
rename to test cases/common/154 wrap file should not failed/subprojects/packagefiles/bar-1.0-patch.tar.xz
Binary files differ
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
similarity index 100%
rename from test cases/common/157 wrap file should not failed/subprojects/packagefiles/bar-1.0.tar.xz
rename to test cases/common/154 wrap file should not failed/subprojects/packagefiles/bar-1.0.tar.xz
Binary files differ
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
similarity index 100%
rename from test cases/common/157 wrap file should not failed/subprojects/packagefiles/foo-1.0/meson.build
rename to 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
similarity index 100%
rename from test cases/common/157 wrap file should not failed/subprojects/patchdir.wrap
rename to 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
similarity index 100%
rename from test cases/common/157 wrap file should not failed/subprojects/zlib-1.2.8/foo.c
rename to 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
similarity index 100%
rename from test cases/common/157 wrap file should not failed/subprojects/zlib-1.2.8/meson.build
rename to 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
similarity index 100%
rename from test cases/common/157 wrap file should not failed/subprojects/zlib.wrap
rename to 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
similarity index 100%
rename from test cases/common/158 includedir subproj/meson.build
rename to 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
similarity index 100%
rename from test cases/common/158 includedir subproj/prog.c
rename to 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
similarity index 100%
rename from test cases/common/158 includedir subproj/subprojects/inctest/include/incfile.h
rename to 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
similarity index 100%
rename from test cases/common/158 includedir subproj/subprojects/inctest/meson.build
rename to 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
similarity index 100%
rename from test cases/common/159 subproject dir name collision/a.c
rename to 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
similarity index 100%
rename from test cases/common/159 subproject dir name collision/custom_subproject_dir/B/b.c
rename to 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
similarity index 100%
rename from test cases/common/159 subproject dir name collision/custom_subproject_dir/B/meson.build
rename to 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
similarity index 100%
rename from test cases/common/159 subproject dir name collision/custom_subproject_dir/C/c.c
rename to 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
similarity index 100%
rename from test cases/common/159 subproject dir name collision/custom_subproject_dir/C/meson.build
rename to 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
similarity index 100%
rename from test cases/common/159 subproject dir name collision/meson.build
rename to 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
similarity index 100%
rename from test cases/common/159 subproject dir name collision/other_subdir/custom_subproject_dir/other.c
rename to 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
similarity index 100%
rename from test cases/common/159 subproject dir name collision/other_subdir/meson.build
rename to 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
similarity index 100%
rename from test cases/common/160 config tool variable/meson.build
rename to 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
similarity index 100%
rename from test cases/common/161 custom target subdir depend files/copyfile.py
rename to 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
similarity index 100%
rename from test cases/common/161 custom target subdir depend files/meson.build
rename to 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
similarity index 100%
rename from test cases/common/161 custom target subdir depend files/subdir/dep.dat
rename to 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
similarity index 100%
rename from test cases/common/161 custom target subdir depend files/subdir/foo.c.in
rename to 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
similarity index 100%
rename from test cases/common/161 custom target subdir depend files/subdir/meson.build
rename to 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
similarity index 100%
rename from test cases/common/163 disabler/meson.build
rename to 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
similarity index 100%
rename from test cases/common/164 array option/meson.build
rename to 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
similarity index 100%
rename from test cases/common/164 array option/meson_options.txt
rename to 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
similarity index 100%
rename from test cases/common/165 custom target template substitution/checkcopy.py
rename to 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
similarity index 100%
rename from test cases/common/165 custom target template substitution/foo.c.in
rename to 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
similarity index 100%
rename from test cases/common/165 custom target template substitution/meson.build
rename to 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
similarity index 100%
rename from test cases/common/166 not-found dependency/meson.build
rename to 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
similarity index 100%
rename from test cases/common/166 not-found dependency/sub/meson.build
rename to 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
similarity index 100%
rename from test cases/common/166 not-found dependency/subprojects/trivial/meson.build
rename to 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
similarity index 100%
rename from test cases/common/166 not-found dependency/subprojects/trivial/trivial.c
rename to 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
similarity index 100%
rename from test cases/common/166 not-found dependency/testlib.c
rename to 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
similarity index 100%
rename from test cases/common/167 subdir if_found/meson.build
rename to 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
similarity index 100%
rename from test cases/common/167 subdir if_found/subdir/meson.build
rename to 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
similarity index 100%
rename from test cases/common/168 default options prefix dependent defaults/meson.build
rename to 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
similarity index 100%
rename from test cases/common/169 dependency factory/meson.build
rename to 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
similarity index 100%
rename from test cases/common/170 get project license/bar.c
rename to 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
similarity index 100%
rename from test cases/common/170 get project license/meson.build
rename to 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
similarity index 100%
rename from test cases/common/171 yield/meson.build
rename to 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
similarity index 100%
rename from test cases/common/171 yield/meson_options.txt
rename to 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
similarity index 100%
rename from test cases/common/171 yield/subprojects/sub/meson.build
rename to 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
similarity index 100%
rename from test cases/common/171 yield/subprojects/sub/meson_options.txt
rename to 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
similarity index 100%
rename from test cases/common/172 subproject nested subproject dirs/contrib/subprojects/alpha/a.c
rename to 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
similarity index 100%
rename from test cases/common/172 subproject nested subproject dirs/contrib/subprojects/alpha/meson.build
rename to 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
similarity index 100%
rename from test cases/common/172 subproject nested subproject dirs/contrib/subprojects/alpha/var/subprojects/wrap_files_might_be_here
rename to 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
similarity index 100%
rename from test cases/common/172 subproject nested subproject dirs/contrib/subprojects/beta/b.c
rename to 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
similarity index 100%
rename from test cases/common/172 subproject nested subproject dirs/contrib/subprojects/beta/meson.build
rename to 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
similarity index 100%
rename from test cases/common/172 subproject nested subproject dirs/meson.build
rename to 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
similarity index 100%
rename from test cases/common/172 subproject nested subproject dirs/prog.c
rename to 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
similarity index 100%
rename from test cases/common/173 preserve gendir/base.inp
rename to 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
similarity index 100%
rename from test cases/common/173 preserve gendir/com/mesonbuild/subbie.inp
rename to 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
similarity index 100%
rename from test cases/common/173 preserve gendir/genprog.py
rename to 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
similarity index 100%
rename from test cases/common/173 preserve gendir/meson.build
rename to 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
similarity index 100%
rename from test cases/common/173 preserve gendir/testprog.c
rename to 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
similarity index 100%
rename from test cases/common/174 source in dep/bar.cpp
rename to 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
similarity index 100%
rename from test cases/common/174 source in dep/foo.c
rename to 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
similarity index 100%
rename from test cases/common/174 source in dep/generated/funname
rename to 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
similarity index 100%
rename from test cases/common/174 source in dep/generated/genheader.py
rename to 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
similarity index 100%
rename from test cases/common/174 source in dep/generated/main.c
rename to 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
similarity index 100%
rename from test cases/common/174 source in dep/generated/meson.build
rename to 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
similarity index 100%
rename from test cases/common/174 source in dep/meson.build
rename to 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
similarity index 100%
rename from test cases/common/175 generator link whole/export.h
rename to 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
similarity index 100%
rename from test cases/common/175 generator link whole/generator.py
rename to 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
similarity index 100%
rename from test cases/common/175 generator link whole/main.c
rename to 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
similarity index 100%
rename from test cases/common/175 generator link whole/meson.build
rename to 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
similarity index 100%
rename from test cases/common/175 generator link whole/meson_test_function.tmpl
rename to 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
similarity index 100%
rename from test cases/common/175 generator link whole/pull_meson_test_function.c
rename to 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
similarity index 100%
rename from test cases/common/176 initial c_args/meson.build
rename to 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
similarity index 100%
rename from test cases/common/176 initial c_args/test.json
rename to 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
similarity index 100%
rename from test cases/common/177 identical target name in subproject flat layout/foo.c
rename to 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
similarity index 100%
rename from test cases/common/177 identical target name in subproject flat layout/main.c
rename to 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
similarity index 100%
rename from test cases/common/177 identical target name in subproject flat layout/meson.build
rename to 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
similarity index 100%
rename from test cases/common/177 identical target name in subproject flat layout/subprojects/subproj/foo.c
rename to 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
similarity index 100%
rename from test cases/common/177 identical target name in subproject flat layout/subprojects/subproj/meson.build
rename to 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
similarity index 100%
rename from test cases/common/178 as-needed/config.h
rename to 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
similarity index 100%
rename from test cases/common/178 as-needed/libA.cpp
rename to 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
similarity index 100%
rename from test cases/common/178 as-needed/libA.h
rename to 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
similarity index 100%
rename from test cases/common/178 as-needed/libB.cpp
rename to 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
similarity index 100%
rename from test cases/common/178 as-needed/main.cpp
rename to 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
similarity index 100%
rename from test cases/common/178 as-needed/meson.build
rename to 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
similarity index 100%
rename from test cases/common/179 ndebug if-release enabled/main.c
rename to 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
similarity index 100%
rename from test cases/common/179 ndebug if-release enabled/meson.build
rename to 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
similarity index 100%
rename from test cases/common/180 ndebug if-release disabled/main.c
rename to 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
similarity index 100%
rename from test cases/common/180 ndebug if-release disabled/meson.build
rename to 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
similarity index 100%
rename from test cases/common/181 subproject version/meson.build
rename to 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
similarity index 100%
rename from test cases/common/181 subproject version/subprojects/a/meson.build
rename to 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
similarity index 100%
rename from test cases/common/182 subdir_done/meson.build
rename to 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
similarity index 100%
rename from test cases/common/183 bothlibraries/libfile.c
rename to 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
similarity index 100%
rename from test cases/common/183 bothlibraries/main.c
rename to 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
similarity index 100%
rename from test cases/common/183 bothlibraries/meson.build
rename to 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
similarity index 100%
rename from test cases/common/183 bothlibraries/mylib.h
rename to 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
similarity index 100%
rename from test cases/common/184 escape and unicode/file.c.in
rename to 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
similarity index 100%
rename from test cases/common/184 escape and unicode/file.py
rename to 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
similarity index 100%
rename from test cases/common/184 escape and unicode/find.py
rename to 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
similarity index 100%
rename from test cases/common/184 escape and unicode/fun.c
rename to 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
similarity index 100%
rename from test cases/common/184 escape and unicode/main.c
rename to 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
similarity index 100%
rename from test cases/common/184 escape and unicode/meson.build
rename to 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
similarity index 100%
rename from test cases/common/185 has link arg/meson.build
rename to 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
similarity index 100%
rename from test cases/common/186 same target name flat layout/foo.c
rename to 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
similarity index 100%
rename from test cases/common/186 same target name flat layout/main.c
rename to 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
similarity index 100%
rename from test cases/common/186 same target name flat layout/meson.build
rename to 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
similarity index 100%
rename from test cases/common/186 same target name flat layout/subdir/foo.c
rename to 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
similarity index 100%
rename from test cases/common/186 same target name flat layout/subdir/meson.build
rename to 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
similarity index 100%
rename from test cases/common/187 find override/meson.build
rename to 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
similarity index 100%
rename from test cases/common/187 find override/otherdir/main.c
rename to 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
similarity index 100%
rename from test cases/common/187 find override/otherdir/main2.c
rename to 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
similarity index 100%
rename from test cases/common/187 find override/otherdir/meson.build
rename to 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
similarity index 100%
rename from test cases/common/187 find override/otherdir/source.desc
rename to 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
similarity index 100%
rename from test cases/common/187 find override/otherdir/source2.desc
rename to 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
similarity index 100%
rename from test cases/common/187 find override/subdir/converter.py
rename to 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
similarity index 100%
rename from test cases/common/187 find override/subdir/gencodegen.py.in
rename to 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
similarity index 100%
rename from test cases/common/187 find override/subdir/meson.build
rename to 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
similarity index 100%
rename from test cases/common/187 find override/subprojects/sub.wrap
rename to 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
similarity index 100%
rename from test cases/common/187 find override/subprojects/sub/meson.build
rename to 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
similarity index 100%
rename from test cases/common/188 partial dependency/declare_dependency/headers/foo.c
rename to 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
similarity index 100%
rename from test cases/common/188 partial dependency/declare_dependency/headers/foo.h
rename to 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
similarity index 100%
rename from test cases/common/188 partial dependency/declare_dependency/main.c
rename to 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
similarity index 100%
rename from test cases/common/188 partial dependency/declare_dependency/meson.build
rename to 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
similarity index 100%
rename from test cases/common/188 partial dependency/declare_dependency/other.c
rename to 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
similarity index 100%
rename from test cases/common/188 partial dependency/meson.build
rename to 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
similarity index 100%
rename from test cases/common/189 openmp/main.c
rename to 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
similarity index 100%
rename from test cases/common/189 openmp/main.cpp
rename to 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
similarity index 100%
rename from test cases/common/189 openmp/main.f90
rename to 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
similarity index 100%
rename from test cases/common/189 openmp/meson.build
rename to 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
similarity index 100%
rename from test cases/common/190 same target name/file.c
rename to 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
similarity index 100%
rename from test cases/common/190 same target name/meson.build
rename to 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
similarity index 100%
rename from test cases/common/190 same target name/sub/file2.c
rename to 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
similarity index 100%
rename from test cases/common/190 same target name/sub/meson.build
rename to 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
similarity index 100%
rename from test cases/common/191 test depends/gen.py
rename to 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
similarity index 100%
rename from test cases/common/191 test depends/main.c
rename to 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
similarity index 100%
rename from test cases/common/191 test depends/meson.build
rename to 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
similarity index 100%
rename from test cases/common/191 test depends/test.py
rename to 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
similarity index 100%
rename from test cases/common/192 args flattening/meson.build
rename to 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
similarity index 100%
rename from test cases/common/193 dict/meson.build
rename to 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
similarity index 100%
rename from test cases/common/193 dict/prog.c
rename to 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
similarity index 100%
rename from test cases/common/194 check header/meson.build
rename to 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
similarity index 100%
rename from test cases/common/194 check header/ouagadougou.h
rename to 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
similarity index 100%
rename from test cases/common/195 install_mode/config.h.in
rename to 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
similarity index 100%
rename from test cases/common/195 install_mode/data_source.txt
rename to 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
similarity index 100%
rename from test cases/common/195 install_mode/foo.1
rename to 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
similarity index 100%
rename from test cases/common/195 install_mode/meson.build
rename to 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
similarity index 100%
rename from test cases/common/195 install_mode/rootdir.h
rename to 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
similarity index 100%
rename from test cases/common/195 install_mode/runscript.sh
rename to 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
similarity index 100%
rename from test cases/common/195 install_mode/stat.c
rename to 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
similarity index 100%
rename from test cases/common/195 install_mode/sub1/second.dat
rename to 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
similarity index 100%
rename from test cases/common/195 install_mode/sub2/stub
rename to 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
similarity index 100%
rename from test cases/common/195 install_mode/test.json
rename to 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
similarity index 100%
rename from test cases/common/195 install_mode/trivial.c
rename to 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
similarity index 100%
rename from test cases/common/196 subproject array version/meson.build
rename to 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
similarity index 100%
rename from test cases/common/196 subproject array version/subprojects/foo/meson.build
rename to 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
similarity index 100%
rename from test cases/common/197 feature option/meson.build
rename to 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
similarity index 100%
rename from test cases/common/197 feature option/meson_options.txt
rename to 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
similarity index 100%
rename from test cases/common/198 feature option disabled/meson.build
rename to 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
similarity index 100%
rename from test cases/common/198 feature option disabled/meson_options.txt
rename to 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
similarity index 100%
rename from test cases/common/199 static threads/lib1.c
rename to 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
similarity index 100%
rename from test cases/common/199 static threads/lib2.c
rename to 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
similarity index 100%
rename from test cases/common/199 static threads/meson.build
rename to 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
similarity index 100%
rename from test cases/common/199 static threads/prog.c
rename to 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
similarity index 100%
rename from test cases/common/200 generator in subdir/com/mesonbuild/genprog.py
rename to 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
similarity index 100%
rename from test cases/common/200 generator in subdir/com/mesonbuild/meson.build
rename to 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
similarity index 100%
rename from test cases/common/200 generator in subdir/com/mesonbuild/subbie.inp
rename to 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
similarity index 100%
rename from test cases/common/200 generator in subdir/com/mesonbuild/testprog.c
rename to 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
similarity index 100%
rename from test cases/common/200 generator in subdir/meson.build
rename to 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
similarity index 100%
rename from test cases/common/202 subproject with features/meson.build
rename to 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
similarity index 100%
rename from test cases/common/202 subproject with features/meson_options.txt
rename to 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
similarity index 100%
rename from test cases/common/202 subproject with features/nothing.c
rename to 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
similarity index 100%
rename from test cases/common/202 subproject with features/subprojects/auto_sub_with_missing_dep/meson.build
rename to 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
similarity index 100%
rename from test cases/common/202 subproject with features/subprojects/disabled_sub/lib/meson.build
rename to test cases/common/197 subproject with features/subprojects/disabled_sub/lib/meson.build
diff --git a/test cases/common/202 subproject with features/subprojects/disabled_sub/lib/sub.c b/test cases/common/197 subproject with features/subprojects/disabled_sub/lib/sub.c
similarity index 100%
rename from test cases/common/202 subproject with features/subprojects/disabled_sub/lib/sub.c
rename to 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
similarity index 100%
rename from test cases/common/202 subproject with features/subprojects/disabled_sub/lib/sub.h
rename to 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
similarity index 100%
rename from test cases/common/202 subproject with features/subprojects/disabled_sub/meson.build
rename to 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
similarity index 100%
rename from test cases/common/202 subproject with features/subprojects/sub/lib/meson.build
rename to 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
similarity index 100%
rename from test cases/common/202 subproject with features/subprojects/sub/lib/sub.c
rename to test cases/common/197 subproject with features/subprojects/sub/lib/sub.c
diff --git a/test cases/common/202 subproject with features/subprojects/sub/lib/sub.h b/test cases/common/197 subproject with features/subprojects/sub/lib/sub.h
similarity index 100%
rename from test cases/common/202 subproject with features/subprojects/sub/lib/sub.h
rename to 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
similarity index 100%
rename from test cases/common/202 subproject with features/subprojects/sub/meson.build
rename to 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
similarity index 100%
rename from test cases/common/203 function attributes/meson.build
rename to 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
similarity index 100%
rename from test cases/common/203 function attributes/meson_options.txt
rename to 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
similarity index 100%
rename from test cases/common/203 function attributes/test.json
rename to 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
similarity index 100%
rename from test cases/common/204 broken subproject/meson.build
rename to 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
similarity index 100%
rename from test cases/common/204 broken subproject/subprojects/broken/broken.c
rename to 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
similarity index 100%
rename from test cases/common/204 broken subproject/subprojects/broken/meson.build
rename to 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
similarity index 100%
rename from test cases/common/205 argument syntax/meson.build
rename to 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
similarity index 100%
rename from test cases/common/206 install name_prefix name_suffix/libfile.c
rename to 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
similarity index 100%
rename from test cases/common/206 install name_prefix name_suffix/meson.build
rename to 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
similarity index 100%
rename from test cases/common/206 install name_prefix name_suffix/test.json
rename to 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
similarity index 100%
rename from test cases/common/207 kwarg entry/inc/prog.h
rename to 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
similarity index 100%
rename from test cases/common/207 kwarg entry/meson.build
rename to 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
similarity index 100%
rename from test cases/common/207 kwarg entry/prog.c
rename to 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
similarity index 100%
rename from test cases/common/207 kwarg entry/test.json
rename to 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
similarity index 100%
rename from test cases/common/208 custom target build by default/docgen.py
rename to 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
similarity index 100%
rename from test cases/common/208 custom target build by default/meson.build
rename to 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
similarity index 100%
rename from test cases/common/208 custom target build by default/test.json
rename to 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
similarity index 100%
rename from test cases/common/209 find_library and headers/foo.h
rename to 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
similarity index 100%
rename from test cases/common/209 find_library and headers/meson.build
rename to 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
similarity index 100%
rename from test cases/common/210 line continuation/meson.build
rename to 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
similarity index 100%
rename from test cases/common/212 native file path override/main.cpp
rename to 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
similarity index 100%
rename from test cases/common/212 native file path override/meson.build
rename to 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
similarity index 100%
rename from test cases/common/212 native file path override/nativefile.ini
rename to 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
similarity index 100%
rename from test cases/common/212 native file path override/test.json
rename to 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
similarity index 100%
rename from test cases/common/213 tap tests/cat.c
rename to 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
similarity index 100%
rename from test cases/common/213 tap tests/issue7515.txt
rename to 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
similarity index 100%
rename from test cases/common/213 tap tests/meson.build
rename to 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
similarity index 100%
rename from test cases/common/213 tap tests/tester.c
rename to 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
similarity index 100%
rename from test cases/common/214 warning level 0/main.cpp
rename to 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
similarity index 100%
rename from test cases/common/214 warning level 0/meson.build
rename to 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
similarity index 100%
rename from test cases/common/215 link custom/custom_stlib.py
rename to 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
similarity index 100%
rename from test cases/common/215 link custom/custom_target.c
rename to 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
similarity index 100%
rename from test cases/common/215 link custom/custom_target.py
rename to 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
similarity index 100%
rename from test cases/common/215 link custom/dummy.c
rename to 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
similarity index 100%
rename from test cases/common/215 link custom/lib.c
rename to 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
similarity index 100%
rename from test cases/common/215 link custom/meson.build
rename to 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
similarity index 100%
rename from test cases/common/215 link custom/outerlib.c
rename to 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
similarity index 100%
rename from test cases/common/215 link custom/prog.c
rename to 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
similarity index 100%
rename from test cases/common/216 link custom_i single from multiple/generate_conflicting_stlibs.py
rename to 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
similarity index 100%
rename from test cases/common/216 link custom_i single from multiple/meson.build
rename to 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
similarity index 100%
rename from test cases/common/216 link custom_i single from multiple/prog.c
rename to 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
similarity index 100%
rename from test cases/common/217 link custom_i multiple from multiple/generate_stlibs.py
rename to 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
similarity index 100%
rename from test cases/common/217 link custom_i multiple from multiple/meson.build
rename to 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
similarity index 100%
rename from test cases/common/217 link custom_i multiple from multiple/prog.c
rename to 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
similarity index 100%
rename from test cases/common/218 dependency get_variable method/meson.build
rename to 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
similarity index 100%
rename from test cases/common/219 source set configuration_data/a.c
rename to 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
similarity index 100%
rename from test cases/common/219 source set configuration_data/all.h
rename to 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
similarity index 100%
rename from test cases/common/219 source set configuration_data/f.c
rename to 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
similarity index 100%
rename from test cases/common/219 source set configuration_data/g.c
rename to 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
similarity index 100%
rename from test cases/common/219 source set configuration_data/meson.build
rename to 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
similarity index 100%
rename from test cases/common/219 source set configuration_data/nope.c
rename to 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
similarity index 100%
rename from test cases/common/219 source set configuration_data/subdir/b.c
rename to 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
similarity index 100%
rename from test cases/common/219 source set configuration_data/subdir/meson.build
rename to 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
similarity index 100%
rename from test cases/common/220 source set dictionary/a.c
rename to 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
similarity index 100%
rename from test cases/common/220 source set dictionary/all.h
rename to 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
similarity index 100%
rename from test cases/common/220 source set dictionary/f.c
rename to 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
similarity index 100%
rename from test cases/common/220 source set dictionary/g.c
rename to 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
similarity index 100%
rename from test cases/common/220 source set dictionary/meson.build
rename to 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
similarity index 100%
rename from test cases/common/220 source set dictionary/nope.c
rename to 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
similarity index 100%
rename from test cases/common/220 source set dictionary/subdir/b.c
rename to 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
similarity index 100%
rename from test cases/common/220 source set dictionary/subdir/meson.build
rename to 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
similarity index 100%
rename from test cases/common/221 source set custom target/a.c
rename to 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
similarity index 100%
rename from test cases/common/221 source set custom target/all.h
rename to 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
similarity index 100%
rename from test cases/common/221 source set custom target/cp.py
rename to 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
similarity index 100%
rename from test cases/common/221 source set custom target/f.c
rename to 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
similarity index 100%
rename from test cases/common/221 source set custom target/g.c
rename to 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
similarity index 100%
rename from test cases/common/221 source set custom target/meson.build
rename to 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
similarity index 100%
rename from test cases/common/222 source set realistic example/boards/arm/aarch64.cc
rename to 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
similarity index 100%
rename from test cases/common/222 source set realistic example/boards/arm/arm.cc
rename to 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
similarity index 100%
rename from test cases/common/222 source set realistic example/boards/arm/arm.h
rename to 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
similarity index 100%
rename from test cases/common/222 source set realistic example/boards/arm/arm32.cc
rename to 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
similarity index 100%
rename from test cases/common/222 source set realistic example/boards/arm/versatilepb.cc
rename to 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
similarity index 100%
rename from test cases/common/222 source set realistic example/boards/arm/virt.cc
rename to 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
similarity index 100%
rename from test cases/common/222 source set realistic example/boards/arm/xlnx_zcu102.cc
rename to 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
similarity index 100%
rename from test cases/common/222 source set realistic example/boards/meson.build
rename to 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
similarity index 100%
rename from test cases/common/222 source set realistic example/boards/x86/pc.cc
rename to 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
similarity index 100%
rename from test cases/common/222 source set realistic example/common.h
rename to 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
similarity index 100%
rename from test cases/common/222 source set realistic example/config/aarch64
rename to 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
similarity index 100%
rename from test cases/common/222 source set realistic example/config/arm
rename to 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
similarity index 100%
rename from test cases/common/222 source set realistic example/config/x86
rename to 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
similarity index 100%
rename from test cases/common/222 source set realistic example/devices/meson.build
rename to 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
similarity index 100%
rename from test cases/common/222 source set realistic example/devices/virtio-mmio.cc
rename to 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
similarity index 100%
rename from test cases/common/222 source set realistic example/devices/virtio-pci.cc
rename to 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
similarity index 100%
rename from test cases/common/222 source set realistic example/devices/virtio.cc
rename to 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
similarity index 100%
rename from test cases/common/222 source set realistic example/devices/virtio.h
rename to 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
similarity index 100%
rename from test cases/common/222 source set realistic example/main.cc
rename to 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
similarity index 100%
rename from test cases/common/222 source set realistic example/meson.build
rename to 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
similarity index 100%
rename from test cases/common/222 source set realistic example/not-found.cc
rename to 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
similarity index 100%
rename from test cases/common/222 source set realistic example/was-found.cc
rename to 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
similarity index 100%
rename from test cases/common/222 source set realistic example/zlib.cc
rename to 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
similarity index 100%
rename from test cases/common/223 custom target input extracted objects/check_object.py
rename to 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
similarity index 100%
rename from test cases/common/223 custom target input extracted objects/libdir/meson.build
rename to 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
similarity index 100%
rename from test cases/common/223 custom target input extracted objects/libdir/source.c
rename to 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
similarity index 100%
rename from test cases/common/223 custom target input extracted objects/meson.build
rename to 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
similarity index 100%
rename from test cases/common/224 test priorities/meson.build
rename to 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
similarity index 100%
rename from test cases/common/224 test priorities/testprog.py
rename to 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
similarity index 100%
rename from test cases/common/225 include_dir dot/meson.build
rename to 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
similarity index 100%
rename from test cases/common/225 include_dir dot/rone.h
rename to 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
similarity index 100%
rename from test cases/common/225 include_dir dot/src/main.c
rename to 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
similarity index 100%
rename from test cases/common/225 include_dir dot/src/meson.build
rename to 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
similarity index 100%
rename from test cases/common/225 include_dir dot/src/rone.c
rename to 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
similarity index 100%
rename from test cases/common/226 include_type dependency/main.cpp
rename to 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
similarity index 100%
rename from test cases/common/226 include_type dependency/meson.build
rename to 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
similarity index 100%
rename from test cases/common/226 include_type dependency/pch/test.hpp
rename to 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
similarity index 100%
rename from test cases/common/226 include_type dependency/subprojects/subDep/meson.build
rename to 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
similarity index 100%
rename from test cases/common/227 fs module/meson.build
rename to 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
similarity index 100%
rename from test cases/common/227 fs module/subdir/meson.build
rename to 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
similarity index 100%
rename from test cases/common/227 fs module/subdir/subdirfile.txt
rename to 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
similarity index 100%
rename from test cases/common/227 fs module/subprojects/subbie/meson.build
rename to 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
similarity index 100%
rename from test cases/common/227 fs module/subprojects/subbie/subprojectfile.txt
rename to 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
similarity index 100%
rename from test cases/common/227 fs module/subprojects/subbie/subsub/meson.build
rename to 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
similarity index 100%
rename from test cases/common/227 fs module/subprojects/subbie/subsub/subsubfile.txt
rename to 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
similarity index 100%
rename from test cases/common/228 zlib/meson.build
rename to 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
similarity index 100%
rename from test cases/common/229 native prop/crossfile.ini
rename to 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
similarity index 100%
rename from test cases/common/229 native prop/meson.build
rename to 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
similarity index 100%
rename from test cases/common/229 native prop/nativefile.ini
rename to 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
similarity index 100%
rename from test cases/common/230 persubproject options/foo.c
rename to 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
similarity index 100%
rename from test cases/common/230 persubproject options/meson.build
rename to 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
similarity index 100%
rename from test cases/common/230 persubproject options/subprojects/sub1/foo.c
rename to 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
similarity index 100%
rename from test cases/common/230 persubproject options/subprojects/sub1/meson.build
rename to 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
similarity index 100%
rename from test cases/common/230 persubproject options/subprojects/sub2/foo.c
rename to 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
similarity index 100%
rename from test cases/common/230 persubproject options/subprojects/sub2/meson.build
rename to 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
similarity index 100%
rename from test cases/common/231 arithmetic operators/meson.build
rename to 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
similarity index 100%
rename from test cases/common/232 link language/c_linkage.cpp
rename to 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
similarity index 100%
rename from test cases/common/232 link language/c_linkage.h
rename to 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
similarity index 100%
rename from test cases/common/232 link language/lib.cpp
rename to 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
similarity index 100%
rename from test cases/common/232 link language/main.c
rename to 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
similarity index 100%
rename from test cases/common/232 link language/meson.build
rename to 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
similarity index 100%
rename from test cases/common/233 link depends indexed custom target/check_arch.py
rename to 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
similarity index 100%
rename from test cases/common/233 link depends indexed custom target/foo.c
rename to 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
similarity index 100%
rename from test cases/common/233 link depends indexed custom target/make_file.py
rename to 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
similarity index 100%
rename from test cases/common/233 link depends indexed custom target/meson.build
rename to 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
similarity index 100%
rename from test cases/common/234 very long commmand line/codegen.py
rename to 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
similarity index 100%
rename from test cases/common/234 very long commmand line/main.c
rename to 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
similarity index 100%
rename from test cases/common/234 very long commmand line/meson.build
rename to 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
similarity index 100%
rename from test cases/common/234 very long commmand line/name_gen.py
rename to 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
similarity index 100%
rename from test cases/common/235 custom_target source/a
rename to 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
similarity index 100%
rename from test cases/common/235 custom_target source/meson.build
rename to 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
similarity index 100%
rename from test cases/common/235 custom_target source/x.py
rename to 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
similarity index 100%
rename from test cases/common/235 disabler array addition/meson.build
rename to 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
similarity index 100%
rename from test cases/common/235 disabler array addition/test.c
rename to 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
similarity index 100%
rename from test cases/common/236 external project/app.c
rename to 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
similarity index 100%
rename from test cases/common/236 external project/func.c
rename to 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
similarity index 100%
rename from test cases/common/236 external project/func.h
rename to 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
similarity index 100%
rename from test cases/common/236 external project/libfoo/configure
rename to 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
similarity index 100%
rename from test cases/common/236 external project/libfoo/libfoo.c
rename to 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
similarity index 100%
rename from test cases/common/236 external project/libfoo/libfoo.h
rename to 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
similarity index 100%
rename from test cases/common/236 external project/libfoo/meson.build
rename to 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
similarity index 100%
rename from test cases/common/236 external project/meson.build
rename to 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
similarity index 100%
rename from test cases/common/236 external project/test.json
rename to 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
similarity index 100%
rename from test cases/common/237 subdir files/meson.build
rename to 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
similarity index 100%
rename from test cases/common/237 subdir files/subdir/meson.build
rename to 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
similarity index 100%
rename from test cases/common/237 subdir files/subdir/prog.c
rename to 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
similarity index 100%
rename from test cases/common/239 dependency allow_fallback/meson.build
rename to 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
similarity index 100%
rename from test cases/common/239 dependency allow_fallback/subprojects/foob/meson.build
rename to 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
similarity index 100%
rename from test cases/common/239 dependency allow_fallback/subprojects/foob3/meson.build
rename to 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
similarity index 100%
rename from test cases/common/28 find program/meson.build
rename to 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
similarity index 100%
rename from test cases/common/28 find program/print-version-with-prefix.py
rename to 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
similarity index 100%
rename from test cases/common/28 find program/print-version.py
rename to 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
similarity index 100%
rename from test cases/common/28 find program/scripts/test_subdir.py
rename to 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
similarity index 100%
rename from test cases/common/28 find program/source.in
rename to 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
similarity index 100%
rename from test cases/common/29 multiline string/meson.build
rename to 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
similarity index 100%
rename from test cases/common/30 try compile/invalid.c
rename to 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
similarity index 100%
rename from test cases/common/30 try compile/meson.build
rename to 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
similarity index 100%
rename from test cases/common/30 try compile/valid.c
rename to 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
similarity index 100%
rename from test cases/common/31 compiler id/meson.build
rename to 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
similarity index 100%
rename from test cases/common/32 sizeof/config.h.in
rename to 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
similarity index 100%
rename from test cases/common/32 sizeof/meson.build
rename to 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
similarity index 100%
rename from test cases/common/32 sizeof/prog.c.in
rename to 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
similarity index 100%
rename from test cases/common/33 define10/config.h.in
rename to 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
similarity index 100%
rename from test cases/common/33 define10/meson.build
rename to 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
similarity index 100%
rename from test cases/common/33 define10/prog.c
rename to 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
similarity index 100%
rename from test cases/common/34 has header/meson.build
rename to 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
similarity index 100%
rename from test cases/common/34 has header/ouagadougou.h
rename to 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
similarity index 100%
rename from test cases/common/35 run program/get-version.py
rename to 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
similarity index 100%
rename from test cases/common/35 run program/meson.build
rename to 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
similarity index 100%
rename from test cases/common/35 run program/scripts/hello.bat
rename to 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
similarity index 100%
rename from test cases/common/35 run program/scripts/hello.sh
rename to 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
similarity index 100%
rename from test cases/common/37 logic ops/meson.build
rename to 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
similarity index 100%
rename from test cases/common/38 string operations/meson.build
rename to 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
similarity index 100%
rename from test cases/common/39 has function/meson.build
rename to 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
similarity index 100%
rename from test cases/common/40 has member/meson.build
rename to 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
similarity index 100%
rename from test cases/common/41 alignment/meson.build
rename to 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
similarity index 100%
rename from test cases/common/42 library chain/main.c
rename to 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
similarity index 100%
rename from test cases/common/42 library chain/meson.build
rename to 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
similarity index 100%
rename from test cases/common/42 library chain/subdir/lib1.c
rename to 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
similarity index 100%
rename from test cases/common/42 library chain/subdir/meson.build
rename to 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
similarity index 100%
rename from test cases/common/42 library chain/subdir/subdir2/lib2.c
rename to 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
similarity index 100%
rename from test cases/common/42 library chain/subdir/subdir2/meson.build
rename to 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
similarity index 100%
rename from test cases/common/42 library chain/subdir/subdir3/lib3.c
rename to 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
similarity index 100%
rename from test cases/common/42 library chain/subdir/subdir3/meson.build
rename to 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
similarity index 100%
rename from test cases/common/42 library chain/test.json
rename to 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
similarity index 100%
rename from test cases/common/43 options/meson.build
rename to 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
similarity index 100%
rename from test cases/common/43 options/meson_options.txt
rename to 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
similarity index 100%
rename from test cases/common/44 test args/cmd_args.c
rename to 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
similarity index 100%
rename from test cases/common/44 test args/copyfile.py
rename to 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
similarity index 100%
rename from test cases/common/44 test args/env2vars.c
rename to 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
similarity index 100%
rename from test cases/common/44 test args/envvars.c
rename to 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
similarity index 100%
rename from test cases/common/44 test args/meson.build
rename to 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
similarity index 100%
rename from test cases/common/44 test args/tester.c
rename to 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
similarity index 100%
rename from test cases/common/44 test args/tester.py
rename to 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
similarity index 100%
rename from test cases/common/44 test args/testfile.txt
rename to 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
similarity index 100%
rename from test cases/common/45 subproject/meson.build
rename to 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
similarity index 100%
rename from test cases/common/45 subproject/subprojects/sublib/include/subdefs.h
rename to 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
similarity index 100%
rename from test cases/common/45 subproject/subprojects/sublib/meson.build
rename to 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
similarity index 100%
rename from test cases/common/45 subproject/subprojects/sublib/simpletest.c
rename to 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
similarity index 100%
rename from test cases/common/45 subproject/subprojects/sublib/sublib.c
rename to 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
similarity index 100%
rename from test cases/common/45 subproject/test.json
rename to 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
similarity index 100%
rename from test cases/common/45 subproject/user.c
rename to 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
similarity index 100%
rename from test cases/common/46 subproject options/meson.build
rename to 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
similarity index 100%
rename from test cases/common/46 subproject options/meson_options.txt
rename to 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
similarity index 100%
rename from test cases/common/46 subproject options/subprojects/subproject/meson.build
rename to 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
similarity index 100%
rename from test cases/common/46 subproject options/subprojects/subproject/meson_options.txt
rename to 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
similarity index 100%
rename from test cases/common/47 pkgconfig-gen/dependencies/custom.c
rename to 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
similarity index 100%
rename from test cases/common/47 pkgconfig-gen/dependencies/exposed.c
rename to 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
similarity index 100%
rename from test cases/common/47 pkgconfig-gen/dependencies/internal.c
rename to 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
similarity index 100%
rename from test cases/common/47 pkgconfig-gen/dependencies/main.c
rename to 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
similarity index 100%
rename from test cases/common/47 pkgconfig-gen/dependencies/meson.build
rename to 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
similarity index 100%
rename from test cases/common/47 pkgconfig-gen/meson.build
rename to 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
similarity index 100%
rename from test cases/common/47 pkgconfig-gen/simple.c
rename to 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
similarity index 100%
rename from test cases/common/47 pkgconfig-gen/simple.h
rename to 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
similarity index 100%
rename from test cases/common/47 pkgconfig-gen/simple5.c
rename to 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
similarity index 100%
rename from test cases/common/47 pkgconfig-gen/test.json
rename to 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
similarity index 100%
rename from test cases/common/48 custom install dirs/datafile.cat
rename to 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
similarity index 100%
rename from test cases/common/48 custom install dirs/meson.build
rename to 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
similarity index 100%
rename from test cases/common/48 custom install dirs/prog.1
rename to 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
similarity index 100%
rename from test cases/common/48 custom install dirs/prog.c
rename to 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
similarity index 100%
rename from test cases/common/48 custom install dirs/sample.h
rename to 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
similarity index 100%
rename from test cases/common/48 custom install dirs/subdir/datafile.dog
rename to 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
similarity index 100%
rename from test cases/common/48 custom install dirs/test.json
rename to 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
similarity index 100%
rename from test cases/common/49 subproject subproject/meson.build
rename to 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
similarity index 100%
rename from test cases/common/49 subproject subproject/prog.c
rename to 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
similarity index 100%
rename from test cases/common/49 subproject subproject/subprojects/a/a.c
rename to 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
similarity index 100%
rename from test cases/common/49 subproject subproject/subprojects/a/meson.build
rename to 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
similarity index 100%
rename from test cases/common/49 subproject subproject/subprojects/b/b.c
rename to 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
similarity index 100%
rename from test cases/common/49 subproject subproject/subprojects/b/meson.build
rename to 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
similarity index 100%
rename from test cases/common/49 subproject subproject/subprojects/c/meson.build
rename to 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
similarity index 100%
rename from test cases/common/50 same file name/d1/file.c
rename to 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
similarity index 100%
rename from test cases/common/50 same file name/d2/file.c
rename to 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
similarity index 100%
rename from test cases/common/50 same file name/meson.build
rename to 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
similarity index 100%
rename from test cases/common/50 same file name/prog.c
rename to 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
similarity index 100%
rename from test cases/common/51 file grabber/a.c
rename to 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
similarity index 100%
rename from test cases/common/51 file grabber/b.c
rename to 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
similarity index 100%
rename from test cases/common/51 file grabber/c.c
rename to 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
similarity index 100%
rename from test cases/common/51 file grabber/grabber.bat
rename to 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
similarity index 100%
rename from test cases/common/51 file grabber/grabber.sh
rename to 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
similarity index 100%
rename from test cases/common/51 file grabber/grabber2.bat
rename to 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
similarity index 100%
rename from test cases/common/51 file grabber/meson.build
rename to 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
similarity index 100%
rename from test cases/common/51 file grabber/prog.c
rename to 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
similarity index 100%
rename from test cases/common/51 file grabber/subdir/meson.build
rename to 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
similarity index 100%
rename from test cases/common/51 file grabber/subdir/suba.c
rename to 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
similarity index 100%
rename from test cases/common/51 file grabber/subdir/subb.c
rename to 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
similarity index 100%
rename from test cases/common/51 file grabber/subdir/subc.c
rename to 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
similarity index 100%
rename from test cases/common/51 file grabber/subdir/subprog.c
rename to 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
similarity index 100%
rename from test cases/common/52 custom target/data_source.txt
rename to 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
similarity index 100%
rename from test cases/common/52 custom target/depfile/dep.py
rename to 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
similarity index 100%
rename from test cases/common/52 custom target/depfile/meson.build
rename to 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
similarity index 100%
rename from test cases/common/52 custom target/meson.build
rename to 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
similarity index 100%
rename from test cases/common/52 custom target/my_compiler.py
rename to 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
similarity index 100%
rename from test cases/common/52 custom target/test.json
rename to 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
similarity index 100%
rename from test cases/common/53 custom target chain/data_source.txt
rename to 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
similarity index 100%
rename from test cases/common/53 custom target chain/meson.build
rename to 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
similarity index 100%
rename from test cases/common/53 custom target chain/my_compiler.py
rename to 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
similarity index 100%
rename from test cases/common/53 custom target chain/my_compiler2.py
rename to 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
similarity index 100%
rename from test cases/common/53 custom target chain/test.json
rename to 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
similarity index 100%
rename from test cases/common/53 custom target chain/usetarget/meson.build
rename to 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
similarity index 100%
rename from test cases/common/53 custom target chain/usetarget/myexe.c
rename to 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
similarity index 100%
rename from test cases/common/53 custom target chain/usetarget/subcomp.py
rename to 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
similarity index 100%
rename from test cases/common/54 run target/check_exists.py
rename to 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
similarity index 100%
rename from test cases/common/54 run target/configure.in
rename to 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
similarity index 100%
rename from test cases/common/54 run target/converter.py
rename to 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
similarity index 100%
rename from test cases/common/54 run target/fakeburner.py
rename to 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
similarity index 100%
rename from test cases/common/54 run target/helloprinter.c
rename to 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
similarity index 100%
rename from test cases/common/54 run target/meson.build
rename to 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
similarity index 100%
rename from test cases/common/55 object generator/meson.build
rename to 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
similarity index 100%
rename from test cases/common/55 object generator/obj_generator.py
rename to 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
similarity index 100%
rename from test cases/common/55 object generator/prog.c
rename to 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
similarity index 100%
rename from test cases/common/55 object generator/source.c
rename to 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
similarity index 100%
rename from test cases/common/55 object generator/source2.c
rename to 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
similarity index 100%
rename from test cases/common/55 object generator/source3.c
rename to 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
similarity index 100%
rename from test cases/common/56 install script/customtarget.py
rename to 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
similarity index 100%
rename from test cases/common/56 install script/meson.build
rename to 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
similarity index 100%
rename from test cases/common/56 install script/myinstall.py
rename to 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
similarity index 100%
rename from test cases/common/56 install script/prog.c
rename to 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
similarity index 100%
rename from test cases/common/56 install script/src/a file.txt
rename to 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
similarity index 100%
rename from test cases/common/56 install script/src/meson.build
rename to 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
similarity index 100%
rename from test cases/common/56 install script/src/myinstall.py
rename to 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
similarity index 100%
rename from test cases/common/56 install script/test.json
rename to 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
similarity index 100%
rename from test cases/common/57 custom target source output/generator.py
rename to 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
similarity index 100%
rename from test cases/common/57 custom target source output/main.c
rename to 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
similarity index 100%
rename from test cases/common/57 custom target source output/meson.build
rename to 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
similarity index 100%
rename from test cases/common/58 exe static shared/meson.build
rename to 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
similarity index 100%
rename from test cases/common/58 exe static shared/prog.c
rename to 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
similarity index 100%
rename from test cases/common/58 exe static shared/shlib2.c
rename to 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
similarity index 100%
rename from test cases/common/58 exe static shared/stat.c
rename to 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
similarity index 100%
rename from test cases/common/58 exe static shared/stat2.c
rename to 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
similarity index 100%
rename from test cases/common/58 exe static shared/subdir/exports.h
rename to 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
similarity index 100%
rename from test cases/common/58 exe static shared/subdir/meson.build
rename to 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
similarity index 100%
rename from test cases/common/58 exe static shared/subdir/shlib.c
rename to 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
similarity index 100%
rename from test cases/common/59 array methods/meson.build
rename to 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
similarity index 100%
rename from test cases/common/60 custom header generator/input.def
rename to 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
similarity index 100%
rename from test cases/common/60 custom header generator/makeheader.py
rename to 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
similarity index 100%
rename from test cases/common/60 custom header generator/meson.build
rename to 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
similarity index 100%
rename from test cases/common/60 custom header generator/prog.c
rename to 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
similarity index 100%
rename from test cases/common/60 custom header generator/somefile.txt
rename to 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
similarity index 100%
rename from test cases/common/61 multiple generators/data2.dat
rename to 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
similarity index 100%
rename from test cases/common/61 multiple generators/main.cpp
rename to 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
similarity index 100%
rename from test cases/common/61 multiple generators/meson.build
rename to 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
similarity index 100%
rename from test cases/common/61 multiple generators/mygen.py
rename to 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
similarity index 100%
rename from test cases/common/61 multiple generators/subdir/data.dat
rename to 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
similarity index 100%
rename from test cases/common/61 multiple generators/subdir/meson.build
rename to 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
similarity index 100%
rename from test cases/common/62 install subdir/meson.build
rename to 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
similarity index 100%
rename from test cases/common/62 install subdir/nested_elided/sub/dircheck/ninth.dat
rename to 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
similarity index 100%
rename from test cases/common/62 install subdir/nested_elided/sub/eighth.dat
rename to 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
similarity index 100%
rename from test cases/common/62 install subdir/sub/sub1/third.dat
rename to 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
similarity index 100%
rename from test cases/common/62 install subdir/sub1/second.dat
rename to 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
similarity index 100%
rename from test cases/common/62 install subdir/sub2/dircheck/excluded-three.dat
rename to 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
similarity index 100%
rename from test cases/common/62 install subdir/sub2/excluded-three.dat
rename to 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
similarity index 100%
rename from test cases/common/62 install subdir/sub2/excluded/two.dat
rename to 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
similarity index 100%
rename from test cases/common/62 install subdir/sub2/one.dat
rename to 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
similarity index 100%
rename from test cases/common/62 install subdir/sub_elided/dircheck/fifth.dat
rename to 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
similarity index 100%
rename from test cases/common/62 install subdir/sub_elided/fourth.dat
rename to 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
similarity index 100%
rename from test cases/common/62 install subdir/subdir/meson.build
rename to 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
similarity index 100%
rename from test cases/common/62 install subdir/subdir/sub1/data1.dat
rename to 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
similarity index 100%
rename from test cases/common/62 install subdir/subdir/sub1/sub2/data2.dat
rename to 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
similarity index 100%
rename from test cases/common/62 install subdir/subdir/sub_elided/dircheck/seventh.dat
rename to 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
similarity index 100%
rename from test cases/common/62 install subdir/subdir/sub_elided/sixth.dat
rename to 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
similarity index 100%
rename from test cases/common/62 install subdir/test.json
rename to 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
similarity index 100%
rename from test cases/common/63 foreach/meson.build
rename to 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
similarity index 100%
rename from test cases/common/63 foreach/prog1.c
rename to 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
similarity index 100%
rename from test cases/common/63 foreach/prog2.c
rename to 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
similarity index 100%
rename from test cases/common/63 foreach/prog3.c
rename to 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
similarity index 100%
rename from test cases/common/63 foreach/test.json
rename to 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
similarity index 100%
rename from test cases/common/64 number arithmetic/meson.build
rename to 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
similarity index 100%
rename from test cases/common/65 string arithmetic/meson.build
rename to 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
similarity index 100%
rename from test cases/common/66 array arithmetic/meson.build
rename to 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
similarity index 100%
rename from test cases/common/67 arithmetic bidmas/meson.build
rename to 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
similarity index 100%
rename from test cases/common/68 build always/main.c
rename to 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
similarity index 100%
rename from test cases/common/68 build always/meson.build
rename to 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
similarity index 100%
rename from test cases/common/68 build always/version.c.in
rename to 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
similarity index 100%
rename from test cases/common/68 build always/version.h
rename to 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
similarity index 100%
rename from test cases/common/68 build always/version_gen.py
rename to 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
similarity index 100%
rename from test cases/common/69 vcstag/meson.build
rename to 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
similarity index 100%
rename from test cases/common/69 vcstag/tagprog.c
rename to 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
similarity index 100%
rename from test cases/common/69 vcstag/vcstag.c.in
rename to 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
similarity index 100%
rename from test cases/common/70 modules/meson.build
rename to 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
similarity index 100%
rename from test cases/common/71 should fail/failing.c
rename to 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
similarity index 100%
rename from test cases/common/71 should fail/meson.build
rename to 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
similarity index 100%
rename from test cases/common/72 configure file in custom target/inc/confdata.in
rename to 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
similarity index 100%
rename from test cases/common/72 configure file in custom target/inc/meson.build
rename to 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
similarity index 100%
rename from test cases/common/72 configure file in custom target/meson.build
rename to 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
similarity index 100%
rename from test cases/common/72 configure file in custom target/src/meson.build
rename to 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
similarity index 100%
rename from test cases/common/72 configure file in custom target/src/mycompiler.py
rename to 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
similarity index 100%
rename from test cases/common/73 external test program/meson.build
rename to 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
similarity index 100%
rename from test cases/common/73 external test program/mytest.py
rename to 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
similarity index 100%
rename from test cases/common/74 ctarget dependency/gen1.py
rename to 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
similarity index 100%
rename from test cases/common/74 ctarget dependency/gen2.py
rename to 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
similarity index 100%
rename from test cases/common/74 ctarget dependency/input.dat
rename to 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
similarity index 100%
rename from test cases/common/74 ctarget dependency/meson.build
rename to 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
similarity index 100%
rename from test cases/common/75 shared subproject/a.c
rename to 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
similarity index 100%
rename from test cases/common/75 shared subproject/meson.build
rename to 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
similarity index 100%
rename from test cases/common/75 shared subproject/subprojects/B/b.c
rename to 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
similarity index 100%
rename from test cases/common/75 shared subproject/subprojects/B/meson.build
rename to 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
similarity index 100%
rename from test cases/common/75 shared subproject/subprojects/C/c.c
rename to 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
similarity index 100%
rename from test cases/common/75 shared subproject/subprojects/C/meson.build
rename to 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
similarity index 100%
rename from test cases/common/76 shared subproject 2/a.c
rename to 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
similarity index 100%
rename from test cases/common/76 shared subproject 2/meson.build
rename to 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
similarity index 100%
rename from test cases/common/76 shared subproject 2/subprojects/B/b.c
rename to 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
similarity index 100%
rename from test cases/common/76 shared subproject 2/subprojects/B/meson.build
rename to 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
similarity index 100%
rename from test cases/common/76 shared subproject 2/subprojects/C/c.c
rename to 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
similarity index 100%
rename from test cases/common/76 shared subproject 2/subprojects/C/meson.build
rename to 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
similarity index 100%
rename from test cases/common/77 file object/lib.c
rename to 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
similarity index 100%
rename from test cases/common/77 file object/meson.build
rename to 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
similarity index 100%
rename from test cases/common/77 file object/prog.c
rename to 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
similarity index 100%
rename from test cases/common/77 file object/subdir1/lib.c
rename to 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
similarity index 100%
rename from test cases/common/77 file object/subdir1/meson.build
rename to 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
similarity index 100%
rename from test cases/common/77 file object/subdir1/prog.c
rename to 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
similarity index 100%
rename from test cases/common/77 file object/subdir2/lib.c
rename to 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
similarity index 100%
rename from test cases/common/77 file object/subdir2/meson.build
rename to 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
similarity index 100%
rename from test cases/common/77 file object/subdir2/prog.c
rename to 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
similarity index 100%
rename from test cases/common/78 custom subproject dir/a.c
rename to 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
similarity index 100%
rename from test cases/common/78 custom subproject dir/custom_subproject_dir/B/b.c
rename to 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
similarity index 100%
rename from test cases/common/78 custom subproject dir/custom_subproject_dir/B/meson.build
rename to 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
similarity index 100%
rename from test cases/common/78 custom subproject dir/custom_subproject_dir/C/c.c
rename to 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
similarity index 100%
rename from test cases/common/78 custom subproject dir/custom_subproject_dir/C/meson.build
rename to 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
similarity index 100%
rename from test cases/common/78 custom subproject dir/meson.build
rename to 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
similarity index 100%
rename from test cases/common/79 has type/meson.build
rename to 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
similarity index 100%
rename from test cases/common/80 extract from nested subdir/meson.build
rename to 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
similarity index 100%
rename from test cases/common/80 extract from nested subdir/src/first/lib_first.c
rename to 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
similarity index 100%
rename from test cases/common/80 extract from nested subdir/src/first/meson.build
rename to 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
similarity index 100%
rename from test cases/common/80 extract from nested subdir/src/meson.build
rename to 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
similarity index 100%
rename from test cases/common/80 extract from nested subdir/tst/first/exe_first.c
rename to 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
similarity index 100%
rename from test cases/common/80 extract from nested subdir/tst/first/meson.build
rename to 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
similarity index 100%
rename from test cases/common/80 extract from nested subdir/tst/meson.build
rename to 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
similarity index 100%
rename from test cases/common/81 internal dependency/meson.build
rename to 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
similarity index 100%
rename from test cases/common/81 internal dependency/proj1/include/proj1.h
rename to 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
similarity index 100%
rename from test cases/common/81 internal dependency/proj1/meson.build
rename to 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
similarity index 100%
rename from test cases/common/81 internal dependency/proj1/proj1f1.c
rename to 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
similarity index 100%
rename from test cases/common/81 internal dependency/proj1/proj1f2.c
rename to 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
similarity index 100%
rename from test cases/common/81 internal dependency/proj1/proj1f3.c
rename to 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
similarity index 100%
rename from test cases/common/81 internal dependency/src/main.c
rename to 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
similarity index 100%
rename from test cases/common/81 internal dependency/src/meson.build
rename to 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
similarity index 100%
rename from test cases/common/82 same basename/exe1.c
rename to 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
similarity index 100%
rename from test cases/common/82 same basename/exe2.c
rename to 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
similarity index 100%
rename from test cases/common/82 same basename/lib.c
rename to 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
similarity index 100%
rename from test cases/common/82 same basename/meson.build
rename to 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
similarity index 100%
rename from test cases/common/82 same basename/sharedsub/meson.build
rename to 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
similarity index 100%
rename from test cases/common/82 same basename/staticsub/meson.build
rename to 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
similarity index 100%
rename from test cases/common/83 declare dep/entity/entity.h
rename to 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
similarity index 100%
rename from test cases/common/83 declare dep/entity/entity1.c
rename to 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
similarity index 100%
rename from test cases/common/83 declare dep/entity/entity2.c
rename to 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
similarity index 100%
rename from test cases/common/83 declare dep/entity/meson.build
rename to 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
similarity index 100%
rename from test cases/common/83 declare dep/main.c
rename to 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
similarity index 100%
rename from test cases/common/83 declare dep/meson.build
rename to 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
similarity index 100%
rename from test cases/common/84 extract all/extractor.h
rename to 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
similarity index 100%
rename from test cases/common/84 extract all/four.c
rename to 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
similarity index 100%
rename from test cases/common/84 extract all/meson.build
rename to 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
similarity index 100%
rename from test cases/common/84 extract all/one.c
rename to 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
similarity index 100%
rename from test cases/common/84 extract all/prog.c
rename to 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
similarity index 100%
rename from test cases/common/84 extract all/three.c
rename to 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
similarity index 100%
rename from test cases/common/84 extract all/two.c
rename to 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
similarity index 100%
rename from test cases/common/85 add language/meson.build
rename to 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
similarity index 100%
rename from test cases/common/85 add language/prog.c
rename to 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
similarity index 100%
rename from test cases/common/85 add language/prog.cc
rename to 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
similarity index 100%
rename from test cases/common/86 identical target name in subproject/bar.c
rename to 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
similarity index 100%
rename from test cases/common/86 identical target name in subproject/meson.build
rename to 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
similarity index 100%
rename from test cases/common/86 identical target name in subproject/subprojects/foo/bar.c
rename to 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
similarity index 100%
rename from test cases/common/86 identical target name in subproject/subprojects/foo/meson.build
rename to 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
similarity index 100%
rename from test cases/common/87 plusassign/meson.build
rename to 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
similarity index 100%
rename from test cases/common/88 skip subdir/meson.build
rename to 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
similarity index 100%
rename from test cases/common/88 skip subdir/subdir1/meson.build
rename to 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
similarity index 100%
rename from test cases/common/88 skip subdir/subdir1/subdir2/meson.build
rename to 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
similarity index 100%
rename from test cases/common/89 private include/meson.build
rename to 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
similarity index 100%
rename from test cases/common/89 private include/stlib/compiler.py
rename to 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
similarity index 100%
rename from test cases/common/89 private include/stlib/foo1.def
rename to 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
similarity index 100%
rename from test cases/common/89 private include/stlib/foo2.def
rename to 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
similarity index 100%
rename from test cases/common/89 private include/stlib/meson.build
rename to 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
similarity index 100%
rename from test cases/common/89 private include/user/libuser.c
rename to 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
similarity index 100%
rename from test cases/common/89 private include/user/meson.build
rename to 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
similarity index 100%
rename from test cases/common/90 default options/meson.build
rename to 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
similarity index 100%
rename from test cases/common/90 default options/subprojects/sub1/meson.build
rename to 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
similarity index 100%
rename from test cases/common/90 default options/subprojects/sub1/meson_options.txt
rename to 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
similarity index 100%
rename from test cases/common/91 dep fallback/gensrc.py
rename to 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
similarity index 100%
rename from test cases/common/91 dep fallback/meson.build
rename to 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
similarity index 100%
rename from test cases/common/91 dep fallback/subprojects/boblib/bob.c
rename to 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
similarity index 100%
rename from test cases/common/91 dep fallback/subprojects/boblib/bob.h
rename to 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
similarity index 100%
rename from test cases/common/91 dep fallback/subprojects/boblib/genbob.py
rename to 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
similarity index 100%
rename from test cases/common/91 dep fallback/subprojects/boblib/meson.build
rename to 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
similarity index 100%
rename from test cases/common/91 dep fallback/subprojects/dummylib/meson.build
rename to 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
similarity index 100%
rename from test cases/common/91 dep fallback/tester.c
rename to 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
similarity index 100%
rename from test cases/common/92 default library/ef.cpp
rename to 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
similarity index 100%
rename from test cases/common/92 default library/ef.h
rename to 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
similarity index 100%
rename from test cases/common/92 default library/eftest.cpp
rename to 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
similarity index 100%
rename from test cases/common/92 default library/meson.build
rename to 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
similarity index 100%
rename from test cases/common/94 gen extra/meson.build
rename to 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
similarity index 100%
rename from test cases/common/94 gen extra/name.dat
rename to 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
similarity index 100%
rename from test cases/common/94 gen extra/name.l
rename to 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
similarity index 100%
rename from test cases/common/94 gen extra/plain.c
rename to 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
similarity index 100%
rename from test cases/common/94 gen extra/srcgen.py
rename to 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
similarity index 100%
rename from test cases/common/94 gen extra/srcgen2.py
rename to 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
similarity index 100%
rename from test cases/common/94 gen extra/srcgen3.py
rename to 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
similarity index 100%
rename from test cases/common/94 gen extra/upper.c
rename to 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
similarity index 100%
rename from test cases/common/95 benchmark/delayer.c
rename to 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
similarity index 100%
rename from test cases/common/95 benchmark/meson.build
rename to 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
similarity index 100%
rename from test cases/common/96 test workdir/meson.build
rename to 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
similarity index 100%
rename from test cases/common/96 test workdir/opener.c
rename to 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
similarity index 100%
rename from test cases/common/96 test workdir/subdir/checker.py
rename to 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
similarity index 100%
rename from test cases/common/96 test workdir/subdir/meson.build
rename to 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
similarity index 100%
rename from test cases/common/97 suites/exe1.c
rename to 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
similarity index 100%
rename from test cases/common/97 suites/exe2.c
rename to 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
similarity index 100%
rename from test cases/common/97 suites/meson.build
rename to 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
similarity index 100%
rename from test cases/common/97 suites/subprojects/sub/meson.build
rename to 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
similarity index 100%
rename from test cases/common/97 suites/subprojects/sub/sub1.c
rename to 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
similarity index 100%
rename from test cases/common/97 suites/subprojects/sub/sub2.c
rename to 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
similarity index 100%
rename from test cases/common/98 threads/meson.build
rename to 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
similarity index 100%
rename from test cases/common/98 threads/threadprog.c
rename to 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
similarity index 100%
rename from test cases/common/98 threads/threadprog.cpp
rename to 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
similarity index 100%
rename from test cases/common/99 manygen/depuser.c
rename to 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
similarity index 100%
rename from test cases/common/99 manygen/meson.build
rename to 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
similarity index 100%
rename from test cases/common/99 manygen/subdir/funcinfo.def
rename to 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
similarity index 100%
rename from test cases/common/99 manygen/subdir/manygen.py
rename to 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
similarity index 100%
rename from test cases/common/99 manygen/subdir/meson.build
rename to 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
similarity index 100%
rename from test cases/common/100 stringdef/meson.build
rename to 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
similarity index 100%
rename from test cases/common/100 stringdef/stringdef.c
rename to 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
similarity index 100%
rename from test cases/common/101 find program path/meson.build
rename to 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
similarity index 100%
rename from test cases/common/101 find program path/program.py
rename to 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
similarity index 100%
rename from test cases/common/102 subproject subdir/meson.build
rename to test cases/common/99 subproject subdir/meson.build
diff --git a/test cases/common/102 subproject subdir/prog.c b/test cases/common/99 subproject subdir/prog.c
similarity index 100%
rename from test cases/common/102 subproject subdir/prog.c
rename to 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
similarity index 100%
rename from test cases/common/102 subproject subdir/subprojects/sub/lib/meson.build
rename to test cases/common/99 subproject subdir/subprojects/sub/lib/meson.build
diff --git a/test cases/common/102 subproject subdir/subprojects/sub/lib/sub.c b/test cases/common/99 subproject subdir/subprojects/sub/lib/sub.c
similarity index 100%
rename from test cases/common/102 subproject subdir/subprojects/sub/lib/sub.c
rename to test cases/common/99 subproject subdir/subprojects/sub/lib/sub.c
diff --git a/test cases/common/102 subproject subdir/subprojects/sub/lib/sub.h b/test cases/common/99 subproject subdir/subprojects/sub/lib/sub.h
similarity index 100%
rename from test cases/common/102 subproject subdir/subprojects/sub/lib/sub.h
rename to 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
similarity index 100%
rename from test cases/common/102 subproject subdir/subprojects/sub/meson.build
rename to 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
similarity index 100%
rename from test cases/common/102 subproject subdir/subprojects/sub_implicit.wrap
rename to 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
similarity index 100%
rename from test cases/common/102 subproject subdir/subprojects/sub_implicit/meson.build
rename to 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
similarity index 100%
rename from test cases/common/102 subproject subdir/subprojects/sub_implicit/subprojects/subsub/meson.build
rename to 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
similarity index 100%
rename from test cases/common/102 subproject subdir/subprojects/sub_implicit/subprojects/subsub/subprojects/packagefiles/subsubsub-1.0.zip
rename to test cases/common/99 subproject subdir/subprojects/sub_implicit/subprojects/subsub/subprojects/packagefiles/subsubsub-1.0.zip
Binary files differ
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
similarity index 100%
rename from test cases/common/102 subproject subdir/subprojects/sub_implicit/subprojects/subsub/subprojects/subsubsub.wrap
rename to 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
similarity index 100%
rename from test cases/common/102 subproject subdir/subprojects/sub_novar/meson.build
rename to 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
similarity index 100%
rename from test cases/native/21 global arg/meson.build
rename to 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
similarity index 100%
rename from test cases/native/21 global arg/prog.c
rename to 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
similarity index 100%
rename from test cases/native/21 global arg/prog.cc
rename to 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
similarity index 100%
rename from test cases/native/27 pipeline/depends/copyrunner.py
rename to 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
similarity index 100%
rename from test cases/native/27 pipeline/depends/filecopier.c
rename to 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
similarity index 100%
rename from test cases/native/27 pipeline/depends/libsrc.c.in
rename to 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
similarity index 100%
rename from test cases/native/27 pipeline/depends/meson.build
rename to 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
similarity index 100%
rename from test cases/native/27 pipeline/depends/prog.c
rename to 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
similarity index 100%
rename from test cases/native/27 pipeline/input_src.dat
rename to 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
similarity index 100%
rename from test cases/native/27 pipeline/meson.build
rename to 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
similarity index 100%
rename from test cases/native/27 pipeline/prog.c
rename to 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
similarity index 100%
rename from test cases/native/27 pipeline/src/input_src.dat
rename to 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
similarity index 100%
rename from test cases/native/27 pipeline/src/meson.build
rename to 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
similarity index 100%
rename from test cases/native/27 pipeline/src/prog.c
rename to 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
similarity index 100%
rename from test cases/native/27 pipeline/src/srcgen.c
rename to 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
similarity index 100%
rename from test cases/native/27 pipeline/srcgen.c
rename to 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
similarity index 100%
rename from test cases/native/36 tryrun/error.c
rename to 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
similarity index 100%
rename from test cases/native/36 tryrun/meson.build
rename to 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
similarity index 100%
rename from test cases/native/36 tryrun/no_compile.c
rename to 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
similarity index 100%
rename from test cases/native/36 tryrun/ok.c
rename to 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
similarity index 100%
rename from test cases/native/56 install script/file.txt
rename to 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
similarity index 100%
rename from test cases/native/56 install script/meson.build
rename to 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
similarity index 100%
rename from test cases/native/56 install script/src/exe.c
rename to 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
similarity index 100%
rename from test cases/native/56 install script/src/meson.build
rename to 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
similarity index 100%
rename from test cases/native/56 install script/test.json
rename to 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
similarity index 100%
rename from test cases/native/56 install script/wrap.py
rename to 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
similarity index 100%
rename from test cases/native/85 add language/meson.build
rename to 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
similarity index 100%
rename from test cases/native/85 add language/prog.cc
rename to 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
similarity index 100%
rename from test cases/native/93 selfbuilt custom/checkarg.cpp
rename to 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
similarity index 100%
rename from test cases/native/93 selfbuilt custom/data.dat
rename to 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
similarity index 100%
rename from test cases/native/93 selfbuilt custom/mainprog.cpp
rename to 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
similarity index 100%
rename from test cases/native/93 selfbuilt custom/meson.build
rename to 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
similarity index 100%
rename from test cases/native/93 selfbuilt custom/tool.cpp
rename to 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
similarity index 100%
rename from test cases/native/162 external program shebang parsing/input.txt
rename to 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
similarity index 100%
rename from test cases/native/162 external program shebang parsing/main.c
rename to 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
similarity index 100%
rename from test cases/native/162 external program shebang parsing/meson.build
rename to 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
similarity index 100%
rename from test cases/native/162 external program shebang parsing/script.int.in
rename to 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
similarity index 100%
rename from test cases/native/201 override with exe/main2.input
rename to 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
similarity index 100%
rename from test cases/native/201 override with exe/meson.build
rename to 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
similarity index 100%
rename from test cases/native/201 override with exe/subprojects/sub/foobar.c
rename to 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
similarity index 100%
rename from test cases/native/201 override with exe/subprojects/sub/meson.build
rename to 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
similarity index 100%
rename from test cases/unit/77 pkgconfig prefixes/client/client.c
rename to 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
similarity index 100%
rename from test cases/unit/77 pkgconfig prefixes/client/meson.build
rename to 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
similarity index 100%
rename from test cases/unit/77 pkgconfig prefixes/val1/meson.build
rename to 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
similarity index 100%
rename from test cases/unit/77 pkgconfig prefixes/val1/val1.c
rename to 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
similarity index 100%
rename from test cases/unit/77 pkgconfig prefixes/val1/val1.h
rename to 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
similarity index 100%
rename from test cases/unit/77 pkgconfig prefixes/val2/meson.build
rename to 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
similarity index 100%
rename from test cases/unit/77 pkgconfig prefixes/val2/val2.c
rename to 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
similarity index 100%
rename from test cases/unit/77 pkgconfig prefixes/val2/val2.h
rename to 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
similarity index 100%
rename from test cases/unit/78 subdir libdir/meson.build
rename to 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
similarity index 100%
rename from test cases/unit/78 subdir libdir/subprojects/flub/meson.build
rename to 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
similarity index 100%
rename from test cases/unit/79 as link whole/bar.c
rename to 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
similarity index 100%
rename from test cases/unit/79 as link whole/foo.c
rename to 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
similarity index 100%
rename from test cases/unit/79 as link whole/meson.build
rename to 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
similarity index 100%
rename from test cases/unit/79 user options for subproject/.gitignore
rename to 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
similarity index 100%
rename from test cases/unit/79 user options for subproject/75 user options for subproject/.gitignore
rename to 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
similarity index 100%
rename from test cases/unit/79 user options for subproject/75 user options for subproject/meson.build
rename to 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
similarity index 100%
rename from test cases/unit/80 global-rpath/meson.build
rename to 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
similarity index 100%
rename from test cases/unit/80 global-rpath/rpathified.cpp
rename to 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
similarity index 100%
rename from test cases/unit/80 global-rpath/yonder/meson.build
rename to 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
similarity index 100%
rename from test cases/unit/80 global-rpath/yonder/yonder.cpp
rename to 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
similarity index 100%
rename from test cases/unit/80 global-rpath/yonder/yonder.h
rename to 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
similarity index 100%
rename from test cases/unit/81 wrap-git/meson.build
rename to 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
similarity index 100%
rename from test cases/unit/81 wrap-git/subprojects/packagefiles/wrap_git_builddef/meson.build
rename to 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
similarity index 100%
rename from test cases/unit/81 wrap-git/subprojects/wrap_git_upstream/main.c
rename to 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
similarity index 100%
rename from test cases/unit/82 meson version compare/meson.build
rename to 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
similarity index 100%
rename from test cases/unit/83 cross only introspect/meson.build
rename to 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
similarity index 100%
rename from test cases/unit/84 change option choices/meson.build
rename to 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
similarity index 100%
rename from test cases/unit/84 change option choices/meson_options.1.txt
rename to 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
similarity index 100%
rename from test cases/unit/84 change option choices/meson_options.2.txt
rename to 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
similarity index 100%
rename from test cases/unit/85 nested subproject regenerate depends/main.c
rename to 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
similarity index 100%
rename from test cases/unit/85 nested subproject regenerate depends/meson.build
rename to 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
similarity index 100%
rename from test cases/unit/85 nested subproject regenerate depends/subprojects/sub1/meson.build
rename to 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
similarity index 100%
rename from test cases/unit/85 nested subproject regenerate depends/subprojects/sub2/CMakeLists.txt
rename to test cases/unit/86 nested subproject regenerate depends/subprojects/sub2/CMakeLists.txt
