summaryrefslogtreecommitdiff
path: root/absl/synchronization
diff options
context:
space:
mode:
authorGravatar Abseil Team <absl-team@google.com>2017-10-02 09:45:23 -0700
committerGravatar vslashg <gfalcon@google.com>2017-10-02 14:43:19 -0400
commit9c4178d13e84acf3f0d1b8aeee1f67862aeeadc9 (patch)
tree1aa4f76ba354cfc298e80bc4a55c26e8795c56ed /absl/synchronization
parent8d8dcb0ae550fbfdbd7392a3c9d2c5c596bdcde3 (diff)
Changes imported from Abseil "staging" branch:
- 1a906f90b303c6fbac292f4883186a27e7c6476c Increase the mutex_test timeout (by removing the timeout ... by Derek Mauro <dmauro@google.com> - cfc1d3e56727e5b3a41b7d9dfc513f692ac0edd6 Require iOS 9.0 for ABSL_HAVE_THREAD_LOCAL. by Matt Armstrong <marmstrong@google.com> - 22dc24504ac6fbd2a22f5d45a4bd00fe14d500c3 Fix indentation by Jorg Brown <jorg@google.com> GitOrigin-RevId: 1a906f90b303c6fbac292f4883186a27e7c6476c Change-Id: Id6075001460bd6b9ce973897544269fa4103fee8
Diffstat (limited to 'absl/synchronization')
-rw-r--r--absl/synchronization/BUILD.bazel1
1 files changed, 0 insertions, 1 deletions
diff --git a/absl/synchronization/BUILD.bazel b/absl/synchronization/BUILD.bazel
index 7efc67e6..cc8cecf9 100644
--- a/absl/synchronization/BUILD.bazel
+++ b/absl/synchronization/BUILD.bazel
@@ -129,7 +129,6 @@ cc_library(
cc_test(
name = "mutex_test",
size = "large",
- timeout = "moderate",
srcs = ["mutex_test.cc"],
copts = ABSL_TEST_COPTS,
tags = [