Export of internal Abseil changes

--
121db1a08321eaa3006726cc32b459cf17880e35 by Derek Mauro <dmauro@google.com>:

Internal change

PiperOrigin-RevId: 425707805

--
0dec484389bbb75aae0a412146e3564bf833a739 by Derek Mauro <dmauro@google.com>:

macOS CI: Avoid depending on external sites like GitHub by prepopulating
dependencies and setting --distdir

Our Linux CI does this, but for some reason was never enabled on macOS

PiperOrigin-RevId: 425668638
GitOrigin-RevId: 121db1a08321eaa3006726cc32b459cf17880e35
Change-Id: Id51645df90b6a0808dd5b18eb636a10f798e24ea
pull/1110/head
Abseil Team 3 years ago committed by Derek Mauro
parent 63d26fad49
commit 5202173ca7
  1. 8
      absl/container/internal/inlined_vector.h
  2. 10
      ci/macos_xcode_bazel.sh

@ -925,8 +925,8 @@ auto Storage<T, N, A>::Swap(Storage* other_storage_ptr) -> void {
inlined_ptr->GetSize()); inlined_ptr->GetSize());
} }
ABSL_INTERNAL_CATCH_ANY { ABSL_INTERNAL_CATCH_ANY {
allocated_ptr->SetAllocation( allocated_ptr->SetAllocation(Allocation<A>{
{allocated_storage_view.data, allocated_storage_view.capacity}); allocated_storage_view.data, allocated_storage_view.capacity});
ABSL_INTERNAL_RETHROW; ABSL_INTERNAL_RETHROW;
} }
@ -934,8 +934,8 @@ auto Storage<T, N, A>::Swap(Storage* other_storage_ptr) -> void {
inlined_ptr->GetInlinedData(), inlined_ptr->GetInlinedData(),
inlined_ptr->GetSize()); inlined_ptr->GetSize());
inlined_ptr->SetAllocation( inlined_ptr->SetAllocation(Allocation<A>{allocated_storage_view.data,
{allocated_storage_view.data, allocated_storage_view.capacity}); allocated_storage_view.capacity});
} }
swap(GetSizeAndIsAllocated(), other_storage_ptr->GetSizeAndIsAllocated()); swap(GetSizeAndIsAllocated(), other_storage_ptr->GetSizeAndIsAllocated());

@ -32,6 +32,13 @@ else
BAZEL_BIN="bazel" BAZEL_BIN="bazel"
fi fi
# Avoid depending on external sites like GitHub by checking --distdir for
# external dependencies first.
# https://docs.bazel.build/versions/master/guide.html#distdir
if [[ ${KOKORO_GFILE_DIR:-} ]] && [[ -d "${KOKORO_GFILE_DIR}/distdir" ]]; then
BAZEL_EXTRA_ARGS="--distdir=${KOKORO_GFILE_DIR}/distdir ${BAZEL_EXTRA_ARGS:-}"
fi
# Print the compiler and Bazel versions. # Print the compiler and Bazel versions.
echo "---------------" echo "---------------"
gcc -v gcc -v
@ -52,4 +59,5 @@ ${BAZEL_BIN} test ... \
--show_timestamps \ --show_timestamps \
--test_env="TZDIR=${ABSEIL_ROOT}/absl/time/internal/cctz/testdata/zoneinfo" \ --test_env="TZDIR=${ABSEIL_ROOT}/absl/time/internal/cctz/testdata/zoneinfo" \
--test_output=errors \ --test_output=errors \
--test_tag_filters=-benchmark --test_tag_filters=-benchmark \
${BAZEL_EXTRA_ARGS:-}

Loading…
Cancel
Save