Commit 4bbdb026 by Derek Mauro Committed by Copybara-Service

Disable C++11 testing, enable C++14 and C++20 in some configurations

where it wasn't enabled

PiperOrigin-RevId: 459092217
Change-Id: I4500bba8a09f4b320610a8170a26e93fdf7e0cab
parent f4988f5b
...@@ -25,7 +25,7 @@ if [[ -z ${ABSEIL_ROOT:-} ]]; then ...@@ -25,7 +25,7 @@ if [[ -z ${ABSEIL_ROOT:-} ]]; then
fi fi
if [[ -z ${STD:-} ]]; then if [[ -z ${STD:-} ]]; then
STD="c++11 c++14 c++17 c++20" STD="c++14 c++17 c++20"
fi fi
if [[ -z ${COMPILATION_MODE:-} ]]; then if [[ -z ${COMPILATION_MODE:-} ]]; then
......
...@@ -25,7 +25,7 @@ if [[ -z ${ABSEIL_ROOT:-} ]]; then ...@@ -25,7 +25,7 @@ if [[ -z ${ABSEIL_ROOT:-} ]]; then
fi fi
if [[ -z ${STD:-} ]]; then if [[ -z ${STD:-} ]]; then
STD="c++11 c++14 c++17 c++20" STD="c++14 c++17 c++20"
fi fi
if [[ -z ${COMPILATION_MODE:-} ]]; then if [[ -z ${COMPILATION_MODE:-} ]]; then
......
...@@ -25,7 +25,7 @@ if [[ -z ${ABSEIL_ROOT:-} ]]; then ...@@ -25,7 +25,7 @@ if [[ -z ${ABSEIL_ROOT:-} ]]; then
fi fi
if [[ -z ${STD:-} ]]; then if [[ -z ${STD:-} ]]; then
STD="c++11 c++14 c++17 c++20" STD="c++14 c++17 c++20"
fi fi
if [[ -z ${COMPILATION_MODE:-} ]]; then if [[ -z ${COMPILATION_MODE:-} ]]; then
......
...@@ -25,7 +25,7 @@ if [[ -z ${ABSEIL_ROOT:-} ]]; then ...@@ -25,7 +25,7 @@ if [[ -z ${ABSEIL_ROOT:-} ]]; then
fi fi
if [[ -z ${STD:-} ]]; then if [[ -z ${STD:-} ]]; then
STD="c++11 c++14 c++17" STD="c++14 c++17"
fi fi
if [[ -z ${COMPILATION_MODE:-} ]]; then if [[ -z ${COMPILATION_MODE:-} ]]; then
......
...@@ -25,7 +25,7 @@ if [[ -z ${ABSEIL_ROOT:-} ]]; then ...@@ -25,7 +25,7 @@ if [[ -z ${ABSEIL_ROOT:-} ]]; then
fi fi
if [[ -z ${STD:-} ]]; then if [[ -z ${STD:-} ]]; then
STD="c++11 c++14" STD="c++14"
fi fi
if [[ -z ${COMPILATION_MODE:-} ]]; then if [[ -z ${COMPILATION_MODE:-} ]]; then
......
...@@ -25,7 +25,7 @@ if [[ -z ${ABSEIL_ROOT:-} ]]; then ...@@ -25,7 +25,7 @@ if [[ -z ${ABSEIL_ROOT:-} ]]; then
fi fi
if [[ -z ${STD:-} ]]; then if [[ -z ${STD:-} ]]; then
STD="c++11 c++14 c++17 c++20" STD="c++14 c++17 c++20"
fi fi
if [[ -z ${COMPILATION_MODE:-} ]]; then if [[ -z ${COMPILATION_MODE:-} ]]; then
......
...@@ -23,7 +23,7 @@ fi ...@@ -23,7 +23,7 @@ fi
source "${ABSEIL_ROOT}/ci/cmake_common.sh" source "${ABSEIL_ROOT}/ci/cmake_common.sh"
if [[ -z ${ABSL_CMAKE_CXX_STANDARDS:-} ]]; then if [[ -z ${ABSL_CMAKE_CXX_STANDARDS:-} ]]; then
ABSL_CMAKE_CXX_STANDARDS="11 14 17 20" ABSL_CMAKE_CXX_STANDARDS="14 17 20"
fi fi
if [[ -z ${ABSL_CMAKE_BUILD_TYPES:-} ]]; then if [[ -z ${ABSL_CMAKE_BUILD_TYPES:-} ]]; then
......
...@@ -23,7 +23,7 @@ fi ...@@ -23,7 +23,7 @@ fi
source "${ABSEIL_ROOT}/ci/cmake_common.sh" source "${ABSEIL_ROOT}/ci/cmake_common.sh"
if [[ -z ${ABSL_CMAKE_CXX_STANDARDS:-} ]]; then if [[ -z ${ABSL_CMAKE_CXX_STANDARDS:-} ]]; then
ABSL_CMAKE_CXX_STANDARDS="11 14 17" ABSL_CMAKE_CXX_STANDARDS="14 17"
fi fi
if [[ -z ${ABSL_CMAKE_BUILD_TYPES:-} ]]; then if [[ -z ${ABSL_CMAKE_BUILD_TYPES:-} ]]; then
......
...@@ -54,7 +54,8 @@ fi ...@@ -54,7 +54,8 @@ fi
${BAZEL_BIN} test ... \ ${BAZEL_BIN} test ... \
--copt="-DGTEST_REMOVE_LEGACY_TEST_CASEAPI_=1" \ --copt="-DGTEST_REMOVE_LEGACY_TEST_CASEAPI_=1" \
--copt=-Werror \ --copt="-Werror" \
--cxxopt="-std=c++14" \
--keep_going \ --keep_going \
--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" \
......
...@@ -47,7 +47,7 @@ for compilation_mode in ${ABSL_CMAKE_BUILD_TYPES}; do ...@@ -47,7 +47,7 @@ for compilation_mode in ${ABSL_CMAKE_BUILD_TYPES}; do
-DBUILD_SHARED_LIBS=${build_shared} \ -DBUILD_SHARED_LIBS=${build_shared} \
-DABSL_BUILD_TESTING=ON \ -DABSL_BUILD_TESTING=ON \
-DCMAKE_BUILD_TYPE=${compilation_mode} \ -DCMAKE_BUILD_TYPE=${compilation_mode} \
-DCMAKE_CXX_STANDARD=11 \ -DCMAKE_CXX_STANDARD=14 \
-DCMAKE_MODULE_LINKER_FLAGS="-Wl,--no-undefined" \ -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--no-undefined" \
-DABSL_GOOGLETEST_DOWNLOAD_URL="${ABSL_GOOGLETEST_DOWNLOAD_URL}" -DABSL_GOOGLETEST_DOWNLOAD_URL="${ABSL_GOOGLETEST_DOWNLOAD_URL}"
time cmake --build . time cmake --build .
......
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