From 0e3905228aa67dca96bd6f4d4ceb1878c647838b Mon Sep 17 00:00:00 2001
From: Dominic Hamon <dma+github@stripysock.com>
Date: Sun, 25 Dec 2016 03:22:47 -0800
Subject: [PATCH] Fixes from upstream and test builds

---
 BUILD      |  13 +++---
 src/re.h   |   2 +-
 test/BUILD | 128 +++++++++++++++++++++++++++++++++--------------------
 3 files changed, 86 insertions(+), 57 deletions(-)

diff --git a/BUILD b/BUILD
index 78ec74c015..54f86674fe 100644
--- a/BUILD
+++ b/BUILD
@@ -2,7 +2,9 @@ cc_library(
     name = "benchmark",
     srcs = [
         "src/arraysize.h",
+        "src/benchmark_api_internal.h",
         "src/benchmark.cc",
+        "src/benchmark_register.cc",
         "src/check.h",
         "src/colorprint.cc",
         "src/colorprint.h",
@@ -15,13 +17,10 @@ cc_library(
         "src/cycleclock.h",
         "src/internal_macros.h",
         "src/json_reporter.cc",
-        "src/log.cc",
         "src/log.h",
         "src/mutex.h",
-        "src/reporter.cc",
         "src/re.h",
-        "src/re_posix.cc",
-        "src/re_std.cc",
+        "src/reporter.cc",
         "src/sleep.cc",
         "src/sleep.h",
         "src/stat.h",
@@ -29,8 +28,8 @@ cc_library(
         "src/string_util.h",
         "src/sysinfo.cc",
         "src/sysinfo.h",
-        "src/walltime.cc",
-        "src/walltime.h",
+        "src/timers.cc",
+        "src/timers.h",
     ],
     hdrs = [
         "include/benchmark/benchmark.h",
@@ -39,7 +38,7 @@ cc_library(
         "include/benchmark/reporter.h",
     ],
     visibility = ["//test:__pkg__"],
-    defines = ["HAVE_STD_REGEX"],
+    defines = ["HAVE_POSIX_REGEX"],
     includes = ["include"],
     linkopts = ["-pthread"],
 )
diff --git a/src/re.h b/src/re.h
index 01e9736505..e2298713d4 100644
--- a/src/re.h
+++ b/src/re.h
@@ -97,7 +97,7 @@ inline bool Regex::Match(const std::string& str) {
   return std::regex_search(str, re_);
 }
 
-#else
+#elif defined(HAVE_POSIX_REGEX) || defined(HAVE_GNU_POSIX_REGEX)
 inline bool Regex::Init(const std::string& spec, std::string* error) {
   int ec = regcomp(&re_, spec.c_str(), REG_EXTENDED | REG_NOSUB);
   if (ec != 0) {
diff --git a/test/BUILD b/test/BUILD
index 6f0445d6ee..11cead53e8 100644
--- a/test/BUILD
+++ b/test/BUILD
@@ -1,3 +1,12 @@
+cc_library(
+    name = "output_test_helper",
+    srcs = [
+        "output_test.h",
+        "output_test_helper.cc",
+    ],
+    deps = ["//:benchmark"],
+)
+
 cc_binary(
     name = "basic_test",
     srcs = ["basic_test.cc"],
@@ -15,7 +24,10 @@ cc_binary(
 cc_binary(
     name = "complexity_test",
     srcs = ["complexity_test.cc"],
-    deps = ["//:benchmark"],
+    deps = [
+        ":output_test_helper",
+        "//:benchmark",
+    ],
     linkopts = ["-lm", "-pthread"],
 )
 
@@ -25,51 +37,69 @@ cc_binary(
 #     deps = ["//:benchmark"],
 # )
 
-#cc_binary(
-#    name = "diagnostics_test",
-#    srcs = ["diagnostics_test.cc"],
-#    deps = ["//:benchmark"],
-#)
-#
-#cc_binary(
-#    name = "donotoptimize_test",
-#    srcs = ["donotoptimize_test.cc"],
-#    deps = ["//:benchmark"],
-#)
-#
-#cc_binary(
-#    name = "filter_test",
-#    srcs = ["filter_test.cc"],
-#    deps = ["//:benchmark"],
-#)
-#
-#cc_binary(
-#    name = "fixture_test",
-#    srcs = ["fixture_test.cc"],
-#    deps = ["//:benchmark"],
-#)
-#
-#cc_binary(
-#    name = "map_test",
-#    srcs = ["map_test.cc"],
-#    deps = ["//:benchmark"],
-#)
-#
-#cc_binary(
-#    name = "options_test",
-#    srcs = ["options_test.cc"],
-#    deps = ["//:benchmark"],
-#)
-#
-#cc_binary(
-#    name = "reporter_output_test",
-#    srcs = ["reporter_output_test.cc"],
-#    deps = ["//:benchmark"],
-#)
-#
-#cc_binary(
-#    name = "skip_with_error_test",
-#    srcs = ["skip_with_error_test.cc"],
-#    deps = ["//:benchmark"],
-#)
-#
+cc_binary(
+    name = "diagnostics_test",
+    srcs = ["diagnostics_test.cc"],
+    deps = ["//:benchmark"],
+    linkopts = ["-lm", "-pthread"],
+)
+
+cc_binary(
+    name = "donotoptimize_test",
+    srcs = ["donotoptimize_test.cc"],
+    deps = ["//:benchmark"],
+    linkopts = ["-lm", "-pthread"],
+)
+
+cc_binary(
+    name = "filter_test",
+    srcs = ["filter_test.cc"],
+    deps = ["//:benchmark"],
+    linkopts = ["-lm", "-pthread"],
+)
+
+cc_binary(
+    name = "fixture_test",
+    srcs = ["fixture_test.cc"],
+    deps = ["//:benchmark"],
+    linkopts = ["-lm", "-pthread"],
+)
+
+cc_binary(
+    name = "map_test",
+    srcs = ["map_test.cc"],
+    deps = ["//:benchmark"],
+    linkopts = ["-lm", "-pthread"],
+)
+
+cc_binary(
+    name = "options_test",
+    srcs = ["options_test.cc"],
+    deps = ["//:benchmark"],
+    linkopts = ["-lm", "-pthread"],
+)
+
+cc_binary(
+    name = "register_benchmark_test",
+    srcs = ["register_benchmark_test.cc"],
+    deps = ["//:benchmark"],
+    linkopts = ["-lm", "-pthread"],
+)
+
+cc_binary(
+    name = "reporter_output_test",
+    srcs = ["reporter_output_test.cc"],
+    deps = [
+        ":output_test_helper",
+        "//:benchmark",
+    ],
+    linkopts = ["-lm", "-pthread"],
+)
+
+cc_binary(
+    name = "skip_with_error_test",
+    srcs = ["skip_with_error_test.cc"],
+    deps = ["//:benchmark"],
+    linkopts = ["-lm", "-pthread"],
+)
+