aboutsummaryrefslogtreecommitdiff
path: root/libunwind/test
diff options
context:
space:
mode:
authorLouis Dionne <ldionne@apple.com>2020-07-08 16:38:54 -0400
committerLouis Dionne <ldionne@apple.com>2020-11-06 08:12:46 -0500
commit4d79ef814aedb63e85903bb145dfe7ec143c6909 (patch)
treecbafb4c37385d5eae710695c856eee0515b73066 /libunwind/test
parentd8d1cc647d87b453a2dbb8242c75e3bccc443bbd (diff)
downloadllvm-4d79ef814aedb63e85903bb145dfe7ec143c6909.zip
llvm-4d79ef814aedb63e85903bb145dfe7ec143c6909.tar.gz
llvm-4d79ef814aedb63e85903bb145dfe7ec143c6909.tar.bz2
Allow running back-deployment testing against libc++abi
Summary: Before this patch, we could only link against the back-deployment libc++abi dylib. This patch allows linking against the just-built libc++abi, but running against the back-deployment one -- just like we do for libc++. Also, add XFAIL markup to flag expected errors.
Diffstat (limited to 'libunwind/test')
-rw-r--r--libunwind/test/libunwind/test/config.py2
-rw-r--r--libunwind/test/lit.site.cfg.in2
2 files changed, 2 insertions, 2 deletions
diff --git a/libunwind/test/libunwind/test/config.py b/libunwind/test/libunwind/test/config.py
index 9231860..be2dcbd 100644
--- a/libunwind/test/libunwind/test/config.py
+++ b/libunwind/test/libunwind/test/config.py
@@ -17,7 +17,7 @@ class Configuration(LibcxxConfiguration):
super(Configuration, self).__init__(lit_config, config)
self.libunwind_src_root = None
self.libunwind_obj_root = None
- self.abi_library_path = None
+ self.abi_library_root = None
self.libcxx_src_root = None
def configure_src_root(self):
diff --git a/libunwind/test/lit.site.cfg.in b/libunwind/test/lit.site.cfg.in
index 8ff770f..cb2e087 100644
--- a/libunwind/test/lit.site.cfg.in
+++ b/libunwind/test/lit.site.cfg.in
@@ -7,7 +7,7 @@ config.cxx_under_test = "@CMAKE_CXX_COMPILER@"
config.project_obj_root = "@CMAKE_BINARY_DIR@"
config.libunwind_src_root = "@LIBUNWIND_SOURCE_DIR@"
config.libunwind_obj_root = "@LIBUNWIND_BINARY_DIR@"
-config.abi_library_path = "@LIBUNWIND_LIBRARY_DIR@"
+config.abi_library_root = "@LIBUNWIND_LIBRARY_DIR@"
config.libcxx_src_root = "@LIBUNWIND_LIBCXX_PATH@"
config.libunwind_headers = "@LIBUNWIND_SOURCE_DIR@/include"
config.cxx_library_root = "@LIBUNWIND_LIBCXX_LIBRARY_PATH@"