1 files changed, 1 insertions, 24 deletions
diff --git a/indra/test/test.cpp b/indra/test/test.cpp
index 61a4eb07c5..172b6e3542 100644
--- a/indra/test/test.cpp
+++ b/indra/test/test.cpp
@@ -53,25 +53,8 @@
 #   include "ctype_workaround.h"
 #endif
 
-#ifndef LL_WINDOWS
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-#endif
-
-#if LL_MSVC
-#pragma warning (push)
-#pragma warning (disable : 4702) // warning C4702: unreachable code
-#endif
 #include <boost/iostreams/tee.hpp>
 #include <boost/iostreams/stream.hpp>
-#if LL_MSVC
-#pragma warning (pop)
-#endif
-
-#include <boost/scoped_ptr.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/make_shared.hpp>
-#include <boost/foreach.hpp>
 
 #include <fstream>
 
@@ -112,7 +95,7 @@ public:
 
     virtual void recordMessage(LLError::ELevel level, const std::string& message)
     {
-        LL_PROFILE_ZONE_SCOPED
+        LL_PROFILE_ZONE_SCOPED;
         mFile << message << std::endl;
     }
 
@@ -522,12 +505,6 @@ static LLTrace::ThreadRecorder* sMasterThreadRecorder = NULL;
 
 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
-
     ll_init_apr();
     apr_getopt_t* os = NULL;
     if(APR_SUCCESS != apr_getopt_init(&os, gAPRPoolp, argc, argv))