Merge pull request aeron-io#735 from mikeb01/master

Upgrade to gtest 1.10

Author: mikeb01

CMakeLists.txt

@@ -65,11 +65,11 @@ if(SBE_TESTS)
 
  ExternalProject_Add(
  gtest
- URL ${CMAKE_CURRENT_SOURCE_DIR}/cppbuild/googletest-release-1.8.0.zip
- URL_MD5 adfafc8512ab65fd3cf7955ef0100ff5
+ URL ${CMAKE_CURRENT_SOURCE_DIR}/cppbuild/googletest-release-1.10.0.zip
+ URL_MD5 82358affdd7ab94854c8ee73a180fc53
  PREFIX "${SBE_THIRDPARTY_BINARY_DIR}/gtest"
  CMAKE_ARGS -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER};-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
- BUILD_BYPRODUCTS "${SBE_THIRDPARTY_BINARY_DIR}/gtest/src/gtest-build/googlemock/${CMAKE_CFG_INTDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}gmock${CMAKE_STATIC_LIBRARY_SUFFIX};${SBE_THIRDPARTY_BINARY_DIR}/gtest/src/gtest-build/googlemock/${CMAKE_CFG_INTDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}gmock_main${CMAKE_STATIC_LIBRARY_SUFFIX}"
+ BUILD_BYPRODUCTS "${SBE_THIRDPARTY_BINARY_DIR}/gtest/src/gtest-build/lib/${CMAKE_CFG_INTDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}gmock${CMAKE_STATIC_LIBRARY_SUFFIX};${SBE_THIRDPARTY_BINARY_DIR}/gtest/src/gtest-build/lib/${CMAKE_CFG_INTDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}gmock_main${CMAKE_STATIC_LIBRARY_SUFFIX}"
  INSTALL_COMMAND ""
  LOG_CONFIGURE ON
  LOG_BUILD ON
@@ -81,8 +81,9 @@ if(SBE_TESTS)
  set(GTEST_BINARY_DIR ${binary_dir})
 
  set(GTEST_LIBS
- ${GTEST_BINARY_DIR}/googlemock/${CMAKE_CFG_INTDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}gmock${CMAKE_STATIC_LIBRARY_SUFFIX}
- ${GTEST_BINARY_DIR}/googlemock/${CMAKE_CFG_INTDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}gmock_main${CMAKE_STATIC_LIBRARY_SUFFIX}
+ ${GTEST_BINARY_DIR}/lib/${CMAKE_CFG_INTDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}gmock${CMAKE_STATIC_LIBRARY_SUFFIX}
+ ${GTEST_BINARY_DIR}/lib/${CMAKE_CFG_INTDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}gtest${CMAKE_STATIC_LIBRARY_SUFFIX}
+ ${GTEST_BINARY_DIR}/lib/${CMAKE_CFG_INTDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}gtest_main${CMAKE_STATIC_LIBRARY_SUFFIX}
  )
 endif()
 

cppbuild/googletest-release-1.10.0.zip

@@ -532,10 +532,10 @@ TEST_P(HeaderBoundsCheckTest, shouldExceptionWhenBufferTooShortForDecodeOfHeader
  }, std::runtime_error);
 }
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
  HeaderLengthTest,
  HeaderBoundsCheckTest,
- ::testing::Range(0, static_cast<int>(encodedHdrSz), 1), );
+ ::testing::Range(0, static_cast<int>(encodedHdrSz), 1));
 
 class MessageBoundsCheckTest : public BoundsCheckTest, public ::testing::WithParamInterface<int>
 {
@@ -576,7 +576,7 @@ TEST_P(MessageBoundsCheckTest, shouldExceptionWhenBufferTooShortForDecodeOfMessa
  }, std::runtime_error);
 }
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
  MessageLengthTest,
  MessageBoundsCheckTest,
- ::testing::Range(0, static_cast<int>(encodedCarSz), 1), );
+ ::testing::Range(0, static_cast<int>(encodedCarSz), 1));

cppbuild/googletest-release-1.8.0.zip

@@ -312,10 +312,10 @@ TEST_P(HeaderBoundsCheckTest, shouldExceptionWhenBufferTooShortForDecodeOfHeader
  }, std::runtime_error);
 }
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
  HeaderLengthTest,
  HeaderBoundsCheckTest,
- ::testing::Range(0, static_cast<int>(encodedHdrSz), 1), );
+ ::testing::Range(0, static_cast<int>(encodedHdrSz), 1));
 
 class MessageBoundsCheckTest : public BoundsCheckTest, public ::testing::WithParamInterface<int>
 {
@@ -356,7 +356,7 @@ TEST_P(MessageBoundsCheckTest, shouldExceptionWhenBufferTooShortForDecodeOfMessa
  }, std::runtime_error);
 }
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
  MessageLengthTest,
  MessageBoundsCheckTest,
- ::testing::Range(0, static_cast<int>(encodedCarSz), 1), );
+ ::testing::Range(0, static_cast<int>(encodedCarSz), 1));

sbe-tool/src/test/c/BoundsCheckTest.cpp

@@ -1197,7 +1197,7 @@ TEST_P(Rc3OtfFullIrLengthTest, shouldExceptionIfLengthTooShort)
  }, std::runtime_error);
 }
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
  LengthUpToHdrAndCar,
  Rc3OtfFullIrLengthTest,
- ::testing::Range(0, static_cast<int>(encodedCarAndHdrLength - MessageHeader::encodedLength()), 1), );
+ ::testing::Range(0, static_cast<int>(encodedCarAndHdrLength - MessageHeader::encodedLength()), 1));