diff options
author | Eli Schwartz <eschwartz@archlinux.org> | 2021-06-09 14:57:15 -0400 |
---|---|---|
committer | Eli Schwartz <eschwartz@archlinux.org> | 2021-08-15 09:36:18 -0400 |
commit | 59d4f771d280cbea0d0afc9579e127225751c028 (patch) | |
tree | 6454a837f8d8e95ddb69331756e54bcbf03b86f1 /unittests/linuxliketests.py | |
parent | c2592bc921f9357a187d241b233f2be0178195e9 (diff) | |
download | meson-59d4f771d280cbea0d0afc9579e127225751c028.zip meson-59d4f771d280cbea0d0afc9579e127225751c028.tar.gz meson-59d4f771d280cbea0d0afc9579e127225751c028.tar.bz2 |
editorconfig: add setting to trim trailing whitespace
and clean up all outstanding issues
Skip 'test cases/common/141 special characters/meson.build' since it
intentionally uses trailing newlines.
Diffstat (limited to 'unittests/linuxliketests.py')
-rw-r--r-- | unittests/linuxliketests.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/unittests/linuxliketests.py b/unittests/linuxliketests.py index d3067bb..a86c3dc 100644 --- a/unittests/linuxliketests.py +++ b/unittests/linuxliketests.py @@ -1297,7 +1297,7 @@ class LinuxlikeTests(BasePlatformTests): out = self._run(['otool', '-L', f]) # Ensure that the otool output does not contain self.installdir self.assertNotRegex(out, self.installdir + '.*dylib ') - + @skipIfNoPkgconfig def test_link_arg_fullname(self): ''' @@ -1320,19 +1320,19 @@ class LinuxlikeTests(BasePlatformTests): 'PKG_CONFIG_PATH': os.path.join(installdir, self.libdir, 'pkgconfig')} testdir = os.path.join(self.unit_test_dir, '97 link full name','proguser') self.init(testdir,override_envvars=env) - + # test for link with full path with open(os.path.join(self.builddir, 'build.ninja'), encoding='utf-8') as bfile: for line in bfile: if 'build dprovidertest:' in line: self.assertIn('/libtestprovider.a', line) - + if is_osx(): # macOS's ld do not supports `--whole-archive`, skip build & run return - + self.build(override_envvars=env) - + # skip test if pkg-config is too old. # before v0.28, Libs flags like -Wl will not kept in context order with -l flags. # see https://gitlab.freedesktop.org/pkg-config/pkg-config/-/blob/master/NEWS @@ -1689,4 +1689,3 @@ class LinuxlikeTests(BasePlatformTests): obj_files = p.stdout.strip().split('\n') self.assertEqual(len(obj_files), 1) self.assertTrue(obj_files[0].endswith('-prelink.o')) - |