diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2018-10-08 15:46:46 -0700 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2018-11-15 18:42:25 -0800 |
| commit | 80f8c9930c1cca060dceb0f79d58823e66ea63e3 (patch) | |
| tree | a4fe6ef1b6ce13452ae10a34a1c9d98554bf5a05 | |
| parent | f2d503ca3416fc44eae5bed98ef0ab62773153c5 (diff) | |
| download | meson-80f8c9930c1cca060dceb0f79d58823e66ea63e3.zip meson-80f8c9930c1cca060dceb0f79d58823e66ea63e3.tar.gz meson-80f8c9930c1cca060dceb0f79d58823e66ea63e3.tar.bz2 | |
unittests: don't override LD_LIBRARY_PATH
part of using ICC is configuring LD_LIBRARY_PATH so that you can link
with several Intel specific .so's. Currently meson blanket overrides the
LD_LIBRARARY_PATH in several tests which breaks them. Instead prepend
the test dir td LD_LIBRARY_PATH. Fixes 6 tests with ICC.
| -rwxr-xr-x | run_unittests.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/run_unittests.py b/run_unittests.py index cdb04c0..e149ded 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -3918,7 +3918,7 @@ class LinuxlikeTests(BasePlatformTests): # when all tests are run (but works when only this test is run), # but doing this explicitly works. env = os.environ.copy() - env['LD_LIBRARY_PATH'] = installed_libdir + env['LD_LIBRARY_PATH'] = ':'.join([installed_libdir, env.get('LD_LIBRARY_PATH', '')]) self.assertEqual(subprocess.call(installed_exe, env=env), 0) # Ensure that introspect --installed works installed = self.introspect('--installed') @@ -4119,7 +4119,7 @@ endian = 'little' self.init(testdir2) self.build() myenv = os.environ.copy() - myenv['LD_LIBRARY_PATH'] = lib_dir + myenv['LD_LIBRARY_PATH'] = ':'.join([lib_dir, myenv.get('LD_LIBRARY_PATH', '')]) if is_cygwin(): bin_dir = os.path.join(tempdirname, 'bin') myenv['PATH'] = bin_dir + os.pathsep + myenv['PATH'] |