Skip to content

Commit 2069dc7

Browse files
Abseil Teamderekmauro
Abseil Team
authored andcommitted
Export of internal Abseil changes
-- cb68208c1ae9ca45ce48bf2b7e6cc46592a3b22d by Derek Mauro <[email protected]>: Update GoogleTest dependency and use it to mark a parameterized test as possibly unused. PiperOrigin-RevId: 313643136 -- 24f61fe25e943e78f8a1fd014c89516776943170 by Derek Mauro <[email protected]>: Internal change PiperOrigin-RevId: 313636155 -- 36c453ddf04791f8cf3d14673bacd7bbd98911fd by Gennadiy Rozental <[email protected]>: Address sanitizer should not use DYNAMIC_ANNOTATIONS_ENABLED=1 PiperOrigin-RevId: 313635651 -- 7a7a3e3888ac8ae366572ea0a2a1c62dc669cec7 by Abseil Team <[email protected]>: CMake: don't attempt to use googletest unless ABSL_RUN_TESTS==true. Fixes: abseil#690 PiperOrigin-RevId: 313477705 GitOrigin-RevId: cb68208c1ae9ca45ce48bf2b7e6cc46592a3b22d Change-Id: Ief7b31b53cdf3f79518b767d882960c1636aad23
1 parent 4832bf6 commit 2069dc7

File tree

5 files changed

+8
-9
lines changed

5 files changed

+8
-9
lines changed

Diff for: BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ licenses(["notice"]) # Apache 2.0
2020

2121
# Expose license for external usage through bazel.
2222
exports_files([
23-
"LICENSE",
2423
"AUTHORS",
24+
"LICENSE",
2525
])

Diff for: CMakeLists.txt

+1-3
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,8 @@ if(${ABSL_RUN_TESTS})
9999
# on the command line
100100
include(CTest)
101101
enable_testing()
102-
endif()
103102

104-
## check targets
105-
if(BUILD_TESTING)
103+
## check targets
106104
if (NOT ABSL_USE_EXTERNAL_GOOGLETEST)
107105
set(absl_gtest_build_dir ${CMAKE_BINARY_DIR}/googletest-build)
108106
if(${ABSL_USE_GOOGLETEST_HEAD})

Diff for: WORKSPACE

+4-4
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
1919

2020
# GoogleTest/GoogleMock framework. Used by most unit-tests.
2121
http_archive(
22-
name = "com_google_googletest",
23-
urls = ["https://github.com/google/googletest/archive/b6cd405286ed8635ece71c72f118e659f4ade3fb.zip"], # 2019-01-07
24-
strip_prefix = "googletest-b6cd405286ed8635ece71c72f118e659f4ade3fb",
25-
sha256 = "ff7a82736e158c077e76188232eac77913a15dac0b22508c390ab3f88e6d6d86",
22+
name = "com_google_googletest",
23+
urls = ["https://github.com/google/googletest/archive/011959aafddcd30611003de96cfd8d7a7685c700.zip"], # 2020-05-14T00:36:05Z
24+
strip_prefix = "googletest-011959aafddcd30611003de96cfd8d7a7685c700",
25+
sha256 = "6a5d7d63cd6e0ad2a7130471105a3b83799a7a2b14ef7ec8d742b54f01a4833c",
2626
)
2727

2828
# Google benchmark.

Diff for: absl/container/internal/unordered_map_modifiers_test.h

+2
Original file line numberDiff line numberDiff line change
@@ -286,6 +286,8 @@ class UniquePtrModifiersTest : public ::testing::Test {
286286
}
287287
};
288288

289+
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(UniquePtrModifiersTest);
290+
289291
TYPED_TEST_SUITE_P(UniquePtrModifiersTest);
290292

291293
// Test that we do not move from rvalue arguments if an insertion does not

Diff for: ci/linux_clang-latest_libcxx_asan_bazel.sh

-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ for std in ${STD}; do
7878
/usr/local/bin/bazel test ... \
7979
--compilation_mode="${compilation_mode}" \
8080
--copt="${exceptions_mode}" \
81-
--copt="-DDYNAMIC_ANNOTATIONS_ENABLED=1" \
8281
--copt="-DADDRESS_SANITIZER" \
8382
--copt="-DUNDEFINED_BEHAVIOR_SANITIZER" \
8483
--copt="-fsanitize=address" \

0 commit comments

Comments
 (0)