automated merge from viewer-development root

12 files changed, 14 insertions, 14 deletions

diff --git a/indra/llmath/tests/llmodularmath_test.cpp b/indra/llmath/tests/llmodularmath_test.cpp
index e6525542f1..063d3ef79f 100644
--- a/indra/llmath/tests/llmodularmath_test.cpp
+++ b/indra/llmath/tests/llmodularmath_test.cpp
@@ -39,7 +39,7 @@ namespace tut
 	};
 	typedef test_group<modularmath_data> modularmath_test;
 	typedef modularmath_test::object modularmath_object;
-	tut::modularmath_test modularmath_testcase("modularmath");
+	tut::modularmath_test modularmath_testcase("LLModularMath");
 
 	template<> template<>
 	void modularmath_object::test<1>()
diff --git a/indra/llmath/tests/llquaternion_test.cpp b/indra/llmath/tests/llquaternion_test.cpp
index 29e7793d49..9e79b299ff 100644
--- a/indra/llmath/tests/llquaternion_test.cpp
+++ b/indra/llmath/tests/llquaternion_test.cpp
@@ -43,7 +43,7 @@ namespace tut
 	};
 	typedef test_group<llquat_test> llquat_test_t;
 	typedef llquat_test_t::object llquat_test_object_t;
-	tut::llquat_test_t tut_llquat_test("llquat");
+	tut::llquat_test_t tut_llquat_test("LLQuaternion");
 
 	//test case for LLQuaternion::LLQuaternion(void) fn.
 	template<> template<>
diff --git a/indra/llmath/tests/m3math_test.cpp b/indra/llmath/tests/m3math_test.cpp
index 3b424f79c6..8abf61b740 100644
--- a/indra/llmath/tests/m3math_test.cpp
+++ b/indra/llmath/tests/m3math_test.cpp
@@ -44,7 +44,7 @@ namespace tut
 	};
 	typedef test_group<m3math_test> m3math_test_t;
 	typedef m3math_test_t::object m3math_test_object_t;
-	tut::m3math_test_t tut_m3math_test("m3math_test");
+	tut::m3math_test_t tut_m3math_test("m3math_h");
 
 	//test case for setIdentity() fn.
 	template<> template<>
diff --git a/indra/llmath/tests/mathmisc_test.cpp b/indra/llmath/tests/mathmisc_test.cpp
index 58b78cd491..91a2e6c009 100644
--- a/indra/llmath/tests/mathmisc_test.cpp
+++ b/indra/llmath/tests/mathmisc_test.cpp
@@ -45,7 +45,7 @@ namespace tut
 	};
 	typedef test_group<math_data> math_test;
 	typedef math_test::object math_object;
-	tut::math_test tm("basic_linden_math");
+	tut::math_test tm("BasicLindenMath");
 
 	template<> template<>
 	void math_object::test<1>()
@@ -178,7 +178,7 @@ namespace tut
 	};
 	typedef test_group<uuid_data> uuid_test;
 	typedef uuid_test::object uuid_object;
-	tut::uuid_test tu("uuid");
+	tut::uuid_test tu("LLUUID");
 
 	template<> template<>
 	void uuid_object::test<1>()
@@ -233,7 +233,7 @@ namespace tut
 	};
 	typedef test_group<crc_data> crc_test;
 	typedef crc_test::object crc_object;
-	tut::crc_test tc("crc");
+	tut::crc_test tc("LLCrc");
 
 	template<> template<>
 	void crc_object::test<1>()
diff --git a/indra/llmath/tests/v2math_test.cpp b/indra/llmath/tests/v2math_test.cpp
index e112892c49..9747996b25 100644
--- a/indra/llmath/tests/v2math_test.cpp
+++ b/indra/llmath/tests/v2math_test.cpp
@@ -39,7 +39,7 @@ namespace tut
 	};
 	typedef test_group<v2math_data> v2math_test;
 	typedef v2math_test::object v2math_object;
-	tut::v2math_test v2math_testcase("v2math");
+	tut::v2math_test v2math_testcase("v2math_h");
 
 	template<> template<>
 	void v2math_object::test<1>()
diff --git a/indra/llmath/tests/v3color_test.cpp b/indra/llmath/tests/v3color_test.cpp
index 4a05a84123..2c00f00ab3 100644
--- a/indra/llmath/tests/v3color_test.cpp
+++ b/indra/llmath/tests/v3color_test.cpp
@@ -39,7 +39,7 @@ namespace tut
 	};
 	typedef test_group<v3color_data> v3color_test;
 	typedef v3color_test::object v3color_object;
