From 7589471978301606e698626b13ef9b62638c4ea7 Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Sun, 10 Mar 2019 16:37:51 +0200 Subject: [PATCH] Condense directory numbering for release. --- run_unittests.py | 40 +++++++++---------- .../foo.h | 0 .../meson.build | 0 .../meson.build | 0 .../cmake_project/CMakeLists.txt | 0 .../installed_files.txt | 0 .../meson.build | 0 .../projectConfig.cmake.in | 0 .../installed_files.txt | 0 .../main.cpp | 0 .../meson.build | 0 .../nativefile.ini | 0 .../meson.build | 0 .../{212 tap tests => 214 tap tests}/tester.c | 0 .../main.cpp | 0 .../meson.build | 0 .../meson.build | 0 .../{91 kwarg dupe => 92 kwarg dupe}/prog.c | 0 .../meson.build | 0 .../prog.c | 0 .../include/pch.h | 0 .../meson.build | 0 .../prog.c | 0 .../src/pch.c | 0 .../meson.build | 0 .../meson_options.txt | 0 .../{46 reconfigure => 48 reconfigure}/main.c | 0 .../meson.build | 0 .../meson_options.txt | 0 .../envcheck.py | 0 .../meson.build | 0 .../meson.build | 0 .../somelib.cs | 0 .../{49 ldflagdedup => 51 ldflagdedup}/bob.c | 0 .../meson.build | 0 .../{49 ldflagdedup => 51 ldflagdedup}/prog.c | 0 .../meson.build | 0 .../.clang-format | 0 .../meson.build | 0 .../prog_expected_c | 0 .../prog_orig_c | 0 .../subprojects/projectBad/meson.build | 0 .../subprojects/projectBad/meson_options.txt | 0 .../meson.build | 0 .../sharedlib/meson.build | 0 .../sharedlib/shared.cpp | 0 .../sharedlib/shared.hpp | 0 .../staticlib/meson.build | 0 .../staticlib/static.c | 0 .../staticlib/static.h | 0 .../t1.cpp | 0 .../t2.cpp | 0 .../t3.cpp | 0 .../c_compiler.py | 0 .../main.c | 0 .../meson.build | 0 .../meson_options.txt | 0 .../subprojects/evilFile.txt | 0 .../subprojects/projectA/meson.build | 0 .../subprojects/projectA/meson_options.txt | 0 .../subprojects/projectBad/meson.build | 0 .../subprojects/projectBad/meson_options.txt | 0 .../crossfile | 0 .../meson.build | 0 .../meson_options.txt | 0 .../nativefile | 0 66 files changed, 20 insertions(+), 20 deletions(-) rename test cases/common/{209 find_library and headers => 210 find_library and headers}/foo.h (100%) rename test cases/common/{209 find_library and headers => 210 find_library and headers}/meson.build (100%) rename test cases/common/{210 line continuation => 211 line continuation}/meson.build (100%) rename test cases/common/{211 cmake module => 212 cmake module}/cmake_project/CMakeLists.txt (100%) rename test cases/common/{211 cmake module => 212 cmake module}/installed_files.txt (100%) rename test cases/common/{211 cmake module => 212 cmake module}/meson.build (100%) rename test cases/common/{211 cmake module => 212 cmake module}/projectConfig.cmake.in (100%) rename test cases/common/{212 native file path override => 213 native file path override}/installed_files.txt (100%) rename test cases/common/{212 native file path override => 213 native file path override}/main.cpp (100%) rename test cases/common/{212 native file path override => 213 native file path override}/meson.build (100%) rename test cases/common/{212 native file path override => 213 native file path override}/nativefile.ini (100%) rename test cases/common/{212 tap tests => 214 tap tests}/meson.build (100%) rename test cases/common/{212 tap tests => 214 tap tests}/tester.c (100%) rename test cases/common/{213 warning level 0 => 215 warning level 0}/main.cpp (100%) rename test cases/common/{213 warning level 0 => 215 warning level 0}/meson.build (100%) rename test cases/failing/{91 kwarg dupe => 92 kwarg dupe}/meson.build (100%) rename test cases/failing/{91 kwarg dupe => 92 kwarg dupe}/prog.c (100%) rename test cases/failing/{92 missing pch file => 93 missing pch file}/meson.build (100%) rename test cases/failing/{92 missing pch file => 93 missing pch file}/prog.c (100%) rename test cases/failing/{93 pch source different folder => 94 pch source different folder}/include/pch.h (100%) rename test cases/failing/{93 pch source different folder => 94 pch source different folder}/meson.build (100%) rename test cases/failing/{93 pch source different folder => 94 pch source different folder}/prog.c (100%) rename test cases/failing/{93 pch source different folder => 94 pch source different folder}/src/pch.c (100%) rename test cases/unit/{46 native file binary => 47 native file binary}/meson.build (100%) rename test cases/unit/{46 native file binary => 47 native file binary}/meson_options.txt (100%) rename test cases/unit/{46 reconfigure => 48 reconfigure}/main.c (100%) rename test cases/unit/{46 reconfigure => 48 reconfigure}/meson.build (100%) rename test cases/unit/{46 reconfigure => 48 reconfigure}/meson_options.txt (100%) rename test cases/unit/{47 testsetup default => 49 testsetup default}/envcheck.py (100%) rename test cases/unit/{47 testsetup default => 49 testsetup default}/meson.build (100%) rename test cases/unit/{48 pkgconfig csharp library => 50 pkgconfig csharp library}/meson.build (100%) rename test cases/unit/{48 pkgconfig csharp library => 50 pkgconfig csharp library}/somelib.cs (100%) rename test cases/unit/{49 ldflagdedup => 51 ldflagdedup}/bob.c (100%) rename test cases/unit/{49 ldflagdedup => 51 ldflagdedup}/meson.build (100%) rename test cases/unit/{49 ldflagdedup => 51 ldflagdedup}/prog.c (100%) rename test cases/unit/{50 pkgconfig static link order => 52 pkgconfig static link order}/meson.build (100%) rename test cases/unit/{51 clang-format => 53 clang-format}/.clang-format (100%) rename test cases/unit/{51 clang-format => 53 clang-format}/meson.build (100%) rename test cases/unit/{51 clang-format => 53 clang-format}/prog_expected_c (100%) rename test cases/unit/{51 clang-format => 53 clang-format}/prog_orig_c (100%) rename test cases/unit/{51 introspect buildoptions => 54 introspect buildoptions}/subprojects/projectBad/meson.build (100%) rename test cases/unit/{51 introspect buildoptions => 54 introspect buildoptions}/subprojects/projectBad/meson_options.txt (100%) rename test cases/unit/{52 introspection => 55 introspection}/meson.build (100%) rename test cases/unit/{52 introspection => 55 introspection}/sharedlib/meson.build (100%) rename test cases/unit/{52 introspection => 55 introspection}/sharedlib/shared.cpp (100%) rename test cases/unit/{52 introspection => 55 introspection}/sharedlib/shared.hpp (100%) rename test cases/unit/{52 introspection => 55 introspection}/staticlib/meson.build (100%) rename test cases/unit/{52 introspection => 55 introspection}/staticlib/static.c (100%) rename test cases/unit/{52 introspection => 55 introspection}/staticlib/static.h (100%) rename test cases/unit/{52 introspection => 55 introspection}/t1.cpp (100%) rename test cases/unit/{52 introspection => 55 introspection}/t2.cpp (100%) rename test cases/unit/{52 introspection => 55 introspection}/t3.cpp (100%) rename test cases/unit/{53 introspect buildoptions => 56 introspect buildoptions}/c_compiler.py (100%) rename test cases/unit/{53 introspect buildoptions => 56 introspect buildoptions}/main.c (100%) rename test cases/unit/{53 introspect buildoptions => 56 introspect buildoptions}/meson.build (100%) rename test cases/unit/{53 introspect buildoptions => 56 introspect buildoptions}/meson_options.txt (100%) rename test cases/unit/{53 introspect buildoptions => 56 introspect buildoptions}/subprojects/evilFile.txt (100%) rename test cases/unit/{53 introspect buildoptions => 56 introspect buildoptions}/subprojects/projectA/meson.build (100%) rename test cases/unit/{53 introspect buildoptions => 56 introspect buildoptions}/subprojects/projectA/meson_options.txt (100%) rename test cases/unit/{53 introspect buildoptions => 56 introspect buildoptions}/subprojects/projectBad/meson.build (100%) rename test cases/unit/{53 introspect buildoptions => 56 introspect buildoptions}/subprojects/projectBad/meson_options.txt (100%) rename test cases/unit/{54 native file override => 57 native file override}/crossfile (100%) rename test cases/unit/{54 native file override => 57 native file override}/meson.build (100%) rename test cases/unit/{54 native file override => 57 native file override}/meson_options.txt (100%) rename test cases/unit/{54 native file override => 57 native file override}/nativefile (100%) 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 similarity index 100% rename from test cases/common/209 find_library and headers/foo.h rename to 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 similarity index 100% rename from test cases/common/209 find_library and headers/meson.build rename to 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 similarity index 100% rename from test cases/common/210 line continuation/meson.build rename to 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 similarity index 100% rename from test cases/common/211 cmake module/cmake_project/CMakeLists.txt rename to 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 similarity index 100% rename from test cases/common/211 cmake module/installed_files.txt rename to 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 similarity index 100% rename from test cases/common/211 cmake module/meson.build rename to 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 similarity index 100% rename from test cases/common/211 cmake module/projectConfig.cmake.in rename to 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 similarity index 100% rename from test cases/common/212 native file path override/installed_files.txt rename to 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 similarity index 100% rename from test cases/common/212 native file path override/main.cpp rename to 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 similarity index 100% rename from test cases/common/212 native file path override/meson.build rename to 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 similarity index 100% rename from test cases/common/212 native file path override/nativefile.ini rename to 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 similarity index 100% rename from test cases/common/212 tap tests/meson.build rename to 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 similarity index 100% rename from test cases/common/212 tap tests/tester.c rename to 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 similarity index 100% rename from test cases/common/213 warning level 0/main.cpp rename to 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 similarity index 100% rename from test cases/common/213 warning level 0/meson.build rename to 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 similarity index 100% rename from test cases/failing/91 kwarg dupe/meson.build rename to 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 similarity index 100% rename from test cases/failing/91 kwarg dupe/prog.c rename to 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 similarity index 100% rename from test cases/failing/92 missing pch file/meson.build rename to 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 similarity index 100% rename from test cases/failing/92 missing pch file/prog.c rename to 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 similarity index 100% rename from test cases/failing/93 pch source different folder/include/pch.h rename to 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 similarity index 100% rename from test cases/failing/93 pch source different folder/meson.build rename to 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 similarity index 100% rename from test cases/failing/93 pch source different folder/prog.c rename to 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 similarity index 100% rename from test cases/failing/93 pch source different folder/src/pch.c rename to 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 similarity index 100% rename from test cases/unit/46 native file binary/meson.build rename to 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 similarity index 100% rename from test cases/unit/46 native file binary/meson_options.txt rename to 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 similarity index 100% rename from test cases/unit/46 reconfigure/main.c rename to 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 similarity index 100% rename from test cases/unit/46 reconfigure/meson.build rename to 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 similarity index 100% rename from test cases/unit/46 reconfigure/meson_options.txt rename to 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 similarity index 100% rename from test cases/unit/47 testsetup default/envcheck.py rename to 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 similarity index 100% rename from test cases/unit/47 testsetup default/meson.build rename to 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 similarity index 100% rename from test cases/unit/48 pkgconfig csharp library/meson.build rename to 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 similarity index 100% rename from test cases/unit/48 pkgconfig csharp library/somelib.cs rename to 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 similarity index 100% rename from test cases/unit/49 ldflagdedup/bob.c rename to 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 similarity index 100% rename from test cases/unit/49 ldflagdedup/meson.build rename to 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 similarity index 100% rename from test cases/unit/49 ldflagdedup/prog.c rename to 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 similarity index 100% rename from test cases/unit/50 pkgconfig static link order/meson.build rename to 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 similarity index 100% rename from test cases/unit/51 clang-format/.clang-format rename to 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 similarity index 100% rename from test cases/unit/51 clang-format/meson.build rename to 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 similarity index 100% rename from test cases/unit/51 clang-format/prog_expected_c rename to 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 similarity index 100% rename from test cases/unit/51 clang-format/prog_orig_c rename to 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 similarity index 100% rename from test cases/unit/51 introspect buildoptions/subprojects/projectBad/meson.build rename to 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 similarity index 100% rename from test cases/unit/51 introspect buildoptions/subprojects/projectBad/meson_options.txt rename to 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 similarity index 100% rename from test cases/unit/52 introspection/meson.build rename to 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 similarity index 100% rename from test cases/unit/52 introspection/sharedlib/meson.build rename to 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 similarity index 100% rename from test cases/unit/52 introspection/sharedlib/shared.cpp rename to 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 similarity index 100% rename from test cases/unit/52 introspection/sharedlib/shared.hpp rename to 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 similarity index 100% rename from test cases/unit/52 introspection/staticlib/meson.build rename to 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 similarity index 100% rename from test cases/unit/52 introspection/staticlib/static.c rename to 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 similarity index 100% rename from test cases/unit/52 introspection/staticlib/static.h rename to 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 similarity index 100% rename from test cases/unit/52 introspection/t1.cpp rename to 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 similarity index 100% rename from test cases/unit/52 introspection/t2.cpp rename to 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 similarity index 100% rename from test cases/unit/52 introspection/t3.cpp rename to 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 similarity index 100% rename from test cases/unit/53 introspect buildoptions/c_compiler.py rename to 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 similarity index 100% rename from test cases/unit/53 introspect buildoptions/main.c rename to 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 similarity index 100% rename from test cases/unit/53 introspect buildoptions/meson.build rename to 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 similarity index 100% rename from test cases/unit/53 introspect buildoptions/meson_options.txt rename to 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 similarity index 100% rename from test cases/unit/53 introspect buildoptions/subprojects/evilFile.txt rename to 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 similarity index 100% rename from test cases/unit/53 introspect buildoptions/subprojects/projectA/meson.build rename to 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 similarity index 100% rename from test cases/unit/53 introspect buildoptions/subprojects/projectA/meson_options.txt rename to 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 similarity index 100% rename from test cases/unit/53 introspect buildoptions/subprojects/projectBad/meson.build rename to 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 similarity index 100% rename from test cases/unit/53 introspect buildoptions/subprojects/projectBad/meson_options.txt rename to 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 similarity index 100% rename from test cases/unit/54 native file override/crossfile rename to 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 similarity index 100% rename from test cases/unit/54 native file override/meson.build rename to 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 similarity index 100% rename from test cases/unit/54 native file override/meson_options.txt rename to 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 similarity index 100% rename from test cases/unit/54 native file override/nativefile rename to test cases/unit/57 native file override/nativefile