diff options
| author | Dean Michael Berris <dberris@google.com> | 2016-12-06 09:43:44 +0000 |
|---|---|---|
| committer | Dean Michael Berris <dberris@google.com> | 2016-12-06 09:43:44 +0000 |
| commit | 4d4b258a8500b0055e7090eeefd0b52e93b9b8a3 (patch) | |
| tree | 6d2543a56c6bd86c6435a8b096e4d80dea0ab3d4 /test | |
| parent | 927ae7cfc76024af13912779db6bd356325675d7 (diff) | |
[XRay][compiler-rt] Only add unit tests if we're building XRay.
As constructed before this patch, in case we run into case where we
don't actually build the XRay library, we really ought to not be adding
the unit test runs. This should fix the bootstrap build failures.
This is a follow-up further to D26232.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@288788 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test')
| -rw-r--r-- | test/xray/CMakeLists.txt | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/test/xray/CMakeLists.txt b/test/xray/CMakeLists.txt index 8c4d3b54f..5def7e30f 100644 --- a/test/xray/CMakeLists.txt +++ b/test/xray/CMakeLists.txt @@ -23,14 +23,12 @@ if (COMPILER_RT_BUILD_XRAY AND COMPILER_RT_HAS_XRAY) ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg) list(APPEND XRAY_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}) endforeach() -endif() -# Add unit 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) - if (COMPILER_RT_CAN_EXECUTE_TESTS AND NOT ANDROID) + # Add unit 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) endif() |