diff options
| author | callum@lindenlab.com <callum@lindenlab.com> | 2017-02-13 13:55:58 -0800 |
|---|---|---|
| committer | callum@lindenlab.com <callum@lindenlab.com> | 2017-02-13 13:55:58 -0800 |
| commit | c5ac455647dad3158b284fc9bb33dbc1d63928db (patch) | |
| tree | f3195853b2f5753124ede080b2d1effd7b369b72 /indra | |
| parent | 189c0430383aa92fe839d6ed144d916886360407 (diff) | |
| parent | a0c18425958f34b8c373ffc3b20b6ba710b1d8c8 (diff) | |
Automated merge with lindenlab/viewer64
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llcorehttp/tests/test_httprequest.hpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcorehttp/tests/test_httprequest.hpp b/indra/llcorehttp/tests/test_httprequest.hpp index 8b689e8c83..a9c192e141 100644 --- a/indra/llcorehttp/tests/test_httprequest.hpp +++ b/indra/llcorehttp/tests/test_httprequest.hpp @@ -3089,7 +3089,7 @@ void HttpRequestTestObjectType::test<23>() set_test_name("HttpRequest GET 503s with 'Retry-After'"); -#if LL_WINDOWS && ADDRESS_SIZE == 64: +#if LL_WINDOWS && ADDRESS_SIZE == 64 skip("llcorehttp 503-with-retry test hangs on Windows 64"); #endif |