Merge

12 files changed, 14 insertions, 14 deletions

diff --git a/indra/llcommon/tests/bitpack_test.cpp b/indra/llcommon/tests/bitpack_test.cpp
index 09fd037f02..9f1423f5a7 100644
--- a/indra/llcommon/tests/bitpack_test.cpp
+++ b/indra/llcommon/tests/bitpack_test.cpp
@@ -46,7 +46,7 @@ namespace tut
 	};
 	typedef test_group<bit_pack> bit_pack_t;
 	typedef bit_pack_t::object bit_pack_object_t;
-	tut::bit_pack_t tut_bit_pack("bitpack");
+	tut::bit_pack_t tut_bit_pack("LLBitPack");
 
 	// pack -> unpack
 	template<> template<>
diff --git a/indra/llcommon/tests/commonmisc_test.cpp b/indra/llcommon/tests/commonmisc_test.cpp
index ca27fe9b23..0b89d99f16 100644
--- a/indra/llcommon/tests/commonmisc_test.cpp
+++ b/indra/llcommon/tests/commonmisc_test.cpp
@@ -65,7 +65,7 @@ namespace tut
 	};
 	typedef test_group<sd_data> sd_test;
 	typedef sd_test::object sd_object;
-	tut::sd_test sd("llsd");
+	tut::sd_test sd("LLSD");
 
 	template<> template<>
 	void sd_object::test<1>()
@@ -456,7 +456,7 @@ namespace tut
 	};
 	typedef test_group<mem_data> mem_test;
 	typedef mem_test::object mem_object;
-	tut::mem_test mem_stream("memory_stream");
+	tut::mem_test mem_stream("LLMemoryStream");
 
 	template<> template<>
 	void mem_object::test<1>()
@@ -649,7 +649,7 @@ namespace tut
 	};
 	typedef test_group<hash_data> hash_test;
 	typedef hash_test::object hash_object;
-	tut::hash_test hash_tester("hash_test");
+	tut::hash_test hash_tester("LLHash");
 
 	template<> template<>
 	void hash_object::test<1>()
diff --git a/indra/llcommon/tests/llbase64_test.cpp b/indra/llcommon/tests/llbase64_test.cpp
index 6009788b22..b19a811c0e 100644
--- a/indra/llcommon/tests/llbase64_test.cpp
+++ b/indra/llcommon/tests/llbase64_test.cpp
@@ -47,7 +47,7 @@ namespace tut
 	};
 	typedef test_group<base64_data> base64_test;
 	typedef base64_test::object base64_object;
-	tut::base64_test base64("base64");
+	tut::base64_test base64("LLBase64");
 
 	template<> template<>
 	void base64_object::test<1>()
diff --git a/indra/llcommon/tests/lldate_test.cpp b/indra/llcommon/tests/lldate_test.cpp
index c31259227a..4d978af25b 100644
--- a/indra/llcommon/tests/lldate_test.cpp
+++ b/indra/llcommon/tests/lldate_test.cpp
@@ -77,7 +77,7 @@ namespace tut
 	};
 	typedef test_group<date_test> date_test_t;
 	typedef date_test_t::object date_test_object_t;
-	tut::date_test_t tut_date_test("date_test");
+	tut::date_test_t tut_date_test("LLDate");
 
 	/* format validation */
 	template<> template<>
diff --git a/indra/llcommon/tests/lldependencies_test.cpp b/indra/llcommon/tests/lldependencies_test.cpp
index f3c25de8b5..5c6126a472 100644
--- a/indra/llcommon/tests/lldependencies_test.cpp
+++ b/indra/llcommon/tests/lldependencies_test.cpp
@@ -128,7 +128,7 @@ namespace tut
     };
     typedef test_group<deps_data> deps_group;
     typedef deps_group::object deps_object;
-    tut::deps_group depsgr("lldependencies");
+    tut::deps_group depsgr("LLDependencies");
 
     template<> template<>
     void deps_object::test<1>()
diff --git a/indra/llcommon/tests/llframetimer_test.cpp b/indra/llcommon/tests/llframetimer_test.cpp
index 1d047e41f8..5bc6b19967 100644
--- a/indra/llcommon/tests/llframetimer_test.cpp
+++ b/indra/llcommon/tests/llframetimer_test.cpp
@@ -49,7 +49,7 @@ namespace tut
 	};
 	typedef test_group<frametimer_test> frametimer_group_t;
 	typedef frametimer_group_t::object frametimer_object_t;
