From 0dce9862d20bf691d97114fc977521a499824569 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Thu, 22 Oct 2009 10:37:57 -0400
Subject: [PATCH] Fix broken test compile. It looks as though someone tried to
 reactivate the skip()ped test by replacing "google.com" with "linux.org" and
 deleting the skip() call. Unfortunately the edit went wrong: the instance of
 "google.com" in the skip() call was replaced, and the line declaring hostStr
 = "google.com" was deleted. Removing the local hostStr variable broke the
 compile. (Possible merge glitch?) On the above assumption, I commented out
 the skip() call, reinstated the hostStr declaration and replaced "google.com"
 with "linux.org" therein.

---
 indra/llmessage/tests/llhost_test.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/indra/llmessage/tests/llhost_test.cpp b/indra/llmessage/tests/llhost_test.cpp
index f7e7eee88bc..7e5c3a117b3 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>()
 	{
-		skip("setHostByName(\"linux.org\"); getHostName() -> (e.g.) \"yx-in-f100.1e100.net\"");
+//		skip("setHostByName(\"google.com\"); getHostName() -> (e.g.) \"yx-in-f100.1e100.net\"");
+		std::string hostStr = "linux.org";		
 		LLHost host;
 		host.setHostByName(hostStr);	
 
-- 
GitLab