aboutsummaryrefslogtreecommitdiff
path: root/run_unittests.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2020-01-07 23:15:43 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2020-01-08 13:21:00 +0200
commitc2b1e7d58ce92dcb6f836e341f47f51f12baa14e (patch)
treeef90ecd945a7a00f7ead8c88091c5f58da1257ea /run_unittests.py
parent74d245a8c0d019d7a2e0559a27912aa0bb1827fa (diff)
downloadmeson-c2b1e7d58ce92dcb6f836e341f47f51f12baa14e.zip
meson-c2b1e7d58ce92dcb6f836e341f47f51f12baa14e.tar.gz
meson-c2b1e7d58ce92dcb6f836e341f47f51f12baa14e.tar.bz2
Rename test dirs to sequential order.
Diffstat (limited to 'run_unittests.py')
-rwxr-xr-xrun_unittests.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/run_unittests.py b/run_unittests.py
index 669c8ff..015167b 100755
--- a/run_unittests.py
+++ b/run_unittests.py
@@ -4166,7 +4166,7 @@ recommended as it is not supported on some platforms''')
# Maybe encoding issue?
@unittest.skipIf(is_windows(), 'This test fails on Windows CI')
def test_summary(self):
- testdir = os.path.join(self.unit_test_dir, '74 summary')
+ testdir = os.path.join(self.unit_test_dir, '72 summary')
out = self.init(testdir)
expected = textwrap.dedent(r'''
Some Subproject 2.0
@@ -5605,7 +5605,7 @@ class LinuxlikeTests(BasePlatformTests):
Check that Meson produces valid static archives with --strip enabled
'''
with tempfile.TemporaryDirectory() as tempdirname:
- testdirbase = os.path.join(self.unit_test_dir, '68 static archive stripping')
+ testdirbase = os.path.join(self.unit_test_dir, '67 static archive stripping')
# build lib
self.new_builddir()
@@ -5853,7 +5853,7 @@ c = ['{0}']
raise unittest.SkipTest("Cygwin doesn't support LD_LIBRARY_PATH.")
# Build some libraries and install them
- testdir = os.path.join(self.unit_test_dir, '69 static link/lib')
+ testdir = os.path.join(self.unit_test_dir, '68 static link/lib')
libdir = os.path.join(self.installdir, self.libdir)
oldprefix = self.prefix
self.prefix = self.installdir
@@ -5865,7 +5865,7 @@ c = ['{0}']
self.prefix = oldprefix
meson_args = ['-Dc_link_args=-L{}'.format(libdir),
'--fatal-meson-warnings']
- testdir = os.path.join(self.unit_test_dir, '69 static link')
+ testdir = os.path.join(self.unit_test_dir, '68 static link')
env = {'PKG_CONFIG_LIBDIR': os.path.join(libdir, 'pkgconfig')}
self.init(testdir, extra_args=meson_args, override_envvars=env)
self.build()