66 files changed, 20 insertions, 20 deletions
diff --git a/run_unittests.py b/run_unittests.py
index 690ea3391..0e83b6d87 100755
--- a/run_unittests.py
+++ b/run_unittests.py
@@ -1699,7 +1699,7 @@ class AllPlatformTests(BasePlatformTests):
                           self.mtest_command + ['--setup=main:onlyinbar'])
 
     def test_testsetup_default(self):
-        testdir = os.path.join(self.unit_test_dir, '47 testsetup default')
+        testdir = os.path.join(self.unit_test_dir, '49 testsetup default')
         self.init(testdir)
         self.build()
 
@@ -2974,7 +2974,7 @@ recommended as it is not supported on some platforms''')
             pass
 
     def test_warning_level_0(self):
-        testdir = os.path.join(self.common_test_dir, '213 warning level 0')
+        testdir = os.path.join(self.common_test_dir, '215 warning level 0')
 
         # Verify default values when passing no args
         self.init(testdir)
@@ -3132,7 +3132,7 @@ recommended as it is not supported on some platforms''')
             pickle.dump(obj, f)
 
     def test_reconfigure(self):
-        testdir = os.path.join(self.unit_test_dir, '46 reconfigure')
+        testdir = os.path.join(self.unit_test_dir, '48 reconfigure')
         self.init(testdir, extra_args=['-Dopt1=val1'])
         self.setconf('-Dopt2=val2')
 
@@ -3169,7 +3169,7 @@ recommended as it is not supported on some platforms''')
             self.init(testdir, extra_args=['--wipe'])
 
     def test_minor_version_does_not_reconfigure_wipe(self):
-        testdir = os.path.join(self.unit_test_dir, '46 reconfigure')
+        testdir = os.path.join(self.unit_test_dir, '48 reconfigure')
         self.init(testdir, extra_args=['-Dopt1=val1'])
         self.setconf('-Dopt2=val2')
 
@@ -3272,7 +3272,7 @@ recommended as it is not supported on some platforms''')
     def test_clang_format(self):
         if self.backend is not Backend.ninja:
             raise unittest.SkipTest('Clang-format is for now only supported on Ninja, not {}'.format(self.backend.name))
-        testdir = os.path.join(self.unit_test_dir, '51 clang-format')
+        testdir = os.path.join(self.unit_test_dir, '53 clang-format')
         testfile = os.path.join(testdir, 'prog.c')
         badfile = os.path.join(testdir, 'prog_orig_c')
         goodfile = os.path.join(testdir, 'prog_expected_c')
@@ -3292,7 +3292,7 @@ recommended as it is not supported on some platforms''')
                          Path(goodfile).read_text())
 
     def test_introspect_buildoptions_without_configured_build(self):
-        testdir = os.path.join(self.unit_test_dir, '53 introspect buildoptions')
+        testdir = os.path.join(self.unit_test_dir, '56 introspect buildoptions')
         testfile = os.path.join(testdir, 'meson.build')
         res_nb = self.introspect_directory(testfile, ['--buildoptions'] + self.meson_args)
         self.init(testdir, default_args=False)
@@ -3301,7 +3301,7 @@ recommended as it is not supported on some platforms''')
         self.assertListEqual(res_nb, res_wb)
 
     def test_introspect_json_dump(self):
-        testdir = os.path.join(self.unit_test_dir, '52 introspection')
+        testdir = os.path.join(self.unit_test_dir, '55 introspection')
         self.init(testdir)
         infodir = os.path.join(self.builddir, 'meson-info')
         self.assertPathExists(infodir)
@@ -3445,7 +3445,7 @@ recommended as it is not supported on some platforms''')
         self.assertDictEqual(targets_to_find, {})
 
     def test_introspect_file_dump_equals_all(self):
-        testdir = os.path.join(self.unit_test_dir, '52 introspection')
+        testdir = os.path.join(self.unit_test_dir, '55 introspection')
         self.init(testdir)
         res_all = self.introspect('--all')
         res_file = {}
@@ -3472,7 +3472,7 @@ recommended as it is not supported on some platforms''')
         self.assertEqual(res_all, res_file)
 
     def test_introspect_meson_info(self):
-        testdir = os.path.join(self.unit_test_dir, '52 introspection')
+        testdir = os.path.join(self.unit_test_dir, '55 introspection')
         introfile = os.path.join(self.builddir, 'meson-info', 'meson-info.json')
         self.init(testdir)
         self.assertPathExists(introfile)
