diff options
| author | Alain Linden <alain@lindenlab.com> | 2011-03-03 10:38:39 -0800 |
|---|---|---|
| committer | Alain Linden <alain@lindenlab.com> | 2011-03-03 10:38:39 -0800 |
| commit | 8dffedb246dd5fdf89aadded14630a5e8691b30c (patch) | |
| tree | 34170953d7202fe61bf7c4319e0215d233722ad2 /indra/llmessage | |
| parent | aa72b0df03c1dfea7571eae4abed30ce9f269158 (diff) | |
| parent | fa20a6de086febf0b6b098172685c26f939876f6 (diff) | |
merge from lindenlab/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 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; |