Chiebot-Mirror
/
grpc
mirror of https://github.com/grpc/grpc.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #19535 from chwarr/benchmark-rebased

Browse Source 
Update Google Benchmark v1.5.0 to get CMake < 3.6 fix
pull/20162/head
Nicolas Noble 5 years ago committed by GitHub
parent 7b31862c44 0ee7a3ae93
commit aa203db416
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      Makefile
  2. 6
      bazel/grpc_deps.bzl
  3. 3
      grpc.gyp
  4. 2
      third_party/benchmark
  5. 2
      tools/run_tests/sanity/check_submodules.sh

3
Makefile
Unescape View File

@ -8029,8 +8029,11 @@ endif
LIBBENCHMARK_SRC = \ LIBBENCHMARK_SRC = \
third_party/benchmark/src/benchmark.cc \ third_party/benchmark/src/benchmark.cc \
third_party/benchmark/src/benchmark_api_internal.cc \
third_party/benchmark/src/benchmark_main.cc \ third_party/benchmark/src/benchmark_main.cc \
third_party/benchmark/src/benchmark_name.cc \
third_party/benchmark/src/benchmark_register.cc \ third_party/benchmark/src/benchmark_register.cc \
third_party/benchmark/src/benchmark_runner.cc \
third_party/benchmark/src/colorprint.cc \ third_party/benchmark/src/colorprint.cc \
third_party/benchmark/src/commandlineflags.cc \ third_party/benchmark/src/commandlineflags.cc \
third_party/benchmark/src/complexity.cc \ third_party/benchmark/src/complexity.cc \

6
bazel/grpc_deps.bzl
Unescape View File

@ -151,9 +151,9 @@ def grpc_deps():
if "com_github_google_benchmark" not in native.existing_rules(): if "com_github_google_benchmark" not in native.existing_rules():
http_archive( http_archive(
name = "com_github_google_benchmark", name = "com_github_google_benchmark",
sha256 = "c7682e9007ddfd94072647abab3e89ffd9084089460ae47d67060974467b58bf", sha256 = "f68aec93154d010324c05bcd8c5cc53468b87af88d87acb5ddcfaa1bba044837",
strip_prefix = "benchmark-e776aa0275e293707b6a0901e0e8d8a8a3679508", strip_prefix = "benchmark-090faecb454fbd6e6e17a75ef8146acb037118d4",
url = "https://github.com/google/benchmark/archive/e776aa0275e293707b6a0901e0e8d8a8a3679508.tar.gz", url = "https://github.com/google/benchmark/archive/090faecb454fbd6e6e17a75ef8146acb037118d4.tar.gz",
) )
if "com_github_cares_cares" not in native.existing_rules(): if "com_github_cares_cares" not in native.existing_rules():

3
grpc.gyp
Unescape View File

@ -2270,8 +2270,11 @@
], ],
'sources': [ 'sources': [
'third_party/benchmark/src/benchmark.cc', 'third_party/benchmark/src/benchmark.cc',
'third_party/benchmark/src/benchmark_api_internal.cc',
'third_party/benchmark/src/benchmark_main.cc', 'third_party/benchmark/src/benchmark_main.cc',
'third_party/benchmark/src/benchmark_name.cc',
'third_party/benchmark/src/benchmark_register.cc', 'third_party/benchmark/src/benchmark_register.cc',
'third_party/benchmark/src/benchmark_runner.cc',
'third_party/benchmark/src/colorprint.cc', 'third_party/benchmark/src/colorprint.cc',
'third_party/benchmark/src/commandlineflags.cc', 'third_party/benchmark/src/commandlineflags.cc',
'third_party/benchmark/src/complexity.cc', 'third_party/benchmark/src/complexity.cc',

2
third_party/benchmark vendored

@ -1 +1 @@
Subproject commit e776aa0275e293707b6a0901e0e8d8a8a3679508 Subproject commit 090faecb454fbd6e6e17a75ef8146acb037118d4

2
tools/run_tests/sanity/check_submodules.sh
Unescape View File

@ -27,7 +27,7 @@ want_submodules=$(mktemp /tmp/submXXXXXX)
git submodule | awk '{ print $1 }' | sort > "$submodules" git submodule | awk '{ print $1 }' | sort > "$submodules"
cat << EOF | awk '{ print $1 }' | sort > "$want_submodules" cat << EOF | awk '{ print $1 }' | sort > "$want_submodules"
74d91756c11bc22f9b0108b94da9326f7f9e376f third_party/abseil-cpp (74d9175) 74d91756c11bc22f9b0108b94da9326f7f9e376f third_party/abseil-cpp (74d9175)
e776aa0275e293707b6a0901e0e8d8a8a3679508 third_party/benchmark (v1.2.0) 090faecb454fbd6e6e17a75ef8146acb037118d4 third_party/benchmark (v1.5.0)
73594cde8c9a52a102c4341c244c833aa61b9c06 third_party/bloaty (remotes/origin/wide-14-g73594cd) 73594cde8c9a52a102c4341c244c833aa61b9c06 third_party/bloaty (remotes/origin/wide-14-g73594cd)
b29b21a81b32ec273f118f589f46d56ad3332420 third_party/boringssl (remotes/origin/chromium-stable) b29b21a81b32ec273f118f589f46d56ad3332420 third_party/boringssl (remotes/origin/chromium-stable)
afc30d43eef92979b05776ec0963c9cede5fb80f third_party/boringssl-with-bazel (fips-20180716-116-gafc30d43e) afc30d43eef92979b05776ec0963c9cede5fb80f third_party/boringssl-with-bazel (fips-20180716-116-gafc30d43e)

Write Preview
Loading…
Cancel
Save