diff options
| author | Dean Michael Berris <dberris@google.com> | 2016-08-08 03:42:11 +0000 |
|---|---|---|
| committer | Dean Michael Berris <dberris@google.com> | 2016-08-08 03:42:11 +0000 |
| commit | 118e955aeafe4c78b31d5fc4e62dadbca52e1255 (patch) | |
| tree | 0589486a11954d16808a67fc26ab60b82460566d /test/xray | |
| parent | 585545f941de14c15784e9638a00da2ac4df5ed7 (diff) | |
[compiler-rt][XRay] Fix XRay test build dependencies
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@277974 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/xray')
| -rw-r--r-- | test/xray/CMakeLists.txt | 44 |
1 files changed, 23 insertions, 21 deletions
diff --git a/test/xray/CMakeLists.txt b/test/xray/CMakeLists.txt index d4142e075..568256ebf 100644 --- a/test/xray/CMakeLists.txt +++ b/test/xray/CMakeLists.txt @@ -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} |