From 3e39bbf5f9614327bb09d6527db8b40fc472fedf Mon Sep 17 00:00:00 2001 From: Louis Dionne Date: Wed, 27 Oct 2021 15:04:18 -0400 Subject: [PATCH] [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 --- libunwind/test/configs/llvm-libunwind-shared.cfg.in | 4 +--- libunwind/test/configs/llvm-libunwind-static.cfg.in | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/libunwind/test/configs/llvm-libunwind-shared.cfg.in b/libunwind/test/configs/llvm-libunwind-shared.cfg.in index b60c9ff..206c2b9 100644 --- a/libunwind/test/configs/llvm-libunwind-shared.cfg.in +++ b/libunwind/test/configs/llvm-libunwind-shared.cfg.in @@ -49,9 +49,7 @@ config.substitutions.append(('%{compile_flags}', config.substitutions.append(('%{link_flags}', '-nodefaultlibs -L {0} -Wl,-rpath,{0} -lunwind -ldl -lc {1}'.format('@LIBUNWIND_LIBRARY_DIR@', ' '.join(link_flags)) )) -config.substitutions.append(('%{exec}', - '{} {}/utils/run.py --execdir %T -- '.format(sys.executable, '@LIBUNWIND_LIBCXX_PATH@') -)) +config.substitutions.append(('%{exec}', '')) import os, site site.addsitedir(os.path.join('@LIBUNWIND_LIBCXX_PATH@', 'utils')) diff --git a/libunwind/test/configs/llvm-libunwind-static.cfg.in b/libunwind/test/configs/llvm-libunwind-static.cfg.in index 327f048..dd292e7 100644 --- a/libunwind/test/configs/llvm-libunwind-static.cfg.in +++ b/libunwind/test/configs/llvm-libunwind-static.cfg.in @@ -51,9 +51,7 @@ config.substitutions.append(('%{compile_flags}', config.substitutions.append(('%{link_flags}', '-nodefaultlibs {}/libunwind.a -ldl -lc {}'.format('@LIBUNWIND_LIBRARY_DIR@', ' '.join(link_flags)) )) -config.substitutions.append(('%{exec}', - '{} {}/utils/run.py --execdir %T -- '.format(sys.executable, '@LIBUNWIND_LIBCXX_PATH@') -)) +config.substitutions.append(('%{exec}', '')) import os, site site.addsitedir(os.path.join('@LIBUNWIND_LIBCXX_PATH@', 'utils')) -- 2.7.4