Commit 309de598 by Paul Wankadia Committed by Dominic Hamon

Switch to Starlark for C++ rules. (#887)

While I'm here, format all of the files that I touched.
parent f4f5dba4
...@@ -8,6 +8,8 @@ config_setting( ...@@ -8,6 +8,8 @@ config_setting(
visibility = [":__subpackages__"], visibility = [":__subpackages__"],
) )
load("@rules_cc//cc:defs.bzl", "cc_library")
cc_library( cc_library(
name = "benchmark", name = "benchmark",
srcs = glob( srcs = glob(
......
...@@ -3,7 +3,13 @@ workspace(name = "com_github_google_benchmark") ...@@ -3,7 +3,13 @@ workspace(name = "com_github_google_benchmark")
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
http_archive( http_archive(
name = "rules_cc",
strip_prefix = "rules_cc-a508235df92e71d537fcbae0c7c952ea6957a912",
urls = ["https://github.com/bazelbuild/rules_cc/archive/a508235df92e71d537fcbae0c7c952ea6957a912.zip"],
)
http_archive(
name = "com_google_googletest", name = "com_google_googletest",
urls = ["https://github.com/google/googletest/archive/3f0cf6b62ad1eb50d8736538363d3580dd640c3e.zip"],
strip_prefix = "googletest-3f0cf6b62ad1eb50d8736538363d3580dd640c3e", strip_prefix = "googletest-3f0cf6b62ad1eb50d8736538363d3580dd640c3e",
urls = ["https://github.com/google/googletest/archive/3f0cf6b62ad1eb50d8736538363d3580dd640c3e.zip"],
) )
...@@ -5,7 +5,7 @@ TEST_COPTS = [ ...@@ -5,7 +5,7 @@ TEST_COPTS = [
"-Wall", "-Wall",
"-Wextra", "-Wextra",
"-Wshadow", "-Wshadow",
# "-Wshorten-64-to-32", # "-Wshorten-64-to-32",
"-Wfloat-equal", "-Wfloat-equal",
"-fstrict-aliasing", "-fstrict-aliasing",
] ]
...@@ -16,13 +16,14 @@ PER_SRC_COPTS = ({ ...@@ -16,13 +16,14 @@ PER_SRC_COPTS = ({
"donotoptimize_test.cc": ["-O3"], "donotoptimize_test.cc": ["-O3"],
}) })
TEST_ARGS = ["--benchmark_min_time=0.01"] TEST_ARGS = ["--benchmark_min_time=0.01"]
PER_SRC_TEST_ARGS = ({ PER_SRC_TEST_ARGS = ({
"user_counters_tabular_test.cc": ["--benchmark_counters_tabular=true"], "user_counters_tabular_test.cc": ["--benchmark_counters_tabular=true"],
}) })
load("@rules_cc//cc:defs.bzl", "cc_library", "cc_test")
cc_library( cc_library(
name = "output_test_helper", name = "output_test_helper",
testonly = 1, testonly = 1,
...@@ -53,7 +54,14 @@ cc_library( ...@@ -53,7 +54,14 @@ cc_library(
# FIXME: Add support for assembly tests to bazel. # FIXME: Add support for assembly tests to bazel.
# See Issue #556 # See Issue #556
# https://github.com/google/benchmark/issues/556 # https://github.com/google/benchmark/issues/556
) for test_src in glob(["*test.cc"], exclude = ["*_assembly_test.cc", "link_main_test.cc"]) )
for test_src in glob(
["*test.cc"],
exclude = [
"*_assembly_test.cc",
"link_main_test.cc",
],
)
] ]
cc_test( cc_test(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment