diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2022-01-02 13:13:23 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2022-01-02 19:07:36 +0200 |
| commit | 117ba230718d20903e91f210e8ae9a79f8c3a473 (patch) | |
| tree | 98db5c2080b040315f00cad5eb77252853717d51 /unittests | |
| parent | 4101ca6eaae27c5641532310ff1930d1782f1588 (diff) | |
| download | meson-117ba230718d20903e91f210e8ae9a79f8c3a473.zip meson-117ba230718d20903e91f210e8ae9a79f8c3a473.tar.gz meson-117ba230718d20903e91f210e8ae9a79f8c3a473.tar.bz2 | |
Condense test directory numbers for rc1.
Diffstat (limited to 'unittests')
| -rw-r--r-- | unittests/allplatformstests.py | 8 | ||||
| -rw-r--r-- | unittests/linuxliketests.py | 4 | ||||
| -rw-r--r-- | unittests/platformagnostictests.py | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/unittests/allplatformstests.py b/unittests/allplatformstests.py index b176aa5..8b3181e 100644 --- a/unittests/allplatformstests.py +++ b/unittests/allplatformstests.py @@ -3830,7 +3830,7 @@ class AllPlatformTests(BasePlatformTests): self.assertEqual(sorted(link_args), sorted(['-flto'])) def test_install_tag(self) -> None: - testdir = os.path.join(self.unit_test_dir, '98 install all targets') + testdir = os.path.join(self.unit_test_dir, '99 install all targets') self.init(testdir) self.build() @@ -3952,7 +3952,7 @@ class AllPlatformTests(BasePlatformTests): do_install(None, expected_all, 2) def test_introspect_install_plan(self): - testdir = os.path.join(self.unit_test_dir, '98 install all targets') + testdir = os.path.join(self.unit_test_dir, '99 install all targets') introfile = os.path.join(self.builddir, 'meson-info', 'intro-install_plan.json') self.init(testdir) self.assertPathExists(introfile) @@ -4139,7 +4139,7 @@ class AllPlatformTests(BasePlatformTests): }} ''') - testdir = os.path.join(self.unit_test_dir, '100 rlib linkage') + testdir = os.path.join(self.unit_test_dir, '102 rlib linkage') gen_file = os.path.join(testdir, 'lib.rs') with open(gen_file, 'w') as f: f.write(template.format(0)) @@ -4159,7 +4159,7 @@ class AllPlatformTests(BasePlatformTests): self.assertIn('exit status 39', cm.exception.stdout) def test_custom_target_name(self): - testdir = os.path.join(self.unit_test_dir, '99 custom target name') + testdir = os.path.join(self.unit_test_dir, '100 custom target name') self.init(testdir) out = self.build() if self.backend is Backend.ninja: diff --git a/unittests/linuxliketests.py b/unittests/linuxliketests.py index 8ff0f8e..594e9f0 100644 --- a/unittests/linuxliketests.py +++ b/unittests/linuxliketests.py @@ -1334,7 +1334,7 @@ class LinuxlikeTests(BasePlatformTests): see: https://github.com/mesonbuild/meson/issues/9000 https://stackoverflow.com/questions/48532868/gcc-library-option-with-a-colon-llibevent-a ''' - testdir = os.path.join(self.unit_test_dir, '97 link full name','libtestprovider') + testdir = os.path.join(self.unit_test_dir, '98 link full name','libtestprovider') oldprefix = self.prefix # install into installdir without using DESTDIR installdir = self.installdir @@ -1347,7 +1347,7 @@ class LinuxlikeTests(BasePlatformTests): self.new_builddir() env = {'LIBRARY_PATH': os.path.join(installdir, self.libdir), 'PKG_CONFIG_PATH': os.path.join(installdir, self.libdir, 'pkgconfig')} - testdir = os.path.join(self.unit_test_dir, '97 link full name','proguser') + testdir = os.path.join(self.unit_test_dir, '98 link full name','proguser') self.init(testdir,override_envvars=env) # test for link with full path diff --git a/unittests/platformagnostictests.py b/unittests/platformagnostictests.py index 25f3b1a..c5e5233 100644 --- a/unittests/platformagnostictests.py +++ b/unittests/platformagnostictests.py @@ -32,7 +32,7 @@ class PlatformAgnosticTests(BasePlatformTests): Tests that find_program() with a relative path does not find the program in current workdir. ''' - testdir = os.path.join(self.unit_test_dir, '99 relative find program') + testdir = os.path.join(self.unit_test_dir, '101 relative find program') self.init(testdir, workdir=testdir) def test_invalid_option_names(self): @@ -68,5 +68,5 @@ class PlatformAgnosticTests(BasePlatformTests): interp.process(fname) def test_python_dependency_without_pkgconfig(self): - testdir = os.path.join(self.unit_test_dir, '101 python without pkgconfig') + testdir = os.path.join(self.unit_test_dir, '103 python without pkgconfig') self.init(testdir, override_envvars={'PKG_CONFIG': 'notfound'}) |