[compiler-rt] r288786 - [XRay][compiler-rt] CMake fixes for XRay -- take 2.

[Dean Michael Berris via llvm-commits]

Author: dberris
Date: Tue Dec  6 02:40:16 2016
New Revision: 288786

URL: http://llvm.org/viewvc/llvm-project?rev=288786&view=rev
Log:
[XRay][compiler-rt] CMake fixes for XRay -- take 2.

The bootstrap buildbot complains about not being able to find the
unittests for XRay, when the conditionals to include or not include
tests and unit tests don't match.

This is a follow-up to D26232.

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=288786&r1=288785&r2=288786&view=diff
==============================================================================
--- compiler-rt/trunk/test/xray/CMakeLists.txt (original)
+++ compiler-rt/trunk/test/xray/CMakeLists.txt Tue Dec  6 02:40:16 2016
@@ -26,12 +26,14 @@ if (COMPILER_RT_BUILD_XRAY AND COMPILER_
 endif()
 
 # Add unit tests.
-if(COMPILER_RT_INCLUDE_TESTS AND COMPILER_RT_CAN_EXECUTE_TESTS)
+if(COMPILER_RT_INCLUDE_TESTS)
   configure_lit_site_cfg(
     ${CMAKE_CURRENT_SOURCE_DIR}/Unit/lit.site.cfg.in
     ${CMAKE_CURRENT_BINARY_DIR}/Unit/lit.site.cfg)
-  list(APPEND XRAY_TEST_DEPS XRayUnitTests)
-  list(APPEND XRAY_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/Unit)
+  if (COMPILER_RT_CAN_EXECUTE_TESTS AND NOT ANDROID)
+    list(APPEND XRAY_TEST_DEPS XRayUnitTests)
+    list(APPEND XRAY_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/Unit)
+  endif()
 endif()
 
 add_lit_testsuite(check-xray "Running the XRay tests"