diff options
| -rw-r--r-- | unittests/linuxliketests.py | 1 | ||||
| -rw-r--r-- | unittests/machinefiletests.py | 9 |
2 files changed, 7 insertions, 3 deletions
diff --git a/unittests/linuxliketests.py b/unittests/linuxliketests.py index 271822962..2328107ca 100644 --- a/unittests/linuxliketests.py +++ b/unittests/linuxliketests.py @@ -928,6 +928,7 @@ class LinuxlikeTests(BasePlatformTests): install_rpath = get_rpath(os.path.join(self.installdir, 'usr/bin/progcxx')) self.assertEqual(install_rpath, 'baz:/foo/dummy') + @skipIfNoPkgconfig def test_global_rpath(self): if is_cygwin(): raise SkipTest('Windows PE/COFF binaries do not use RPATH') diff --git a/unittests/machinefiletests.py b/unittests/machinefiletests.py index c3802618d..22341cb9a 100644 --- a/unittests/machinefiletests.py +++ b/unittests/machinefiletests.py @@ -215,9 +215,12 @@ class NativeFileTests(BasePlatformTests): # We not have python2, check for it for v in ['2', '2.7', '-2.7']: - rc = subprocess.call(['pkg-config', '--cflags', f'python{v}'], - stdout=subprocess.DEVNULL, - stderr=subprocess.DEVNULL) + try: + rc = subprocess.call(['pkg-config', '--cflags', f'python{v}'], + stdout=subprocess.DEVNULL, + stderr=subprocess.DEVNULL) + except FileNotFoundError: + raise SkipTest('Not running Python 2 tests because pkg-config not found.') if rc == 0: break else: |