diff options
| author | Jussi Pakkanen <jussi.pakkanen@mailbox.org> | 2025-11-23 16:15:20 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jussi.pakkanen@mailbox.org> | 2025-11-23 17:40:18 +0200 |
| commit | 23b3619b31fd78a318bd95954c1e62e361c0cb4a (patch) | |
| tree | a76eab6a3b52ba399c6e6a7b8de0ed62f917b305 /unittests | |
| parent | b1b22987101a97aa5e7afabd73f6ac5a3ac7aa65 (diff) | |
| download | meson-23b3619b31fd78a318bd95954c1e62e361c0cb4a.tar.gz | |
Condense directory names for rc1.
Diffstat (limited to 'unittests')
| -rw-r--r-- | unittests/allplatformstests.py | 16 | ||||
| -rw-r--r-- | unittests/linuxliketests.py | 4 | ||||
| -rw-r--r-- | unittests/platformagnostictests.py | 2 | ||||
| -rw-r--r-- | unittests/rewritetests.py | 2 |
4 files changed, 12 insertions, 12 deletions
diff --git a/unittests/allplatformstests.py b/unittests/allplatformstests.py index acf679541..34b2f98fe 100644 --- a/unittests/allplatformstests.py +++ b/unittests/allplatformstests.py @@ -1449,7 +1449,7 @@ class AllPlatformTests(BasePlatformTests): Test that conflicts between -D for builtin options and the corresponding long option are detected without false positives or negatives. ''' - testdir = os.path.join(self.unit_test_dir, '129 long opt vs D') + testdir = os.path.join(self.unit_test_dir, '130 long opt vs D') for opt in ['-Dsysconfdir=/etc', '-Dsysconfdir2=/etc']: exception_raised = False @@ -2472,10 +2472,10 @@ class AllPlatformTests(BasePlatformTests): # lexer/parser/interpreter we have tests for. for (t, f) in [ ('10 out of bounds', 'meson.build'), - ('18 wrong plusassign', 'meson.build'), - ('56 bad option argument', 'meson_options.txt'), - ('94 subdir parse error', os.path.join('subdir', 'meson.build')), - ('95 invalid option file', 'meson_options.txt'), + ('17 wrong plusassign', 'meson.build'), + ('55 bad option argument', 'meson_options.txt'), + ('93 subdir parse error', os.path.join('subdir', 'meson.build')), + ('94 invalid option file', 'meson_options.txt'), ]: tdir = os.path.join(self.src_root, 'test cases', 'failing', t) @@ -3093,7 +3093,7 @@ class AllPlatformTests(BasePlatformTests): @skipIf(is_windows(), 'POSIX only') def test_python_build_config_extensions(self): testdir = os.path.join(self.unit_test_dir, - '125 python extension') + '126 python extension') VERSION_INFO_KEYS = ('major', 'minor', 'micro', 'releaselevel', 'serial') EXTENSION_SUFFIX = '.extension-suffix.so' @@ -4508,7 +4508,7 @@ class AllPlatformTests(BasePlatformTests): if self.backend is not Backend.ninja: raise SkipTest('ninja backend needed for "meson test" to build test dependencies') - testdir = os.path.join(self.unit_test_dir, '131 custom target index test') + testdir = os.path.join(self.unit_test_dir, '132 custom target index test') self.init(testdir) self.run_tests() @@ -5466,7 +5466,7 @@ class AllPlatformTests(BasePlatformTests): self.__test_multi_stds(test_objc=True) def test_slice(self): - testdir = os.path.join(self.unit_test_dir, '127 test slice') + testdir = os.path.join(self.unit_test_dir, '128 test slice') self.init(testdir) self.build() diff --git a/unittests/linuxliketests.py b/unittests/linuxliketests.py index a97a1f106..4f775d651 100644 --- a/unittests/linuxliketests.py +++ b/unittests/linuxliketests.py @@ -1890,7 +1890,7 @@ class LinuxlikeTests(BasePlatformTests): self.assertIn('build t13-e1: c_LINKER t13-e1.p/main.c.o | libt12-s1.a libt13-s3.a\n', content) def test_top_options_in_sp(self): - testdir = os.path.join(self.unit_test_dir, '126 pkgsubproj') + testdir = os.path.join(self.unit_test_dir, '127 pkgsubproj') self.init(testdir) def test_unreadable_dir_in_declare_dep(self): @@ -1986,7 +1986,7 @@ class LinuxlikeTests(BasePlatformTests): self.wipe() def test_sanitizers(self): - testdir = os.path.join(self.unit_test_dir, '128 sanitizers') + testdir = os.path.join(self.unit_test_dir, '129 sanitizers') with self.subTest('no b_sanitize value'): try: diff --git a/unittests/platformagnostictests.py b/unittests/platformagnostictests.py index 37ac7ad7a..7660ee466 100644 --- a/unittests/platformagnostictests.py +++ b/unittests/platformagnostictests.py @@ -96,7 +96,7 @@ class PlatformAgnosticTests(BasePlatformTests): self.init(testdir, override_envvars={'PKG_CONFIG': 'notfound'}) def test_vala_target_with_internal_glib(self): - testdir = os.path.join(self.unit_test_dir, '130 vala internal glib') + testdir = os.path.join(self.unit_test_dir, '131 vala internal glib') for run in [{ 'version': '2.84.4', 'expected': '2.84'}, { 'version': '2.85.2', 'expected': '2.84' }]: self.new_builddir() self.init(testdir, extra_args=[f'-Dglib-version={run["version"]}']) diff --git a/unittests/rewritetests.py b/unittests/rewritetests.py index f2af8f64a..73e6c7fc5 100644 --- a/unittests/rewritetests.py +++ b/unittests/rewritetests.py @@ -456,7 +456,7 @@ class RewriterTests(BasePlatformTests): self.assertEqualIgnoreOrder(out, expected) def test_tricky_dataflow(self): - self.prime('8 tricky dataflow') + self.prime('9 tricky dataflow') out = self.rewrite(self.builddir, os.path.join(self.builddir, 'addSrc.json')) expected = { 'target': { |