@@ -3486,7 +3486,7 @@ recommended as it is not supported on some platforms''')
         self.assertEqual(res1['build_files_updated'], True)
 
     def test_introspect_config_update(self):
-        testdir = os.path.join(self.unit_test_dir, '52 introspection')
+        testdir = os.path.join(self.unit_test_dir, '55 introspection')
         introfile = os.path.join(self.builddir, 'meson-info', 'intro-buildoptions.json')
         self.init(testdir)
         self.assertPathExists(introfile)
@@ -3512,7 +3512,7 @@ recommended as it is not supported on some platforms''')
         self.assertListEqual(res1, res2)
 
     def test_introspect_targets_from_source(self):
-        testdir = os.path.join(self.unit_test_dir, '52 introspection')
+        testdir = os.path.join(self.unit_test_dir, '55 introspection')
         testfile = os.path.join(testdir, 'meson.build')
         introfile = os.path.join(self.builddir, 'meson-info', 'intro-targets.json')
         self.init(testdir)
@@ -3543,7 +3543,7 @@ recommended as it is not supported on some platforms''')
         self.assertListEqual(res_nb, res_wb)
 
     def test_introspect_dependencies_from_source(self):
-        testdir = os.path.join(self.unit_test_dir, '52 introspection')
+        testdir = os.path.join(self.unit_test_dir, '55 introspection')
         testfile = os.path.join(testdir, 'meson.build')
         res_nb = self.introspect_directory(testfile, ['--scan-dependencies'] + self.meson_args)
         expected = [
@@ -4860,7 +4860,7 @@ endian = 'little'
     @skipIfNoPkgconfig
     @skip_if_not_language('cs')
     def test_pkgconfig_csharp_library(self):
-        testdir = os.path.join(self.unit_test_dir, '48 pkgconfig csharp library')
+        testdir = os.path.join(self.unit_test_dir, '50 pkgconfig csharp library')
         self.init(testdir)
         myenv = os.environ.copy()
         myenv['PKG_CONFIG_PATH'] = self.privatedir
@@ -4873,7 +4873,7 @@ endian = 'little'
         '''
         Test that libraries are listed before their dependencies.
         '''
-        testdir = os.path.join(self.unit_test_dir, '50 pkgconfig static link order')
+        testdir = os.path.join(self.unit_test_dir, '52 pkgconfig static link order')
         self.init(testdir)
         myenv = os.environ.copy()
         myenv['PKG_CONFIG_PATH'] = self.privatedir
@@ -5017,7 +5017,7 @@ endian = 'little'
 
     @skipIfNoPkgconfigDep('gmodule-2.0')
     def test_ldflag_dedup(self):
-        testdir = os.path.join(self.unit_test_dir, '49 ldflagdedup')
+        testdir = os.path.join(self.unit_test_dir, '51 ldflagdedup')
         if is_cygwin() or is_osx():
             raise unittest.SkipTest('Not applicable on Cygwin or OSX.')
         self.init(testdir)
@@ -5516,7 +5516,7 @@ class NativeFileTests(BasePlatformTests):
 
     def setUp(self):
         super().setUp()
-        self.testcase = os.path.join(self.unit_test_dir, '46 native file binary')
+        self.testcase = os.path.join(self.unit_test_dir, '47 native file binary')
         self.current_config = 0
         self.current_wrapper = 0
 
@@ -5789,12 +5789,12 @@ class NativeFileTests(BasePlatformTests):
         self.assertEqual(compiler.version, '1.2345')
 
     def test_native_file_dirs(self):
-        testcase = os.path.join(self.unit_test_dir, '54 native file override')
+        testcase = os.path.join(self.unit_test_dir, '57 native file override')
         self.init(testcase, default_args=False,
                   extra_args=['--native-file', os.path.join(testcase, 'nativefile')])
 
     def test_native_file_dirs_overriden(self):
-        testcase = os.path.join(self.unit_test_dir, '54 native file override')
+        testcase = os.path.join(self.unit_test_dir, '57 native file override')
         self.init(testcase, default_args=False,
                   extra_args=['--native-file', os.path.join(testcase, 'nativefile'),
                               '-Ddef_libdir=liblib', '-Dlibdir=liblib'])
@@ -5809,7 +5809,7 @@ class CrossFileTests(BasePlatformTests):
     """
 
     def test_cross_file_dirs(self):
-        testcase = os.path.join(self.unit_test_dir, '54 native file override')
+        testcase = os.path.join(self.unit_test_dir, '57 native file override')
         self.init(testcase, default_args=False,
                   extra_args=['--native-file', os.path.join(testcase, 'nativefile'),
                               '--cross-file', os.path.join(testcase, 'crossfile'),
@@ -5827,7 +5827,7 @@ class CrossFileTests(BasePlatformTests):
                               '-Ddef_sysconfdir=sysconfbar'])
 
     def test_cross_file_dirs_overriden(self):
-        testcase = os.path.join(self.unit_test_dir, '54 native file override')
+        testcase = os.path.join(self.unit_test_dir, '57 native file override')
         self.init(testcase, default_args=False,
                   extra_args=['--native-file', os.path.join(testcase, 'nativefile'),
                               '--cross-file', os.path.join(testcase, 'crossfile'),
diff --git a/test cases/common/209 find_library and headers/foo.h b/test cases/common/210 find_library and headers/foo.h
index 014e06e82..014e06e82 100644
--- a/test cases/common/209 find_library and headers/foo.h
+++ b/test cases/common/210 find_library and headers/foo.h
diff --git a/test cases/common/209 find_library and headers/meson.build b/test cases/common/210 find_library and headers/meson.build
index bcd71f12a..bcd71f12a 100644
--- a/test cases/common/209 find_library and headers/meson.build
+++ b/test cases/common/210 find_library and headers/meson.build
diff --git a/test cases/common/210 line continuation/meson.build b/test cases/common/211 line continuation/meson.build
index 16c72f9ae..16c72f9ae 100644
--- a/test cases/common/210 line continuation/meson.build
+++ b/test cases/common/211 line continuation/meson.build
diff --git a/test cases/common/211 cmake module/cmake_project/CMakeLists.txt b/test cases/common/212 cmake module/cmake_project/CMakeLists.txt
index cd915846a..cd915846a 100644
--- a/test cases/common/211 cmake module/cmake_project/CMakeLists.txt
+++ b/test cases/common/212 cmake module/cmake_project/CMakeLists.txt
diff --git a/test cases/common/211 cmake module/installed_files.txt b/test cases/common/212 cmake module/installed_files.txt
index f8b11f017..f8b11f017 100644
--- a/test cases/common/211 cmake module/installed_files.txt
+++ b/test cases/common/212 cmake module/installed_files.txt
diff --git a/test cases/common/211 cmake module/meson.build b/test cases/common/212 cmake module/meson.build
index 68f9993a6..68f9993a6 100644
--- a/test cases/common/211 cmake module/meson.build
+++ b/test cases/common/212 cmake module/meson.build
diff --git a/test cases/common/211 cmake module/projectConfig.cmake.in b/test cases/common/212 cmake module/projectConfig.cmake.in
index fa3dfca0f..fa3dfca0f 100644
--- a/test cases/common/211 cmake module/projectConfig.cmake.in
+++ b/test cases/common/212 cmake module/projectConfig.cmake.in
diff --git a/test cases/common/212 native file path override/installed_files.txt b/test cases/common/213 native file path override/installed_files.txt
index 0044d4062..0044d4062 100644
--- a/test cases/common/212 native file path override/installed_files.txt
+++ b/test cases/common/213 native file path override/installed_files.txt
diff --git a/test cases/common/212 native file path override/main.cpp b/test cases/common/213 native file path override/main.cpp
index d65cab212..d65cab212 100644
--- a/test cases/common/212 native file path override/main.cpp
+++ b/test cases/common/213 native file path override/main.cpp
diff --git a/test cases/common/212 native file path override/meson.build b/test cases/common/213 native file path override/meson.build
index 142ca1cfc..142ca1cfc 100644
--- a/test cases/common/212 native file path override/meson.build
+++ b/test cases/common/213 native file path override/meson.build
diff --git a/test cases/common/212 native file path override/nativefile.ini b/test cases/common/213 native file path override/nativefile.ini
index 1c295c7d4..1c295c7d4 100644
--- a/test cases/common/212 native file path override/nativefile.ini
+++ b/test cases/common/213 native file path override/nativefile.ini
diff --git a/test cases/common/212 tap tests/meson.build b/test cases/common/214 tap tests/meson.build
index 58529a72e..58529a72e 100644
--- a/test cases/common/212 tap tests/meson.build
+++ b/test cases/common/214 tap tests/meson.build
diff --git a/test cases/common/212 tap tests/tester.c b/test cases/common/214 tap tests/tester.c
index ac582e7c0..ac582e7c0 100644
--- a/test cases/common/212 tap tests/tester.c
+++ b/test cases/common/214 tap tests/tester.c
diff --git a/test cases/common/213 warning level 0/main.cpp b/test cases/common/215 warning level 0/main.cpp
index 954d9ce3e..954d9ce3e 100644
--- a/test cases/common/213 warning level 0/main.cpp
+++ b/test cases/common/215 warning level 0/main.cpp
diff --git a/test cases/common/213 warning level 0/meson.build b/test cases/common/215 warning level 0/meson.build
index f2bd3390b..f2bd3390b 100644
--- a/test cases/common/213 warning level 0/meson.build
+++ b/test cases/common/215 warning level 0/meson.build
diff --git a/test cases/failing/91 kwarg dupe/meson.build b/test cases/failing/92 kwarg dupe/meson.build
index 06821a278..06821a278 100644
--- a/test cases/failing/91 kwarg dupe/meson.build
+++ b/test cases/failing/92 kwarg dupe/meson.build
diff --git a/test cases/failing/91 kwarg dupe/prog.c b/test cases/failing/92 kwarg dupe/prog.c
index 5f3fbe6a2..5f3fbe6a2 100644
--- a/test cases/failing/91 kwarg dupe/prog.c
+++ b/test cases/failing/92 kwarg dupe/prog.c
diff --git a/test cases/failing/92 missing pch file/meson.build b/test cases/failing/93 missing pch file/meson.build
index a67b79877..a67b79877 100644
--- a/test cases/failing/92 missing pch file/meson.build
+++ b/test cases/failing/93 missing pch file/meson.build
diff --git a/test cases/failing/92 missing pch file/prog.c b/test cases/failing/93 missing pch file/prog.c
index 11b7fad8e..11b7fad8e 100644
--- a/test cases/failing/92 missing pch file/prog.c
+++ b/test cases/failing/93 missing pch file/prog.c
diff --git a/test cases/failing/93 pch source different folder/include/pch.h b/test cases/failing/94 pch source different folder/include/pch.h
index e69de29bb..e69de29bb 100644
--- a/test cases/failing/93 pch source different folder/include/pch.h
+++ b/test cases/failing/94 pch source different folder/include/pch.h
diff --git a/test cases/failing/93 pch source different folder/meson.build b/test cases/failing/94 pch source different folder/meson.build
index d32071772..d32071772 100644
--- a/test cases/failing/93 pch source different folder/meson.build
+++ b/test cases/failing/94 pch source different folder/meson.build
diff --git a/test cases/failing/93 pch source different folder/prog.c b/test cases/failing/94 pch source different folder/prog.c
index c272dabae..c272dabae 100644
--- a/test cases/failing/93 pch source different folder/prog.c
+++ b/test cases/failing/94 pch source different folder/prog.c
diff --git a/test cases/failing/93 pch source different folder/src/pch.c b/test cases/failing/94 pch source different folder/src/pch.c
index e69de29bb..e69de29bb 100644
--- a/test cases/failing/93 pch source different folder/src/pch.c
+++ b/test cases/failing/94 pch source different folder/src/pch.c
diff --git a/test cases/unit/46 native file binary/meson.build b/test cases/unit/47 native file binary/meson.build
index 4489ac1e6..4489ac1e6 100644
--- a/test cases/unit/46 native file binary/meson.build
+++ b/test cases/unit/47 native file binary/meson.build
diff --git a/test cases/unit/46 native file binary/meson_options.txt b/test cases/unit/47 native file binary/meson_options.txt
index 651da0ebe..651da0ebe 100644
--- a/test cases/unit/46 native file binary/meson_options.txt
+++ b/test cases/unit/47 native file binary/meson_options.txt
diff --git a/test cases/unit/46 reconfigure/main.c b/test cases/unit/48 reconfigure/main.c
index 25927f5a1..25927f5a1 100644
--- a/test cases/unit/46 reconfigure/main.c
+++ b/test cases/unit/48 reconfigure/main.c
diff --git a/test cases/unit/46 reconfigure/meson.build b/test cases/unit/48 reconfigure/meson.build
index 6eaac5db7..6eaac5db7 100644
--- a/test cases/unit/46 reconfigure/meson.build
+++ b/test cases/unit/48 reconfigure/meson.build
diff --git a/test cases/unit/46 reconfigure/meson_options.txt b/test cases/unit/48 reconfigure/meson_options.txt
index 728f7b782..728f7b782 100644
--- a/test cases/unit/46 reconfigure/meson_options.txt
+++ b/test cases/unit/48 reconfigure/meson_options.txt
diff --git a/test cases/unit/47 testsetup default/envcheck.py b/test cases/unit/49 testsetup default/envcheck.py
index 6ba3093ff..6ba3093ff 100644
--- a/test cases/unit/47 testsetup default/envcheck.py
+++ b/test cases/unit/49 testsetup default/envcheck.py
diff --git a/test cases/unit/47 testsetup default/meson.build b/test cases/unit/49 testsetup default/meson.build
index bdd35b807..bdd35b807 100644
--- a/test cases/unit/47 testsetup default/meson.build
+++ b/test cases/unit/49 testsetup default/meson.build
diff --git a/test cases/unit/48 pkgconfig csharp library/meson.build b/test cases/unit/50 pkgconfig csharp library/meson.build
index 148d40fe4..148d40fe4 100644
--- a/test cases/unit/48 pkgconfig csharp library/meson.build
+++ b/test cases/unit/50 pkgconfig csharp library/meson.build
diff --git a/test cases/unit/48 pkgconfig csharp library/somelib.cs b/test cases/unit/50 pkgconfig csharp library/somelib.cs
index 24d37edf6..24d37edf6 100644
--- a/test cases/unit/48 pkgconfig csharp library/somelib.cs
+++ b/test cases/unit/50 pkgconfig csharp library/somelib.cs
diff --git a/test cases/unit/49 ldflagdedup/bob.c b/test cases/unit/51 ldflagdedup/bob.c
index a68d4b170..a68d4b170 100644
--- a/test cases/unit/49 ldflagdedup/bob.c
+++ b/test cases/unit/51 ldflagdedup/bob.c
diff --git a/test cases/unit/49 ldflagdedup/meson.build b/test cases/unit/51 ldflagdedup/meson.build
index 0bbcc503d..0bbcc503d 100644
--- a/test cases/unit/49 ldflagdedup/meson.build
+++ b/test cases/unit/51 ldflagdedup/meson.build
diff --git a/test cases/unit/49 ldflagdedup/prog.c b/test cases/unit/51 ldflagdedup/prog.c
index 02c599de3..02c599de3 100644
--- a/test cases/unit/49 ldflagdedup/prog.c
+++ b/test cases/unit/51 ldflagdedup/prog.c
diff --git a/test cases/unit/50 pkgconfig static link order/meson.build b/test cases/unit/52 pkgconfig static link order/meson.build
index b61de9ab1..b61de9ab1 100644
--- a/test cases/unit/50 pkgconfig static link order/meson.build
+++ b/test cases/unit/52 pkgconfig static link order/meson.build
diff --git a/test cases/unit/51 clang-format/.clang-format b/test cases/unit/53 clang-format/.clang-format
index 5c60ac9f3..5c60ac9f3 100644
--- a/test cases/unit/51 clang-format/.clang-format
+++ b/test cases/unit/53 clang-format/.clang-format
diff --git a/test cases/unit/51 clang-format/meson.build b/test cases/unit/53 clang-format/meson.build
index 1b93cd54d..1b93cd54d 100644
--- a/test cases/unit/51 clang-format/meson.build
+++ b/test cases/unit/53 clang-format/meson.build
diff --git a/test cases/unit/51 clang-format/prog_expected_c b/test cases/unit/53 clang-format/prog_expected_c
index a045966a7..a045966a7 100644
--- a/test cases/unit/51 clang-format/prog_expected_c
+++ b/test cases/unit/53 clang-format/prog_expected_c
diff --git a/test cases/unit/51 clang-format/prog_orig_c b/test cases/unit/53 clang-format/prog_orig_c
index f098bbcce..f098bbcce 100644
--- a/test cases/unit/51 clang-format/prog_orig_c
+++ b/test cases/unit/53 clang-format/prog_orig_c
diff --git a/test cases/unit/51 introspect buildoptions/subprojects/projectBad/meson.build b/test cases/unit/54 introspect buildoptions/subprojects/projectBad/meson.build
index 4d0aeebb9..4d0aeebb9 100644
--- a/test cases/unit/51 introspect buildoptions/subprojects/projectBad/meson.build
+++ b/test cases/unit/54 introspect buildoptions/subprojects/projectBad/meson.build
diff --git a/test cases/unit/51 introspect buildoptions/subprojects/projectBad/meson_options.txt b/test cases/unit/54 introspect buildoptions/subprojects/projectBad/meson_options.txt
index f15d3529f..f15d3529f 100644
--- a/test cases/unit/51 introspect buildoptions/subprojects/projectBad/meson_options.txt
+++ b/test cases/unit/54 introspect buildoptions/subprojects/projectBad/meson_options.txt
diff --git a/test cases/unit/52 introspection/meson.build b/test cases/unit/55 introspection/meson.build
index 98f6f226f..98f6f226f 100644
--- a/test cases/unit/52 introspection/meson.build
+++ b/test cases/unit/55 introspection/meson.build
diff --git a/test cases/unit/52 introspection/sharedlib/meson.build b/test cases/unit/55 introspection/sharedlib/meson.build
index 3de3493db..3de3493db 100644
--- a/test cases/unit/52 introspection/sharedlib/meson.build
+++ b/test cases/unit/55 introspection/sharedlib/meson.build
diff --git a/test cases/unit/52 introspection/sharedlib/shared.cpp b/test cases/unit/55 introspection/sharedlib/shared.cpp
index 5030ab75e..5030ab75e 100644
--- a/test cases/unit/52 introspection/sharedlib/shared.cpp
+++ b/test cases/unit/55 introspection/sharedlib/shared.cpp
diff --git a/test cases/unit/52 introspection/sharedlib/shared.hpp b/test cases/unit/55 introspection/sharedlib/shared.hpp
index dc9b2da28..dc9b2da28 100644
--- a/test cases/unit/52 introspection/sharedlib/shared.hpp
+++ b/test cases/unit/55 introspection/sharedlib/shared.hpp
diff --git a/test cases/unit/52 introspection/staticlib/meson.build b/test cases/unit/55 introspection/staticlib/meson.build
index b1b9afe02..b1b9afe02 100644
--- a/test cases/unit/52 introspection/staticlib/meson.build
+++ b/test cases/unit/55 introspection/staticlib/meson.build
diff --git a/test cases/unit/52 introspection/staticlib/static.c b/test cases/unit/55 introspection/staticlib/static.c
index 37ebc0d80..37ebc0d80 100644
--- a/test cases/unit/52 introspection/staticlib/static.c
+++ b/test cases/unit/55 introspection/staticlib/static.c
diff --git a/test cases/unit/52 introspection/staticlib/static.h b/test cases/unit/55 introspection/staticlib/static.h
index 506784e43..506784e43 100644
--- a/test cases/unit/52 introspection/staticlib/static.h
+++ b/test cases/unit/55 introspection/staticlib/static.h
diff --git a/test cases/unit/52 introspection/t1.cpp b/test cases/unit/55 introspection/t1.cpp
index 2bcaab87c..2bcaab87c 100644
--- a/test cases/unit/52 introspection/t1.cpp
+++ b/test cases/unit/55 introspection/t1.cpp
diff --git a/test cases/unit/52 introspection/t2.cpp b/test cases/unit/55 introspection/t2.cpp
index fee5097c3..fee5097c3 100644
--- a/test cases/unit/52 introspection/t2.cpp
+++ b/test cases/unit/55 introspection/t2.cpp
diff --git a/test cases/unit/52 introspection/t3.cpp b/test cases/unit/55 introspection/t3.cpp
index 8a906e079..8a906e079 100644
--- a/test cases/unit/52 introspection/t3.cpp
+++ b/test cases/unit/55 introspection/t3.cpp
diff --git a/test cases/unit/53 introspect buildoptions/c_compiler.py b/test cases/unit/56 introspect buildoptions/c_compiler.py
index c7241e7e0..c7241e7e0 100644
--- a/test cases/unit/53 introspect buildoptions/c_compiler.py
+++ b/test cases/unit/56 introspect buildoptions/c_compiler.py
diff --git a/test cases/unit/53 introspect buildoptions/main.c b/test cases/unit/56 introspect buildoptions/main.c
index ef99ae617..ef99ae617 100644
--- a/test cases/unit/53 introspect buildoptions/main.c
+++ b/test cases/unit/56 introspect buildoptions/main.c
diff --git a/test cases/unit/53 introspect buildoptions/meson.build b/test cases/unit/56 introspect buildoptions/meson.build
index 8052b5f09..8052b5f09 100644
--- a/test cases/unit/53 introspect buildoptions/meson.build
+++ b/test cases/unit/56 introspect buildoptions/meson.build
diff --git a/test cases/unit/53 introspect buildoptions/meson_options.txt b/test cases/unit/56 introspect buildoptions/meson_options.txt
index 61f9a8db4..61f9a8db4 100644
--- a/test cases/unit/53 introspect buildoptions/meson_options.txt
+++ b/test cases/unit/56 introspect buildoptions/meson_options.txt
diff --git a/test cases/unit/53 introspect buildoptions/subprojects/evilFile.txt b/test cases/unit/56 introspect buildoptions/subprojects/evilFile.txt
index e69de29bb..e69de29bb 100644
--- a/test cases/unit/53 introspect buildoptions/subprojects/evilFile.txt
+++ b/test cases/unit/56 introspect buildoptions/subprojects/evilFile.txt
diff --git a/test cases/unit/53 introspect buildoptions/subprojects/projectA/meson.build b/test cases/unit/56 introspect buildoptions/subprojects/projectA/meson.build
index 1ab9ee8a5..1ab9ee8a5 100644
--- a/test cases/unit/53 introspect buildoptions/subprojects/projectA/meson.build
+++ b/test cases/unit/56 introspect buildoptions/subprojects/projectA/meson.build
diff --git a/test cases/unit/53 introspect buildoptions/subprojects/projectA/meson_options.txt b/test cases/unit/56 introspect buildoptions/subprojects/projectA/meson_options.txt
index fa77f954a..fa77f954a 100644
--- a/test cases/unit/53 introspect buildoptions/subprojects/projectA/meson_options.txt
+++ b/test cases/unit/56 introspect buildoptions/subprojects/projectA/meson_options.txt
diff --git a/test cases/unit/53 introspect buildoptions/subprojects/projectBad/meson.build b/test cases/unit/56 introspect buildoptions/subprojects/projectBad/meson.build
index 500c1b9cc..500c1b9cc 100644
--- a/test cases/unit/53 introspect buildoptions/subprojects/projectBad/meson.build
+++ b/test cases/unit/56 introspect buildoptions/subprojects/projectBad/meson.build
diff --git a/test cases/unit/53 introspect buildoptions/subprojects/projectBad/meson_options.txt b/test cases/unit/56 introspect buildoptions/subprojects/projectBad/meson_options.txt
index f15d3529f..f15d3529f 100644
--- a/test cases/unit/53 introspect buildoptions/subprojects/projectBad/meson_options.txt
+++ b/test cases/unit/56 introspect buildoptions/subprojects/projectBad/meson_options.txt
diff --git a/test cases/unit/54 native file override/crossfile b/test cases/unit/57 native file override/crossfile
index 9dc4fbcfc..9dc4fbcfc 100644
--- a/test cases/unit/54 native file override/crossfile
+++ b/test cases/unit/57 native file override/crossfile
diff --git a/test cases/unit/54 native file override/meson.build b/test cases/unit/57 native file override/meson.build
index 8318abaef..8318abaef 100644
--- a/test cases/unit/54 native file override/meson.build
+++ b/test cases/unit/57 native file override/meson.build
diff --git a/test cases/unit/54 native file override/meson_options.txt b/test cases/unit/57 native file override/meson_options.txt
index 4d2abf9c6..4d2abf9c6 100644
--- a/test cases/unit/54 native file override/meson_options.txt
+++ b/test cases/unit/57 native file override/meson_options.txt
diff --git a/test cases/unit/54 native file override/nativefile b/test cases/unit/57 native file override/nativefile
index a39072579..a39072579 100644
--- a/test cases/unit/54 native file override/nativefile
+++ b/test cases/unit/57 native file override/nativefile