From 33ad8db77584c66496f261a1cfd9aa535462a003 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

(cherry picked from commit 82d713782529074b03720833038cb0df2b8bcffd)
---
 indra/llimage/tests/llimageworker_test.cpp | 3 ++-
 indra/test/test.cpp                        | 6 ------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/indra/llimage/tests/llimageworker_test.cpp b/indra/llimage/tests/llimageworker_test.cpp
index 49fc1afd82..2568adf89e 100644
--- a/indra/llimage/tests/llimageworker_test.cpp
+++ b/indra/llimage/tests/llimageworker_test.cpp
@@ -68,6 +68,7 @@ U8* LLImageRaw::allocateData(S32 size) { return NULL; }
 U8* LLImageRaw::reallocateData(S32 size) { return NULL; }
 const U8* LLImageBase::getData() const { return NULL; }
 U8* LLImageBase::getData() { return NULL; }
+const std::string& LLImage::getLastThreadError() { static std::string msg; return msg; }
 
 // End Stubbing
 // -------------------------------------------------------------------------------------------
@@ -98,7 +99,7 @@ namespace tut
                 done = res;
                 *done = false;
             }
-            virtual void completed(bool success, LLImageRaw* raw, LLImageRaw* aux, U32)
+            virtual void completed(bool success, const std::string& error_message, LLImageRaw* raw, LLImageRaw* aux, U32 request_id)
             {
                 *done = true;
             }
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 8011d3f457ca86b9610d5e9580d554393dd4a0a6 Mon Sep 17 00:00:00 2001
From: Brad Linden <brad@lindenlab.com>
Date: Wed, 15 May 2024 16:08:04 -0700
Subject: Fix channel detection for mac builds

---
 .github/workflows/build.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 4785273b78..b26006f2ff 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -179,7 +179,7 @@ jobs:
 
           # determine the viewer channel from the branch name
           branch=$AUTOBUILD_VCS_BRANCH
-          IFS='/' read -ra ba <<< $branch
+          IFS='/' read -ra ba <<< "$branch"
           prefix=${ba[0]}
           if [ "$prefix" == "project" ]; then
               IFS='_' read -ra prj <<< "${ba[1]}"
-- 
cgit v1.2.3