aboutsummaryrefslogtreecommitdiff
path: root/run_unittests.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2019-11-08 21:23:36 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2019-11-13 17:46:34 +0200
commit2a73517e0808dbedb561f9670401d18309893eb0 (patch)
tree9bf212671578a13356b4870295fec0155d05ab26 /run_unittests.py
parent9cee7367683576b2a4abb122205d0367d5a92fab (diff)
downloadmeson-2a73517e0808dbedb561f9670401d18309893eb0.zip
meson-2a73517e0808dbedb561f9670401d18309893eb0.tar.gz
meson-2a73517e0808dbedb561f9670401d18309893eb0.tar.bz2
Revert "Add `-Wl,-rpath-link` for secondary dependencies"
This reverts commit 7b9c348102792030859ed0001a51416506a0a092. Closes #6027.
Diffstat (limited to 'run_unittests.py')
-rwxr-xr-xrun_unittests.py39
1 files changed, 0 insertions, 39 deletions
diff --git a/run_unittests.py b/run_unittests.py
index 7d0b624..1105a8f 100755
--- a/run_unittests.py
+++ b/run_unittests.py
@@ -5466,45 +5466,6 @@ class LinuxlikeTests(BasePlatformTests):
self.build()
@skipIfNoPkgconfig
- def test_pkgconfig_secondary_dependencies(self):
- '''
- Check that Meson gets -Wl,-rpath-link right for secondary dependencies
-
- This test requires at least two libraries, as -Wl,-rpath-link is only
- required for dependencies of dependencies (i.e. secondary dependencies).
- '''
- with tempfile.TemporaryDirectory() as tempdirname:
- testdirbase = os.path.join(self.unit_test_dir, '67 rpath-link secondary')
-
- # build libA
- testdirlibA = os.path.join(testdirbase, 'libA')
- testlibAprefix = os.path.join(tempdirname, 'libAprefix')
- self.init(testdirlibA, extra_args=['--prefix=' + testlibAprefix,
- '--libdir=lib',
- '--default-library=shared'], default_args=False)
- self.build()
- self.install(use_destdir=False)
-
- # build libB (uses libA)
- pkg_dir = [os.path.join(testlibAprefix, 'lib/pkgconfig')]
- self.new_builddir()
- testdirlibB = os.path.join(testdirbase, 'libB')
- testlibBprefix = os.path.join(tempdirname, 'libBprefix')
- self.init(testdirlibB, extra_args=['--prefix=' + testlibBprefix,
- '--libdir=lib',
- '--default-library=shared'], default_args=False,
- override_envvars={'PKG_CONFIG_PATH': ':'.join(pkg_dir)})
- self.build()
- self.install(use_destdir=False)
-
- # build executable (uses libB, secondary dependency on libA)
- pkg_dir.append(os.path.join(testlibBprefix, 'lib/pkgconfig'))
- self.new_builddir()
- self.init(os.path.join(testdirbase, 'app'),
- override_envvars={'PKG_CONFIG_PATH': ':'.join(pkg_dir)})
- self.build()
-
- @skipIfNoPkgconfig
def test_static_archive_stripping(self):
'''
Check that Meson produces valid static archives with --strip enabled