[compiler-rt] 51c152c - Revert "Make compiler-rt/asan tests run with llvm-lit."

[Amy Huang via llvm-commits]

Author: Amy Huang
Date: 2020-08-17T10:00:45-07:00
New Revision: 51c152ca2a932754e0b0e167b96394eab064961e

URL: https://github.com/llvm/llvm-project/commit/51c152ca2a932754e0b0e167b96394eab064961e
DIFF: https://github.com/llvm/llvm-project/commit/51c152ca2a932754e0b0e167b96394eab064961e.diff

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

This reverts commit 7f84f62ef07a0a540a7dd751d08aae583d5e2472.

Seems to be causing a bunch of compiler-rt test failures on
ppc64-linux bots.

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 d4ce1577fb19f..1c2633eb4597b 100644
--- a/compiler-rt/test/asan/CMakeLists.txt
+++ b/compiler-rt/test/asan/CMakeLists.txt
@@ -58,8 +58,6 @@ 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 8ccca1d9aa147..63c02f7ddeeb0 100644
--- a/compiler-rt/test/asan/lit.cfg.py
+++ b/compiler-rt/test/asan/lit.cfg.py
@@ -63,11 +63,6 @@ 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 d3057b2468f78..81cebde2029ed 100644
--- a/compiler-rt/test/asan/lit.site.cfg.py.in
+++ b/compiler-rt/test/asan/lit.site.cfg.py.in
@@ -9,7 +9,6 @@ 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")