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 750e61509 Revert "ORC-1303: [C++] Upgrade GoogleTest to 1.12.1"
750e61509 is described below
commit 750e615091e399569e1f8a1c1491a5d2f343539c
Author: Dongjoon Hyun <[email protected]>
AuthorDate: Mon Nov 28 21:19:15 2022 -0800
Revert "ORC-1303: [C++] Upgrade GoogleTest to 1.12.1"
This reverts commit 87b6c260e5e2e0ac2117c4302b7c70f053257d05.
---
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, 14 insertions(+), 19 deletions(-)
diff --git a/c++/test/CMakeLists.txt b/c++/test/CMakeLists.txt
index 59208831d..00aca6b55 100644
--- a/c++/test/CMakeLists.txt
+++ b/c++/test/CMakeLists.txt
@@ -57,7 +57,6 @@ 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 f2b60c1a3..bc0ecb8eb 100644
--- a/c++/test/TestColumnReader.cc
+++ b/c++/test/TestColumnReader.cc
@@ -4724,6 +4724,6 @@ TEST(TestColumnReader, testStringDictinoryIndexOverflow) {
}
}
-INSTANTIATE_TEST_SUITE_P(OrcColumnReaderTest, TestColumnReaderEncoded,
Values(true, false));
+INSTANTIATE_TEST_CASE_P(OrcColumnReaderTest, TestColumnReaderEncoded,
Values(true, false));
} // namespace orc
diff --git a/c++/test/TestRleEncoder.cc b/c++/test/TestRleEncoder.cc
index 7ef68f458..f54e072ef 100644
--- a/c++/test/TestRleEncoder.cc
+++ b/c++/test/TestRleEncoder.cc
@@ -306,5 +306,5 @@ namespace orc {
runExampleTest(data, 9, expectedEncoded, 13);
}
- INSTANTIATE_TEST_SUITE_P(OrcTest, RleTest, Values(true, false));
+ INSTANTIATE_TEST_CASE_P(OrcTest, RleTest, Values(true, false));
}
diff --git a/c++/test/TestWriter.cc b/c++/test/TestWriter.cc
index ae5701807..ee8270805 100644
--- a/c++/test/TestWriter.cc
+++ b/c++/test/TestWriter.cc
@@ -2044,5 +2044,5 @@ namespace orc {
testSuppressPresentStream(CompressionKind_SNAPPY);
}
- INSTANTIATE_TEST_SUITE_P(OrcTest, WriterTest, Values(FileVersion::v_0_11(),
FileVersion::v_0_12(), FileVersion::UNSTABLE_PRE_2_0()));
+ INSTANTIATE_TEST_CASE_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 f10069928..6919847fb 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.12.1")
+set(GTEST_VERSION "1.8.0")
set(PROTOBUF_VERSION "3.5.1")
set(ZSTD_VERSION "1.5.2")
@@ -316,7 +316,6 @@ 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")
@@ -338,10 +337,9 @@ if (BUILD_CPP_TESTS)
URL ${GTEST_SRC_URL}
${THIRDPARTY_LOG_OPTIONS}
CMAKE_ARGS ${GTEST_CMAKE_ARGS}
- BUILD_BYPRODUCTS "${GMOCK_STATIC_LIB}" "${GTEST_STATIC_LIB}")
+ BUILD_BYPRODUCTS "${GMOCK_STATIC_LIB}")
set(GMOCK_LIBRARY ${GMOCK_STATIC_LIB})
- set(GTEST_LIBRARY ${GTEST_STATIC_LIB})
set(GTEST_VENDORED TRUE)
endif ()
@@ -349,26 +347,25 @@ 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})
- target_link_libraries (orc_gtest INTERFACE ${GTEST_STATIC_LIB})
+ if (NOT "${GTEST_STATIC_LIB}" STREQUAL "")
+ target_link_libraries (orc_gmock INTERFACE ${GTEST_STATIC_LIB})
+ endif ()
else ()
target_link_libraries (orc_gmock INTERFACE ${GMOCK_LIBRARY})
- target_link_libraries (orc_gtest INTERFACE ${GTEST_LIBRARY})
+ if (NOT "${GTEST_LIBRARY}" STREQUAL "")
+ target_link_libraries (orc_gmock INTERFACE ${GTEST_LIBRARY})
+ endif ()
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 e71a51d73..fe2be1d70 100644
--- a/tools/test/CMakeLists.txt
+++ b/tools/test/CMakeLists.txt
@@ -36,7 +36,6 @@ 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 a0e2a2980..9fb28f494 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_SUITE_P(TestMatchParam, FileParam,
+ INSTANTIATE_TEST_CASE_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_SUITE_P(TestMatch1900, FileParam,
+INSTANTIATE_TEST_CASE_P(TestMatch1900, FileParam,
testing::Values(
OrcFileDescription("TestOrcFile.testDate1900.orc",
"TestOrcFile.testDate1900.jsn.gz",
@@ -568,7 +568,7 @@ INSTANTIATE_TEST_SUITE_P(TestMatch1900, FileParam,
#endif
#ifdef HAS_POST_2038
- INSTANTIATE_TEST_SUITE_P(TestMatch2038, FileParam,
+ INSTANTIATE_TEST_CASE_P(TestMatch2038, FileParam,
testing::Values(
OrcFileDescription("TestOrcFile.testDate2038.orc",
"TestOrcFile.testDate2038.jsn.gz",
