From c2e425e5395c1b1b43a2f477565e374d919f10ee Mon Sep 17 00:00:00 2001 From: Dave Hiller Date: Tue, 14 Jul 2009 16:52:40 +0000 Subject: QAR-1651 svn merge -r126784:126785 svn+ssh://svn.lindenlab.com/svn/linden/branches/mock-3 into trunk --- indra/test/test.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'indra/test/test.cpp') diff --git a/indra/test/test.cpp b/indra/test/test.cpp index ba81c6e49e..c9e985c914 100644 --- a/indra/test/test.cpp +++ b/indra/test/test.cpp @@ -54,6 +54,9 @@ # include "ctype_workaround.h" #endif +#include +#include + namespace tut { std::string sSourceDir; @@ -238,6 +241,9 @@ void wouldHaveCrashed(const std::string& message) int main(int argc, char **argv) { + // The following line must be executed to initialize Google Mock + // (and Google Test) before running the tests. + ::testing::InitGoogleMock(&argc, argv); LLError::initForApplication("."); LLError::setFatalFunction(wouldHaveCrashed); LLError::setDefaultLevel(LLError::LEVEL_ERROR); -- cgit v1.2.3 From 48328db339b5eff70a631f067fb3010b30cb4d3a Mon Sep 17 00:00:00 2001 From: Steve Linden Date: Thu, 10 Sep 2009 15:36:49 -0700 Subject: #ifdef'd out gmock and gtest for LL_WINDOWS. Does not appear to be needed and breaks the build. --- indra/test/test.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'indra/test/test.cpp') diff --git a/indra/test/test.cpp b/indra/test/test.cpp index c9e985c914..e7ba8e33b8 100644 --- a/indra/test/test.cpp +++ b/indra/test/test.cpp @@ -54,8 +54,10 @@ # include "ctype_workaround.h" #endif +#ifndef LL_WINDOWS #include #include +#endif namespace tut { @@ -243,7 +245,9 @@ int main(int argc, char **argv) { // The following line must be executed to initialize Google Mock // (and Google Test) before running the tests. +#ifndef LL_WINDOWS ::testing::InitGoogleMock(&argc, argv); +#endif LLError::initForApplication("."); LLError::setFatalFunction(wouldHaveCrashed); LLError::setDefaultLevel(LLError::LEVEL_ERROR); -- cgit v1.2.3