diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-02-24 22:31:35 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-02-24 22:31:35 -0500 |
| commit | 781bd2ce1956c32db72ec0d477edc44619f39f05 (patch) | |
| tree | bde52dae7e7fc79ee6cf517fc976ec9f5c188b1d /indra/llmessage | |
| parent | b1787a19d37b831de5465c0b0f3b7abd42d99afb (diff) | |
| parent | ed73c8bf6357ca1e1a8009ead6b3b664e25c29c9 (diff) | |
sync to latest viewer-development and viewer-autobuild
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 1cad0f6d22..51532b8af6 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_directories (${CMAKE_CURRENT_SOURCE_DIR}) 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; |