Skip to content

Commit

Permalink
Disable C++11 testing, enable C++14 and C++20 in some configurations
Browse files Browse the repository at this point in the history
where it wasn't enabled

PiperOrigin-RevId: 459092217
Change-Id: I4500bba8a09f4b320610a8170a26e93fdf7e0cab
  • Loading branch information
derekmauro authored and copybara-github committed Jul 5, 2022
1 parent f4988f5 commit 4bbdb02
Show file tree
Hide file tree
Showing 10 changed files with 11 additions and 10 deletions.
2 changes: 1 addition & 1 deletion ci/linux_clang-latest_libcxx_asan_bazel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ if [[ -z ${ABSEIL_ROOT:-} ]]; then
fi

if [[ -z ${STD:-} ]]; then
STD="c++11 c++14 c++17 c++20"
STD="c++14 c++17 c++20"
fi

if [[ -z ${COMPILATION_MODE:-} ]]; then
Expand Down
2 changes: 1 addition & 1 deletion ci/linux_clang-latest_libcxx_bazel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ if [[ -z ${ABSEIL_ROOT:-} ]]; then
fi

if [[ -z ${STD:-} ]]; then
STD="c++11 c++14 c++17 c++20"
STD="c++14 c++17 c++20"
fi

if [[ -z ${COMPILATION_MODE:-} ]]; then
Expand Down
2 changes: 1 addition & 1 deletion ci/linux_clang-latest_libcxx_tsan_bazel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ if [[ -z ${ABSEIL_ROOT:-} ]]; then
fi

if [[ -z ${STD:-} ]]; then
STD="c++11 c++14 c++17 c++20"
STD="c++14 c++17 c++20"
fi

if [[ -z ${COMPILATION_MODE:-} ]]; then
Expand Down
2 changes: 1 addition & 1 deletion ci/linux_clang-latest_libstdcxx_bazel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ if [[ -z ${ABSEIL_ROOT:-} ]]; then
fi

if [[ -z ${STD:-} ]]; then
STD="c++11 c++14 c++17"
STD="c++14 c++17"
fi

if [[ -z ${COMPILATION_MODE:-} ]]; then
Expand Down
2 changes: 1 addition & 1 deletion ci/linux_gcc-floor_libstdcxx_bazel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ if [[ -z ${ABSEIL_ROOT:-} ]]; then
fi

if [[ -z ${STD:-} ]]; then
STD="c++11 c++14"
STD="c++14"
fi

if [[ -z ${COMPILATION_MODE:-} ]]; then
Expand Down
2 changes: 1 addition & 1 deletion ci/linux_gcc-latest_libstdcxx_bazel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ if [[ -z ${ABSEIL_ROOT:-} ]]; then
fi

if [[ -z ${STD:-} ]]; then
STD="c++11 c++14 c++17 c++20"
STD="c++14 c++17 c++20"
fi

if [[ -z ${COMPILATION_MODE:-} ]]; then
Expand Down
2 changes: 1 addition & 1 deletion ci/linux_gcc-latest_libstdcxx_cmake.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ fi
source "${ABSEIL_ROOT}/ci/cmake_common.sh"

if [[ -z ${ABSL_CMAKE_CXX_STANDARDS:-} ]]; then
ABSL_CMAKE_CXX_STANDARDS="11 14 17 20"
ABSL_CMAKE_CXX_STANDARDS="14 17 20"
fi

if [[ -z ${ABSL_CMAKE_BUILD_TYPES:-} ]]; then
Expand Down
2 changes: 1 addition & 1 deletion ci/linux_gcc_alpine_cmake.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ fi
source "${ABSEIL_ROOT}/ci/cmake_common.sh"

if [[ -z ${ABSL_CMAKE_CXX_STANDARDS:-} ]]; then
ABSL_CMAKE_CXX_STANDARDS="11 14 17"
ABSL_CMAKE_CXX_STANDARDS="14 17"
fi

if [[ -z ${ABSL_CMAKE_BUILD_TYPES:-} ]]; then
Expand Down
3 changes: 2 additions & 1 deletion ci/macos_xcode_bazel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@ fi

${BAZEL_BIN} test ... \
--copt="-DGTEST_REMOVE_LEGACY_TEST_CASEAPI_=1" \
--copt=-Werror \
--copt="-Werror" \
--cxxopt="-std=c++14" \
--keep_going \
--show_timestamps \
--test_env="TZDIR=${ABSEIL_ROOT}/absl/time/internal/cctz/testdata/zoneinfo" \
Expand Down
2 changes: 1 addition & 1 deletion ci/macos_xcode_cmake.sh
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ for compilation_mode in ${ABSL_CMAKE_BUILD_TYPES}; do
-DBUILD_SHARED_LIBS=${build_shared} \
-DABSL_BUILD_TESTING=ON \
-DCMAKE_BUILD_TYPE=${compilation_mode} \
-DCMAKE_CXX_STANDARD=11 \
-DCMAKE_CXX_STANDARD=14 \
-DCMAKE_MODULE_LINKER_FLAGS="-Wl,--no-undefined" \
-DABSL_GOOGLETEST_DOWNLOAD_URL="${ABSL_GOOGLETEST_DOWNLOAD_URL}"
time cmake --build .
Expand Down

0 comments on commit 4bbdb02

Please sign in to comment.