diff options
| author | Kitty Barnett <develop@catznip.com> | 2024-09-30 15:54:20 +0200 |
|---|---|---|
| committer | Kitty Barnett <develop@catznip.com> | 2024-09-30 15:54:20 +0200 |
| commit | ed2d4f02d93459bf114ebeab8727d507b7bfc0ef (patch) | |
| tree | a216907e2c01db7932c83e212319cb7a8c790013 /indra/llcorehttp | |
| parent | a8d8314cb9af193ea7ce95456fb308217ba28e3c (diff) | |
| parent | a409503653bebacbc498409806f9e1a4b97ed6ac (diff) | |
Merge branch 'develop' into rlva/base
Diffstat (limited to 'indra/llcorehttp')
| -rw-r--r-- | indra/llcorehttp/CMakeLists.txt | 1 | ||||
| -rwxr-xr-x | indra/llcorehttp/tests/llcorehttp_test.cpp | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/indra/llcorehttp/CMakeLists.txt b/indra/llcorehttp/CMakeLists.txt index 05b788a433..b141171516 100644 --- a/indra/llcorehttp/CMakeLists.txt +++ b/indra/llcorehttp/CMakeLists.txt @@ -10,7 +10,6 @@ include(ZLIBNG) include(LLCoreHttp) include(LLAddBuildTest) include(LLCommon) -include(Tut) include(bugsplat) set(llcorehttp_SOURCE_FILES diff --git a/indra/llcorehttp/tests/llcorehttp_test.cpp b/indra/llcorehttp/tests/llcorehttp_test.cpp index c0cc2c8030..8a788e5a93 100755 --- a/indra/llcorehttp/tests/llcorehttp_test.cpp +++ b/indra/llcorehttp/tests/llcorehttp_test.cpp @@ -43,9 +43,12 @@ #include "test_httpoperation.hpp" // As of 2019-06-28, test_httprequest.hpp consistently crashes on Mac Release // builds for reasons not yet diagnosed. -#if ! (LL_DARWIN && LL_RELEASE) +// On Linux too, this is likely to badly handling (p)thread creation and not waiting +// for threads to properly shutdown +#if LL_WINDOWS #include "test_httprequest.hpp" #endif + #include "test_httpheaders.hpp" #include "test_httprequestqueue.hpp" #include "_httpservice.h" |