aboutsummaryrefslogtreecommitdiff
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
parent74d245a8c0d019d7a2e0559a27912aa0bb1827fa (diff)
downloadmeson-c2b1e7d58ce92dcb6f836e341f47f51f12baa14e.zip
meson-c2b1e7d58ce92dcb6f836e341f47f51f12baa14e.tar.gz
meson-c2b1e7d58ce92dcb6f836e341f47f51f12baa14e.tar.bz2
Rename test dirs to sequential order.
-rwxr-xr-xrun_unittests.py8
-rw-r--r--test cases/unit/67 static archive stripping/app/appA.c (renamed from test cases/unit/68 static archive stripping/app/appA.c)0
-rw-r--r--test cases/unit/67 static archive stripping/app/appB.c (renamed from test cases/unit/68 static archive stripping/app/appB.c)0
-rw-r--r--test cases/unit/67 static archive stripping/app/meson.build (renamed from test cases/unit/68 static archive stripping/app/meson.build)0
-rw-r--r--test cases/unit/67 static archive stripping/lib/libA.c (renamed from test cases/unit/68 static archive stripping/lib/libA.c)0
-rw-r--r--test cases/unit/67 static archive stripping/lib/libA.h (renamed from test cases/unit/68 static archive stripping/lib/libA.h)0
-rw-r--r--test cases/unit/67 static archive stripping/lib/libB.c (renamed from test cases/unit/68 static archive stripping/lib/libB.c)0
-rw-r--r--test cases/unit/67 static archive stripping/lib/libB.h (renamed from test cases/unit/68 static archive stripping/lib/libB.h)0
-rw-r--r--test cases/unit/67 static archive stripping/lib/meson.build (renamed from test cases/unit/68 static archive stripping/lib/meson.build)0
-rw-r--r--test cases/unit/68 static link/lib/func1.c (renamed from test cases/unit/69 static link/lib/func1.c)0
-rw-r--r--test cases/unit/68 static link/lib/func10.c (renamed from test cases/unit/69 static link/lib/func10.c)0
-rw-r--r--test cases/unit/68 static link/lib/func11.c (renamed from test cases/unit/69 static link/lib/func11.c)0
-rw-r--r--test cases/unit/68 static link/lib/func12.c (renamed from test cases/unit/69 static link/lib/func12.c)0
-rw-r--r--test cases/unit/68 static link/lib/func14.c (renamed from test cases/unit/69 static link/lib/func14.c)0
-rw-r--r--test cases/unit/68 static link/lib/func15.c (renamed from test cases/unit/69 static link/lib/func15.c)0
-rw-r--r--test cases/unit/68 static link/lib/func16.c (renamed from test cases/unit/69 static link/lib/func16.c)0
-rw-r--r--test cases/unit/68 static link/lib/func17.c (renamed from test cases/unit/69 static link/lib/func17.c)0
-rw-r--r--test cases/unit/68 static link/lib/func18.c (renamed from test cases/unit/69 static link/lib/func18.c)0
-rw-r--r--test cases/unit/68 static link/lib/func19.c (renamed from test cases/unit/69 static link/lib/func19.c)0
-rw-r--r--test cases/unit/68 static link/lib/func2.c (renamed from test cases/unit/69 static link/lib/func2.c)0
-rw-r--r--test cases/unit/68 static link/lib/func3.c (renamed from test cases/unit/69 static link/lib/func3.c)0
-rw-r--r--test cases/unit/68 static link/lib/func4.c (renamed from test cases/unit/69 static link/lib/func4.c)0
-rw-r--r--test cases/unit/68 static link/lib/func5.c (renamed from test cases/unit/69 static link/lib/func5.c)0
-rw-r--r--test cases/unit/68 static link/lib/func6.c (renamed from test cases/unit/69 static link/lib/func6.c)0
-rw-r--r--test cases/unit/68 static link/lib/func7.c (renamed from test cases/unit/69 static link/lib/func7.c)0
-rw-r--r--test cases/unit/68 static link/lib/func8.c (renamed from test cases/unit/69 static link/lib/func8.c)0
-rw-r--r--test cases/unit/68 static link/lib/func9.c (renamed from test cases/unit/69 static link/lib/func9.c)0
-rw-r--r--test cases/unit/68 static link/lib/meson.build (renamed from test cases/unit/69 static link/lib/meson.build)0
-rw-r--r--test cases/unit/68 static link/meson.build (renamed from test cases/unit/69 static link/meson.build)0
-rw-r--r--test cases/unit/68 static link/test1.c (renamed from test cases/unit/69 static link/test1.c)0
-rw-r--r--test cases/unit/68 static link/test2.c (renamed from test cases/unit/69 static link/test2.c)0
-rw-r--r--test cases/unit/68 static link/test3.c (renamed from test cases/unit/69 static link/test3.c)0
-rw-r--r--test cases/unit/68 static link/test4.c (renamed from test cases/unit/69 static link/test4.c)0
-rw-r--r--test cases/unit/68 static link/test5.c (renamed from test cases/unit/69 static link/test5.c)0
-rw-r--r--test cases/unit/72 summary/meson.build (renamed from test cases/unit/74 summary/meson.build)0
-rw-r--r--test cases/unit/72 summary/subprojects/sub/meson.build (renamed from test cases/unit/74 summary/subprojects/sub/meson.build)0
-rw-r--r--test cases/unit/72 summary/subprojects/sub2/meson.build (renamed from test cases/unit/74 summary/subprojects/sub2/meson.build)0
37 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()
diff --git a/test cases/unit/68 static archive stripping/app/appA.c b/test cases/unit/67 static archive stripping/app/appA.c
index e44b54a..e44b54a 100644
--- a/test cases/unit/68 static archive stripping/app/appA.c
+++ b/test cases/unit/67 static archive stripping/app/appA.c
diff --git a/test cases/unit/68 static archive stripping/app/appB.c b/test cases/unit/67 static archive stripping/app/appB.c
index 0ec0b62..0ec0b62 100644
--- a/test cases/unit/68 static archive stripping/app/appB.c
+++ b/test cases/unit/67 static archive stripping/app/appB.c
diff --git a/test cases/unit/68 static archive stripping/app/meson.build b/test cases/unit/67 static archive stripping/app/meson.build
index 118719d..118719d 100644
--- a/test cases/unit/68 static archive stripping/app/meson.build
+++ b/test cases/unit/67 static archive stripping/app/meson.build
diff --git a/test cases/unit/68 static archive stripping/lib/libA.c b/test cases/unit/67 static archive stripping/lib/libA.c
index a97185e..a97185e 100644
--- a/test cases/unit/68 static archive stripping/lib/libA.c
+++ b/test cases/unit/67 static archive stripping/lib/libA.c
diff --git a/test cases/unit/68 static archive stripping/lib/libA.h b/test cases/unit/67 static archive stripping/lib/libA.h
index e6450cd..e6450cd 100644
--- a/test cases/unit/68 static archive stripping/lib/libA.h
+++ b/test cases/unit/67 static archive stripping/lib/libA.h
diff --git a/test cases/unit/68 static archive stripping/lib/libB.c b/test cases/unit/67 static archive stripping/lib/libB.c
index 0200b1f..0200b1f 100644
--- a/test cases/unit/68 static archive stripping/lib/libB.c
+++ b/test cases/unit/67 static archive stripping/lib/libB.c
diff --git a/test cases/unit/68 static archive stripping/lib/libB.h b/test cases/unit/67 static archive stripping/lib/libB.h
index 065a4a4..065a4a4 100644
--- a/test cases/unit/68 static archive stripping/lib/libB.h
+++ b/test cases/unit/67 static archive stripping/lib/libB.h
diff --git a/test cases/unit/68 static archive stripping/lib/meson.build b/test cases/unit/67 static archive stripping/lib/meson.build
index ae50fa7..ae50fa7 100644
--- a/test cases/unit/68 static archive stripping/lib/meson.build
+++ b/test cases/unit/67 static archive stripping/lib/meson.build
diff --git a/test cases/unit/69 static link/lib/func1.c b/test cases/unit/68 static link/lib/func1.c
index cc934ad..cc934ad 100644
--- a/test cases/unit/69 static link/lib/func1.c
+++ b/test cases/unit/68 static link/lib/func1.c
diff --git a/test cases/unit/69 static link/lib/func10.c b/test cases/unit/68 static link/lib/func10.c
index 75a911f..75a911f 100644
--- a/test cases/unit/69 static link/lib/func10.c
+++ b/test cases/unit/68 static link/lib/func10.c
diff --git a/test cases/unit/69 static link/lib/func11.c b/test cases/unit/68 static link/lib/func11.c
index 1d5119b..1d5119b 100644
--- a/test cases/unit/69 static link/lib/func11.c
+++ b/test cases/unit/68 static link/lib/func11.c
diff --git a/test cases/unit/69 static link/lib/func12.c b/test cases/unit/68 static link/lib/func12.c
index 73db5c0..73db5c0 100644
--- a/test cases/unit/69 static link/lib/func12.c
+++ b/test cases/unit/68 static link/lib/func12.c
diff --git a/test cases/unit/69 static link/lib/func14.c b/test cases/unit/68 static link/lib/func14.c
index 0277319..0277319 100644
--- a/test cases/unit/69 static link/lib/func14.c
+++ b/test cases/unit/68 static link/lib/func14.c
diff --git a/test cases/unit/69 static link/lib/func15.c b/test cases/unit/68 static link/lib/func15.c
index 78303cc..78303cc 100644
--- a/test cases/unit/69 static link/lib/func15.c
+++ b/test cases/unit/68 static link/lib/func15.c
diff --git a/test cases/unit/69 static link/lib/func16.c b/test cases/unit/68 static link/lib/func16.c
index 379b682..379b682 100644
--- a/test cases/unit/69 static link/lib/func16.c
+++ b/test cases/unit/68 static link/lib/func16.c
diff --git a/test cases/unit/69 static link/lib/func17.c b/test cases/unit/68 static link/lib/func17.c
index d1d8ec4..d1d8ec4 100644
--- a/test cases/unit/69 static link/lib/func17.c
+++ b/test cases/unit/68 static link/lib/func17.c
diff --git a/test cases/unit/69 static link/lib/func18.c b/test cases/unit/68 static link/lib/func18.c
index c149085..c149085 100644
--- a/test cases/unit/69 static link/lib/func18.c
+++ b/test cases/unit/68 static link/lib/func18.c
diff --git a/test cases/unit/69 static link/lib/func19.c b/test cases/unit/68 static link/lib/func19.c
index 69120e4..69120e4 100644
--- a/test cases/unit/69 static link/lib/func19.c
+++ b/test cases/unit/68 static link/lib/func19.c
diff --git a/test cases/unit/69 static link/lib/func2.c b/test cases/unit/68 static link/lib/func2.c
index 6b8f539..6b8f539 100644
--- a/test cases/unit/69 static link/lib/func2.c
+++ b/test cases/unit/68 static link/lib/func2.c
diff --git a/test cases/unit/69 static link/lib/func3.c b/test cases/unit/68 static link/lib/func3.c
index 04f9f89..04f9f89 100644
--- a/test cases/unit/69 static link/lib/func3.c
+++ b/test cases/unit/68 static link/lib/func3.c
diff --git a/test cases/unit/69 static link/lib/func4.c b/test cases/unit/68 static link/lib/func4.c
index c44c990..c44c990 100644
--- a/test cases/unit/69 static link/lib/func4.c
+++ b/test cases/unit/68 static link/lib/func4.c
diff --git a/test cases/unit/69 static link/lib/func5.c b/test cases/unit/68 static link/lib/func5.c
index 8e07864..8e07864 100644
--- a/test cases/unit/69 static link/lib/func5.c
+++ b/test cases/unit/68 static link/lib/func5.c
diff --git a/test cases/unit/69 static link/lib/func6.c b/test cases/unit/68 static link/lib/func6.c
index 276fe7d..276fe7d 100644
--- a/test cases/unit/69 static link/lib/func6.c
+++ b/test cases/unit/68 static link/lib/func6.c
diff --git a/test cases/unit/69 static link/lib/func7.c b/test cases/unit/68 static link/lib/func7.c
index 8c1a536..8c1a536 100644
--- a/test cases/unit/69 static link/lib/func7.c
+++ b/test cases/unit/68 static link/lib/func7.c
diff --git a/test cases/unit/69 static link/lib/func8.c b/test cases/unit/68 static link/lib/func8.c
index b7b6cd5..b7b6cd5 100644
--- a/test cases/unit/69 static link/lib/func8.c
+++ b/test cases/unit/68 static link/lib/func8.c
diff --git a/test cases/unit/69 static link/lib/func9.c b/test cases/unit/68 static link/lib/func9.c
index 852252d..852252d 100644
--- a/test cases/unit/69 static link/lib/func9.c
+++ b/test cases/unit/68 static link/lib/func9.c
diff --git a/test cases/unit/69 static link/lib/meson.build b/test cases/unit/68 static link/lib/meson.build
index 8f95fc4..8f95fc4 100644
--- a/test cases/unit/69 static link/lib/meson.build
+++ b/test cases/unit/68 static link/lib/meson.build
diff --git a/test cases/unit/69 static link/meson.build b/test cases/unit/68 static link/meson.build
index dac17f8..dac17f8 100644
--- a/test cases/unit/69 static link/meson.build
+++ b/test cases/unit/68 static link/meson.build
diff --git a/test cases/unit/69 static link/test1.c b/test cases/unit/68 static link/test1.c
index ffc9b9e..ffc9b9e 100644
--- a/test cases/unit/69 static link/test1.c
+++ b/test cases/unit/68 static link/test1.c
diff --git a/test cases/unit/69 static link/test2.c b/test cases/unit/68 static link/test2.c
index 561422a..561422a 100644
--- a/test cases/unit/69 static link/test2.c
+++ b/test cases/unit/68 static link/test2.c
diff --git a/test cases/unit/69 static link/test3.c b/test cases/unit/68 static link/test3.c
index 1216064..1216064 100644
--- a/test cases/unit/69 static link/test3.c
+++ b/test cases/unit/68 static link/test3.c
diff --git a/test cases/unit/69 static link/test4.c b/test cases/unit/68 static link/test4.c
index 7c281e0..7c281e0 100644
--- a/test cases/unit/69 static link/test4.c
+++ b/test cases/unit/68 static link/test4.c
diff --git a/test cases/unit/69 static link/test5.c b/test cases/unit/68 static link/test5.c
index 6020f0e..6020f0e 100644
--- a/test cases/unit/69 static link/test5.c
+++ b/test cases/unit/68 static link/test5.c
diff --git a/test cases/unit/74 summary/meson.build b/test cases/unit/72 summary/meson.build
index c6d94d9..c6d94d9 100644
--- a/test cases/unit/74 summary/meson.build
+++ b/test cases/unit/72 summary/meson.build
diff --git a/test cases/unit/74 summary/subprojects/sub/meson.build b/test cases/unit/72 summary/subprojects/sub/meson.build
index e7d7833..e7d7833 100644
--- a/test cases/unit/74 summary/subprojects/sub/meson.build
+++ b/test cases/unit/72 summary/subprojects/sub/meson.build
diff --git a/test cases/unit/74 summary/subprojects/sub2/meson.build b/test cases/unit/72 summary/subprojects/sub2/meson.build
index 86b9cfd..86b9cfd 100644
--- a/test cases/unit/74 summary/subprojects/sub2/meson.build
+++ b/test cases/unit/72 summary/subprojects/sub2/meson.build