diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-11 19:42:26 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-11 19:42:26 -0500 |
| commit | 7309fda08c5bd13c1966a4024f193074f0b4a410 (patch) | |
| tree | b7eea9121560e1d13ed41f9dd5946738755da320 /indra/llmessage | |
| parent | 4223ab9acf282f52aac2bcf124f4b2912c2fe88e (diff) | |
| parent | c20eb01ff2adfc23b83d1d5c8723962f794fdbf4 (diff) | |
sync up to latest viewer-development
Diffstat (limited to 'indra/llmessage')
| -rw-r--r-- | indra/llmessage/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | indra/llmessage/tests/llhost_test.cpp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/indra/llmessage/CMakeLists.txt b/indra/llmessage/CMakeLists.txt index d1bb7cc5d4..c5f82cf052 100644 --- a/indra/llmessage/CMakeLists.txt +++ b/indra/llmessage/CMakeLists.txt @@ -10,6 +10,7 @@ include(LLMath) include(LLMessage) include(LLVFS) include(LLAddBuildTest) +include(Python) include(Tut) include(Python) 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; |