diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-27 06:39:42 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-27 06:39:42 -0400 |
| commit | 5b316df2249fc62c1e6a4f089b9726c4e62f23e0 (patch) | |
| tree | 550521651fb4a14124f9c6aed3c9018b29d92920 /indra/llmessage | |
| parent | b7b9a37bc13d40a3caf7ea77d6857c2bb6036e06 (diff) | |
| parent | 3df0b60b3ad338a62a27e1492990f15c1393ea03 (diff) | |
merge out latest changes from viewer-development
Diffstat (limited to 'indra/llmessage')
| -rw-r--r-- | indra/llmessage/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | indra/llmessage/tests/llhost_test.cpp | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/indra/llmessage/CMakeLists.txt b/indra/llmessage/CMakeLists.txt index 1cad0f6d22..c5f82cf052 100644 --- a/indra/llmessage/CMakeLists.txt +++ b/indra/llmessage/CMakeLists.txt @@ -10,7 +10,9 @@ include(LLMath) include(LLMessage) include(LLVFS) include(LLAddBuildTest) +include(Python) include(Tut) +include(Python) 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; |