summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2018-09-05 20:38:22 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2018-09-05 20:38:22 +0300
commit273340cc9eba4c09794367440d4018a70b489087 (patch)
tree2a4b61cfe21a8976956521bd033e900776dfa87c
parent289c1bf91992c167e8ec4292f2584a4add7f5485 (diff)
downloadmeson-testcondense.tar.gz
Condense test dirs.testcondensedircondenser
-rwxr-xr-xrun_unittests.py26
-rw-r--r--test cases/common/202 override with exe/main2.input (renamed from test cases/common/206 override with exe/main2.input)0
-rw-r--r--test cases/common/202 override with exe/meson.build (renamed from test cases/common/206 override with exe/meson.build)0
-rw-r--r--test cases/common/202 override with exe/subprojects/sub/foobar.c (renamed from test cases/common/206 override with exe/subprojects/sub/foobar.c)0
-rw-r--r--test cases/common/202 override with exe/subprojects/sub/meson.build (renamed from test cases/common/206 override with exe/subprojects/sub/meson.build)0
-rw-r--r--test cases/common/203 subproject with features/meson.build (renamed from test cases/common/206 subproject with features/meson.build)0
-rw-r--r--test cases/common/203 subproject with features/meson_options.txt (renamed from test cases/common/206 subproject with features/meson_options.txt)0
-rw-r--r--test cases/common/203 subproject with features/nothing.c (renamed from test cases/common/206 subproject with features/nothing.c)0
-rw-r--r--test cases/common/203 subproject with features/subprojects/auto_sub_with_missing_dep/meson.build (renamed from test cases/common/206 subproject with features/subprojects/auto_sub_with_missing_dep/meson.build)0
-rw-r--r--test cases/common/203 subproject with features/subprojects/disabled_sub/lib/meson.build (renamed from test cases/common/206 subproject with features/subprojects/disabled_sub/lib/meson.build)0
-rw-r--r--test cases/common/203 subproject with features/subprojects/disabled_sub/lib/sub.c (renamed from test cases/common/206 subproject with features/subprojects/disabled_sub/lib/sub.c)0
-rw-r--r--test cases/common/203 subproject with features/subprojects/disabled_sub/lib/sub.h (renamed from test cases/common/206 subproject with features/subprojects/disabled_sub/lib/sub.h)0
-rw-r--r--test cases/common/203 subproject with features/subprojects/disabled_sub/meson.build (renamed from test cases/common/206 subproject with features/subprojects/disabled_sub/meson.build)0
-rw-r--r--test cases/common/203 subproject with features/subprojects/sub/lib/meson.build (renamed from test cases/common/206 subproject with features/subprojects/sub/lib/meson.build)0
-rw-r--r--test cases/common/203 subproject with features/subprojects/sub/lib/sub.c (renamed from test cases/common/206 subproject with features/subprojects/sub/lib/sub.c)0
-rw-r--r--test cases/common/203 subproject with features/subprojects/sub/lib/sub.h (renamed from test cases/common/206 subproject with features/subprojects/sub/lib/sub.h)0
-rw-r--r--test cases/common/203 subproject with features/subprojects/sub/meson.build (renamed from test cases/common/206 subproject with features/subprojects/sub/meson.build)0
-rw-r--r--test cases/failing/82 override exe config/foo.c (renamed from test cases/failing/81 override exe config/foo.c)0
-rw-r--r--test cases/failing/82 override exe config/meson.build (renamed from test cases/failing/81 override exe config/meson.build)0
-rw-r--r--test cases/failing/83 gl dependency with version/meson.build (renamed from test cases/failing/82 gl dependency with version/meson.build)0
-rw-r--r--test cases/failing/84 threads dependency with version/meson.build (renamed from test cases/failing/83 threads dependency with version/meson.build)0
-rw-r--r--test cases/failing/85 gtest dependency with version/meson.build (renamed from test cases/failing/84 gtest dependency with version/meson.build)0
-rw-r--r--test cases/failing/86 dub libray/meson.build (renamed from test cases/failing/85 dub libray/meson.build)0
-rw-r--r--test cases/failing/87 dub executable/meson.build (renamed from test cases/failing/86 dub executable/meson.build)0
-rw-r--r--test cases/failing/88 dub compiler/meson.build (renamed from test cases/failing/87 dub compiler/meson.build)0
-rw-r--r--test cases/unit/36 exe_wrapper behaviour/broken-cross.txt (renamed from test cases/unit/35 exe_wrapper behaviour/broken-cross.txt)0
-rw-r--r--test cases/unit/36 exe_wrapper behaviour/meson.build (renamed from test cases/unit/35 exe_wrapper behaviour/meson.build)0
-rw-r--r--test cases/unit/36 exe_wrapper behaviour/meson_options.txt (renamed from test cases/unit/35 exe_wrapper behaviour/meson_options.txt)0
-rw-r--r--test cases/unit/36 exe_wrapper behaviour/prog.c (renamed from test cases/unit/35 exe_wrapper behaviour/prog.c)0
-rw-r--r--test cases/unit/37 mixed command line args/meson.build (renamed from test cases/unit/36 mixed command line args/meson.build)0
-rw-r--r--test cases/unit/37 mixed command line args/meson_options.txt (renamed from test cases/unit/36 mixed command line args/meson_options.txt)0
-rw-r--r--test cases/unit/38 pkgconfig format/meson.build (renamed from test cases/unit/37 pkgconfig format/meson.build)0
-rw-r--r--test cases/unit/38 pkgconfig format/somelib.c (renamed from test cases/unit/37 pkgconfig format/somelib.c)0
-rw-r--r--test cases/unit/38 pkgconfig format/someret.c (renamed from test cases/unit/37 pkgconfig format/someret.c)0
-rwxr-xr-xtest cases/unit/39 python extmodule/blaster.py (renamed from test cases/unit/38 python extmodule/blaster.py)0
-rw-r--r--test cases/unit/39 python extmodule/ext/meson.build (renamed from test cases/unit/38 python extmodule/ext/meson.build)0
-rw-r--r--test cases/unit/39 python extmodule/ext/tachyon_module.c (renamed from test cases/unit/38 python extmodule/ext/tachyon_module.c)0
-rw-r--r--test cases/unit/39 python extmodule/meson.build (renamed from test cases/unit/38 python extmodule/meson.build)0
-rw-r--r--test cases/unit/39 python extmodule/meson_options.txt (renamed from test cases/unit/38 python extmodule/meson_options.txt)0
-rw-r--r--test cases/unit/40 external, internal library rpath/built library/bar.c (renamed from test cases/unit/39 external, internal library rpath/built library/bar.c)0
-rw-r--r--test cases/unit/40 external, internal library rpath/built library/meson.build (renamed from test cases/unit/39 external, internal library rpath/built library/meson.build)0
-rw-r--r--test cases/unit/40 external, internal library rpath/built library/meson_options.txt (renamed from test cases/unit/39 external, internal library rpath/built library/meson_options.txt)0
-rw-r--r--test cases/unit/40 external, internal library rpath/built library/prog.c (renamed from test cases/unit/39 external, internal library rpath/built library/prog.c)0
-rw-r--r--test cases/unit/40 external, internal library rpath/external library/bar.c (renamed from test cases/unit/39 external, internal library rpath/external library/bar.c)0
-rw-r--r--test cases/unit/40 external, internal library rpath/external library/faa.c (renamed from test cases/unit/39 external, internal library rpath/external library/faa.c)0
-rw-r--r--test cases/unit/40 external, internal library rpath/external library/foo.c (renamed from test cases/unit/39 external, internal library rpath/external library/foo.c)0
-rw-r--r--test cases/unit/40 external, internal library rpath/external library/meson.build (renamed from test cases/unit/39 external, internal library rpath/external library/meson.build)0
-rw-r--r--test cases/unit/41 featurenew subprojects/meson.build (renamed from test cases/unit/40 featurenew subprojects/meson.build)0
-rw-r--r--test cases/unit/41 featurenew subprojects/subprojects/bar/meson.build (renamed from test cases/unit/40 featurenew subprojects/subprojects/bar/meson.build)0
-rw-r--r--test cases/unit/41 featurenew subprojects/subprojects/foo/meson.build (renamed from test cases/unit/40 featurenew subprojects/subprojects/foo/meson.build)0
-rw-r--r--test cases/unit/42 rpath order/meson.build (renamed from test cases/unit/41 rpath order/meson.build)0
-rw-r--r--test cases/unit/42 rpath order/myexe.c (renamed from test cases/unit/41 rpath order/myexe.c)0
-rw-r--r--test cases/unit/42 rpath order/subprojects/sub1/lib.c (renamed from test cases/unit/41 rpath order/subprojects/sub1/lib.c)0
-rw-r--r--test cases/unit/42 rpath order/subprojects/sub1/meson.build (renamed from test cases/unit/41 rpath order/subprojects/sub1/meson.build)0
-rw-r--r--test cases/unit/42 rpath order/subprojects/sub2/lib.c (renamed from test cases/unit/41 rpath order/subprojects/sub2/lib.c)0
-rw-r--r--test cases/unit/42 rpath order/subprojects/sub2/meson.build (renamed from test cases/unit/41 rpath order/subprojects/sub2/meson.build)0
-rw-r--r--test cases/unit/43 dep order/lib1.c (renamed from test cases/unit/42 dep order/lib1.c)0
-rw-r--r--test cases/unit/43 dep order/lib2.c (renamed from test cases/unit/42 dep order/lib2.c)0
-rw-r--r--test cases/unit/43 dep order/meson.build (renamed from test cases/unit/42 dep order/meson.build)0
-rw-r--r--test cases/unit/43 dep order/myexe.c (renamed from test cases/unit/42 dep order/myexe.c)0
-rw-r--r--test cases/unit/44 promote wrap/meson.build (renamed from test cases/unit/43 promote wrap/meson.build)0
-rw-r--r--test cases/unit/44 promote wrap/subprojects/s1/meson.build (renamed from test cases/unit/43 promote wrap/subprojects/s1/meson.build)0
-rw-r--r--test cases/unit/44 promote wrap/subprojects/s1/subprojects/ambiguous/meson.build (renamed from test cases/unit/43 promote wrap/subprojects/s1/subprojects/ambiguous/meson.build)0
-rw-r--r--test cases/unit/44 promote wrap/subprojects/s2/meson.build (renamed from test cases/unit/43 promote wrap/subprojects/s2/meson.build)0
-rw-r--r--test cases/unit/44 promote wrap/subprojects/s2/subprojects/ambiguous.wrap (renamed from test cases/unit/43 promote wrap/subprojects/s2/subprojects/ambiguous.wrap)0
65 files changed, 13 insertions, 13 deletions
diff --git a/run_unittests.py b/run_unittests.py
index d446a5480..d2c9bb17d 100755
--- a/run_unittests.py
+++ b/run_unittests.py
@@ -2157,7 +2157,7 @@ int main(int argc, char **argv) {
self.build()
def test_subproject_promotion_wrap(self):
- testdir = os.path.join(self.unit_test_dir, '43 promote wrap')
+ testdir = os.path.join(self.unit_test_dir, '44 promote wrap')
workdir = os.path.join(self.builddir, 'work')
shutil.copytree(testdir, workdir)
spdir = os.path.join(workdir, 'subprojects')
@@ -2378,14 +2378,14 @@ recommended as it is not supported on some platforms''')
self.assertRebuiltTarget('app')
def test_conflicting_d_dash_option(self):
- testdir = os.path.join(self.unit_test_dir, '36 mixed command line args')
+ testdir = os.path.join(self.unit_test_dir, '37 mixed command line args')
with self.assertRaises(subprocess.CalledProcessError) as e:
self.init(testdir, extra_args=['-Dbindir=foo', '--bindir=bar'])
# Just to ensure that we caught the correct error
self.assertIn('passed as both', e.stderr)
def _test_same_option_twice(self, arg, args):
- testdir = os.path.join(self.unit_test_dir, '36 mixed command line args')
+ testdir = os.path.join(self.unit_test_dir, '37 mixed command line args')
self.init(testdir, extra_args=args)
opts = self.introspect('--buildoptions')
for item in opts:
@@ -2404,7 +2404,7 @@ recommended as it is not supported on some platforms''')
self._test_same_option_twice('one', ['-Done=foo', '-Done=bar'])
def _test_same_option_twice_configure(self, arg, args):
- testdir = os.path.join(self.unit_test_dir, '36 mixed command line args')
+ testdir = os.path.join(self.unit_test_dir, '37 mixed command line args')
self.init(testdir)
self.setconf(args)
opts = self.introspect('--buildoptions')
@@ -2548,7 +2548,7 @@ recommended as it is not supported on some platforms''')
pass
def test_feature_check_usage_subprojects(self):
- testdir = os.path.join(self.unit_test_dir, '40 featurenew subprojects')
+ testdir = os.path.join(self.unit_test_dir, '41 featurenew subprojects')
out = self.init(testdir)
# Parent project warns correctly
self.assertRegex(out, "WARNING: Project targetting '>=0.45'.*'0.47.0': dict")
@@ -3838,7 +3838,7 @@ endian = 'little'
@skipIfNoPkgconfig
def test_pkgconfig_formatting(self):
- testdir = os.path.join(self.unit_test_dir, '37 pkgconfig format')
+ testdir = os.path.join(self.unit_test_dir, '38 pkgconfig format')
self.init(testdir)
myenv = os.environ.copy()
myenv['PKG_CONFIG_PATH'] = self.privatedir
@@ -3853,7 +3853,7 @@ endian = 'little'
'''
Test that the dependencies are always listed in a deterministic order.
'''
- testdir = os.path.join(self.unit_test_dir, '42 dep order')
+ testdir = os.path.join(self.unit_test_dir, '43 dep order')
self.init(testdir)
with open(os.path.join(self.builddir, 'build.ninja')) as bfile:
for line in bfile:
@@ -3868,7 +3868,7 @@ endian = 'little'
'''
if is_cygwin():
raise unittest.SkipTest('rpath are not used on Cygwin')
- testdir = os.path.join(self.unit_test_dir, '41 rpath order')
+ testdir = os.path.join(self.unit_test_dir, '42 rpath order')
self.init(testdir)
if is_osx():
rpathre = re.compile('-rpath,.*/subprojects/sub1.*-rpath,.*/subprojects/sub2')
@@ -3885,7 +3885,7 @@ endian = 'little'
'''
Test that we produce the correct dependencies when a program is overridden with an executable.
'''
- testdir = os.path.join(self.common_test_dir, '206 override with exe')
+ testdir = os.path.join(self.common_test_dir, '202 override with exe')
self.init(testdir)
with open(os.path.join(self.builddir, 'build.ninja')) as bfile:
for line in bfile:
@@ -3904,7 +3904,7 @@ endian = 'little'
'''
oldprefix = self.prefix
# Install external library so we can find it
- testdir = os.path.join(self.unit_test_dir, '39 external, internal library rpath', 'external library')
+ testdir = os.path.join(self.unit_test_dir, '40 external, internal library rpath', 'external library')
# install into installdir without using DESTDIR
installdir = self.installdir
self.prefix = installdir
@@ -3916,7 +3916,7 @@ endian = 'little'
self.new_builddir()
os.environ['LIBRARY_PATH'] = os.path.join(installdir, self.libdir)
os.environ['PKG_CONFIG_PATH'] = os.path.join(installdir, self.libdir, 'pkgconfig')
- testdir = os.path.join(self.unit_test_dir, '39 external, internal library rpath', 'built library')
+ testdir = os.path.join(self.unit_test_dir, '40 external, internal library rpath', 'built library')
# install into installdir without using DESTDIR
self.prefix = self.installdir
self.init(testdir)
@@ -4036,7 +4036,7 @@ class LinuxCrossMingwTests(BasePlatformTests):
requires running a cross-built executable (custom_target or run_target)
and causes the tests to be skipped if they are run.
'''
- testdir = os.path.join(self.unit_test_dir, '35 exe_wrapper behaviour')
+ testdir = os.path.join(self.unit_test_dir, '36 exe_wrapper behaviour')
# Configures, builds, and tests fine by default
self.init(testdir)
self.build()
@@ -4068,7 +4068,7 @@ class PythonTests(BasePlatformTests):
if self.backend is not Backend.ninja:
raise unittest.SkipTest('Skipping python tests with {} backend'.format(self.backend.name))
- testdir = os.path.join(self.src_root, 'test cases', 'unit', '38 python extmodule')
+ testdir = os.path.join(self.src_root, 'test cases', 'unit', '39 python extmodule')
# No python version specified, this will use meson's python
self.init(testdir)
diff --git a/test cases/common/206 override with exe/main2.input b/test cases/common/202 override with exe/main2.input
index e69de29bb..e69de29bb 100644
--- a/test cases/common/206 override with exe/main2.input
+++ b/test cases/common/202 override with exe/main2.input
diff --git a/test cases/common/206 override with exe/meson.build b/test cases/common/202 override with exe/meson.build
index 81f6c02b7..81f6c02b7 100644
--- a/test cases/common/206 override with exe/meson.build
+++ b/test cases/common/202 override with exe/meson.build
diff --git a/test cases/common/206 override with exe/subprojects/sub/foobar.c b/test cases/common/202 override with exe/subprojects/sub/foobar.c
index 030ac49da..030ac49da 100644
--- a/test cases/common/206 override with exe/subprojects/sub/foobar.c
+++ b/test cases/common/202 override with exe/subprojects/sub/foobar.c
diff --git a/test cases/common/206 override with exe/subprojects/sub/meson.build b/test cases/common/202 override with exe/subprojects/sub/meson.build
index 1f186da0d..1f186da0d 100644
--- a/test cases/common/206 override with exe/subprojects/sub/meson.build
+++ b/test cases/common/202 override with exe/subprojects/sub/meson.build
diff --git a/test cases/common/206 subproject with features/meson.build b/test cases/common/203 subproject with features/meson.build
index 5bdfefbc0..5bdfefbc0 100644
--- a/test cases/common/206 subproject with features/meson.build
+++ b/test cases/common/203 subproject with features/meson.build
diff --git a/test cases/common/206 subproject with features/meson_options.txt b/test cases/common/203 subproject with features/meson_options.txt
index a46e5fbf5..a46e5fbf5 100644
--- a/test cases/common/206 subproject with features/meson_options.txt
+++ b/test cases/common/203 subproject with features/meson_options.txt
diff --git a/test cases/common/206 subproject with features/nothing.c b/test cases/common/203 subproject with features/nothing.c
index 77750c217..77750c217 100644
--- a/test cases/common/206 subproject with features/nothing.c
+++ b/test cases/common/203 subproject with features/nothing.c
diff --git a/test cases/common/206 subproject with features/subprojects/auto_sub_with_missing_dep/meson.build b/test cases/common/203 subproject with features/subprojects/auto_sub_with_missing_dep/meson.build
index fa6b011ea..fa6b011ea 100644
--- a/test cases/common/206 subproject with features/subprojects/auto_sub_with_missing_dep/meson.build
+++ b/test cases/common/203 subproject with features/subprojects/auto_sub_with_missing_dep/meson.build
diff --git a/test cases/common/206 subproject with features/subprojects/disabled_sub/lib/meson.build b/test cases/common/203 subproject with features/subprojects/disabled_sub/lib/meson.build
index 933001aeb..933001aeb 100644
--- a/test cases/common/206 subproject with features/subprojects/disabled_sub/lib/meson.build
+++ b/test cases/common/203 subproject with features/subprojects/disabled_sub/lib/meson.build
diff --git a/test cases/common/206 subproject with features/subprojects/disabled_sub/lib/sub.c b/test cases/common/203 subproject with features/subprojects/disabled_sub/lib/sub.c
index 068a5b89c..068a5b89c 100644
--- a/test cases/common/206 subproject with features/subprojects/disabled_sub/lib/sub.c
+++ b/test cases/common/203 subproject with features/subprojects/disabled_sub/lib/sub.c
diff --git a/test cases/common/206 subproject with features/subprojects/disabled_sub/lib/sub.h b/test cases/common/203 subproject with features/subprojects/disabled_sub/lib/sub.h
index f1ab0e19d..f1ab0e19d 100644
--- a/test cases/common/206 subproject with features/subprojects/disabled_sub/lib/sub.h
+++ b/test cases/common/203 subproject with features/subprojects/disabled_sub/lib/sub.h
diff --git a/test cases/common/206 subproject with features/subprojects/disabled_sub/meson.build b/test cases/common/203 subproject with features/subprojects/disabled_sub/meson.build
index 65fef032b..65fef032b 100644
--- a/test cases/common/206 subproject with features/subprojects/disabled_sub/meson.build
+++ b/test cases/common/203 subproject with features/subprojects/disabled_sub/meson.build
diff --git a/test cases/common/206 subproject with features/subprojects/sub/lib/meson.build b/test cases/common/203 subproject with features/subprojects/sub/lib/meson.build
index 731d22bfb..731d22bfb 100644
--- a/test cases/common/206 subproject with features/subprojects/sub/lib/meson.build
+++ b/test cases/common/203 subproject with features/subprojects/sub/lib/meson.build
diff --git a/test cases/common/206 subproject with features/subprojects/sub/lib/sub.c b/test cases/common/203 subproject with features/subprojects/sub/lib/sub.c
index ed78306eb..ed78306eb 100644
--- a/test cases/common/206 subproject with features/subprojects/sub/lib/sub.c
+++ b/test cases/common/203 subproject with features/subprojects/sub/lib/sub.c
diff --git a/test cases/common/206 subproject with features/subprojects/sub/lib/sub.h b/test cases/common/203 subproject with features/subprojects/sub/lib/sub.h
index f1ab0e19d..f1ab0e19d 100644
--- a/test cases/common/206 subproject with features/subprojects/sub/lib/sub.h
+++ b/test cases/common/203 subproject with features/subprojects/sub/lib/sub.h
diff --git a/test cases/common/206 subproject with features/subprojects/sub/meson.build b/test cases/common/203 subproject with features/subprojects/sub/meson.build
index 31882ac4c..31882ac4c 100644
--- a/test cases/common/206 subproject with features/subprojects/sub/meson.build
+++ b/test cases/common/203 subproject with features/subprojects/sub/meson.build
diff --git a/test cases/failing/81 override exe config/foo.c b/test cases/failing/82 override exe config/foo.c
index 03b2213bb..03b2213bb 100644
--- a/test cases/failing/81 override exe config/foo.c
+++ b/test cases/failing/82 override exe config/foo.c
diff --git a/test cases/failing/81 override exe config/meson.build b/test cases/failing/82 override exe config/meson.build
index 29a74166b..29a74166b 100644
--- a/test cases/failing/81 override exe config/meson.build
+++ b/test cases/failing/82 override exe config/meson.build
diff --git a/test cases/failing/82 gl dependency with version/meson.build b/test cases/failing/83 gl dependency with version/meson.build
index 3014d433f..3014d433f 100644
--- a/test cases/failing/82 gl dependency with version/meson.build
+++ b/test cases/failing/83 gl dependency with version/meson.build
diff --git a/test cases/failing/83 threads dependency with version/meson.build b/test cases/failing/84 threads dependency with version/meson.build
index 6023faeb6..6023faeb6 100644
--- a/test cases/failing/83 threads dependency with version/meson.build
+++ b/test cases/failing/84 threads dependency with version/meson.build
diff --git a/test cases/failing/84 gtest dependency with version/meson.build b/test cases/failing/85 gtest dependency with version/meson.build
index 5115f2790..5115f2790 100644
--- a/test cases/failing/84 gtest dependency with version/meson.build
+++ b/test cases/failing/85 gtest dependency with version/meson.build
diff --git a/test cases/failing/85 dub libray/meson.build b/test cases/failing/86 dub libray/meson.build
index 792171834..792171834 100644
--- a/test cases/failing/85 dub libray/meson.build
+++ b/test cases/failing/86 dub libray/meson.build
diff --git a/test cases/failing/86 dub executable/meson.build b/test cases/failing/87 dub executable/meson.build
index a44f1beb9..a44f1beb9 100644
--- a/test cases/failing/86 dub executable/meson.build
+++ b/test cases/failing/87 dub executable/meson.build
diff --git a/test cases/failing/87 dub compiler/meson.build b/test cases/failing/88 dub compiler/meson.build
index f5bc4946f..f5bc4946f 100644
--- a/test cases/failing/87 dub compiler/meson.build
+++ b/test cases/failing/88 dub compiler/meson.build
diff --git a/test cases/unit/35 exe_wrapper behaviour/broken-cross.txt b/test cases/unit/36 exe_wrapper behaviour/broken-cross.txt
index a5a39318d..a5a39318d 100644
--- a/test cases/unit/35 exe_wrapper behaviour/broken-cross.txt
+++ b/test cases/unit/36 exe_wrapper behaviour/broken-cross.txt
diff --git a/test cases/unit/35 exe_wrapper behaviour/meson.build b/test cases/unit/36 exe_wrapper behaviour/meson.build
index 16a44d5f7..16a44d5f7 100644
--- a/test cases/unit/35 exe_wrapper behaviour/meson.build
+++ b/test cases/unit/36 exe_wrapper behaviour/meson.build
diff --git a/test cases/unit/35 exe_wrapper behaviour/meson_options.txt b/test cases/unit/36 exe_wrapper behaviour/meson_options.txt
index e5645a033..e5645a033 100644
--- a/test cases/unit/35 exe_wrapper behaviour/meson_options.txt
+++ b/test cases/unit/36 exe_wrapper behaviour/meson_options.txt
diff --git a/test cases/unit/35 exe_wrapper behaviour/prog.c b/test cases/unit/36 exe_wrapper behaviour/prog.c
index 3213780df..3213780df 100644
--- a/test cases/unit/35 exe_wrapper behaviour/prog.c
+++ b/test cases/unit/36 exe_wrapper behaviour/prog.c
diff --git a/test cases/unit/36 mixed command line args/meson.build b/test cases/unit/37 mixed command line args/meson.build
index af5cdc790..af5cdc790 100644
--- a/test cases/unit/36 mixed command line args/meson.build
+++ b/test cases/unit/37 mixed command line args/meson.build
diff --git a/test cases/unit/36 mixed command line args/meson_options.txt b/test cases/unit/37 mixed command line args/meson_options.txt
index 5a4bc22bf..5a4bc22bf 100644
--- a/test cases/unit/36 mixed command line args/meson_options.txt
+++ b/test cases/unit/37 mixed command line args/meson_options.txt
diff --git a/test cases/unit/37 pkgconfig format/meson.build b/test cases/unit/38 pkgconfig format/meson.build
index ea00f5df4..ea00f5df4 100644
--- a/test cases/unit/37 pkgconfig format/meson.build
+++ b/test cases/unit/38 pkgconfig format/meson.build
diff --git a/test cases/unit/37 pkgconfig format/somelib.c b/test cases/unit/38 pkgconfig format/somelib.c
index 0558024b3..0558024b3 100644
--- a/test cases/unit/37 pkgconfig format/somelib.c
+++ b/test cases/unit/38 pkgconfig format/somelib.c
diff --git a/test cases/unit/37 pkgconfig format/someret.c b/test cases/unit/38 pkgconfig format/someret.c
index 69f429928..69f429928 100644
--- a/test cases/unit/37 pkgconfig format/someret.c
+++ b/test cases/unit/38 pkgconfig format/someret.c
diff --git a/test cases/unit/38 python extmodule/blaster.py b/test cases/unit/39 python extmodule/blaster.py
index 163b6d426..163b6d426 100755
--- a/test cases/unit/38 python extmodule/blaster.py
+++ b/test cases/unit/39 python extmodule/blaster.py
diff --git a/test cases/unit/38 python extmodule/ext/meson.build b/test cases/unit/39 python extmodule/ext/meson.build
index b13bb326f..b13bb326f 100644
--- a/test cases/unit/38 python extmodule/ext/meson.build
+++ b/test cases/unit/39 python extmodule/ext/meson.build
diff --git a/test cases/unit/38 python extmodule/ext/tachyon_module.c b/test cases/unit/39 python extmodule/ext/tachyon_module.c
index 68eda5380..68eda5380 100644
--- a/test cases/unit/38 python extmodule/ext/tachyon_module.c
+++ b/test cases/unit/39 python extmodule/ext/tachyon_module.c
diff --git a/test cases/unit/38 python extmodule/meson.build b/test cases/unit/39 python extmodule/meson.build
index 479865482..479865482 100644
--- a/test cases/unit/38 python extmodule/meson.build
+++ b/test cases/unit/39 python extmodule/meson.build
diff --git a/test cases/unit/38 python extmodule/meson_options.txt b/test cases/unit/39 python extmodule/meson_options.txt
index b8f645d09..b8f645d09 100644
--- a/test cases/unit/38 python extmodule/meson_options.txt
+++ b/test cases/unit/39 python extmodule/meson_options.txt
diff --git a/test cases/unit/39 external, internal library rpath/built library/bar.c b/test cases/unit/40 external, internal library rpath/built library/bar.c
index 4f5662ebd..4f5662ebd 100644
--- a/test cases/unit/39 external, internal library rpath/built library/bar.c
+++ b/test cases/unit/40 external, internal library rpath/built library/bar.c
diff --git a/test cases/unit/39 external, internal library rpath/built library/meson.build b/test cases/unit/40 external, internal library rpath/built library/meson.build
index f63399659..f63399659 100644
--- a/test cases/unit/39 external, internal library rpath/built library/meson.build
+++ b/test cases/unit/40 external, internal library rpath/built library/meson.build
diff --git a/test cases/unit/39 external, internal library rpath/built library/meson_options.txt b/test cases/unit/40 external, internal library rpath/built library/meson_options.txt
index aa1d2ec9b..aa1d2ec9b 100644
--- a/test cases/unit/39 external, internal library rpath/built library/meson_options.txt
+++ b/test cases/unit/40 external, internal library rpath/built library/meson_options.txt
diff --git a/test cases/unit/39 external, internal library rpath/built library/prog.c b/test cases/unit/40 external, internal library rpath/built library/prog.c
index e3d4cf63f..e3d4cf63f 100644
--- a/test cases/unit/39 external, internal library rpath/built library/prog.c
+++ b/test cases/unit/40 external, internal library rpath/built library/prog.c
diff --git a/test cases/unit/39 external, internal library rpath/external library/bar.c b/test cases/unit/40 external, internal library rpath/external library/bar.c
index c6f42d651..c6f42d651 100644
--- a/test cases/unit/39 external, internal library rpath/external library/bar.c
+++ b/test cases/unit/40 external, internal library rpath/external library/bar.c
diff --git a/test cases/unit/39 external, internal library rpath/external library/faa.c b/test cases/unit/40 external, internal library rpath/external library/faa.c
index 473357516..473357516 100644
--- a/test cases/unit/39 external, internal library rpath/external library/faa.c
+++ b/test cases/unit/40 external, internal library rpath/external library/faa.c
diff --git a/test cases/unit/39 external, internal library rpath/external library/foo.c b/test cases/unit/40 external, internal library rpath/external library/foo.c
index a34e4a885..a34e4a885 100644
--- a/test cases/unit/39 external, internal library rpath/external library/foo.c
+++ b/test cases/unit/40 external, internal library rpath/external library/foo.c
diff --git a/test cases/unit/39 external, internal library rpath/external library/meson.build b/test cases/unit/40 external, internal library rpath/external library/meson.build
index 3c311f592..3c311f592 100644
--- a/test cases/unit/39 external, internal library rpath/external library/meson.build
+++ b/test cases/unit/40 external, internal library rpath/external library/meson.build
diff --git a/test cases/unit/40 featurenew subprojects/meson.build b/test cases/unit/41 featurenew subprojects/meson.build
index 27898cd79..27898cd79 100644
--- a/test cases/unit/40 featurenew subprojects/meson.build
+++ b/test cases/unit/41 featurenew subprojects/meson.build
diff --git a/test cases/unit/40 featurenew subprojects/subprojects/bar/meson.build b/test cases/unit/41 featurenew subprojects/subprojects/bar/meson.build
index 712a125f7..712a125f7 100644
--- a/test cases/unit/40 featurenew subprojects/subprojects/bar/meson.build
+++ b/test cases/unit/41 featurenew subprojects/subprojects/bar/meson.build
diff --git a/test cases/unit/40 featurenew subprojects/subprojects/foo/meson.build b/test cases/unit/41 featurenew subprojects/subprojects/foo/meson.build
index 0ef4472bd..0ef4472bd 100644
--- a/test cases/unit/40 featurenew subprojects/subprojects/foo/meson.build
+++ b/test cases/unit/41 featurenew subprojects/subprojects/foo/meson.build
diff --git a/test cases/unit/41 rpath order/meson.build b/test cases/unit/42 rpath order/meson.build
index a722894e5..a722894e5 100644
--- a/test cases/unit/41 rpath order/meson.build
+++ b/test cases/unit/42 rpath order/meson.build
diff --git a/test cases/unit/41 rpath order/myexe.c b/test cases/unit/42 rpath order/myexe.c
index 03b2213bb..03b2213bb 100644
--- a/test cases/unit/41 rpath order/myexe.c
+++ b/test cases/unit/42 rpath order/myexe.c
diff --git a/test cases/unit/41 rpath order/subprojects/sub1/lib.c b/test cases/unit/42 rpath order/subprojects/sub1/lib.c
index e69de29bb..e69de29bb 100644
--- a/test cases/unit/41 rpath order/subprojects/sub1/lib.c
+++ b/test cases/unit/42 rpath order/subprojects/sub1/lib.c
diff --git a/test cases/unit/41 rpath order/subprojects/sub1/meson.build b/test cases/unit/42 rpath order/subprojects/sub1/meson.build
index 4dd5d0843..4dd5d0843 100644
--- a/test cases/unit/41 rpath order/subprojects/sub1/meson.build
+++ b/test cases/unit/42 rpath order/subprojects/sub1/meson.build
diff --git a/test cases/unit/41 rpath order/subprojects/sub2/lib.c b/test cases/unit/42 rpath order/subprojects/sub2/lib.c
index e69de29bb..e69de29bb 100644
--- a/test cases/unit/41 rpath order/subprojects/sub2/lib.c
+++ b/test cases/unit/42 rpath order/subprojects/sub2/lib.c
diff --git a/test cases/unit/41 rpath order/subprojects/sub2/meson.build b/test cases/unit/42 rpath order/subprojects/sub2/meson.build
index bc3510db3..bc3510db3 100644
--- a/test cases/unit/41 rpath order/subprojects/sub2/meson.build
+++ b/test cases/unit/42 rpath order/subprojects/sub2/meson.build
diff --git a/test cases/unit/42 dep order/lib1.c b/test cases/unit/43 dep order/lib1.c
index e69de29bb..e69de29bb 100644
--- a/test cases/unit/42 dep order/lib1.c
+++ b/test cases/unit/43 dep order/lib1.c
diff --git a/test cases/unit/42 dep order/lib2.c b/test cases/unit/43 dep order/lib2.c
index e69de29bb..e69de29bb 100644
--- a/test cases/unit/42 dep order/lib2.c
+++ b/test cases/unit/43 dep order/lib2.c
diff --git a/test cases/unit/42 dep order/meson.build b/test cases/unit/43 dep order/meson.build
index 17cf9dfba..17cf9dfba 100644
--- a/test cases/unit/42 dep order/meson.build
+++ b/test cases/unit/43 dep order/meson.build
diff --git a/test cases/unit/42 dep order/myexe.c b/test cases/unit/43 dep order/myexe.c
index 8f4c045ee..8f4c045ee 100644
--- a/test cases/unit/42 dep order/myexe.c
+++ b/test cases/unit/43 dep order/myexe.c
diff --git a/test cases/unit/43 promote wrap/meson.build b/test cases/unit/44 promote wrap/meson.build
index 066cf36cf..066cf36cf 100644
--- a/test cases/unit/43 promote wrap/meson.build
+++ b/test cases/unit/44 promote wrap/meson.build
diff --git a/test cases/unit/43 promote wrap/subprojects/s1/meson.build b/test cases/unit/44 promote wrap/subprojects/s1/meson.build
index 3d1f5bc35..3d1f5bc35 100644
--- a/test cases/unit/43 promote wrap/subprojects/s1/meson.build
+++ b/test cases/unit/44 promote wrap/subprojects/s1/meson.build
diff --git a/test cases/unit/43 promote wrap/subprojects/s1/subprojects/ambiguous/meson.build b/test cases/unit/44 promote wrap/subprojects/s1/subprojects/ambiguous/meson.build
index 296adff4c..296adff4c 100644
--- a/test cases/unit/43 promote wrap/subprojects/s1/subprojects/ambiguous/meson.build
+++ b/test cases/unit/44 promote wrap/subprojects/s1/subprojects/ambiguous/meson.build
diff --git a/test cases/unit/43 promote wrap/subprojects/s2/meson.build b/test cases/unit/44 promote wrap/subprojects/s2/meson.build
index b5db63429..b5db63429 100644
--- a/test cases/unit/43 promote wrap/subprojects/s2/meson.build
+++ b/test cases/unit/44 promote wrap/subprojects/s2/meson.build
diff --git a/test cases/unit/43 promote wrap/subprojects/s2/subprojects/ambiguous.wrap b/test cases/unit/44 promote wrap/subprojects/s2/subprojects/ambiguous.wrap
index 09ba4e87f..09ba4e87f 100644
--- a/test cases/unit/43 promote wrap/subprojects/s2/subprojects/ambiguous.wrap
+++ b/test cases/unit/44 promote wrap/subprojects/s2/subprojects/ambiguous.wrap