diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-07-29 12:06:39 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-29 12:06:39 +0300 |
| commit | c316eb5b2b3a25aaab6e9ef5e4850e9bb72ba635 (patch) | |
| tree | 4b31b52d41337503826a7bda0cc0c18008799c55 /indra/llcorehttp | |
| parent | a9e1d0c781ffdddd5e04d48af604fcb014325b4c (diff) | |
| parent | 42885c0d23d8efc47ad77e09bb327e4ec6a4fada (diff) | |
Merge pull request #2133 from Nicky-D/feature/linux_tests
Add ability to compile and run tests on Linux
Diffstat (limited to 'indra/llcorehttp')
| -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" |