diff options
Diffstat (limited to 'run_unittests.py')
| -rwxr-xr-x | run_unittests.py | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/run_unittests.py b/run_unittests.py index 690ea33..0e83b6d 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -1699,7 +1699,7 @@ class AllPlatformTests(BasePlatformTests): self.mtest_command + ['--setup=main:onlyinbar']) def test_testsetup_default(self): - testdir = os.path.join(self.unit_test_dir, '47 testsetup default') + testdir = os.path.join(self.unit_test_dir, '49 testsetup default') self.init(testdir) self.build() @@ -2974,7 +2974,7 @@ recommended as it is not supported on some platforms''') pass def test_warning_level_0(self): - testdir = os.path.join(self.common_test_dir, '213 warning level 0') + testdir = os.path.join(self.common_test_dir, '215 warning level 0') # Verify default values when passing no args self.init(testdir) @@ -3132,7 +3132,7 @@ recommended as it is not supported on some platforms''') pickle.dump(obj, f) def test_reconfigure(self): - testdir = os.path.join(self.unit_test_dir, '46 reconfigure') + testdir = os.path.join(self.unit_test_dir, '48 reconfigure') self.init(testdir, extra_args=['-Dopt1=val1']) self.setconf('-Dopt2=val2') @@ -3169,7 +3169,7 @@ recommended as it is not supported on some platforms''') self.init(testdir, extra_args=['--wipe']) def test_minor_version_does_not_reconfigure_wipe(self): - testdir = os.path.join(self.unit_test_dir, '46 reconfigure') + testdir = os.path.join(self.unit_test_dir, '48 reconfigure') self.init(testdir, extra_args=['-Dopt1=val1']) self.setconf('-Dopt2=val2') @@ -3272,7 +3272,7 @@ recommended as it is not supported on some platforms''') def test_clang_format(self): if self.backend is not Backend.ninja: raise unittest.SkipTest('Clang-format is for now only supported on Ninja, not {}'.format(self.backend.name)) - testdir = os.path.join(self.unit_test_dir, '51 clang-format') + testdir = os.path.join(self.unit_test_dir, '53 clang-format') testfile = os.path.join(testdir, 'prog.c') badfile = os.path.join(testdir, 'prog_orig_c') goodfile = os.path.join(testdir, 'prog_expected_c') @@ -3292,7 +3292,7 @@ recommended as it is not supported on some platforms''') Path(goodfile).read_text()) def test_introspect_buildoptions_without_configured_build(self): - testdir = os.path.join(self.unit_test_dir, '53 introspect buildoptions') + testdir = os.path.join(self.unit_test_dir, '56 introspect buildoptions') testfile = os.path.join(testdir, 'meson.build') res_nb = self.introspect_directory(testfile, ['--buildoptions'] + self.meson_args) self.init(testdir, default_args=False) @@ -3301,7 +3301,7 @@ recommended as it is not supported on some platforms''') self.assertListEqual(res_nb, res_wb) def test_introspect_json_dump(self): - testdir = os.path.join(self.unit_test_dir, '52 introspection') + testdir = os.path.join(self.unit_test_dir, '55 introspection') self.init(testdir) infodir = os.path.join(self.builddir, 'meson-info') self.assertPathExists(infodir) @@ -3445,7 +3445,7 @@ recommended as it is not supported on some platforms''') self.assertDictEqual(targets_to_find, {}) def test_introspect_file_dump_equals_all(self): - testdir = os.path.join(self.unit_test_dir, '52 introspection') + testdir = os.path.join(self.unit_test_dir, '55 introspection') self.init(testdir) res_all = self.introspect('--all') res_file = {} @@ -3472,7 +3472,7 @@ recommended as it is not supported on some platforms''') self.assertEqual(res_all, res_file) def test_introspect_meson_info(self): - testdir = os.path.join(self.unit_test_dir, '52 introspection') + testdir = os.path.join(self.unit_test_dir, '55 introspection') introfile = os.path.join(self.builddir, 'meson-info', 'meson-info.json') self.init(testdir) self.assertPathExists(introfile) @@ -3486,7 +3486,7 @@ recommended as it is not supported on some platforms''') self.assertEqual(res1['build_files_updated'], True) def test_introspect_config_update(self): - testdir = os.path.join(self.unit_test_dir, '52 introspection') + testdir = os.path.join(self.unit_test_dir, '55 introspection') introfile = os.path.join(self.builddir, 'meson-info', 'intro-buildoptions.json') self.init(testdir) self.assertPathExists(introfile) @@ -3512,7 +3512,7 @@ recommended as it is not supported on some platforms''') self.assertListEqual(res1, res2) def test_introspect_targets_from_source(self): - testdir = os.path.join(self.unit_test_dir, '52 introspection') + testdir = os.path.join(self.unit_test_dir, '55 introspection') testfile = os.path.join(testdir, 'meson.build') introfile = os.path.join(self.builddir, 'meson-info', 'intro-targets.json') self.init(testdir) @@ -3543,7 +3543,7 @@ recommended as it is not supported on some platforms''') self.assertListEqual(res_nb, res_wb) def test_introspect_dependencies_from_source(self): - testdir = os.path.join(self.unit_test_dir, '52 introspection') + testdir = os.path.join(self.unit_test_dir, '55 introspection') testfile = os.path.join(testdir, 'meson.build') res_nb = self.introspect_directory(testfile, ['--scan-dependencies'] + self.meson_args) expected = [ @@ -4860,7 +4860,7 @@ endian = 'little' @skipIfNoPkgconfig @skip_if_not_language('cs') def test_pkgconfig_csharp_library(self): - testdir = os.path.join(self.unit_test_dir, '48 pkgconfig csharp library') + testdir = os.path.join(self.unit_test_dir, '50 pkgconfig csharp library') self.init(testdir) myenv = os.environ.copy() myenv['PKG_CONFIG_PATH'] = self.privatedir @@ -4873,7 +4873,7 @@ endian = 'little' ''' Test that libraries are listed before their dependencies. ''' - testdir = os.path.join(self.unit_test_dir, '50 pkgconfig static link order') + testdir = os.path.join(self.unit_test_dir, '52 pkgconfig static link order') self.init(testdir) myenv = os.environ.copy() myenv['PKG_CONFIG_PATH'] = self.privatedir @@ -5017,7 +5017,7 @@ endian = 'little' @skipIfNoPkgconfigDep('gmodule-2.0') def test_ldflag_dedup(self): - testdir = os.path.join(self.unit_test_dir, '49 ldflagdedup') + testdir = os.path.join(self.unit_test_dir, '51 ldflagdedup') if is_cygwin() or is_osx(): raise unittest.SkipTest('Not applicable on Cygwin or OSX.') self.init(testdir) @@ -5516,7 +5516,7 @@ class NativeFileTests(BasePlatformTests): def setUp(self): super().setUp() - self.testcase = os.path.join(self.unit_test_dir, '46 native file binary') + self.testcase = os.path.join(self.unit_test_dir, '47 native file binary') self.current_config = 0 self.current_wrapper = 0 @@ -5789,12 +5789,12 @@ class NativeFileTests(BasePlatformTests): self.assertEqual(compiler.version, '1.2345') def test_native_file_dirs(self): - testcase = os.path.join(self.unit_test_dir, '54 native file override') + testcase = os.path.join(self.unit_test_dir, '57 native file override') self.init(testcase, default_args=False, extra_args=['--native-file', os.path.join(testcase, 'nativefile')]) def test_native_file_dirs_overriden(self): - testcase = os.path.join(self.unit_test_dir, '54 native file override') + testcase = os.path.join(self.unit_test_dir, '57 native file override') self.init(testcase, default_args=False, extra_args=['--native-file', os.path.join(testcase, 'nativefile'), '-Ddef_libdir=liblib', '-Dlibdir=liblib']) @@ -5809,7 +5809,7 @@ class CrossFileTests(BasePlatformTests): """ def test_cross_file_dirs(self): - testcase = os.path.join(self.unit_test_dir, '54 native file override') + testcase = os.path.join(self.unit_test_dir, '57 native file override') self.init(testcase, default_args=False, extra_args=['--native-file', os.path.join(testcase, 'nativefile'), '--cross-file', os.path.join(testcase, 'crossfile'), @@ -5827,7 +5827,7 @@ class CrossFileTests(BasePlatformTests): '-Ddef_sysconfdir=sysconfbar']) def test_cross_file_dirs_overriden(self): - testcase = os.path.join(self.unit_test_dir, '54 native file override') + testcase = os.path.join(self.unit_test_dir, '57 native file override') self.init(testcase, default_args=False, extra_args=['--native-file', os.path.join(testcase, 'nativefile'), '--cross-file', os.path.join(testcase, 'crossfile'), |