From ee30375cfc3ef1c8ff0ce99e7bf6b1dad8251ef8 Mon Sep 17 00:00:00 2001 From: sangelovic Date: Fri, 12 Apr 2019 21:42:33 +0200 Subject: [PATCH] Use official release of googletest (v1.8.1) rather than master --- test/googletest-download/CMakeLists.txt.in | 2 +- test/unittests/Connection_test.cpp | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/test/googletest-download/CMakeLists.txt.in b/test/googletest-download/CMakeLists.txt.in index aff4f6f..03619f1 100644 --- a/test/googletest-download/CMakeLists.txt.in +++ b/test/googletest-download/CMakeLists.txt.in @@ -8,7 +8,7 @@ include(ExternalProject) ExternalProject_Add(googletest GIT_REPOSITORY https://github.com/google/googletest.git - GIT_TAG master + GIT_TAG release-1.8.1 SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/googletest-src" BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/googletest-build" CONFIGURE_COMMAND "" diff --git a/test/unittests/Connection_test.cpp b/test/unittests/Connection_test.cpp index 2116b4b..d6ad2f2 100644 --- a/test/unittests/Connection_test.cpp +++ b/test/unittests/Connection_test.cpp @@ -145,4 +145,6 @@ TEST_P(AConnectionNameRequest, ThrowsOnFail) ASSERT_THROW(conn_.requestName(""), sdbus::Error); } -INSTANTIATE_TEST_SUITE_P(Request, AConnectionNameRequest, ::testing::Values(BusType::eSystem, BusType::eSession)); +// INSTANTIATE_TEST_SUITE_P is defined in googletest master, but not in googletest v1.8.1 that we are using now +INSTANTIATE_TEST_CASE_P(Request, AConnectionNameRequest, ::testing::Values(BusType::eSystem, BusType::eSession)); +//INSTANTIATE_TEST_SUITE_P(Request, AConnectionNameRequest, ::testing::Values(BusType::eSystem, BusType::eSession))