[compiler-rt] 7f84f62 - Make compiler-rt/asan tests run with llvm-lit.

[Amy Huang via llvm-commits]

Author: Amy Huang
Date: 2020-08-17T09:24:19-07:00
New Revision: 7f84f62ef07a0a540a7dd751d08aae583d5e2472

URL: https://github.com/llvm/llvm-project/commit/7f84f62ef07a0a540a7dd751d08aae583d5e2472
DIFF: https://github.com/llvm/llvm-project/commit/7f84f62ef07a0a540a7dd751d08aae583d5e2472.diff

LOG: Make compiler-rt/asan tests run with llvm-lit.

This sets some config parameters so we can run the asan tests with
llvm-lit,
e.g. `./bin/llvm-lit [...]/compiler-rt/test/asan`

Differential Revision: https://reviews.llvm.org/D83821

Added: 
    

Modified: 
    compiler-rt/test/asan/CMakeLists.txt
    compiler-rt/test/asan/lit.cfg.py
    compiler-rt/test/asan/lit.site.cfg.py.in

Removed: 
    


################################################################################
diff  --git a/compiler-rt/test/asan/CMakeLists.txt b/compiler-rt/test/asan/CMakeLists.txt
index 1c2633eb4597..d4ce1577fb19 100644
--- a/compiler-rt/test/asan/CMakeLists.txt
+++ b/compiler-rt/test/asan/CMakeLists.txt
@@ -58,6 +58,8 @@ foreach(arch ${ASAN_TEST_ARCH})
   configure_lit_site_cfg(
     ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in
     ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg.py
+    MAIN_CONFIG
+    ${CMAKE_CURRENT_SOURCE_DIR}/lit.cfg.py
     )
   list(APPEND ASAN_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME})
 

diff  --git a/compiler-rt/test/asan/lit.cfg.py b/compiler-rt/test/asan/lit.cfg.py
index 63c02f7ddeeb..8ccca1d9aa14 100644
--- a/compiler-rt/test/asan/lit.cfg.py
+++ b/compiler-rt/test/asan/lit.cfg.py
@@ -63,6 +63,11 @@ def push_dynamic_library_lookup_path(config, new_path):
 # Setup source root.
 config.test_source_root = os.path.dirname(__file__)
 
+# Setup executable root.
+if hasattr(config, 'asan_lit_binary_dir') and \
+        config.asan_lit_binary_dir is not None:
+    config.test_exec_root = config.asan_lit_binary_dir
+
 if config.host_os not in ['FreeBSD', 'NetBSD']:
   libdl_flag = "-ldl"
 else:

diff  --git a/compiler-rt/test/asan/lit.site.cfg.py.in b/compiler-rt/test/asan/lit.site.cfg.py.in
index 81cebde2029e..d3057b2468f7 100644
--- a/compiler-rt/test/asan/lit.site.cfg.py.in
+++ b/compiler-rt/test/asan/lit.site.cfg.py.in
@@ -9,6 +9,7 @@ config.apple_platform = "@ASAN_TEST_APPLE_PLATFORM@"
 config.apple_platform_min_deployment_target_flag = "@ASAN_TEST_MIN_DEPLOYMENT_TARGET_FLAG@"
 config.asan_dynamic = @ASAN_TEST_DYNAMIC@
 config.target_arch = "@ASAN_TEST_TARGET_ARCH@"
+config.asan_lit_binary_dir = "@COMPILER_RT_BINARY_DIR@"
 
 # Load common config for all compiler-rt lit tests.
 lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/test/lit.common.configured")