Merge 0d7c330 into 6ecf8a8

jmillikin-stripe · web-flow · commit 37eee8aac900 · 2018-02-21T04:52:07.000Z
diff --git a/.gitignore b/.gitignore
@@ -41,6 +41,9 @@ build.ninja
 install_manifest.txt
 rules.ninja
 
+# bazel output symlinks.
+bazel-*
+
 # out-of-source build top-level folders.
 build/
 _build/
diff --git a/.travis.yml b/.travis.yml
@@ -159,11 +159,20 @@ install:
       brew update;
       brew install gcc@7;
     fi
+  - if [ "{TRAVIS_OS_NAME}" == "linux" ]; then
+      wget https://github.com/bazelbuild/bazel/releases/download/0.10.1/bazel-0.10.1-installer-linux-x86_64.sh --output-document bazel-installer.sh;
+      sudo bash bazel-installer.sh;
+    fi
+  - if [ "{TRAVIS_OS_NAME}" == "osx" ]; then
+      curl -o bazel-installer.sh https://github.com/bazelbuild/bazel/releases/download/0.10.1/bazel-0.10.1-installer-darwin-x86_64.sh;
+      sudo bash bazel-installer.sh;
+    fi
 
 script:
   - cmake -DCMAKE_C_COMPILER=${C_COMPILER} -DCMAKE_CXX_COMPILER=${COMPILER} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_CXX_FLAGS="${EXTRA_FLAGS}" -DBENCHMARK_DOWNLOAD_DEPENDENCIES=ON -DBENCHMARK_BUILD_32_BITS=${BUILD_32_BITS} ..
   - make
   - ctest -C ${BUILD_TYPE} --output-on-failure
+  - bazel test -c dbg --announce_rc --verbose_failures --test_output=errors --keep_going //...
 
 after_success:
   - if [ "${BUILD_TYPE}" == "Coverage" -a "${TRAVIS_OS_NAME}" == "linux" ]; then
diff --git a/AUTHORS b/AUTHORS
@@ -38,6 +38,7 @@ Radoslav Yovchev <radoslav.tm@gmail.com>
 Roman Lebedev <lebedev.ri@gmail.com>
 Shuo Chen <chenshuo@chenshuo.com>
 Steinar H. Gunderson <sgunderson@bigfoot.com>
+Stripe, Inc.
 Yixuan Qiu <yixuanq@gmail.com>
 Yusuke Suzuki <utatane.tea@gmail.com>
 Zbigniew Skowron <zbychs@gmail.com>
diff --git a/BUILD.bazel b/BUILD.bazel
@@ -0,0 +1,19 @@
+licenses(["notice"])
+
+cc_library(
+    name = "benchmark",
+    srcs = glob([
+        "src/*.cc",
+        "src/*.h",
+    ]),
+    hdrs = ["include/benchmark/benchmark.h"],
+    copts = ["-DHAVE_STD_REGEX"],
+    strip_include_prefix = "include",
+    visibility = ["//visibility:public"],
+)
+
+cc_library(
+    name = "benchmark_internal_headers",
+    hdrs = glob(["src/*.h"]),
+    visibility = ["//test:__pkg__"],
+)
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
@@ -38,6 +38,7 @@ Ismael Jimenez Martinez <ismael.jimenez.martinez@gmail.com>
 Jern-Kuan Leong <jernkuan@gmail.com>
 JianXiong Zhou <zhoujianxiong2@gmail.com>
 Joao Paulo Magalhaes <joaoppmagalhaes@gmail.com>
+John Millikin <jmillikin@stripe.com>
 Jussi Knuuttila <jussi.knuuttila@gmail.com>
 Kai Wolf <kai.wolf@gmail.com>
 Kishan Kumar <kumar.kishan@outlook.com>
diff --git a/WORKSPACE b/WORKSPACE
@@ -0,0 +1,7 @@
+load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
+
+git_repository(
+    name = "com_google_googletest",
+    commit = "3f0cf6b62ad1eb50d8736538363d3580dd640c3e",  # HEAD
+    remote = "https://github.com/google/googletest",
+)
diff --git a/test/BUILD b/test/BUILD
@@ -0,0 +1,46 @@
+NEEDS_GTEST_MAIN = [
+    "statistics_test.cc",
+]
+
+TEST_COPTS = [
+    "-pedantic",
+    "-pedantic-errors",
+    "-std=c++11",
+    "-DHAVE_STD_REGEX",
+]
+
+TEST_ARGS = ["--benchmark_min_time=0.01"]
+
+cc_library(
+    name = "output_test_helper",
+    testonly = 1,
+    srcs = ["output_test_helper.cc"],
+    hdrs = ["output_test.h"],
+    copts = TEST_COPTS,
+    deps = [
+        "//:benchmark",
+        "//:benchmark_internal_headers",
+    ],
+)
+
+[cc_test(
+    name = test_src[:-len(".cc")],
+    size = "small",
+    srcs = [test_src],
+    args = TEST_ARGS + ({
+        "user_counters_tabular_test.cc": ["--benchmark_counters_tabular=true"],
+    }).get(test_src, []),
+    copts = TEST_COPTS + ({
+        "cxx03_test.cc": ["-std=c++03"],
+        # Some of the issues with DoNotOptimize only occur when optimization is enabled
+        "donotoptimize_test.cc": ["-O3"],
+    }).get(test_src, []),
+    deps = [
+        ":output_test_helper",
+        "//:benchmark",
+        "//:benchmark_internal_headers",
+        "@com_google_googletest//:gtest",
+    ] + (
+        ["@com_google_googletest//:gtest_main"] if (test_src in NEEDS_GTEST_MAIN) else []
+    ),
+) for test_src in glob(["*_test.cc"])]
