mirror of https://github.com/OpenRCT2/OpenRCT2.git
Update GoogleTest version
This commit is contained in:
parent
b08c87c0c4
commit
d81b36e16f
|
@ -13,11 +13,10 @@ else (SYSTEM_GTEST)
|
|||
# Bootstrap GoogleTest
|
||||
INCLUDE(ExternalProject)
|
||||
|
||||
# Use googletest with https://github.com/google/googletest/pull/1045 applied
|
||||
ExternalProject_Add(
|
||||
googletest-distribution
|
||||
URL https://github.com/google/googletest/archive/ad49eaa0466b98f21449efaaaae817683daa8b99.tar.gz
|
||||
URL_HASH SHA1=e468bfdffe7c46c14ce06bfb48a29b6201908504
|
||||
URL https://github.com/google/googletest/archive/e2239ee6043f73722e7aa812a459f54a28552929.tar.gz # v1.11.0 release
|
||||
URL_HASH SHA1=b0399e38211cc4fedd612f71bad7984ed4cbe8fe
|
||||
TIMEOUT 10
|
||||
CONFIGURE_COMMAND ""
|
||||
BUILD_COMMAND ""
|
||||
|
@ -32,10 +31,10 @@ else (SYSTEM_GTEST)
|
|||
googletest
|
||||
DEPENDS googletest-distribution
|
||||
DOWNLOAD_COMMAND ""
|
||||
SOURCE_DIR "${GOOGLETEST_DISTRIB_SOURCE_DIR}/googletest"
|
||||
CMAKE_ARGS "-DCMAKE_CXX_FLAGS=${TARGET_M}"
|
||||
BUILD_BYPRODUCTS "googletest-prefix/src/googletest-build/${CMAKE_STATIC_LIBRARY_PREFIX}gtest${CMAKE_STATIC_LIBRARY_SUFFIX}"
|
||||
BUILD_BYPRODUCTS "googletest-prefix/src/googletest-build/${CMAKE_STATIC_LIBRARY_PREFIX}gtest_main${CMAKE_STATIC_LIBRARY_SUFFIX}"
|
||||
SOURCE_DIR "${GOOGLETEST_DISTRIB_SOURCE_DIR}"
|
||||
CMAKE_ARGS "-DCMAKE_CXX_FLAGS=${TARGET_M} -DBUILD_GMOCK=off"
|
||||
BUILD_BYPRODUCTS "googletest-prefix/src/googletest-build/lib/${CMAKE_STATIC_LIBRARY_PREFIX}gtest${CMAKE_STATIC_LIBRARY_SUFFIX}"
|
||||
BUILD_BYPRODUCTS "googletest-prefix/src/googletest-build/lib/${CMAKE_STATIC_LIBRARY_PREFIX}gtest_main${CMAKE_STATIC_LIBRARY_SUFFIX}"
|
||||
# Disable install step
|
||||
INSTALL_COMMAND ""
|
||||
# Wrap download, configure and build steps in a script to log output
|
||||
|
@ -49,7 +48,7 @@ else (SYSTEM_GTEST)
|
|||
|
||||
# Library
|
||||
ExternalProject_Get_Property(googletest BINARY_DIR)
|
||||
set(GOOGLETEST_BINARY_DIR "${BINARY_DIR}")
|
||||
set(GOOGLETEST_BINARY_DIR "${BINARY_DIR}/lib")
|
||||
set(GTEST_LIBRARY_PATH ${GOOGLETEST_BINARY_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}gtest${CMAKE_STATIC_LIBRARY_SUFFIX})
|
||||
set(GTEST_MAIN_LIBRARY_PATH ${GOOGLETEST_BINARY_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}gtest_main${CMAKE_STATIC_LIBRARY_SUFFIX})
|
||||
set(GTEST_LIBRARY gtest)
|
||||
|
|
|
@ -211,7 +211,7 @@ TEST_P(SimplePathfindingTest, CanFindPathFromStartToGoal)
|
|||
EXPECT_TRUE(succeeded);
|
||||
}
|
||||
|
||||
INSTANTIATE_TEST_CASE_P(
|
||||
INSTANTIATE_TEST_SUITE_P(
|
||||
ForScenario, SimplePathfindingTest,
|
||||
::testing::Values(
|
||||
SimplePathfindingScenario("StraightFlat", { 19, 15, 14 }, 24), SimplePathfindingScenario("SBend", { 15, 12, 14 }, 87),
|
||||
|
@ -244,7 +244,7 @@ TEST_P(ImpossiblePathfindingTest, CannotFindPathFromStartToGoal)
|
|||
EXPECT_FALSE(FindPath(&pos, goal, 10000, ride->id));
|
||||
}
|
||||
|
||||
INSTANTIATE_TEST_CASE_P(
|
||||
INSTANTIATE_TEST_SUITE_P(
|
||||
ForScenario, ImpossiblePathfindingTest,
|
||||
::testing::Values(
|
||||
SimplePathfindingScenario("PathWithGap", { 1, 6, 14 }, 10000),
|
||||
|
|
|
@ -115,4 +115,4 @@ struct PrintReplayParameter
|
|||
}
|
||||
};
|
||||
|
||||
INSTANTIATE_TEST_CASE_P(Replay, ReplayTests, testing::ValuesIn(GetReplayFiles()), PrintReplayParameter());
|
||||
INSTANTIATE_TEST_SUITE_P(Replay, ReplayTests, testing::ValuesIn(GetReplayFiles()), PrintReplayParameter());
|
||||
|
|
|
@ -27,7 +27,7 @@ class StringTest : public testing::TestWithParam<TCase>
|
|||
// Tests for String::Trim
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
INSTANTIATE_TEST_CASE_P(
|
||||
INSTANTIATE_TEST_SUITE_P(
|
||||
TrimData, StringTest,
|
||||
testing::Values(
|
||||
// input after Trim after TrimStart
|
||||
|
|
Loading…
Reference in New Issue