livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#1457 Fix the tests on mac 

(cherry picked from commit 82d7137825)
master
Andrey Lihatskiy 2024-05-14 08:50:04 +03:00 committed by Nat Goodspeed
parent bb3c36f5cb
commit 33ad8db775
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
indra/llimage/tests/llimageworker_test.cpp
View File

@ -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;
}

6
indra/test/test.cpp
View File

@ -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