[compiler-rt] 22d5162 - Remove unused Unit test directory for xray.

[Eric Christopher via llvm-commits]

Author: Eric Christopher
Date: 2019-12-09T18:40:44-08:00
New Revision: 22d516261a98fd56ccce39b3031fdba8d64de696

URL: https://github.com/llvm/llvm-project/commit/22d516261a98fd56ccce39b3031fdba8d64de696
DIFF: https://github.com/llvm/llvm-project/commit/22d516261a98fd56ccce39b3031fdba8d64de696.diff

LOG: Remove unused Unit test directory for xray.

Added: 
    

Modified: 
    compiler-rt/test/xray/CMakeLists.txt

Removed: 
    compiler-rt/test/xray/Unit/lit.site.cfg.py.in


################################################################################
diff  --git a/compiler-rt/test/xray/CMakeLists.txt b/compiler-rt/test/xray/CMakeLists.txt
index b44e82462257..2633717a24fa 100644
--- a/compiler-rt/test/xray/CMakeLists.txt
+++ b/compiler-rt/test/xray/CMakeLists.txt
@@ -25,17 +25,6 @@ if (COMPILER_RT_BUILD_XRAY AND COMPILER_RT_HAS_XRAY)
       ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg.py)
     list(APPEND XRAY_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME})
   endforeach()
-
-  # Add unit tests.
-  if(COMPILER_RT_INCLUDE_TESTS)
-    if(UNIX AND NOT APPLE)
-      configure_lit_site_cfg(
-        ${CMAKE_CURRENT_SOURCE_DIR}/Unit/lit.site.cfg.py.in
-        ${CMAKE_CURRENT_BINARY_DIR}/Unit/lit.site.cfg.py)
-      list(APPEND XRAY_TEST_DEPS XRayUnitTests)
-      list(APPEND XRAY_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/Unit)
-    endif()
-  endif()
 endif()
 
 add_lit_testsuite(check-xray "Running the XRay tests"

diff  --git a/compiler-rt/test/xray/Unit/lit.site.cfg.py.in b/compiler-rt/test/xray/Unit/lit.site.cfg.py.in
deleted file mode 100644
index 54709ac70ce4..000000000000
--- a/compiler-rt/test/xray/Unit/lit.site.cfg.py.in
+++ /dev/null
@@ -1,32 +0,0 @@
- at LIT_SITE_CFG_IN_HEADER@
-
-import os
-import platform
-
-# Load common config for all compiler-rt unit tests.
-lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/unittests/lit.common.unit.configured")
-
-# Setup config name.
-config.name = 'XRay-Unit'
-
-config.test_exec_root = "@COMPILER_RT_BINARY_DIR@/lib/xray/tests"
-config.test_source_root = config.test_exec_root
-
-# Do not patch the XRay unit tests pre-main, and also make the error logging
-# verbose to get a more accurate error logging mechanism.
-config.environment['XRAY_OPTIONS'] = 'patch_premain=false'
-
-# Add the LLVM Library directory to the LD_LIBRARY_PATH to allow tests to look
-# up the shared libraries.
-if 'LD_LIBRARY_PATH' in os.environ:
-  libdirs = os.path.pathsep.join((config.llvm_lib_dir, os.environ['LD_LIBRARY_PATH']))
-  config.environment['LD_LIBRARY_PATH'] = libdirs
-else:
-  config.environment['LD_LIBRARY_PATH'] = config.llvm_lib_dir
-
-if platform.system() == 'FreeBSD':
-  if 'LD_32_LIBRARY_PATH' in os.environ:
-    libdirs = os.path.pathsep.join((config.llvm_lib_dir, os.environ['LD_32_LIBRARY_PATH']))
-    config.environment['LD_32_LIBRARY_PATH'] = libdirs
-  else:
-    config.environment['LD_32_LIBRARY_PATH'] = config.llvm_lib_dir