QAR-1651

svn merge -r126784:126785 svn+ssh://svn.lindenlab.com/svn/linden/branches/mock-3 into trunk

1 files changed, 6 insertions, 0 deletions

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 <gmock/gmock.h>
+#include <gtest/gtest.h>
+
 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);