summaryrefslogtreecommitdiff
path: root/unittests/platformagnostictests.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2023-10-26 19:23:20 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2023-10-27 17:43:03 +0300
commit3bbe66e971dfe84dcffa702c2673fb136da0a508 (patch)
treedfad22ea1a365b4584320a92f1aa592ef868e14d /unittests/platformagnostictests.py
parentada6236f76f4fbce4313b48eeaf9d8485516fde8 (diff)
downloadmeson-3bbe66e971dfe84dcffa702c2673fb136da0a508.tar.gz
Condense test directories for RC1.
Diffstat (limited to 'unittests/platformagnostictests.py')
-rw-r--r--unittests/platformagnostictests.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/unittests/platformagnostictests.py b/unittests/platformagnostictests.py
index 204a22ba5..f094e988a 100644
--- a/unittests/platformagnostictests.py
+++ b/unittests/platformagnostictests.py
@@ -39,7 +39,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, '101 relative find program')
+ testdir = os.path.join(self.unit_test_dir, '100 relative find program')
self.init(testdir, workdir=testdir)
def test_invalid_option_names(self):
@@ -75,11 +75,11 @@ class PlatformAgnosticTests(BasePlatformTests):
interp.process(fname)
def test_python_dependency_without_pkgconfig(self):
- testdir = os.path.join(self.unit_test_dir, '103 python without pkgconfig')
+ testdir = os.path.join(self.unit_test_dir, '102 python without pkgconfig')
self.init(testdir, override_envvars={'PKG_CONFIG': 'notfound'})
def test_debug_function_outputs_to_meson_log(self):
- testdir = os.path.join(self.unit_test_dir, '105 debug function')
+ testdir = os.path.join(self.unit_test_dir, '104 debug function')
log_msg = 'This is an example debug output, should only end up in debug log'
output = self.init(testdir)
@@ -250,7 +250,7 @@ class PlatformAgnosticTests(BasePlatformTests):
thing to do as new features are added, but keeping track of them is
good.
'''
- testdir = os.path.join(self.unit_test_dir, '114 empty project')
+ testdir = os.path.join(self.unit_test_dir, '116 empty project')
self.init(testdir)
self._run(self.meson_command + ['--internal', 'regenerate', '--profile-self', testdir, self.builddir])
@@ -265,7 +265,7 @@ class PlatformAgnosticTests(BasePlatformTests):
def test_meson_package_cache_dir(self):
# Copy testdir into temporary directory to not pollute meson source tree.
- testdir = os.path.join(self.unit_test_dir, '116 meson package cache dir')
+ testdir = os.path.join(self.unit_test_dir, '118 meson package cache dir')
srcdir = os.path.join(self.builddir, 'srctree')
shutil.copytree(testdir, srcdir)
builddir = os.path.join(srcdir, '_build')
@@ -274,7 +274,7 @@ class PlatformAgnosticTests(BasePlatformTests):
def test_cmake_openssl_not_found_bug(self):
"""Issue #12098"""
- testdir = os.path.join(self.unit_test_dir, '117 openssl cmake bug')
+ testdir = os.path.join(self.unit_test_dir, '119 openssl cmake bug')
self.meson_native_files.append(os.path.join(testdir, 'nativefile.ini'))
out = self.init(testdir, allow_fail=True)
self.assertNotIn('Unhandled python exception', out)