diff options
| author | Dean Michael Berris <dberris@google.com> | 2016-08-26 02:39:09 +0000 |
|---|---|---|
| committer | Dean Michael Berris <dberris@google.com> | 2016-08-26 02:39:09 +0000 |
| commit | 510911f7bd7406ec7cd3b4d32349537f5448e578 (patch) | |
| tree | 7b0158539189bc06a20872af96cf9d399d3b71dc | |
| parent | 269cd8d1d27d7c74b3bf2de79d1ded8b4f1fc3a1 (diff) | |
| download | bcm5719-llvm-510911f7bd7406ec7cd3b4d32349537f5448e578.tar.gz bcm5719-llvm-510911f7bd7406ec7cd3b4d32349537f5448e578.zip | |
Include tests only if COMPILER_RT_BUILD_XRAY is ON.
This should un-break users that have not re-generated their CMake
configs when they ran it when this was defaulted to OFF. Related to
r277975 post-commit review.
llvm-svn: 279802
| -rw-r--r-- | compiler-rt/test/xray/CMakeLists.txt | 48 |
1 files changed, 25 insertions, 23 deletions
diff --git a/compiler-rt/test/xray/CMakeLists.txt b/compiler-rt/test/xray/CMakeLists.txt index 49ceafe09b8..e58032d03ee 100644 --- a/compiler-rt/test/xray/CMakeLists.txt +++ b/compiler-rt/test/xray/CMakeLists.txt @@ -10,30 +10,32 @@ if(NOT COMPILER_RT_STANDALONE_BUILD AND COMPILER_RT_BUILD_XRAY AND 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(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) - - 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() +if (COMPILER_RT_BUILD_XRAY AND COMPILER_RT_HAS_XRAY) + 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() + + 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() +endif() add_lit_testsuite(check-xray "Running the XRay tests" ${XRAY_TESTSUITES} - DEPENDS ${XRAY_TEST_DEPS}) + DEPENDS ${XRAY_TEST_DEPS}) set_target_properties(check-xray PROPERTIES FOLDER "Compiler-RT Misc") |
