summaryrefslogtreecommitdiff
path: root/indra/llmessage/tests/llhost_test.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-03-03 07:20:54 -0500
committerOz Linden <oz@lindenlab.com>2011-03-03 07:20:54 -0500
commitb7c49f0f47f53d200df5afe4a4b68a83dd789918 (patch)
tree8941117f3f0384be524a8013cdd3b159642ebde1 /indra/llmessage/tests/llhost_test.cpp
parent64c07135bab95b5425ddff69351f0c86301def97 (diff)
parent781bd2ce1956c32db72ec0d477edc44619f39f05 (diff)
merge up from viewer-development and viewer-autobuild
Diffstat (limited to 'indra/llmessage/tests/llhost_test.cpp')
-rw-r--r--indra/llmessage/tests/llhost_test.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llmessage/tests/llhost_test.cpp b/indra/llmessage/tests/llhost_test.cpp
index 705473b0c0..eadf83c428 100644
--- a/indra/llmessage/tests/llhost_test.cpp
+++ b/indra/llmessage/tests/llhost_test.cpp
@@ -151,6 +151,7 @@ namespace tut
template<> template<>
void host_object::test<9>()
{
+ skip("this test is flaky, but we should figure out why...");
// skip("setHostByName(\"google.com\"); getHostName() -> (e.g.) \"yx-in-f100.1e100.net\"");
std::string hostStr = "lindenlab.com";
LLHost host;