[test-suite] r333194 - [test-suite] Revert rL333184 (Enable MicroBenchmarks by default and enable benchmark library to cross compile)

[Brian Homerding via llvm-commits]

Author: homerdin
Date: Thu May 24 08:33:52 2018
New Revision: 333194

URL: http://llvm.org/viewvc/llvm-project?rev=333194&view=rev
Log:
[test-suite] Revert rL333184 (Enable MicroBenchmarks by default and enable benchmark library to cross compile)

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
    test-suite/trunk/MicroBenchmarks/libs/CMakeLists.txt

Modified: test-suite/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/CMakeLists.txt?rev=333194&r1=333193&r2=333194&view=diff
==============================================================================
--- test-suite/trunk/CMakeLists.txt (original)
+++ test-suite/trunk/CMakeLists.txt Thu May 24 08:33:52 2018
@@ -211,8 +211,9 @@ if(NOT TEST_SUITE_SUBDIRS)
   set(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)
+	 # Exclude tools, CTMark, and MicroBenchmarks from default list
+    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=333194&r1=333193&r2=333194&view=diff
==============================================================================
--- test-suite/trunk/MicroBenchmarks/CMakeLists.txt (original)
+++ test-suite/trunk/MicroBenchmarks/CMakeLists.txt Thu May 24 08:33:52 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)

Modified: test-suite/trunk/MicroBenchmarks/libs/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MicroBenchmarks/libs/CMakeLists.txt?rev=333194&r1=333193&r2=333194&view=diff
==============================================================================
--- test-suite/trunk/MicroBenchmarks/libs/CMakeLists.txt (original)
+++ test-suite/trunk/MicroBenchmarks/libs/CMakeLists.txt Thu May 24 08:33:52 2018
@@ -1,5 +1,3 @@
-set(CMAKE_CXX_STANDARD 11)
-set(HAVE_STD_REGEX 1)
 add_subdirectory(benchmark-1.3.0)
 test_suite_add_build_dependencies(benchmark)
 test_suite_add_build_dependencies(output_test_helper)