[test-suite] r332984 - [test-suite] Revert rL332981 (Enable MicroBenchmarks by default)

[Brian Homerding via llvm-commits]

Author: homerdin
Date: Tue May 22 07:51:59 2018
New Revision: 332984

URL: http://llvm.org/viewvc/llvm-project?rev=332984&view=rev
Log:
[test-suite] Revert rL332981 (Enable MicroBenchmarks by default)

The benchmark library's build is failing some builds.

Differential Revision: https://reviews.llvm.org/D46267

Modified:
    test-suite/trunk/CMakeLists.txt
    test-suite/trunk/MicroBenchmarks/CMakeLists.txt

Modified: test-suite/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/CMakeLists.txt?rev=332984&r1=332983&r2=332984&view=diff
==============================================================================
--- test-suite/trunk/CMakeLists.txt (original)
+++ test-suite/trunk/CMakeLists.txt Tue May 22 07:51:59 2018
@@ -212,7 +212,8 @@ if(NOT TEST_SUITE_SUBDIRS)
   foreach(entry ${sub_cmakelists})
     get_filename_component(subdir ${entry} DIRECTORY)
 	 # Exclude tools and CTMark from default list
-    if(NOT ${subdir} STREQUAL tools AND NOT ${subdir} STREQUAL CTMark)
+    if(NOT ${subdir} STREQUAL tools AND NOT ${subdir} STREQUAL CTMark
+       AND NOT ${subdir} STREQUAL MicroBenchmarks)
       list(APPEND TEST_SUITE_SUBDIRS ${subdir})
     endif()
   endforeach()

Modified: test-suite/trunk/MicroBenchmarks/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MicroBenchmarks/CMakeLists.txt?rev=332984&r1=332983&r2=332984&view=diff
==============================================================================
--- test-suite/trunk/MicroBenchmarks/CMakeLists.txt (original)
+++ test-suite/trunk/MicroBenchmarks/CMakeLists.txt Tue May 22 07:51:59 2018
@@ -1,7 +1,5 @@
-if(NOT DEFINED DISABLE_CXX)
-  file(COPY lit.local.cfg DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+file(COPY lit.local.cfg DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 
-  add_subdirectory(libs)
-  add_subdirectory(XRay)
-  add_subdirectory(LCALS)
-endif()
+add_subdirectory(libs)
+add_subdirectory(XRay)
+add_subdirectory(LCALS)