diff --git a/autobuild.xml b/autobuild.xml
index 6f5c1211eb81f5e83265c7e1ac7d60a7d55eab7b..476028a62ec8d0fb9c172b2b8f91ec1305bc2025 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1227,96 +1227,6 @@
<key>version</key>
<string>1413.539880</string>
</map>
- <key>googlemock</key>
- <map>
- <key>copyright</key>
- <string>Copyright 2008, Google Inc.</string>
- <key>description</key>
- <string>a library for writing and using C++ mock classes</string>
- <key>license</key>
- <string>BSD</string>
- <key>license_file</key>
- <string>LICENSES/gmock.txt</string>
- <key>name</key>
- <string>googlemock</string>
- <key>platforms</key>
- <map>
- <key>darwin</key>
- <map>
- <key>archive</key>
- <map>
- <key>hash</key>
- <string>022649e284163b8ee23e3c9a81302fa7</string>
- <key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/googlemock_3p-update-googlemock/rev/297460/arch/Darwin/installer/googlemock-1.7.0.297460-darwin-297460.tar.bz2</string>
- </map>
- <key>name</key>
- <string>darwin</string>
- </map>
- <key>darwin64</key>
- <map>
- <key>archive</key>
- <map>
- <key>hash</key>
- <string>36e2e30610eb131e3522ef84cc67405d</string>
- <key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/56330/526832/googlemock-1.7.0.539876-darwin64-539876.tar.bz2</string>
- </map>
- <key>name</key>
- <string>darwin64</string>
- </map>
- <key>linux</key>
- <map>
- <key>archive</key>
- <map>
- <key>hash</key>
- <string>ad51f68702f25ba245fff312c50c8876</string>
- <key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/p64_3p-googlemock/rev/317828/arch/Linux/installer/googlemock-1.7.0.317828-linux-317828.tar.bz2</string>
- </map>
- <key>name</key>
- <string>linux</string>
- </map>
- <key>linux64</key>
- <map>
- <key>archive</key>
- <map>
- <key>hash</key>
- <string>ff459b58695c76838782847a0b792104</string>
- <key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/9697/45717/googlemock-1.7.0.509686-linux64-509686.tar.bz2</string>
- </map>
- <key>name</key>
- <string>linux64</string>
- </map>
- <key>windows</key>
- <map>
- <key>archive</key>
- <map>
- <key>hash</key>
- <string>38a2c655876044efe536a8e685e74a2a</string>
- <key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/56336/526861/googlemock-1.7.0.539876-windows-539876.tar.bz2</string>
- </map>
- <key>name</key>
- <string>windows</string>
- </map>
- <key>windows64</key>
- <map>
- <key>archive</key>
- <map>
- <key>hash</key>
- <string>ff4fa1fd7a1ed9ffa477c4574ffc16af</string>
- <key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/56334/526845/googlemock-1.7.0.539876-windows64-539876.tar.bz2</string>
- </map>
- <key>name</key>
- <string>windows64</string>
- </map>
- </map>
- <key>version</key>
- <string>1.7.0.539876</string>
- </map>
<key>gstreamer</key>
<map>
<key>copyright</key>
diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt
index fb99c4654dd3f4f4393b41ce62ae53845d985683..48bac795391492f9a249fada7ccb821e1232c0cc 100644
--- a/indra/cmake/CMakeLists.txt
+++ b/indra/cmake/CMakeLists.txt
@@ -41,7 +41,6 @@ set(cmake_SOURCE_FILES
GLOD.cmake
## GStreamer010Plugin.cmake
GoogleBreakpad.cmake
- GoogleMock.cmake
Havok.cmake
Hunspell.cmake
JPEG.cmake
diff --git a/indra/cmake/GoogleMock.cmake b/indra/cmake/GoogleMock.cmake
deleted file mode 100644
index 5a00546927d401e7a861bfab473178998fc7984a..0000000000000000000000000000000000000000
--- a/indra/cmake/GoogleMock.cmake
+++ /dev/null
@@ -1,28 +0,0 @@
-# -*- cmake -*-
-include(Prebuilt)
-include(Linking)
-
-use_prebuilt_binary(googlemock)
-
-set(GOOGLEMOCK_INCLUDE_DIRS
- ${LIBS_PREBUILT_DIR}/include)
-
-if (LINUX)
- # VWR-24366: gmock is underlinked, it needs gtest.
- set(GOOGLEMOCK_LIBRARIES
- gmock -Wl,--no-as-needed
- gtest -Wl,--as-needed)
-elseif(WINDOWS)
- set(GOOGLEMOCK_LIBRARIES
- gmock)
- set(GOOGLEMOCK_INCLUDE_DIRS
- ${LIBS_PREBUILT_DIR}/include
- ${LIBS_PREBUILT_DIR}/include/gmock
- ${LIBS_PREBUILT_DIR}/include/gmock/boost/tr1/tr1)
-elseif(DARWIN)
- set(GOOGLEMOCK_LIBRARIES
- gmock
- gtest)
-endif(LINUX)
-
-
diff --git a/indra/cmake/LLAddBuildTest.cmake b/indra/cmake/LLAddBuildTest.cmake
index 4932e9044f3949678df593c4758ca447bf251cba..9677eddefbdb57f15256657ea169f604091f8e83 100644
--- a/indra/cmake/LLAddBuildTest.cmake
+++ b/indra/cmake/LLAddBuildTest.cmake
@@ -1,7 +1,6 @@
# -*- cmake -*-
include(00-Common)
include(LLTestCommand)
-include(GoogleMock)
include(Tut)
#*****************************************************************************
@@ -20,7 +19,6 @@ MACRO(LL_ADD_PROJECT_UNIT_TESTS project sources)
#
# WARNING: do NOT modify this code without working with poppy -
# there is another branch that will conflict heavily with any changes here.
-INCLUDE(GoogleMock)
IF(LL_TEST_VERBOSE)
@@ -50,13 +48,11 @@ INCLUDE(GoogleMock)
${LLMATH_INCLUDE_DIRS}
${LLCOMMON_INCLUDE_DIRS}
${LIBS_OPEN_DIR}/test
- ${GOOGLEMOCK_INCLUDE_DIRS}
)
SET(alltest_LIBRARIES
${BOOST_FIBER_LIBRARY}
${BOOST_CONTEXT_LIBRARY}
${BOOST_SYSTEM_LIBRARY}
- ${GOOGLEMOCK_LIBRARIES}
${PTHREAD_LIBRARY}
${WINDOWS_LIBRARIES}
)
@@ -205,7 +201,6 @@ FUNCTION(LL_ADD_INTEGRATION_TEST
${BOOST_FIBER_LIBRARY}
${BOOST_CONTEXT_LIBRARY}
${BOOST_SYSTEM_LIBRARY}
- ${GOOGLEMOCK_LIBRARIES}
${PTHREAD_LIBRARY}
)
diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt
index 4190d17e1f0b9d77e16f45059668add52ca7a3de..673467ff8d6c19ae5e374235362f943578553915 100644
--- a/indra/llcommon/CMakeLists.txt
+++ b/indra/llcommon/CMakeLists.txt
@@ -323,7 +323,6 @@ if (LL_TESTS)
set(test_libs llcommon
${LLCOMMON_LIBRARIES}
${WINDOWS_LIBRARIES}
- ${GOOGLEMOCK_LIBRARIES}
${BOOST_FIBER_LIBRARY}
${BOOST_CONTEXT_LIBRARY}
${BOOST_THREAD_LIBRARY}
diff --git a/indra/llcorehttp/CMakeLists.txt b/indra/llcorehttp/CMakeLists.txt
index 44f339d2c4a240012f2444848b3c4d424fa880a8..0d63ed14b0ee335687f1b12adcc4bcd7bccfde18 100644
--- a/indra/llcorehttp/CMakeLists.txt
+++ b/indra/llcorehttp/CMakeLists.txt
@@ -3,7 +3,6 @@
project(llcorehttp)
include(00-Common)
-include(GoogleMock)
include(CURL)
include(OpenSSL)
include(NGHTTP2)
@@ -133,7 +132,6 @@ if (LL_TESTS AND LLCOREHTTP_TESTS)
${WINDOWS_LIBRARIES}
${LLMESSAGE_LIBRARIES}
${LLCOMMON_LIBRARIES}
- ${GOOGLEMOCK_LIBRARIES}
${CURL_LIBRARIES}
${OPENSSL_LIBRARIES}
${CRYPTO_LIBRARIES}
@@ -206,7 +204,6 @@ endif (DARWIN)
${WINDOWS_LIBRARIES}
${LLMESSAGE_LIBRARIES}
${LLCOMMON_LIBRARIES}
- ${GOOGLEMOCK_LIBRARIES}
${CURL_LIBRARIES}
${OPENSSL_LIBRARIES}
${CRYPTO_LIBRARIES}
diff --git a/indra/llmessage/CMakeLists.txt b/indra/llmessage/CMakeLists.txt
index 2f99ca069e072d9f3a9ddf49bbeede6af71fd1de..bb838d9540caedd23f6911eff9823d2806f34a55 100644
--- a/indra/llmessage/CMakeLists.txt
+++ b/indra/llmessage/CMakeLists.txt
@@ -3,7 +3,6 @@
project(llmessage)
include(00-Common)
-include(GoogleMock)
include(LLAddBuildTest)
include(LLCommon)
include(LLCoreHttp)
@@ -268,7 +267,6 @@ if (LINUX)
${BOOST_FIBER_LIBRARY}
${BOOST_CONTEXT_LIBRARY}
rt
- ${GOOGLEMOCK_LIBRARIES}
)
else (LINUX)
set(test_libs
@@ -283,7 +281,6 @@ else (LINUX)
${JSONCPP_LIBRARIES}
${BOOST_FIBER_LIBRARY}
${BOOST_CONTEXT_LIBRARY}
- ${GOOGLEMOCK_LIBRARIES}
)
endif(LINUX)
diff --git a/indra/llmessage/tests/llmockhttpclient.h b/indra/llmessage/tests/llmockhttpclient.h
deleted file mode 100644
index af26bf88032b8fb26343bed211f3826ae6dea768..0000000000000000000000000000000000000000
--- a/indra/llmessage/tests/llmockhttpclient.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/**
- * @file
- * @brief
- *
- * $LicenseInfo:firstyear=2008&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
- * $/LicenseInfo$
- */
-
-/* Macro Definitions */
-#ifndef LL_LLMOCKHTTPCLIENT_H
-#define LL_LLMOCKHTTPCLIENT_H
-
-#include "linden_common.h"
-#include "llhttpclientinterface.h"
-
-#include <gmock/gmock.h>
-
-class LLMockHTTPClient : public LLHTTPClientInterface
-{
-public:
- MOCK_METHOD2(get, void(const std::string& url, LLCurl::ResponderPtr responder));
- MOCK_METHOD3(get, void(const std::string& url, LLCurl::ResponderPtr responder, const LLSD& headers));
- MOCK_METHOD3(put, void(const std::string& url, const LLSD& body, LLCurl::ResponderPtr responder));
-};
-
-// A helper to match responder types
-template<typename T>
-struct ResponderType
-{
- bool operator()(LLCurl::ResponderPtr ptr) const
- {
- T* p = dynamic_cast<T*>(ptr.get());
- return p != NULL;
- }
-};
-
-inline bool operator==(const LLSD& l, const LLSD& r)
-{
- std::ostringstream ls, rs;
- ls << l;
- rs << r;
- return ls.str() == rs.str();
-
-}
-
-
-#endif //LL_LLMOCKHTTPCLIENT_H
-
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index aa244028870be837ef9efb20f220d670c661fd9d..0e8777ff60066c2a0bc7e17066ce6d56403fdef7 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -2545,7 +2545,6 @@ if (LL_TESTS)
${LLVFS_LIBRARIES}
${LLMATH_LIBRARIES}
${LLCOMMON_LIBRARIES}
- ${GOOGLEMOCK_LIBRARIES}
)
if (LINUX)
@@ -2562,7 +2561,6 @@ if (LL_TESTS)
${LLCOMMON_LIBRARIES}
${LLMESSAGE_LIBRARIES}
${LLCOREHTTP_LIBRARIES}
- ${GOOGLEMOCK_LIBRARIES}
${OPENSSL_LIBRARIES}
${CRYPTO_LIBRARIES}
${LIBRT_LIBRARY}
diff --git a/indra/test/CMakeLists.txt b/indra/test/CMakeLists.txt
index 87536e146ba6f81f7a1a626c8504a1606c23b6c0..0e615bf85e3e487087cf193afc60b7829d8b345e 100644
--- a/indra/test/CMakeLists.txt
+++ b/indra/test/CMakeLists.txt
@@ -14,8 +14,6 @@ include(Linking)
include(Tut)
include(LLAddBuildTest)
-include(GoogleMock)
-
include_directories(
${LLCOMMON_INCLUDE_DIRS}
${LLCOREHTTP_INCLUDE_DIRS}
@@ -26,7 +24,6 @@ include_directories(
${LLVFS_INCLUDE_DIRS}
${LLXML_INCLUDE_DIRS}
${LSCRIPT_INCLUDE_DIRS}
- ${GOOGLEMOCK_INCLUDE_DIRS}
${TUT_INCLUDE_DIR}
)
include_directories(SYSTEM
@@ -95,7 +92,6 @@ target_link_libraries(lltest
${LLCOMMON_LIBRARIES}
${LLCOREHTTP_LIBRARIES}
${EXPAT_LIBRARIES}
- ${GOOGLEMOCK_LIBRARIES}
${PTHREAD_LIBRARY}
${WINDOWS_LIBRARIES}
${BOOST_PROGRAM_OPTIONS_LIBRARY}
diff --git a/indra/test/test.cpp b/indra/test/test.cpp
index a036a5e335e4d037bb6307bea4d2be161b871325..46ce00cb8fe989bcdc24d39e86db911a0c5aa68a 100644
--- a/indra/test/test.cpp
+++ b/indra/test/test.cpp
@@ -53,11 +53,6 @@
# 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
@@ -521,12 +516,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))