diff options
author | Bryan O'Sullivan <bos@lindenlab.com> | 2009-11-03 13:39:02 -0800 |
---|---|---|
committer | Bryan O'Sullivan <bos@lindenlab.com> | 2009-11-03 13:39:02 -0800 |
commit | 28ed8f84d86403cf90b7963b147d2ac5c6cf37c7 (patch) | |
tree | cebb2895642b96aa64e8cf8c2eb402e8423165d6 /indra/llmessage/tests/llhost_test.cpp | |
parent | 9c3595465972ba4be916e871f6b0a62cc0c13d4a (diff) | |
parent | 63b9bd43ff41da01d549f630bd838caff0dffd97 (diff) |
Merge with SVN render-pipeline-8 branch
Diffstat (limited to 'indra/llmessage/tests/llhost_test.cpp')
-rw-r--r-- | indra/llmessage/tests/llhost_test.cpp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/indra/llmessage/tests/llhost_test.cpp b/indra/llmessage/tests/llhost_test.cpp index 2424dbcb6b..7e5c3a117b 100644 --- a/indra/llmessage/tests/llhost_test.cpp +++ b/indra/llmessage/tests/llhost_test.cpp @@ -157,7 +157,8 @@ namespace tut template<> template<> void host_object::test<9>() { - std::string hostStr = "linux.org"; +// skip("setHostByName(\"google.com\"); getHostName() -> (e.g.) \"yx-in-f100.1e100.net\""); + std::string hostStr = "linux.org"; LLHost host; host.setHostByName(hostStr); @@ -166,7 +167,15 @@ namespace tut // the main domain name and not do the exact compare std::string hostname = host.getHostName(); - ensure("getHostName failed", hostname.find(hostStr) != std::string::npos); + try + { + ensure("getHostName failed", hostname.find(hostStr) != std::string::npos); + } + catch (const std::exception&) + { + std::cerr << "set '" << hostStr << "'; reported '" << hostname << "'" << std::endl; + throw; + } } // setHostByName for dotted IP |