Export of internal Abseil changes
-- d3a10a071226497cd34be0f41cb55449193b7172 by Andy Soffer <asoffer@google.com>: Removing formatting traits that were only used internally. ON_CALL/EXPECT_CALL do a sufficient job here. PiperOrigin-RevId: 288342973 -- df8180038ea36a0876a84fdc163d1319a611f9db by Greg Falcon <gfalcon@google.com>: Add CI testing for alternate options.h settings. PiperOrigin-RevId: 288323951 GitOrigin-RevId: d3a10a071226497cd34be0f41cb55449193b7172 Change-Id: I26c75a1ededd52dd2c5a4c50e220d0b8a52d5c7c
This commit is contained in:
parent
1de0166368
commit
a048203a88
15 changed files with 72 additions and 385 deletions
27
ci/absl_types_options.h
Normal file
27
ci/absl_types_options.h
Normal file
|
@ -0,0 +1,27 @@
|
|||
#ifndef ABSL_BASE_OPTIONS_H_
|
||||
#define ABSL_BASE_OPTIONS_H_
|
||||
|
||||
// Copyright 2019 The Abseil Authors.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// https://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
// Alternate options.h file, requesting to always use Abseil implementations
|
||||
// of the workalike types, regardless of language version.
|
||||
|
||||
#define ABSL_OPTION_USE_STD_ANY 0
|
||||
#define ABSL_OPTION_USE_STD_OPTIONAL 0
|
||||
#define ABSL_OPTION_USE_STD_STRING_VIEW 0
|
||||
#define ABSL_OPTION_USE_STD_VARIANT 0
|
||||
|
||||
|
||||
#endif // ABSL_BASE_OPTIONS_H_
|
|
@ -55,7 +55,8 @@ for std in ${STD}; do
|
|||
for exceptions_mode in ${EXCEPTIONS_MODE}; do
|
||||
echo "--------------------------------------------------------------------"
|
||||
time docker run \
|
||||
--volume="${ABSEIL_ROOT}:/abseil-cpp:ro" \
|
||||
--volume="${ABSEIL_ROOT}:/abseil-cpp-ro:ro" \
|
||||
--tmpfs=/abseil-cpp \
|
||||
--workdir=/abseil-cpp \
|
||||
--cap-add=SYS_PTRACE \
|
||||
--rm \
|
||||
|
@ -66,18 +67,23 @@ for std in ${STD}; do
|
|||
-e CPLUS_INCLUDE_PATH="/opt/llvm/libcxx/include/c++/v1" \
|
||||
${DOCKER_EXTRA_ARGS:-} \
|
||||
${DOCKER_CONTAINER} \
|
||||
/usr/local/bin/bazel test ... \
|
||||
--compilation_mode="${compilation_mode}" \
|
||||
--copt="${exceptions_mode}" \
|
||||
--copt=-Werror \
|
||||
--define="absl=1" \
|
||||
--keep_going \
|
||||
--show_timestamps \
|
||||
--test_env="GTEST_INSTALL_FAILURE_SIGNAL_HANDLER=1" \
|
||||
--test_env="TZDIR=/abseil-cpp/absl/time/internal/cctz/testdata/zoneinfo" \
|
||||
--test_output=errors \
|
||||
--test_tag_filters=-benchmark \
|
||||
${BAZEL_EXTRA_ARGS:-}
|
||||
/bin/sh -c "
|
||||
cp -r /abseil-cpp-ro/* /abseil-cpp/
|
||||
if [ -n \"${ALTERNATE_OPTIONS:-}\" ]; then
|
||||
cp ${ALTERNATE_OPTIONS:-} absl/base/options.h || exit 1
|
||||
fi
|
||||
/usr/local/bin/bazel test ... \
|
||||
--compilation_mode=\"${compilation_mode}\" \
|
||||
--copt=\"${exceptions_mode}\" \
|
||||
--copt=-Werror \
|
||||
--define=\"absl=1\" \
|
||||
--keep_going \
|
||||
--show_timestamps \
|
||||
--test_env=\"GTEST_INSTALL_FAILURE_SIGNAL_HANDLER=1\" \
|
||||
--test_env=\"TZDIR=/abseil-cpp/absl/time/internal/cctz/testdata/zoneinfo\" \
|
||||
--test_output=errors \
|
||||
--test_tag_filters=-benchmark \
|
||||
${BAZEL_EXTRA_ARGS:-}"
|
||||
done
|
||||
done
|
||||
done
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue