aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFini Jastrow <ulf.fini.jastrow@desy.de>2021-01-20 07:04:40 +0100
committerJussi Pakkanen <jpakkane@gmail.com>2021-01-20 19:01:47 +0000
commit5dd1aac5c9da384328495929eb8b30e89f4eb1ec (patch)
treebe0759795b24ef72e1ca485633caf5548ce82972
parent49cde9653c904b7f3ddc6b42bb4cf1bd4646d162 (diff)
downloadmeson-5dd1aac5c9da384328495929eb8b30e89f4eb1ec.zip
meson-5dd1aac5c9da384328495929eb8b30e89f4eb1ec.tar.gz
meson-5dd1aac5c9da384328495929eb8b30e89f4eb1ec.tar.bz2
unittests: Remove double install for case 10
[why] In test case 10 the project is installed twice. This has been introduced with commit 55abe16 unit tests: Test that relative install_rpath works correctly where the cxx tests where added by copy and paste. [how] First test all build rpaths, then after install all install rpaths. [note] The aforementioned commit is a bit strange in that it adds a tests with a relative rpath with cxx files but not with c files. Signed-off-by: Fini Jastrow <ulf.fini.jastrow@desy.de>
-rwxr-xr-xrun_unittests.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/run_unittests.py b/run_unittests.py
index ca87eec..da6d329 100755
--- a/run_unittests.py
+++ b/run_unittests.py
@@ -6682,16 +6682,13 @@ class LinuxlikeTests(BasePlatformTests):
testdir = os.path.join(self.unit_test_dir, '10 build_rpath')
self.init(testdir)
self.build()
- # C program RPATH
build_rpath = get_rpath(os.path.join(self.builddir, 'prog'))
self.assertEqual(build_rpath, '$ORIGIN/sub:/foo/bar')
- self.install()
- install_rpath = get_rpath(os.path.join(self.installdir, 'usr/bin/prog'))
- self.assertEqual(install_rpath, '/baz')
- # C++ program RPATH
build_rpath = get_rpath(os.path.join(self.builddir, 'progcxx'))
self.assertEqual(build_rpath, '$ORIGIN/sub:/foo/bar')
self.install()
+ install_rpath = get_rpath(os.path.join(self.installdir, 'usr/bin/prog'))
+ self.assertEqual(install_rpath, '/baz')
install_rpath = get_rpath(os.path.join(self.installdir, 'usr/bin/progcxx'))
self.assertEqual(install_rpath, 'baz')