-	tut::frametimer_group_t frametimer_instance("frametimer");
+	tut::frametimer_group_t frametimer_instance("LLFrameTimer");
 
 	template<> template<>
 	void frametimer_object_t::test<1>()
diff --git a/indra/llcommon/tests/llprocessor_test.cpp b/indra/llcommon/tests/llprocessor_test.cpp
index a9e312b70b..065f6e946e 100644
--- a/indra/llcommon/tests/llprocessor_test.cpp
+++ b/indra/llcommon/tests/llprocessor_test.cpp
@@ -44,7 +44,7 @@ namespace tut
 
 	typedef test_group<processor> processor_t;
 	typedef processor_t::object processor_object_t;
-	tut::processor_t tut_processor("processor");
+	tut::processor_t tut_processor("LLProcessor");
 
 	template<> template<>
 	void processor_object_t::test<1>()
diff --git a/indra/llcommon/tests/llrand_test.cpp b/indra/llcommon/tests/llrand_test.cpp
index 1f178d6fc9..b58802a93c 100644
--- a/indra/llcommon/tests/llrand_test.cpp
+++ b/indra/llcommon/tests/llrand_test.cpp
@@ -45,7 +45,7 @@ namespace tut
 
 	typedef test_group<random> random_t;
 	typedef random_t::object random_object_t;
-	tut::random_t tut_random("random");
+	tut::random_t tut_random("LLSeedRand");
 
 	template<> template<>
 	void random_object_t::test<1>()
diff --git a/indra/llcommon/tests/llsdserialize_test.cpp b/indra/llcommon/tests/llsdserialize_test.cpp
index 6ab48ec34a..b5d89ffd30 100644
--- a/indra/llcommon/tests/llsdserialize_test.cpp
+++ b/indra/llcommon/tests/llsdserialize_test.cpp
@@ -80,7 +80,7 @@ namespace tut
 
 	typedef test_group<sd_xml_data> sd_xml_test;
 	typedef sd_xml_test::object sd_xml_object;
-	tut::sd_xml_test sd_xml_stream("sd_xml_serialization");
+	tut::sd_xml_test sd_xml_stream("LLSDXMLFormatter");
 
 	template<> template<>
 	void sd_xml_object::test<1>()
diff --git a/indra/llcommon/tests/llstring_test.cpp b/indra/llcommon/tests/llstring_test.cpp
index beba55416a..35f5a11394 100644
--- a/indra/llcommon/tests/llstring_test.cpp
+++ b/indra/llcommon/tests/llstring_test.cpp
@@ -44,7 +44,7 @@ namespace tut
 	};
 	typedef test_group<string_index> string_index_t;
 	typedef string_index_t::object string_index_object_t;
-	tut::string_index_t tut_string_index("string_test");
+	tut::string_index_t tut_string_index("LLString");
 
 	template<> template<>
 	void string_index_object_t::test<1>()
diff --git a/indra/llcommon/tests/lltreeiterators_test.cpp b/indra/llcommon/tests/lltreeiterators_test.cpp
index 31c70b4daa..29efefa0c8 100644
--- a/indra/llcommon/tests/lltreeiterators_test.cpp
+++ b/indra/llcommon/tests/lltreeiterators_test.cpp
@@ -62,7 +62,7 @@ namespace tut
     };
     typedef test_group<iter_data> iter_group;
     typedef iter_group::object iter_object;
-    tut::iter_group ig("lltreeiterators");
+    tut::iter_group ig("LLTreeIterators");
 } // namespace tut
 
 /*****************************************************************************
diff --git a/indra/llcommon/tests/stringize_test.cpp b/indra/llcommon/tests/stringize_test.cpp
index dd69787a1c..6762afe393 100644
--- a/indra/llcommon/tests/stringize_test.cpp
+++ b/indra/llcommon/tests/stringize_test.cpp
@@ -86,7 +86,7 @@ namespace tut
     };
     typedef test_group<stringize_data> stringize_group;
     typedef stringize_group::object stringize_object;
-    tut::stringize_group strzgrp("stringize");
+    tut::stringize_group strzgrp("stringize_h");
 
     template<> template<>
     void stringize_object::test<1>()