[compiler-rt] r279802 - Include tests only if COMPILER_RT_BUILD_XRAY is ON.

[Dean Michael Berris via llvm-commits]

Author: dberris
Date: Thu Aug 25 21:39:09 2016
New Revision: 279802

URL: http://llvm.org/viewvc/llvm-project?rev=279802&view=rev
Log:
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.

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

Modified: compiler-rt/trunk/test/xray/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/xray/CMakeLists.txt?rev=279802&r1=279801&r2=279802&view=diff
==============================================================================
--- compiler-rt/trunk/test/xray/CMakeLists.txt (original)
+++ compiler-rt/trunk/test/xray/CMakeLists.txt Thu Aug 25 21:39:09 2016
@@ -10,30 +10,32 @@ if(NOT COMPILER_RT_STANDALONE_BUILD 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 (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()
+    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}
-	DEPENDS ${XRAY_TEST_DEPS})
+  DEPENDS ${XRAY_TEST_DEPS})
 set_target_properties(check-xray PROPERTIES FOLDER "Compiler-RT Misc")