From 7aacab8ae05d7115049923da9cfbf584dc1f8338 Mon Sep 17 00:00:00 2001
From: Abseil Team <absl-team@google.com>
Date: Thu, 31 May 2018 12:26:35 -0700
Subject:   - e2f6b8ac647271815b4fed2991f405524dd762c3 Release cctz
 microbenchmarks. by Alex Strelnikov <strel@google.com>   -
 924ba2a3f9fca695d73c6bf491d20669e2b96b8e Changed RawPtr to use
 std::addressof() instead of operato... by Abseil Team <absl-team@google.com> 
  - e8cf67f9fa74d4c5632da35547025ad2301c6819 Import of CCTZ from GitHub. by
 Alex Strelnikov <strel@google.com>   -
 2ece8a96611afcddd7b91e0197dadb896248250c Abandon ".inc" files in favor of
 ".h" headers. by Jorg Brown <jorg@google.com>   -
 37f5ed5da4058f90fb3e6a2733fce5b1fd0aaedf Add exception safety tests for
 absl::optional<T> by Abseil Team <absl-team@google.com>   -
 337f995a866b8f905f64ca6b271b5fec8f248a60 Update WORKSPACE to grab specific
 commits of dependencies... by Alex Strelnikov <strel@google.com>   -
 93e5b134607a554993387ad913e6c1621606004b Release Charmap microbenchmark. by
 Alex Strelnikov <strel@google.com>   -
 95c2e29b6d93ec1334484ee37d91f63101c45307 Release OStringStream
 microbenchmarks. by Alex Strelnikov <strel@google.com>   -
 250f51839ed26dd1e6b658d35aa291413e5f4825 Internal change by Greg Falcon
 <gfalcon@google.com>   - ce34900fa3d1a95a8446bc943cdd801fac95be25 Improve
 compatibility of cctz cc_test targets for portabl... by Shaindel Schwartz
 <shaindel@google.com>   - ce7e31dbf2c1ee93c79aae5b7dc7c603cb4babcf Improve
 portability of cc_tests. (Mark more tests that ca... by Abseil Team
 <absl-team@google.com>   - dfcd4e455923703c1a1dcd523c5f915f7990fa2a Accept
 strings with custom allocators as arguments to abs... by Greg Falcon
 <gfalcon@google.com>   - 2946b41ed3d5b8b5a8dc11182e443cf1ab6e3bde Link
 against benchmark_main instead of using BENCHMARK_MA... by Alex Strelnikov
 <strel@google.com>   - f09de9e03bf8edd363069c4b352d8009423f531c Adds link to
 doc about the formats allowed by SimpleAtof(... by Greg Miller
 <jgm@google.com>   - 59b0977e7a308e0800277886cf60226b2cc426a1 Simplify the
 HideMask() calculation so that it doesn't us... by Jorg Brown
 <jorg@google.com>

GitOrigin-RevId: e2f6b8ac647271815b4fed2991f405524dd762c3
Change-Id: Ib9c8547ed7fe217fad6cb3ab1362e96181aa5cfa
---
 absl/synchronization/BUILD.bazel                       | 4 ++--
 absl/synchronization/internal/graphcycles_benchmark.cc | 2 --
 absl/synchronization/mutex_benchmark.cc                | 2 --
 3 files changed, 2 insertions(+), 6 deletions(-)

(limited to 'absl/synchronization')

diff --git a/absl/synchronization/BUILD.bazel b/absl/synchronization/BUILD.bazel
index 2502c53f..123536ea 100644
--- a/absl/synchronization/BUILD.bazel
+++ b/absl/synchronization/BUILD.bazel
@@ -130,7 +130,7 @@ cc_test(
     deps = [
         ":graphcycles_internal",
         "//absl/base",
-        "@com_github_google_benchmark//:benchmark",
+        "@com_github_google_benchmark//:benchmark_main",
     ],
 )
 
@@ -176,7 +176,7 @@ cc_test(
         ":synchronization",
         ":thread_pool",
         "//absl/base",
-        "@com_github_google_benchmark//:benchmark",
+        "@com_github_google_benchmark//:benchmark_main",
     ],
 )
 
diff --git a/absl/synchronization/internal/graphcycles_benchmark.cc b/absl/synchronization/internal/graphcycles_benchmark.cc
index b4a1debe..a239c25c 100644
--- a/absl/synchronization/internal/graphcycles_benchmark.cc
+++ b/absl/synchronization/internal/graphcycles_benchmark.cc
@@ -42,5 +42,3 @@ void BM_StressTest(benchmark::State& state) {
 BENCHMARK(BM_StressTest)->Range(2048, 1048576);
 
 }  // namespace
-
-BENCHMARK_MAIN();
diff --git a/absl/synchronization/mutex_benchmark.cc b/absl/synchronization/mutex_benchmark.cc
index d91071b7..30a52355 100644
--- a/absl/synchronization/mutex_benchmark.cc
+++ b/absl/synchronization/mutex_benchmark.cc
@@ -92,5 +92,3 @@ BENCHMARK(BM_ContendedMutex)->Threads(1);
 BENCHMARK(BM_ContendedMutex)->ThreadPerCpu();
 
 }  // namespace
-
-BENCHMARK_MAIN();
-- 
cgit v1.2.3