[PATCH] D46267: [test-suite] Enable MicroBenchmarks by default

[Brian Homerding via Phabricator via llvm-commits]

homerdin updated this revision to Diff 148901.
homerdin added a comment.

Added a definition that will prevent the benchmark library from building cxx03_test which will fail when using c++11.


https://reviews.llvm.org/D46267

Files:
  CMakeLists.txt
  MicroBenchmarks/CMakeLists.txt
  MicroBenchmarks/libs/CMakeLists.txt


Index: MicroBenchmarks/libs/CMakeLists.txt
===================================================================
--- MicroBenchmarks/libs/CMakeLists.txt
+++ MicroBenchmarks/libs/CMakeLists.txt
@@ -1,3 +1,10 @@
+# The benchmark library build system uses try_run tests to determine regex
+# Circumvent these tests and enforce std::regex
+set(CMAKE_CXX_STANDARD 11)
+set(HAVE_STD_REGEX 1)
+# When enforcing c++11 we need to disable one of the benchmark library's tests
+set(BENCHMARK_HAS_CXX03_FLAG 0)
+
 add_subdirectory(benchmark-1.3.0)
 test_suite_add_build_dependencies(benchmark)
 test_suite_add_build_dependencies(output_test_helper)
Index: MicroBenchmarks/CMakeLists.txt
===================================================================
--- MicroBenchmarks/CMakeLists.txt
+++ 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()
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -211,9 +211,8 @@
   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()


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D46267.148901.patch
Type: text/x-patch
Size: 1809 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20180529/747ac044/attachment.bin>