aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Homerding <homerdin@gmail.com>2018-05-22 13:55:25 +0000
committerBrian Homerding <homerdin@gmail.com>2018-05-22 13:55:25 +0000
commita3c439776a358ed78581e98c44085a4706cc376d (patch)
treec5466ee824ff196b05ef4a0e89b546e55235eb41
parentb9d870b66613fe18698e504ad78f3c7a98cb4a32 (diff)
[test-suite] Enable MicroBenchmarks by default
With the changes in https://reviews.llvm.org/rL327422 and https://reviews.llvm.org/rL327710 the MicroBenchmarks directory produces additional meaningful data. The patch enables the MicroBenchmarks directory to build by default. Reviewers: MatzeB, hfinkel Differential Revision: https://reviews.llvm.org/D46267 git-svn-id: https://llvm.org/svn/llvm-project/test-suite/trunk@332981 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--CMakeLists.txt5
-rw-r--r--MicroBenchmarks/CMakeLists.txt10
2 files changed, 8 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0ae56b69..43899d54 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -211,9 +211,8 @@ if(NOT TEST_SUITE_SUBDIRS)
set(TEST_SUITE_SUBDIRS "")
foreach(entry ${sub_cmakelists})
get_filename_component(subdir ${entry} DIRECTORY)
- # Exclude tools, CTMark, and MicroBenchmarks from default list
- if(NOT ${subdir} STREQUAL tools AND NOT ${subdir} STREQUAL CTMark
- AND NOT ${subdir} STREQUAL MicroBenchmarks)
+ # Exclude tools and CTMark from default list
+ if(NOT ${subdir} STREQUAL tools AND NOT ${subdir} STREQUAL CTMark)
list(APPEND TEST_SUITE_SUBDIRS ${subdir})
endif()
endforeach()
diff --git a/MicroBenchmarks/CMakeLists.txt b/MicroBenchmarks/CMakeLists.txt
index ed67e9d0..0c117a10 100644
--- a/MicroBenchmarks/CMakeLists.txt
+++ b/MicroBenchmarks/CMakeLists.txt
@@ -1,5 +1,7 @@
-file(COPY lit.local.cfg DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+if(NOT DEFINED DISABLE_CXX)
+ file(COPY lit.local.cfg DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
-add_subdirectory(libs)
-add_subdirectory(XRay)
-add_subdirectory(LCALS)
+ add_subdirectory(libs)
+ add_subdirectory(XRay)
+ add_subdirectory(LCALS)
+endif()