summaryrefslogtreecommitdiff
path: root/indra/llcorehttp
diff options
context:
space:
mode:
authorandreykproductengine <andreykproductengine@lindenlab.com>2019-02-15 22:05:44 +0200
committerandreykproductengine <andreykproductengine@lindenlab.com>2019-02-15 22:05:44 +0200
commit344a3a040fb1c664108830ac784c6e4593a57553 (patch)
treed5c50daa2656d9e51e2e6c7a0b29802fee09456a /indra/llcorehttp
parent0c8d51b8c8bdca567e349755393c57cd113a81f0 (diff)
Teamcity W64 build freeze.
Diffstat (limited to 'indra/llcorehttp')
-rw-r--r--indra/llcorehttp/tests/test_httprequest.hpp12
1 files changed, 10 insertions, 2 deletions
diff --git a/indra/llcorehttp/tests/test_httprequest.hpp b/indra/llcorehttp/tests/test_httprequest.hpp
index 4ac3f6f991..e65588e48f 100644
--- a/indra/llcorehttp/tests/test_httprequest.hpp
+++ b/indra/llcorehttp/tests/test_httprequest.hpp
@@ -2904,7 +2904,11 @@ void HttpRequestTestObjectType::test<22>()
set_test_name("BUG-2295");
#if LL_WINDOWS && ADDRESS_SIZE == 64
- skip("BUG-2295 - partial load on W64 causes freeze");
+ // teamcity win64 builds freeze on this test, if you figure out the cause, please fix it
+ if (getenv("TEAMCITY_PROJECT_NAME"))
+ {
+ skip("BUG-2295 - partial load on W64 causes freeze");
+ }
#endif
// Handler can be stack-allocated *if* there are no dangling
// references to it after completion of this method.
@@ -3095,7 +3099,11 @@ void HttpRequestTestObjectType::test<23>()
set_test_name("HttpRequest GET 503s with 'Retry-After'");
#if LL_WINDOWS && ADDRESS_SIZE == 64
- skip("llcorehttp 503-with-retry test hangs on Windows 64");
+ // teamcity win64 builds freeze on this test, if you figure out the cause, please fix it
+ if (getenv("TEAMCITY_PROJECT_NAME"))
+ {
+ skip("llcorehttp 503-with-retry test hangs on Windows 64");
+ }
#endif
// This tests mainly that the code doesn't fall over if