diff options
| author | Dan Albert <danalbert@google.com> | 2015-04-14 23:49:12 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-14 23:49:12 +0000 |
| commit | 5b4618897e6e6fda29600d66a74d0f3f1024338a (patch) | |
| tree | afa4c1de11ca3295ad28815bb21fda3a2132ea6a | |
| parent | 4325b239b22e56200a53719b28e0207c00240acc (diff) | |
| parent | 15d0bc57253f8e586fe1f52d359c753e7e01dc67 (diff) | |
| download | external_libcxx-5b4618897e6e6fda29600d66a74d0f3f1024338a.tar.gz external_libcxx-5b4618897e6e6fda29600d66a74d0f3f1024338a.tar.bz2 external_libcxx-5b4618897e6e6fda29600d66a74d0f3f1024338a.zip | |
am 15d0bc57: Merge "Fix LD_LIBRARY_PATH for host tests after update."
* commit '15d0bc57253f8e586fe1f52d359c753e7e01dc67':
Fix LD_LIBRARY_PATH for host tests after update.
| -rw-r--r-- | test/libcxx/android/test/format.py | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/test/libcxx/android/test/format.py b/test/libcxx/android/test/format.py index 34cad72e6..228272c18 100644 --- a/test/libcxx/android/test/format.py +++ b/test/libcxx/android/test/format.py @@ -17,10 +17,7 @@ class HostTestFormat(libcxx.test.format.LibcxxTestFormat): self.libcxx_obj_root = libcxx_obj_root self.use_verify_for_fail = False self.executor = TimeoutExecutor(timeout, LocalExecutor()) - self.exec_env = {} if exec_env is None else exec_env - def _run(self, exec_path, _, in_dir=None): - cmd = [exec_path] # We need to use LD_LIBRARY_PATH because the build system's rpath is # relative, which won't work since we're running from /tmp. We can # either scan `cxx_under_test`/`link_template` to determine whether @@ -32,9 +29,8 @@ class HostTestFormat(libcxx.test.format.LibcxxTestFormat): os.path.join(outdir, 'lib'), os.path.join(outdir, 'lib64'), ]) - out, err, rc = lit.util.executeCommand( - cmd, cwd=in_dir, env={'LD_LIBRARY_PATH': libpath}) - return self._make_report(cmd, out, err, rc) + default_env = {'LD_LIBRARY_PATH': libpath} + self.exec_env = default_env if exec_env is None else exec_env class TestFormat(HostTestFormat): |