diff options
| author | Rye Mutt <rye@alchemyviewer.org> | 2024-03-27 19:51:59 -0400 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-03-28 19:41:47 +0200 |
| commit | 53d4fcd3597d2042b2c82bd3aaa41f61fdb7b3d5 (patch) | |
| tree | 82ef91e462969544976943366f6cdd911c4a2436 /indra/test | |
| parent | 32c24ffbd7395be67ec6d59a00c68165ec8d8318 (diff) | |
Remove dead googlemock dependency and related setup code
Diffstat (limited to 'indra/test')
| -rw-r--r-- | indra/test/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | indra/test/test.cpp | 17 |
2 files changed, 0 insertions, 19 deletions
diff --git a/indra/test/CMakeLists.txt b/indra/test/CMakeLists.txt index 4a0a8716c4..3dcddf9dc2 100644 --- a/indra/test/CMakeLists.txt +++ b/indra/test/CMakeLists.txt @@ -9,7 +9,6 @@ include(Linking) include(Tut) include(LLAddBuildTest) include(bugsplat) -include(GoogleMock) set(test_SOURCE_FILES io.cpp @@ -65,7 +64,6 @@ target_link_libraries(lltest llxml llcommon llcorehttp - ll::googlemock ) if (WINDOWS) diff --git a/indra/test/test.cpp b/indra/test/test.cpp index 94478a5263..be3b326afe 100644 --- a/indra/test/test.cpp +++ b/indra/test/test.cpp @@ -53,17 +53,6 @@ # include "ctype_workaround.h" #endif -#ifndef LL_WINDOWS - -typedef struct { - void *re_pcre; - size_t re_nsub; - size_t re_erroffset; -} regex_t; -#include <gmock/gmock.h> -#include <gtest/gtest.h> -#endif - #if LL_MSVC #pragma warning (push) #pragma warning (disable : 4702) // warning C4702: unreachable code @@ -528,12 +517,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)) |