diff options
| author | callum_linden <callum@lindenlab.com> | 2017-09-21 14:01:48 -0700 |
|---|---|---|
| committer | callum_linden <callum@lindenlab.com> | 2017-09-21 14:01:48 -0700 |
| commit | b42e2da9df9ee1c23916917c336e6b9d242e01d0 (patch) | |
| tree | 5ec74a0cdd306136ae49f87731bbeddbc1651c27 /indra/llcorehttp | |
| parent | cdba690ec9a68ab3ac930a0b8aa9b8bca4deb7f4 (diff) | |
| parent | 1e49cd9b007ccb020c155b3d034793540e9e09ca (diff) | |
Automated merge with head of viewer64
Diffstat (limited to 'indra/llcorehttp')
| -rw-r--r-- | indra/llcorehttp/tests/test_httprequest.hpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/llcorehttp/tests/test_httprequest.hpp b/indra/llcorehttp/tests/test_httprequest.hpp index 45215ee0f4..b450f3502e 100644 --- a/indra/llcorehttp/tests/test_httprequest.hpp +++ b/indra/llcorehttp/tests/test_httprequest.hpp @@ -836,7 +836,7 @@ void HttpRequestTestObjectType::test<8>() ensure("Two handler calls on the way out", 2 == mHandlerCalls); -#if defined(WIN32) +#if 0 // defined(WIN32) // Can only do this memory test on Windows. On other platforms, // the LL logging system holds on to memory and produces what looks // like memory leaks... @@ -947,7 +947,7 @@ void HttpRequestTestObjectType::test<9>() ensure("Two handler calls on the way out", 2 == mHandlerCalls); -#if defined(WIN32) +#if 0 // defined(WIN32) // Can only do this memory test on Windows. On other platforms, // the LL logging system holds on to memory and produces what looks // like memory leaks... @@ -1183,7 +1183,7 @@ void HttpRequestTestObjectType::test<11>() ensure("Two handler calls on the way out", 2 == mHandlerCalls); -#if defined(WIN32) +#if 0 // defined(WIN32) // Can only do this memory test on Windows. On other platforms, // the LL logging system holds on to memory and produces what looks // like memory leaks... @@ -1429,7 +1429,7 @@ void HttpRequestTestObjectType::test<13>() ensure("Two handler calls on the way out", 2 == mHandlerCalls); -#if defined(WIN32) +#if 0 // defined(WIN32) // Can only do this memory test on Windows. On other platforms, // the LL logging system holds on to memory and produces what looks // like memory leaks... @@ -1663,7 +1663,7 @@ void HttpRequestTestObjectType::test<15>() ensure("Two handler calls on the way out", 2 == mHandlerCalls); -#if defined(WIN32) +#if 0 // defined(WIN32) // Can only do this memory test on Windows. On other platforms, // the LL logging system holds on to memory and produces what looks // like memory leaks... |