diff options
author | Dylan Baker <dylan@pnwbakers.com> | 2020-07-30 19:46:57 -0700 |
---|---|---|
committer | Dylan Baker <dylan@pnwbakers.com> | 2020-08-01 22:00:06 -0700 |
commit | 4d2a17041f0dd54001a7d32b36e75608330f41f5 (patch) | |
tree | ff356660cc03ba080819694b3da6886dfa5be782 | |
parent | 3a4d8dde52a5755901ec97784e9f3d883162873b (diff) | |
download | meson-4d2a17041f0dd54001a7d32b36e75608330f41f5.zip meson-4d2a17041f0dd54001a7d32b36e75608330f41f5.tar.gz meson-4d2a17041f0dd54001a7d32b36e75608330f41f5.tar.bz2 |
run dircondensor.py
-rwxr-xr-x | run_unittests.py | 14 | ||||
-rw-r--r-- | test cases/cmake/20 cmake file/foolib.cmake.in (renamed from test cases/cmake/19 cmake file/foolib.cmake.in) | 0 | ||||
-rw-r--r-- | test cases/cmake/20 cmake file/meson.build (renamed from test cases/cmake/19 cmake file/meson.build) | 0 | ||||
-rw-r--r-- | test cases/cmake/20 cmake file/test.json (renamed from test cases/cmake/19 cmake file/test.json) | 0 | ||||
-rw-r--r-- | test cases/failing/107 number in combo/meson.build (renamed from test cases/failing/106 number in combo/meson.build) | 0 | ||||
-rw-r--r-- | test cases/failing/107 number in combo/nativefile.ini (renamed from test cases/failing/106 number in combo/nativefile.ini) | 0 | ||||
-rw-r--r-- | test cases/failing/107 number in combo/test.json (renamed from test cases/failing/106 number in combo/test.json) | 2 | ||||
-rw-r--r-- | test cases/failing/108 bool in combo/meson.build (renamed from test cases/failing/107 bool in combo/meson.build) | 0 | ||||
-rw-r--r-- | test cases/failing/108 bool in combo/meson_options.txt (renamed from test cases/failing/107 bool in combo/meson_options.txt) | 0 | ||||
-rw-r--r-- | test cases/failing/108 bool in combo/nativefile.ini (renamed from test cases/failing/107 bool in combo/nativefile.ini) | 0 | ||||
-rw-r--r-- | test cases/failing/108 bool in combo/test.json (renamed from test cases/failing/107 bool in combo/test.json) | 2 | ||||
-rw-r--r-- | test cases/unit/77 pkgconfig prefixes/client/client.c (renamed from test cases/unit/76 pkgconfig prefixes/client/client.c) | 0 | ||||
-rw-r--r-- | test cases/unit/77 pkgconfig prefixes/client/meson.build (renamed from test cases/unit/76 pkgconfig prefixes/client/meson.build) | 0 | ||||
-rw-r--r-- | test cases/unit/77 pkgconfig prefixes/val1/meson.build (renamed from test cases/unit/76 pkgconfig prefixes/val1/meson.build) | 0 | ||||
-rw-r--r-- | test cases/unit/77 pkgconfig prefixes/val1/val1.c (renamed from test cases/unit/76 pkgconfig prefixes/val1/val1.c) | 0 | ||||
-rw-r--r-- | test cases/unit/77 pkgconfig prefixes/val1/val1.h (renamed from test cases/unit/76 pkgconfig prefixes/val1/val1.h) | 0 | ||||
-rw-r--r-- | test cases/unit/77 pkgconfig prefixes/val2/meson.build (renamed from test cases/unit/76 pkgconfig prefixes/val2/meson.build) | 0 | ||||
-rw-r--r-- | test cases/unit/77 pkgconfig prefixes/val2/val2.c (renamed from test cases/unit/76 pkgconfig prefixes/val2/val2.c) | 0 | ||||
-rw-r--r-- | test cases/unit/77 pkgconfig prefixes/val2/val2.h (renamed from test cases/unit/76 pkgconfig prefixes/val2/val2.h) | 0 | ||||
-rw-r--r-- | test cases/unit/78 subdir libdir/meson.build (renamed from test cases/unit/76 subdir libdir/meson.build) | 0 | ||||
-rw-r--r-- | test cases/unit/78 subdir libdir/subprojects/flub/meson.build (renamed from test cases/unit/76 subdir libdir/subprojects/flub/meson.build) | 0 | ||||
-rw-r--r-- | test cases/unit/79 user options for subproject/75 user options for subproject/.gitignore (renamed from test cases/unit/75 user options for subproject/.gitignore) | 0 | ||||
-rw-r--r-- | test cases/unit/79 user options for subproject/75 user options for subproject/meson.build (renamed from test cases/unit/75 user options for subproject/meson.build) | 0 | ||||
-rw-r--r-- | test cases/unit/80 global-rpath/meson.build (renamed from test cases/unit/77 global-rpath/meson.build) | 0 | ||||
-rw-r--r-- | test cases/unit/80 global-rpath/rpathified.cpp (renamed from test cases/unit/77 global-rpath/rpathified.cpp) | 0 | ||||
-rw-r--r-- | test cases/unit/80 global-rpath/yonder/meson.build (renamed from test cases/unit/77 global-rpath/yonder/meson.build) | 0 | ||||
-rw-r--r-- | test cases/unit/80 global-rpath/yonder/yonder.cpp (renamed from test cases/unit/77 global-rpath/yonder/yonder.cpp) | 0 | ||||
-rw-r--r-- | test cases/unit/80 global-rpath/yonder/yonder.h (renamed from test cases/unit/77 global-rpath/yonder/yonder.h) | 0 | ||||
-rw-r--r-- | test cases/unit/81 wrap-git/meson.build (renamed from test cases/unit/78 wrap-git/meson.build) | 0 | ||||
-rw-r--r-- | test cases/unit/81 wrap-git/subprojects/packagefiles/wrap_git_builddef/meson.build (renamed from test cases/unit/78 wrap-git/subprojects/packagefiles/wrap_git_builddef/meson.build) | 0 | ||||
-rw-r--r-- | test cases/unit/81 wrap-git/subprojects/wrap_git_upstream/main.c (renamed from test cases/unit/78 wrap-git/subprojects/wrap_git_upstream/main.c) | 0 |
31 files changed, 9 insertions, 9 deletions
diff --git a/run_unittests.py b/run_unittests.py index 21eabde..6d7eba2 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -5014,7 +5014,7 @@ recommended as it is not supported on some platforms''') def test_wrap_git(self): with tempfile.TemporaryDirectory() as tmpdir: srcdir = os.path.join(tmpdir, 'src') - shutil.copytree(os.path.join(self.unit_test_dir, '78 wrap-git'), srcdir) + shutil.copytree(os.path.join(self.unit_test_dir, '81 wrap-git'), srcdir) upstream = os.path.join(srcdir, 'subprojects', 'wrap_git_upstream') upstream_uri = Path(upstream).as_uri() _git_init(upstream) @@ -6473,7 +6473,7 @@ class LinuxlikeTests(BasePlatformTests): if is_osx(): raise unittest.SkipTest('Global RPATHs via LDFLAGS not yet supported on MacOS (does anybody need it?)') - testdir = os.path.join(self.unit_test_dir, '77 global-rpath') + testdir = os.path.join(self.unit_test_dir, '80 global-rpath') oldinstalldir = self.installdir # Build and install an external library without DESTDIR. @@ -6846,7 +6846,7 @@ class LinuxlikeTests(BasePlatformTests): oldinstalldir = self.installdir # Build and install both external libraries without DESTDIR - val1dir = os.path.join(self.unit_test_dir, '76 pkgconfig prefixes', 'val1') + val1dir = os.path.join(self.unit_test_dir, '77 pkgconfig prefixes', 'val1') val1prefix = os.path.join(oldinstalldir, 'val1') self.prefix = val1prefix self.installdir = val1prefix @@ -6857,7 +6857,7 @@ class LinuxlikeTests(BasePlatformTests): env1 = {} env1['PKG_CONFIG_PATH'] = os.path.join(val1prefix, self.libdir, 'pkgconfig') - val2dir = os.path.join(self.unit_test_dir, '76 pkgconfig prefixes', 'val2') + val2dir = os.path.join(self.unit_test_dir, '77 pkgconfig prefixes', 'val2') val2prefix = os.path.join(oldinstalldir, 'val2') self.prefix = val2prefix self.installdir = val2prefix @@ -6869,7 +6869,7 @@ class LinuxlikeTests(BasePlatformTests): # Build, install, and run the client program env2 = {} env2['PKG_CONFIG_PATH'] = os.path.join(val2prefix, self.libdir, 'pkgconfig') - testdir = os.path.join(self.unit_test_dir, '76 pkgconfig prefixes', 'client') + testdir = os.path.join(self.unit_test_dir, '77 pkgconfig prefixes', 'client') testprefix = os.path.join(oldinstalldir, 'client') self.prefix = testprefix self.installdir = testprefix @@ -7180,7 +7180,7 @@ class LinuxCrossArmTests(BaseLinuxCrossTests): def test_cross_libdir_subproject(self): # Guard against a regression where calling "subproject" # would reset the value of libdir to its default value. - testdir = os.path.join(self.unit_test_dir, '76 subdir libdir') + testdir = os.path.join(self.unit_test_dir, '78 subdir libdir') self.init(testdir, extra_args=['--libdir=fuf']) for i in self.introspect('--buildoptions'): if i['name'] == 'libdir': @@ -8017,7 +8017,7 @@ class NativeFileTests(BasePlatformTests): self.init(testcase, extra_args=['--native-file', config, '-Dother_one=false']) def test_user_options_subproject(self): - testcase = os.path.join(self.unit_test_dir, '75 user options for subproject') + testcase = os.path.join(self.unit_test_dir, '79 user options for subproject') s = os.path.join(testcase, 'subprojects') if not os.path.exists(s): diff --git a/test cases/cmake/19 cmake file/foolib.cmake.in b/test cases/cmake/20 cmake file/foolib.cmake.in index 16e992b..16e992b 100644 --- a/test cases/cmake/19 cmake file/foolib.cmake.in +++ b/test cases/cmake/20 cmake file/foolib.cmake.in diff --git a/test cases/cmake/19 cmake file/meson.build b/test cases/cmake/20 cmake file/meson.build index 758bbee..758bbee 100644 --- a/test cases/cmake/19 cmake file/meson.build +++ b/test cases/cmake/20 cmake file/meson.build diff --git a/test cases/cmake/19 cmake file/test.json b/test cases/cmake/20 cmake file/test.json index a8c4ba3..a8c4ba3 100644 --- a/test cases/cmake/19 cmake file/test.json +++ b/test cases/cmake/20 cmake file/test.json diff --git a/test cases/failing/106 number in combo/meson.build b/test cases/failing/107 number in combo/meson.build index 1a647df..1a647df 100644 --- a/test cases/failing/106 number in combo/meson.build +++ b/test cases/failing/107 number in combo/meson.build diff --git a/test cases/failing/106 number in combo/nativefile.ini b/test cases/failing/107 number in combo/nativefile.ini index 55f10fc..55f10fc 100644 --- a/test cases/failing/106 number in combo/nativefile.ini +++ b/test cases/failing/107 number in combo/nativefile.ini diff --git a/test cases/failing/106 number in combo/test.json b/test cases/failing/107 number in combo/test.json index a32c358..f5aeb4e 100644 --- a/test cases/failing/106 number in combo/test.json +++ b/test cases/failing/107 number in combo/test.json @@ -1,5 +1,5 @@ { "stdout": [ - { "line": "test cases/failing/106 number in combo/meson.build:1:0: ERROR: Value \"1\" (of type \"number\") for combo option \"Optimization level\" is not one of the choices. Possible choices are (as string): \"0\", \"g\", \"1\", \"2\", \"3\", \"s\"." } + { "line": "test cases/failing/107 number in combo/meson.build:1:0: ERROR: Value \"1\" (of type \"number\") for combo option \"Optimization level\" is not one of the choices. Possible choices are (as string): \"0\", \"g\", \"1\", \"2\", \"3\", \"s\"." } ] } diff --git a/test cases/failing/107 bool in combo/meson.build b/test cases/failing/108 bool in combo/meson.build index c5efd67..c5efd67 100644 --- a/test cases/failing/107 bool in combo/meson.build +++ b/test cases/failing/108 bool in combo/meson.build diff --git a/test cases/failing/107 bool in combo/meson_options.txt b/test cases/failing/108 bool in combo/meson_options.txt index 0c8f5de..0c8f5de 100644 --- a/test cases/failing/107 bool in combo/meson_options.txt +++ b/test cases/failing/108 bool in combo/meson_options.txt diff --git a/test cases/failing/107 bool in combo/nativefile.ini b/test cases/failing/108 bool in combo/nativefile.ini index b423957..b423957 100644 --- a/test cases/failing/107 bool in combo/nativefile.ini +++ b/test cases/failing/108 bool in combo/nativefile.ini diff --git a/test cases/failing/107 bool in combo/test.json b/test cases/failing/108 bool in combo/test.json index 37218e8..729ad3d 100644 --- a/test cases/failing/107 bool in combo/test.json +++ b/test cases/failing/108 bool in combo/test.json @@ -1,5 +1,5 @@ { "stdout": [ - { "line": "test cases/failing/107 bool in combo/meson.build:1:0: ERROR: Value \"True\" (of type \"boolean\") for combo option \"opt\" is not one of the choices. Possible choices are (as string): \"true\", \"false\"." } + { "line": "test cases/failing/108 bool in combo/meson.build:1:0: ERROR: Value \"True\" (of type \"boolean\") for combo option \"opt\" is not one of the choices. Possible choices are (as string): \"true\", \"false\"." } ] } diff --git a/test cases/unit/76 pkgconfig prefixes/client/client.c b/test cases/unit/77 pkgconfig prefixes/client/client.c index be9bead..be9bead 100644 --- a/test cases/unit/76 pkgconfig prefixes/client/client.c +++ b/test cases/unit/77 pkgconfig prefixes/client/client.c diff --git a/test cases/unit/76 pkgconfig prefixes/client/meson.build b/test cases/unit/77 pkgconfig prefixes/client/meson.build index 491937b..491937b 100644 --- a/test cases/unit/76 pkgconfig prefixes/client/meson.build +++ b/test cases/unit/77 pkgconfig prefixes/client/meson.build diff --git a/test cases/unit/76 pkgconfig prefixes/val1/meson.build b/test cases/unit/77 pkgconfig prefixes/val1/meson.build index cc63e31..cc63e31 100644 --- a/test cases/unit/76 pkgconfig prefixes/val1/meson.build +++ b/test cases/unit/77 pkgconfig prefixes/val1/meson.build diff --git a/test cases/unit/76 pkgconfig prefixes/val1/val1.c b/test cases/unit/77 pkgconfig prefixes/val1/val1.c index 591e521..591e521 100644 --- a/test cases/unit/76 pkgconfig prefixes/val1/val1.c +++ b/test cases/unit/77 pkgconfig prefixes/val1/val1.c diff --git a/test cases/unit/76 pkgconfig prefixes/val1/val1.h b/test cases/unit/77 pkgconfig prefixes/val1/val1.h index 6bd435e..6bd435e 100644 --- a/test cases/unit/76 pkgconfig prefixes/val1/val1.h +++ b/test cases/unit/77 pkgconfig prefixes/val1/val1.h diff --git a/test cases/unit/76 pkgconfig prefixes/val2/meson.build b/test cases/unit/77 pkgconfig prefixes/val2/meson.build index ce69481..ce69481 100644 --- a/test cases/unit/76 pkgconfig prefixes/val2/meson.build +++ b/test cases/unit/77 pkgconfig prefixes/val2/meson.build diff --git a/test cases/unit/76 pkgconfig prefixes/val2/val2.c b/test cases/unit/77 pkgconfig prefixes/val2/val2.c index d7d4857..d7d4857 100644 --- a/test cases/unit/76 pkgconfig prefixes/val2/val2.c +++ b/test cases/unit/77 pkgconfig prefixes/val2/val2.c diff --git a/test cases/unit/76 pkgconfig prefixes/val2/val2.h b/test cases/unit/77 pkgconfig prefixes/val2/val2.h index 995023d..995023d 100644 --- a/test cases/unit/76 pkgconfig prefixes/val2/val2.h +++ b/test cases/unit/77 pkgconfig prefixes/val2/val2.h diff --git a/test cases/unit/76 subdir libdir/meson.build b/test cases/unit/78 subdir libdir/meson.build index 5099c91..5099c91 100644 --- a/test cases/unit/76 subdir libdir/meson.build +++ b/test cases/unit/78 subdir libdir/meson.build diff --git a/test cases/unit/76 subdir libdir/subprojects/flub/meson.build b/test cases/unit/78 subdir libdir/subprojects/flub/meson.build index 7bfd2c5..7bfd2c5 100644 --- a/test cases/unit/76 subdir libdir/subprojects/flub/meson.build +++ b/test cases/unit/78 subdir libdir/subprojects/flub/meson.build diff --git a/test cases/unit/75 user options for subproject/.gitignore b/test cases/unit/79 user options for subproject/75 user options for subproject/.gitignore index 4976afc..4976afc 100644 --- a/test cases/unit/75 user options for subproject/.gitignore +++ b/test cases/unit/79 user options for subproject/75 user options for subproject/.gitignore diff --git a/test cases/unit/75 user options for subproject/meson.build b/test cases/unit/79 user options for subproject/75 user options for subproject/meson.build index 0bc395b..0bc395b 100644 --- a/test cases/unit/75 user options for subproject/meson.build +++ b/test cases/unit/79 user options for subproject/75 user options for subproject/meson.build diff --git a/test cases/unit/77 global-rpath/meson.build b/test cases/unit/80 global-rpath/meson.build index c67d9e0..c67d9e0 100644 --- a/test cases/unit/77 global-rpath/meson.build +++ b/test cases/unit/80 global-rpath/meson.build diff --git a/test cases/unit/77 global-rpath/rpathified.cpp b/test cases/unit/80 global-rpath/rpathified.cpp index 3788906..3788906 100644 --- a/test cases/unit/77 global-rpath/rpathified.cpp +++ b/test cases/unit/80 global-rpath/rpathified.cpp diff --git a/test cases/unit/77 global-rpath/yonder/meson.build b/test cases/unit/80 global-rpath/yonder/meson.build index e32f383..e32f383 100644 --- a/test cases/unit/77 global-rpath/yonder/meson.build +++ b/test cases/unit/80 global-rpath/yonder/meson.build diff --git a/test cases/unit/77 global-rpath/yonder/yonder.cpp b/test cases/unit/80 global-rpath/yonder/yonder.cpp index b182d34..b182d34 100644 --- a/test cases/unit/77 global-rpath/yonder/yonder.cpp +++ b/test cases/unit/80 global-rpath/yonder/yonder.cpp diff --git a/test cases/unit/77 global-rpath/yonder/yonder.h b/test cases/unit/80 global-rpath/yonder/yonder.h index 9d9ad16..9d9ad16 100644 --- a/test cases/unit/77 global-rpath/yonder/yonder.h +++ b/test cases/unit/80 global-rpath/yonder/yonder.h diff --git a/test cases/unit/78 wrap-git/meson.build b/test cases/unit/81 wrap-git/meson.build index b0af30a..b0af30a 100644 --- a/test cases/unit/78 wrap-git/meson.build +++ b/test cases/unit/81 wrap-git/meson.build diff --git a/test cases/unit/78 wrap-git/subprojects/packagefiles/wrap_git_builddef/meson.build b/test cases/unit/81 wrap-git/subprojects/packagefiles/wrap_git_builddef/meson.build index 2570f77..2570f77 100644 --- a/test cases/unit/78 wrap-git/subprojects/packagefiles/wrap_git_builddef/meson.build +++ b/test cases/unit/81 wrap-git/subprojects/packagefiles/wrap_git_builddef/meson.build diff --git a/test cases/unit/78 wrap-git/subprojects/wrap_git_upstream/main.c b/test cases/unit/81 wrap-git/subprojects/wrap_git_upstream/main.c index 8488f4e..8488f4e 100644 --- a/test cases/unit/78 wrap-git/subprojects/wrap_git_upstream/main.c +++ b/test cases/unit/81 wrap-git/subprojects/wrap_git_upstream/main.c |