maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[compiler-rt][XRay] Fix XRay test build dependencies 

llvm-svn: 277974
This commit is contained in:
Dean Michael Berris 2016-08-08 03:42:11 +00:00
parent 151e5be5ea
commit 26cc6628f7
2 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compiler-rt/lib/xray/CMakeLists.txt
View File

@ -41,7 +41,3 @@ foreach (arch ${XRAY_SUPPORTED_ARCH})
endforeach()
add_dependencies(compiler-rt xray)
# if(COMPILER_RT_INCLUDE_TESTS)
# add_subdirectory(tests)
# endif()

44
compiler-rt/test/xray/CMakeLists.txt
View File

@ -3,33 +3,35 @@ set(XRAY_LIT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
set(XRAY_TESTSUITES)
set(XRAY_TEST_DEPS ${SANITIZER_COMMON_LIT_TEST_DEPS})
if(NOT COMPILER_RT_STANDALONE_BUILD)
if(NOT COMPILER_RT_STANDALONE_BUILD AND COMPILER_RT_HAS_XRAY)
list(APPEND XRAY_TEST_DEPS xray)
endif()
set(XRAY_TEST_ARCH ${XRAY_SUPPORTED_ARCH})
foreach(arch ${XRAY_TEST_ARCH})
set(XRAY_TEST_TARGET_ARCH ${arch})
string(TOLOWER "-${arch}-${OS_NAME}" XRAY_TEST_CONFIG_SUFFIX)
if (COMPILER_RT_INCLUDE_TESTS)
set(XRAY_TEST_ARCH ${XRAY_SUPPORTED_ARCH})
foreach(arch ${XRAY_TEST_ARCH})
set(XRAY_TEST_TARGET_ARCH ${arch})
string(TOLOWER "-${arch}-${OS_NAME}" XRAY_TEST_CONFIG_SUFFIX)
if(ANDROID OR ${arch} MATCHES "arm|aarch64")
# This is only true if we are cross-compiling.
# Build all tests with host compiler and use host tools.
set(XRAY_TEST_TARGET_CC ${COMPILER_RT_TEST_COMPILER})
set(XRAY_TEST_TARGET_CFLAGS ${COMPILER_RT_TEST_COMPILER_CFLAGS})
else()
get_target_flags_for_arch(${arch} XRAY_TEST_TARGET_CFLAGS)
string(REPLACE ";" " " XRAY_TEST_TARGET_CFLAGS "${XRAY_TEST_TARGET_CFLAGS}")
endif()
if(ANDROID OR ${arch} MATCHES "arm|aarch64")
# This is only true if we are cross-compiling.
# Build all tests with host compiler and use host tools.
set(XRAY_TEST_TARGET_CC ${COMPILER_RT_TEST_COMPILER})
set(XRAY_TEST_TARGET_CFLAGS ${COMPILER_RT_TEST_COMPILER_CFLAGS})
else()
get_target_flags_for_arch(${arch} XRAY_TEST_TARGET_CFLAGS)
string(REPLACE ";" " " XRAY_TEST_TARGET_CFLAGS "${XRAY_TEST_TARGET_CFLAGS}")
endif()
string(TOUPPER ${arch} ARCH_UPPER_CASE)
set(CONFIG_NAME ${ARCH_UPPER_CASE}${OS_NAME}Config)
string(TOUPPER ${arch} ARCH_UPPER_CASE)
set(CONFIG_NAME ${ARCH_UPPER_CASE}${OS_NAME}Config)
configure_lit_site_cfg(
${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in
${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg)
list(APPEND XRAY_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME})
endforeach()
configure_lit_site_cfg(
${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in
${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg)
list(APPEND XRAY_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME})
endforeach()
endif()
add_lit_testsuite(check-xray "Running the XRay tests"
${XRAY_TESTSUITES}