aboutsummaryrefslogtreecommitdiff
path: root/run_unittests.py
diff options
context:
space:
mode:
authorXavier Claessens <xavier.claessens@collabora.com>2019-09-18 22:06:19 -0400
committerXavier Claessens <xclaesse@gmail.com>2019-10-01 13:06:45 -0400
commitdc5ad1fad953d8cc2191aed1bd6c7c7db83faf99 (patch)
tree8e590d391931dd4701bf61f5609bc409ae3663b9 /run_unittests.py
parent484b721369957100ee6d2b76f17224a583e2bd86 (diff)
downloadmeson-dc5ad1fad953d8cc2191aed1bd6c7c7db83faf99.zip
meson-dc5ad1fad953d8cc2191aed1bd6c7c7db83faf99.tar.gz
meson-dc5ad1fad953d8cc2191aed1bd6c7c7db83faf99.tar.bz2
pkgconfig: Do not include uninstalled static libraries
Diffstat (limited to 'run_unittests.py')
-rwxr-xr-xrun_unittests.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/run_unittests.py b/run_unittests.py
index 67a3df7..d835ccd 100755
--- a/run_unittests.py
+++ b/run_unittests.py
@@ -5637,6 +5637,9 @@ c = ['{0}']
self.init(testdir, override_envvars=env)
def test_static_link(self):
+ if is_cygwin():
+ 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')
libdir = os.path.join(self.installdir, self.prefix[1:], self.libdir)
@@ -5646,9 +5649,12 @@ c = ['{0}']
# Test that installed libraries works
self.new_builddir()
testdir = os.path.join(self.unit_test_dir, '69 static link')
- self.init(testdir, extra_args=['-Dc_link_args="-L{}"'.format(libdir)])
+ env = {'PKG_CONFIG_LIBDIR': os.path.join(libdir, 'pkgconfig')}
+ run_env = {'LD_LIBRARY_PATH': libdir}
+ self.init(testdir, extra_args=['-Dc_link_args="-L{}"'.format(libdir)],
+ override_envvars=env)
self.build()
- self.run_tests()
+ self.run_tests(override_envvars=run_env)
def should_run_cross_arm_tests():
return shutil.which('arm-linux-gnueabihf-gcc') and not platform.machine().lower().startswith('arm')