diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-03 07:20:54 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-03 07:20:54 -0500 |
| commit | b7c49f0f47f53d200df5afe4a4b68a83dd789918 (patch) | |
| tree | 8941117f3f0384be524a8013cdd3b159642ebde1 /indra/llmessage | |
| parent | 64c07135bab95b5425ddff69351f0c86301def97 (diff) | |
| parent | 781bd2ce1956c32db72ec0d477edc44619f39f05 (diff) | |
merge up from 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; |