diff options
author | Oz Linden <oz@lindenlab.com> | 2011-03-18 08:08:12 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-03-18 08:08:12 -0400 |
commit | 7e3c32308c1f7d9e325fae55e7116b5fe3f460ca (patch) | |
tree | fac07085cf1b416ef3fb240961913758ebf6b435 /indra/llmessage/tests/llhost_test.cpp | |
parent | f64a20ddcff91677b02b7688e08819cffb0989c9 (diff) | |
parent | 28eaade69b4b330db7a9dfea528cc4f0a3998841 (diff) |
merge out 2.6.0 changes from viewer-development
Diffstat (limited to 'indra/llmessage/tests/llhost_test.cpp')
-rw-r--r-- | indra/llmessage/tests/llhost_test.cpp | 1 |
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; |