commit 37f42e4a14df140282143ba2b6abb778e9f0a1fc
author Louis Dionne <ldionne@apple.com> Fri Nov 06 17:26:42 2020 -0500
committer Copybara-Service <copybara-worker@google.com> Tue Nov 10 14:09:58 2020 -0800
tree 325014a63a7a733b4db597d5a4de8e2c4ca2cf72
parent 46ec6e62fa089ecba2476c9c760ef62d318c6d64

Revert "Allow running back-deployment testing against libc++abi"

This reverts commit 4d79ef814aedb63, which broke a few build bots.
I'm reverting until I have time to investigate.

GitOrigin-RevId: c1887e3f15aeac7037b88b066b33d142c6bb1321

test/libunwind/test/config.py

diff --git a/test/libunwind/test/config.py b/test/libunwind/test/config.py
index be2dcbd..9231860 100644
--- a/test/libunwind/test/config.py
+++ b/test/libunwind/test/config.py
@@ -17,7 +17,7 @@
         super(Configuration, self).__init__(lit_config, config)
         self.libunwind_src_root = None
         self.libunwind_obj_root = None
-        self.abi_library_root = None
+        self.abi_library_path = None
         self.libcxx_src_root = None
 
     def configure_src_root(self):

test/lit.site.cfg.in

diff --git a/test/lit.site.cfg.in b/test/lit.site.cfg.in
index cb2e087..8ff770f 100644
--- a/test/lit.site.cfg.in
+++ b/test/lit.site.cfg.in
@@ -7,7 +7,7 @@
 config.project_obj_root         = "@CMAKE_BINARY_DIR@"
 config.libunwind_src_root       = "@LIBUNWIND_SOURCE_DIR@"
 config.libunwind_obj_root       = "@LIBUNWIND_BINARY_DIR@"
-config.abi_library_root         = "@LIBUNWIND_LIBRARY_DIR@"
+config.abi_library_path         = "@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@"