-	tut::v3color_test v3color_testcase("v3color");
+	tut::v3color_test v3color_testcase("v3color_h");
 
 	template<> template<>
 	void v3color_object::test<1>()
diff --git a/indra/llmath/tests/v3dmath_test.cpp b/indra/llmath/tests/v3dmath_test.cpp
index 68bcbd124f..b67346f4e5 100644
--- a/indra/llmath/tests/v3dmath_test.cpp
+++ b/indra/llmath/tests/v3dmath_test.cpp
@@ -43,7 +43,7 @@ namespace tut
 	};
 	typedef test_group<v3dmath_data> v3dmath_test;
 	typedef v3dmath_test::object v3dmath_object;
-	tut::v3dmath_test v3dmath_testcase("v3dmath");
+	tut::v3dmath_test v3dmath_testcase("v3dmath_h");
 
 	template<> template<>
 	void v3dmath_object::test<1>()
diff --git a/indra/llmath/tests/v3math_test.cpp b/indra/llmath/tests/v3math_test.cpp
index e6ef5d5012..e4732bf861 100644
--- a/indra/llmath/tests/v3math_test.cpp
+++ b/indra/llmath/tests/v3math_test.cpp
@@ -45,7 +45,7 @@ namespace tut
 	};
 	typedef test_group<v3math_data> v3math_test;
 	typedef v3math_test::object v3math_object;
-	tut::v3math_test v3math_testcase("v3math");
+	tut::v3math_test v3math_testcase("v3math_h");
 
 	template<> template<>
 	void v3math_object::test<1>()
diff --git a/indra/llmath/tests/v4color_test.cpp b/indra/llmath/tests/v4color_test.cpp
index dde5f9069b..fbd43625d1 100644
--- a/indra/llmath/tests/v4color_test.cpp
+++ b/indra/llmath/tests/v4color_test.cpp
@@ -43,7 +43,7 @@ namespace tut
 	};
 	typedef test_group<v4color_data> v4color_test;
 	typedef v4color_test::object v4color_object;
-	tut::v4color_test v4color_testcase("v4color");
+	tut::v4color_test v4color_testcase("v4color_h");
 
 	template<> template<>
 	void v4color_object::test<1>()
diff --git a/indra/llmath/tests/v4coloru_test.cpp b/indra/llmath/tests/v4coloru_test.cpp
index 1408d05b81..6d84ba41ef 100644
--- a/indra/llmath/tests/v4coloru_test.cpp
+++ b/indra/llmath/tests/v4coloru_test.cpp
@@ -42,7 +42,7 @@ namespace tut
 	};
 	typedef test_group<v4coloru_data> v4coloru_test;
 	typedef v4coloru_test::object v4coloru_object;
-	tut::v4coloru_test v4coloru_testcase("v4coloru");
+	tut::v4coloru_test v4coloru_testcase("v4coloru_h");
 
 	template<> template<>
 	void v4coloru_object::test<1>()
diff --git a/indra/llmath/tests/v4math_test.cpp b/indra/llmath/tests/v4math_test.cpp
index 24c1af5e61..b1f934e555 100644
--- a/indra/llmath/tests/v4math_test.cpp
+++ b/indra/llmath/tests/v4math_test.cpp
@@ -41,7 +41,7 @@ namespace tut
 	};
 	typedef test_group<v4math_data> v4math_test;
 	typedef v4math_test::object v4math_object;
-	tut::v4math_test v4math_testcase("v4math");
+	tut::v4math_test v4math_testcase("v4math_h");
 
 	template<> template<>
 	void v4math_object::test<1>()
diff --git a/indra/llmath/tests/xform_test.cpp b/indra/llmath/tests/xform_test.cpp
index 1337daa50a..49870eef3c 100644
--- a/indra/llmath/tests/xform_test.cpp
+++ b/indra/llmath/tests/xform_test.cpp
@@ -38,7 +38,7 @@ namespace tut
 	};
 	typedef test_group<xform_test> xform_test_t;
 	typedef xform_test_t::object xform_test_object_t;
-	tut::xform_test_t tut_xform_test("xform_test");
+	tut::xform_test_t tut_xform_test("LLXForm");
 
 	//test case for init(), getParent(), getRotation(), getPositionW(), getWorldRotation() fns.
 	template<> template<>