diff options
| author | Nicky <nicky.dasmijn@posteo.nl> | 2024-08-03 14:30:06 +0200 |
|---|---|---|
| committer | Nicky <nicky.dasmijn@posteo.nl> | 2024-08-03 14:30:06 +0200 |
| commit | 04c47b95323a8022785e58fec03c14769ddfa6af (patch) | |
| tree | 2e781e03d8af6bc231f9340b1e289234c363ff20 /indra/llcorehttp/tests/llcorehttp_test.cpp | |
| parent | f480075e1ffbcc026843a3d14fd6533aad1e7126 (diff) | |
| parent | 2ee039c736f64c91bb4f16e403360cddb0089707 (diff) | |
Merge remote-tracking branch 'll/marchcat/b-develop' into feature/warning_cleansweep
Diffstat (limited to 'indra/llcorehttp/tests/llcorehttp_test.cpp')
| -rwxr-xr-x | indra/llcorehttp/tests/llcorehttp_test.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
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" |