From 82d713782529074b03720833038cb0df2b8bcffd Mon Sep 17 00:00:00 2001
From: Andrey Lihatskiy <alihatskiy@productengine.com>
Date: Tue, 14 May 2024 08:50:04 +0300
Subject: #1457 Fix the tests on mac

---
 indra/test/test.cpp | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'indra/test')

diff --git a/indra/test/test.cpp b/indra/test/test.cpp
index 21232e88f5..61a4eb07c5 100644
--- a/indra/test/test.cpp
+++ b/indra/test/test.cpp
@@ -54,12 +54,6 @@
 #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
-- 
cgit v1.2.3


From 1ebf006b73c06d037e3d3ae4393136082195096d Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Wed, 27 Mar 2024 19:51:59 -0400
Subject: Remove dead googlemock dependency and related setup code

---
 indra/test/CMakeLists.txt |  2 --
 indra/test/test.cpp       | 11 -----------
 2 files changed, 13 deletions(-)

(limited to 'indra/test')

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 61a4eb07c5..cbd1077306 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
@@ -522,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))
-- 
cgit v1.2.3