Commit d9a31a2d by Abseil Team Committed by Andy Getz

Export of internal Abseil changes

--
45c3adace0020bb705e04d254f7b3f914d2ba2e6 by Abseil Team <absl-team@google.com>:

Cleanup CordRepRing unit tests

PiperOrigin-RevId: 365848947

--
3d16aae1a4a20666151d8a5ebfd48a2777053b75 by Derek Mauro <dmauro@google.com>:

Internal change

PiperOrigin-RevId: 365830995

--
298f2de7061f21fb94b4bc715bbadef37732d1fa by Derek Mauro <dmauro@google.com>:

Internal change

PiperOrigin-RevId: 365830862

--
540c6f4b8f4443d3bb969e566761760813b17545 by Derek Mauro <dmauro@google.com>:

Upgrade MacOS CI to use Bazel 3.7.0

PiperOrigin-RevId: 365825990

--
8b09ef04a1061038a982c3ff29dc7c8a28364f5f by Abseil Team <absl-team@google.com>:

internal change

PiperOrigin-RevId: 365819242
GitOrigin-RevId: 45c3adace0020bb705e04d254f7b3f914d2ba2e6
Change-Id: I3b2bebd212a41d0c0dda56fefb455240408cc461
parent 9fde5a6e
...@@ -36,7 +36,9 @@ TEST(StatusCode, InsertionOperator) { ...@@ -36,7 +36,9 @@ TEST(StatusCode, InsertionOperator) {
// its creator, and its classifier. // its creator, and its classifier.
struct ErrorTest { struct ErrorTest {
absl::StatusCode code; absl::StatusCode code;
using Creator = absl::Status (*)(absl::string_view); using Creator = absl::Status (*)(
absl::string_view
);
using Classifier = bool (*)(const absl::Status&); using Classifier = bool (*)(const absl::Status&);
Creator creator; Creator creator;
Classifier classifier; Classifier classifier;
...@@ -78,7 +80,9 @@ TEST(Status, CreateAndClassify) { ...@@ -78,7 +80,9 @@ TEST(Status, CreateAndClassify) {
// expected error code and message. // expected error code and message.
std::string message = std::string message =
absl::StrCat("error code ", test.code, " test message"); absl::StrCat("error code ", test.code, " test message");
absl::Status status = test.creator(message); absl::Status status = test.creator(
message
);
EXPECT_EQ(test.code, status.code()); EXPECT_EQ(test.code, status.code());
EXPECT_EQ(message, status.message()); EXPECT_EQ(message, status.message());
......
...@@ -24,7 +24,7 @@ if [[ -z ${ABSEIL_ROOT:-} ]]; then ...@@ -24,7 +24,7 @@ if [[ -z ${ABSEIL_ROOT:-} ]]; then
fi fi
# If we are running on Kokoro, check for a versioned Bazel binary. # If we are running on Kokoro, check for a versioned Bazel binary.
KOKORO_GFILE_BAZEL_BIN="bazel-2.0.0-darwin-x86_64" KOKORO_GFILE_BAZEL_BIN="bazel-3.7.0-darwin-x86_64"
if [[ ${KOKORO_GFILE_DIR:-} ]] && [[ -f ${KOKORO_GFILE_DIR}/${KOKORO_GFILE_BAZEL_BIN} ]]; then if [[ ${KOKORO_GFILE_DIR:-} ]] && [[ -f ${KOKORO_GFILE_DIR}/${KOKORO_GFILE_BAZEL_BIN} ]]; then
BAZEL_BIN="${KOKORO_GFILE_DIR}/${KOKORO_GFILE_BAZEL_BIN}" BAZEL_BIN="${KOKORO_GFILE_DIR}/${KOKORO_GFILE_BAZEL_BIN}"
chmod +x ${BAZEL_BIN} chmod +x ${BAZEL_BIN}
......
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