From 35848c62cc2604d7a3ba54c1e7d15b9171457afb Mon Sep 17 00:00:00 2001 From: Sid Dahiya <53239974+sid-dahiya@users.noreply.github.com> Date: Tue, 25 Jan 2022 13:20:03 -0800 Subject: [PATCH] Update to latest googletest package and fix local tests (#55) Co-authored-by: Sid Dahiya --- external/gtest/CMakeLists.txt | 2 +- libs/motifCpp/include/motifCpp/motifCppTest.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/external/gtest/CMakeLists.txt b/external/gtest/CMakeLists.txt index 0d422af..074b6ba 100644 --- a/external/gtest/CMakeLists.txt +++ b/external/gtest/CMakeLists.txt @@ -14,7 +14,7 @@ if(MSO_ENABLE_UNIT_TESTS) FetchContent_Declare( googletest GIT_REPOSITORY https://github.com/google/googletest.git - GIT_TAG 2fe3bd994b3189899d93f1d5a881e725e046fdc2 + GIT_TAG 7eae8de0da5774fa08ce350d9d470901b76b2834 GIT_SHALLOW 1 GIT_PROGRESS 1 ) diff --git a/libs/motifCpp/include/motifCpp/motifCppTest.h b/libs/motifCpp/include/motifCpp/motifCppTest.h index 06fb00f..8f137d6 100644 --- a/libs/motifCpp/include/motifCpp/motifCppTest.h +++ b/libs/motifCpp/include/motifCpp/motifCppTest.h @@ -101,7 +101,7 @@ inline void AreEqualAt( GTEST_ASSERT_AT_( file, line, - ::testing::internal::EqHelper::Compare( + ::testing::internal::EqHelper::Compare( expectedExpr, actualExpr, expected, actual), GTEST_FATAL_FAILURE_AT_) << FormatCustomMsg(line, message); @@ -125,7 +125,7 @@ void AreEqualAt( GTEST_ASSERT_AT_( file, line, - ::testing::internal::EqHelper::Compare( + ::testing::internal::EqHelper::Compare( expectedExpr, actualExpr, expected, actual), GTEST_FATAL_FAILURE_AT_) << FormatCustomMsg(line, message);