Skip to content

Commit 3e39bbf

Browse files
committed
[libunwind] Simplify the executor used in the tests
Instead of going through libc++'s run.py, we can simply run the executable directly since we don't need to setup a working directory or control the environment. Differential Revision: https://reviews.llvm.org/D112649
1 parent c3cd5f5 commit 3e39bbf

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

libunwind/test/configs/llvm-libunwind-shared.cfg.in

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,7 @@ config.substitutions.append(('%{compile_flags}',
4949
config.substitutions.append(('%{link_flags}',
5050
'-nodefaultlibs -L {0} -Wl,-rpath,{0} -lunwind -ldl -lc {1}'.format('@LIBUNWIND_LIBRARY_DIR@', ' '.join(link_flags))
5151
))
52-
config.substitutions.append(('%{exec}',
53-
'{} {}/utils/run.py --execdir %T -- '.format(sys.executable, '@LIBUNWIND_LIBCXX_PATH@')
54-
))
52+
config.substitutions.append(('%{exec}', ''))
5553

5654
import os, site
5755
site.addsitedir(os.path.join('@LIBUNWIND_LIBCXX_PATH@', 'utils'))

libunwind/test/configs/llvm-libunwind-static.cfg.in

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,7 @@ config.substitutions.append(('%{compile_flags}',
5151
config.substitutions.append(('%{link_flags}',
5252
'-nodefaultlibs {}/libunwind.a -ldl -lc {}'.format('@LIBUNWIND_LIBRARY_DIR@', ' '.join(link_flags))
5353
))
54-
config.substitutions.append(('%{exec}',
55-
'{} {}/utils/run.py --execdir %T -- '.format(sys.executable, '@LIBUNWIND_LIBCXX_PATH@')
56-
))
54+
config.substitutions.append(('%{exec}', ''))
5755

5856
import os, site
5957
site.addsitedir(os.path.join('@LIBUNWIND_LIBCXX_PATH@', 'utils'))

0 commit comments

Comments
 (0)