diff --git a/run_unittests.py b/run_unittests.py index e53f0c79d..839f82bf9 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -7017,7 +7017,7 @@ class LinuxlikeTests(BasePlatformTests): ''' if is_cygwin(): raise unittest.SkipTest('Windows PE/COFF binaries do not use RPATH') - testdir = os.path.join(self.unit_test_dir, '89 pkgconfig build rpath order') + testdir = os.path.join(self.unit_test_dir, '90 pkgconfig build rpath order') self.init(testdir, override_envvars={'PKG_CONFIG_PATH': testdir}) self.build() build_rpath = get_rpath(os.path.join(self.builddir, 'prog')) @@ -7733,7 +7733,7 @@ class LinuxlikeTests(BasePlatformTests): gccver = subprocess.check_output(['cc', '--version']) if b'7.5.0' in gccver: raise unittest.SkipTest('GCC on Bionic is too old to be supported.') - testdir = os.path.join(self.unit_test_dir, '87 prelinking') + testdir = os.path.join(self.unit_test_dir, '88 prelinking') self.init(testdir) self.build() outlib = os.path.join(self.builddir, 'libprelinked.a') @@ -7839,7 +7839,7 @@ class LinuxCrossArmTests(BaseLinuxCrossTests): https://github.com/mesonbuild/meson/issues/7997 check run native test in crossbuild without exe wrapper ''' - testdir = os.path.join(self.unit_test_dir, '88 run native test') + testdir = os.path.join(self.unit_test_dir, '89 run native test') stamp_file = os.path.join(self.builddir, 'native_test_has_run.stamp') self.init(testdir) self.build() diff --git a/test cases/common/241 get_file_contents/.gitattributes b/test cases/common/235 get_file_contents/.gitattributes similarity index 100% rename from test cases/common/241 get_file_contents/.gitattributes rename to test cases/common/235 get_file_contents/.gitattributes diff --git a/test cases/common/241 get_file_contents/VERSION b/test cases/common/235 get_file_contents/VERSION similarity index 100% rename from test cases/common/241 get_file_contents/VERSION rename to test cases/common/235 get_file_contents/VERSION diff --git a/test cases/common/241 get_file_contents/meson.build b/test cases/common/235 get_file_contents/meson.build similarity index 100% rename from test cases/common/241 get_file_contents/meson.build rename to test cases/common/235 get_file_contents/meson.build diff --git a/test cases/common/241 get_file_contents/other/meson.build b/test cases/common/235 get_file_contents/other/meson.build similarity index 100% rename from test cases/common/241 get_file_contents/other/meson.build rename to test cases/common/235 get_file_contents/other/meson.build diff --git a/test cases/common/241 get_file_contents/utf-16-text b/test cases/common/235 get_file_contents/utf-16-text similarity index 100% rename from test cases/common/241 get_file_contents/utf-16-text rename to test cases/common/235 get_file_contents/utf-16-text diff --git a/test cases/unit/87 prelinking/file1.c b/test cases/unit/88 prelinking/file1.c similarity index 100% rename from test cases/unit/87 prelinking/file1.c rename to test cases/unit/88 prelinking/file1.c diff --git a/test cases/unit/87 prelinking/file2.c b/test cases/unit/88 prelinking/file2.c similarity index 100% rename from test cases/unit/87 prelinking/file2.c rename to test cases/unit/88 prelinking/file2.c diff --git a/test cases/unit/87 prelinking/file3.c b/test cases/unit/88 prelinking/file3.c similarity index 100% rename from test cases/unit/87 prelinking/file3.c rename to test cases/unit/88 prelinking/file3.c diff --git a/test cases/unit/87 prelinking/file4.c b/test cases/unit/88 prelinking/file4.c similarity index 100% rename from test cases/unit/87 prelinking/file4.c rename to test cases/unit/88 prelinking/file4.c diff --git a/test cases/unit/87 prelinking/main.c b/test cases/unit/88 prelinking/main.c similarity index 100% rename from test cases/unit/87 prelinking/main.c rename to test cases/unit/88 prelinking/main.c diff --git a/test cases/unit/87 prelinking/meson.build b/test cases/unit/88 prelinking/meson.build similarity index 100% rename from test cases/unit/87 prelinking/meson.build rename to test cases/unit/88 prelinking/meson.build diff --git a/test cases/unit/87 prelinking/private_header.h b/test cases/unit/88 prelinking/private_header.h similarity index 100% rename from test cases/unit/87 prelinking/private_header.h rename to test cases/unit/88 prelinking/private_header.h diff --git a/test cases/unit/87 prelinking/public_header.h b/test cases/unit/88 prelinking/public_header.h similarity index 100% rename from test cases/unit/87 prelinking/public_header.h rename to test cases/unit/88 prelinking/public_header.h diff --git a/test cases/unit/88 run native test/main.c b/test cases/unit/89 run native test/main.c similarity index 100% rename from test cases/unit/88 run native test/main.c rename to test cases/unit/89 run native test/main.c diff --git a/test cases/unit/88 run native test/meson.build b/test cases/unit/89 run native test/meson.build similarity index 100% rename from test cases/unit/88 run native test/meson.build rename to test cases/unit/89 run native test/meson.build diff --git a/test cases/unit/89 pkgconfig build rpath order/dummy.pc b/test cases/unit/90 pkgconfig build rpath order/dummy.pc similarity index 100% rename from test cases/unit/89 pkgconfig build rpath order/dummy.pc rename to test cases/unit/90 pkgconfig build rpath order/dummy.pc diff --git a/test cases/unit/89 pkgconfig build rpath order/meson.build b/test cases/unit/90 pkgconfig build rpath order/meson.build similarity index 100% rename from test cases/unit/89 pkgconfig build rpath order/meson.build rename to test cases/unit/90 pkgconfig build rpath order/meson.build diff --git a/test cases/unit/89 pkgconfig build rpath order/prog.c b/test cases/unit/90 pkgconfig build rpath order/prog.c similarity index 100% rename from test cases/unit/89 pkgconfig build rpath order/prog.c rename to test cases/unit/90 pkgconfig build rpath order/prog.c diff --git a/test cases/unit/89 pkgconfig build rpath order/prog.cc b/test cases/unit/90 pkgconfig build rpath order/prog.cc similarity index 100% rename from test cases/unit/89 pkgconfig build rpath order/prog.cc rename to test cases/unit/90 pkgconfig build rpath order/prog.cc diff --git a/test cases/unit/89 pkgconfig build rpath order/sub/meson.build b/test cases/unit/90 pkgconfig build rpath order/sub/meson.build similarity index 100% rename from test cases/unit/89 pkgconfig build rpath order/sub/meson.build rename to test cases/unit/90 pkgconfig build rpath order/sub/meson.build diff --git a/test cases/unit/89 pkgconfig build rpath order/sub/stuff.c b/test cases/unit/90 pkgconfig build rpath order/sub/stuff.c similarity index 100% rename from test cases/unit/89 pkgconfig build rpath order/sub/stuff.c rename to test cases/unit/90 pkgconfig build rpath order/sub/stuff.c