You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@orc.apache.org by do...@apache.org on 2022/10/27 16:44:58 UTC
[orc] branch branch-1.8 updated: ORC-1303: [C++] Upgrade GoogleTest to 1.12.1
This is an automated email from the ASF dual-hosted git repository.
dongjoon pushed a commit to branch branch-1.8
in repository https://gitbox.apache.org/repos/asf/orc.git
The following commit(s) were added to refs/heads/branch-1.8 by this push:
new 87b6c260e ORC-1303: [C++] Upgrade GoogleTest to 1.12.1
87b6c260e is described below
commit 87b6c260e5e2e0ac2117c4302b7c70f053257d05
Author: Gang Wu <us...@gmail.com>
AuthorDate: Thu Oct 27 09:44:42 2022 -0700
ORC-1303: [C++] Upgrade GoogleTest to 1.12.1
### What changes were proposed in this pull request?
Upgrade the gtest & gmock library to v1.12.1
### Why are the changes needed?
Prerequisite for C++17 adoption.
### How was this patch tested?
Pass the CI check.
Closes #1298 from wgtmac/ORC-1303.
Authored-by: Gang Wu <us...@gmail.com>
Signed-off-by: Dongjoon Hyun <do...@apache.org>
(cherry picked from commit cdca6e0fcb8ab62e9bd225a03906873153db621e)
Signed-off-by: Dongjoon Hyun <do...@apache.org>
---
c++/test/CMakeLists.txt | 1 +
c++/test/TestColumnReader.cc | 2 +-
c++/test/TestRleEncoder.cc | 2 +-
c++/test/TestWriter.cc | 2 +-
cmake_modules/ThirdpartyToolchain.cmake | 19 +++++++++++--------
tools/test/CMakeLists.txt | 1 +
tools/test/TestMatch.cc | 6 +++---
7 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/c++/test/CMakeLists.txt b/c++/test/CMakeLists.txt
index 00aca6b55..59208831d 100644
--- a/c++/test/CMakeLists.txt
+++ b/c++/test/CMakeLists.txt
@@ -57,6 +57,7 @@ target_link_libraries (orc-test
orc::protobuf
orc::snappy
orc::zlib
+ orc::gtest
orc::gmock
)
diff --git a/c++/test/TestColumnReader.cc b/c++/test/TestColumnReader.cc
index bc0ecb8eb..f2b60c1a3 100644
--- a/c++/test/TestColumnReader.cc
+++ b/c++/test/TestColumnReader.cc
@@ -4724,6 +4724,6 @@ TEST(TestColumnReader, testStringDictinoryIndexOverflow) {
}
}
-INSTANTIATE_TEST_CASE_P(OrcColumnReaderTest, TestColumnReaderEncoded, Values(true, false));
+INSTANTIATE_TEST_SUITE_P(OrcColumnReaderTest, TestColumnReaderEncoded, Values(true, false));
} // namespace orc
diff --git a/c++/test/TestRleEncoder.cc b/c++/test/TestRleEncoder.cc
index f54e072ef..7ef68f458 100644
--- a/c++/test/TestRleEncoder.cc
+++ b/c++/test/TestRleEncoder.cc
@@ -306,5 +306,5 @@ namespace orc {
runExampleTest(data, 9, expectedEncoded, 13);
}
- INSTANTIATE_TEST_CASE_P(OrcTest, RleTest, Values(true, false));
+ INSTANTIATE_TEST_SUITE_P(OrcTest, RleTest, Values(true, false));
}
diff --git a/c++/test/TestWriter.cc b/c++/test/TestWriter.cc
index ee8270805..ae5701807 100644
--- a/c++/test/TestWriter.cc
+++ b/c++/test/TestWriter.cc
@@ -2044,5 +2044,5 @@ namespace orc {
testSuppressPresentStream(CompressionKind_SNAPPY);
}
- INSTANTIATE_TEST_CASE_P(OrcTest, WriterTest, Values(FileVersion::v_0_11(), FileVersion::v_0_12(), FileVersion::UNSTABLE_PRE_2_0()));
+ INSTANTIATE_TEST_SUITE_P(OrcTest, WriterTest, Values(FileVersion::v_0_11(), FileVersion::v_0_12(), FileVersion::UNSTABLE_PRE_2_0()));
}
diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake
index 6919847fb..f10069928 100644
--- a/cmake_modules/ThirdpartyToolchain.cmake
+++ b/cmake_modules/ThirdpartyToolchain.cmake
@@ -13,7 +13,7 @@
set(LZ4_VERSION "1.9.3")
set(SNAPPY_VERSION "1.1.7")
set(ZLIB_VERSION "1.2.11")
-set(GTEST_VERSION "1.8.0")
+set(GTEST_VERSION "1.12.1")
set(PROTOBUF_VERSION "3.5.1")
set(ZSTD_VERSION "1.5.2")
@@ -316,6 +316,7 @@ if (BUILD_CPP_TESTS)
set(GTEST_PREFIX "${THIRDPARTY_DIR}/googletest_ep-install")
set(GTEST_INCLUDE_DIR "${GTEST_PREFIX}/include")
set(GMOCK_STATIC_LIB "${GTEST_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}gmock${CMAKE_STATIC_LIBRARY_SUFFIX}")
+ set(GTEST_STATIC_LIB "${GTEST_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}gtest${CMAKE_STATIC_LIBRARY_SUFFIX}")
set(GTEST_SRC_URL "https://github.com/google/googletest/archive/release-${GTEST_VERSION}.tar.gz")
if(APPLE)
set(GTEST_CMAKE_CXX_FLAGS " -DGTEST_USE_OWN_TR1_TUPLE=1 -Wno-unused-value -Wno-ignored-attributes")
@@ -337,9 +338,10 @@ if (BUILD_CPP_TESTS)
URL ${GTEST_SRC_URL}
${THIRDPARTY_LOG_OPTIONS}
CMAKE_ARGS ${GTEST_CMAKE_ARGS}
- BUILD_BYPRODUCTS "${GMOCK_STATIC_LIB}")
+ BUILD_BYPRODUCTS "${GMOCK_STATIC_LIB}" "${GTEST_STATIC_LIB}")
set(GMOCK_LIBRARY ${GMOCK_STATIC_LIB})
+ set(GTEST_LIBRARY ${GTEST_STATIC_LIB})
set(GTEST_VENDORED TRUE)
endif ()
@@ -347,25 +349,26 @@ if (BUILD_CPP_TESTS)
# distributions statically link gtest inside the gmock shared lib
add_library (orc_gmock INTERFACE)
add_library (orc::gmock ALIAS orc_gmock)
+ add_library (orc_gtest INTERFACE)
+ add_library (orc::gtest ALIAS orc_gtest)
if (ORC_PREFER_STATIC_GMOCK AND ${GMOCK_STATIC_LIB})
target_link_libraries (orc_gmock INTERFACE ${GMOCK_STATIC_LIB})
- if (NOT "${GTEST_STATIC_LIB}" STREQUAL "")
- target_link_libraries (orc_gmock INTERFACE ${GTEST_STATIC_LIB})
- endif ()
+ target_link_libraries (orc_gtest INTERFACE ${GTEST_STATIC_LIB})
else ()
target_link_libraries (orc_gmock INTERFACE ${GMOCK_LIBRARY})
- if (NOT "${GTEST_LIBRARY}" STREQUAL "")
- target_link_libraries (orc_gmock INTERFACE ${GTEST_LIBRARY})
- endif ()
+ target_link_libraries (orc_gtest INTERFACE ${GTEST_LIBRARY})
endif ()
target_include_directories (orc_gmock SYSTEM INTERFACE ${GTEST_INCLUDE_DIR})
+ target_include_directories (orc_gtest SYSTEM INTERFACE ${GTEST_INCLUDE_DIR})
if (GTEST_VENDORED)
add_dependencies (orc_gmock googletest_ep)
+ add_dependencies (orc_gtest googletest_ep)
endif ()
if (NOT APPLE AND NOT MSVC)
target_link_libraries (orc_gmock INTERFACE Threads::Threads)
+ target_link_libraries (orc_gtest INTERFACE Threads::Threads)
endif ()
endif ()
diff --git a/tools/test/CMakeLists.txt b/tools/test/CMakeLists.txt
index fe2be1d70..e71a51d73 100644
--- a/tools/test/CMakeLists.txt
+++ b/tools/test/CMakeLists.txt
@@ -36,6 +36,7 @@ target_link_libraries (tool-test
orc::protobuf
orc::zlib
orc::snappy
+ orc::gtest
orc::gmock
)
diff --git a/tools/test/TestMatch.cc b/tools/test/TestMatch.cc
index 9fb28f494..a0e2a2980 100644
--- a/tools/test/TestMatch.cc
+++ b/tools/test/TestMatch.cc
@@ -161,7 +161,7 @@ namespace orc {
std::map<std::string, std::string> makeMetadata();
- INSTANTIATE_TEST_CASE_P(TestMatchParam, FileParam,
+ INSTANTIATE_TEST_SUITE_P(TestMatchParam, FileParam,
testing::Values(
OrcFileDescription("TestOrcFile.columnProjection.orc",
"TestOrcFile.columnProjection.jsn.gz",
@@ -550,7 +550,7 @@ namespace orc {
));
#ifdef HAS_PRE_1970
-INSTANTIATE_TEST_CASE_P(TestMatch1900, FileParam,
+INSTANTIATE_TEST_SUITE_P(TestMatch1900, FileParam,
testing::Values(
OrcFileDescription("TestOrcFile.testDate1900.orc",
"TestOrcFile.testDate1900.jsn.gz",
@@ -568,7 +568,7 @@ INSTANTIATE_TEST_CASE_P(TestMatch1900, FileParam,
#endif
#ifdef HAS_POST_2038
- INSTANTIATE_TEST_CASE_P(TestMatch2038, FileParam,
+ INSTANTIATE_TEST_SUITE_P(TestMatch2038, FileParam,
testing::Values(
OrcFileDescription("TestOrcFile.testDate2038.orc",
"TestOrcFile.testDate2038.jsn.gz",