diff options
| author | Callum Prentice <callum@gmail.com> | 2016-12-07 08:43:51 -0800 |
|---|---|---|
| committer | Callum Prentice <callum@gmail.com> | 2016-12-07 08:43:51 -0800 |
| commit | 70a42af076cbe6f12a265d508b4ed96af65d26ba (patch) | |
| tree | b8dd5848d4703f6320eb69c0376c492fa3a16bbb /indra/llcorehttp/tests/test_httprequest.hpp | |
| parent | 15c043ec20eeaa08de21c0aed4e122b5095a98b0 (diff) | |
| parent | 232c3598547913ca6cb66593059497b413a9322c (diff) | |
Automated merge with tip of lindenlab/oz_viewer64
Diffstat (limited to 'indra/llcorehttp/tests/test_httprequest.hpp')
| -rw-r--r-- | indra/llcorehttp/tests/test_httprequest.hpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/indra/llcorehttp/tests/test_httprequest.hpp b/indra/llcorehttp/tests/test_httprequest.hpp index 0aad3d1835..463e55dd7e 100644 --- a/indra/llcorehttp/tests/test_httprequest.hpp +++ b/indra/llcorehttp/tests/test_httprequest.hpp @@ -1455,10 +1455,6 @@ void HttpRequestTestObjectType::test<14>() set_test_name("HttpRequest GET timeout"); -#if LL_WINDOWS - skip("This test causes our dummy server test_llcorehttp_peer.py to fail"); -#endif - // Handler can be stack-allocated *if* there are no dangling // references to it after completion of this method. // Create before memory record as the string copy will bump numbers. |
