diff --git a/BuildParams b/BuildParams
index 8ca056db49db7f16ddcb6138093ecdcc8da128f2..6b7d15f6cca37f89d2a6d16b00409aca9130e20e 100644
--- a/BuildParams
+++ b/BuildParams
@@ -172,4 +172,13 @@ oz_viewer-review2_coverity.build_CYGWIN_Debug = false
oz_viewer-review2_coverity.build_CYGWIN_RelWithDebInfo = false
oz_viewer-review2_coverity.build_CYGWIN_Release = false
+# ========================================
+# enus
+# ========================================
+
+viewer-tut-teamcity.email = enus@lindenlab.com
+viewer-tut-teamcity.build_server = false
+viewer-tut-teamcity.build_server_tests = false
+
+
# eof
diff --git a/build.sh b/build.sh
index 390321624626851098b923b746172ed1c5bd1451..878aa45ce37381e373e31db4b6948f69368bbc19 100755
--- a/build.sh
+++ b/build.sh
@@ -222,7 +222,7 @@ do
fi
else
begin_section "Build$variant"
- build "$variant" "$build_dir" >> "$build_log" 2>&1
+ build "$variant" "$build_dir" 2>&1 | tee -a "$build_log" | grep --line-buffered "^##teamcity"
if `cat "$build_dir/build_ok"`
then
echo so far so good.
@@ -251,7 +251,7 @@ then
begin_section "Build$variant"
build_dir=`build_dir_$arch $variant`
build_dir_stubs="$build_dir/win_setup/$variant"
- cat "$build_dir/build.log" >> "$build_log"
+ tee -a $build_log < "$build_dir/build.log" | grep --line-buffered "^##teamcity"
if `cat "$build_dir/build_ok"`
then
echo so far so good.
diff --git a/indra/llcharacter/tests/lljoint_test.cpp b/indra/llcharacter/tests/lljoint_test.cpp
index 1c861b390a2b9a6ed11fd2b21ae5760dff9e99f5..e92aa832d66f820c46524920d3b1db27b6919432 100644
--- a/indra/llcharacter/tests/lljoint_test.cpp
+++ b/indra/llcharacter/tests/lljoint_test.cpp
@@ -42,7 +42,7 @@ namespace tut
};
typedef test_group<lljoint_data> lljoint_test;
typedef lljoint_test::object lljoint_object;
- tut::lljoint_test lljoint_testcase("lljoint");
+ tut::lljoint_test lljoint_testcase("LLJoint");
template<> template<>
void lljoint_object::test<1>()
diff --git a/indra/llcommon/tests/bitpack_test.cpp b/indra/llcommon/tests/bitpack_test.cpp
index a74b5ebc3a70b3e3203b06900079142356bc68e0..05289881d00f610ddd252c6ab9648284a7d00c6c 100644
--- a/indra/llcommon/tests/bitpack_test.cpp
+++ b/indra/llcommon/tests/bitpack_test.cpp
@@ -40,7 +40,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 390e3719cfc28be8151825978b59dd30024d6ac4..b115c153c1713643358905a7652a955a29bbf87f 100644
--- a/indra/llcommon/tests/commonmisc_test.cpp
+++ b/indra/llcommon/tests/commonmisc_test.cpp
@@ -59,7 +59,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>()
@@ -450,7 +450,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>()
@@ -643,7 +643,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 70036dc186f7fd003a22443667caa2960f3801cb..d0394150fa2ae63b2d82d8f266dfa55f3a281090 100644
--- a/indra/llcommon/tests/llbase64_test.cpp
+++ b/indra/llcommon/tests/llbase64_test.cpp
@@ -41,7 +41,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 a8bfda54240986c8c96a21708dc7e7f4fd34a950..7c95ccb91fe4ab21fe70c3bf44c32d842cbb59eb 100644
--- a/indra/llcommon/tests/lldate_test.cpp
+++ b/indra/llcommon/tests/lldate_test.cpp
@@ -71,7 +71,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 e4e30a33ec3b28b4196e876877b0f884480689df..e40743ccf75d7babba03d80b10174b227987e2d7 100644
--- a/indra/llcommon/tests/lldependencies_test.cpp
+++ b/indra/llcommon/tests/lldependencies_test.cpp
@@ -145,7 +145,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 215dde7e70b54b3e8b3d2caab916e9a9636f2316..8ac1c91a3a0dc9c398302eac8a1e0b3001f744d6 100644
--- a/indra/llcommon/tests/llframetimer_test.cpp
+++ b/indra/llcommon/tests/llframetimer_test.cpp
@@ -43,7 +43,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 14adcc7303696fb1ca4904680f821f8eb2f9425d..884e1b5e5b50210455a659faadf5bc165e2620e3 100644
--- a/indra/llcommon/tests/llprocessor_test.cpp
+++ b/indra/llcommon/tests/llprocessor_test.cpp
@@ -38,7 +38,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 a21159d47ee860713f44c810d09aab59a592a616..383e6f9e0a926fdd04fa68d3a76848b2aa0a9aa6 100644
--- a/indra/llcommon/tests/llrand_test.cpp
+++ b/indra/llcommon/tests/llrand_test.cpp
@@ -39,7 +39,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 9eaa307141d72045947b9f0ad958dbd7a4ee2403..770443da1dd1c73fa15bb86b8f8f71a3ff08ede3 100644
--- a/indra/llcommon/tests/llsdserialize_test.cpp
+++ b/indra/llcommon/tests/llsdserialize_test.cpp
@@ -74,7 +74,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 aa36aab0dcf41c1fa3d5a1f662d3ee1c2f6a1e8d..304e91ed927ed434c90764869ae3556850c82cfa 100644
--- a/indra/llcommon/tests/llstring_test.cpp
+++ b/indra/llcommon/tests/llstring_test.cpp
@@ -38,7 +38,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 b0b4c7e0ad5e37ca9ff6d08f1c7c69ec4d2b0c13..1d619867d480c7f120788fe8a141f58b3ab655ab 100644
--- a/indra/llcommon/tests/lltreeiterators_test.cpp
+++ b/indra/llcommon/tests/lltreeiterators_test.cpp
@@ -56,7 +56,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 757aa85ed7de5d0edd4c8c5ffc15d6f916f52474..3d34f23998d5b61748e05bf7f465e0403fbe2385 100644
--- a/indra/llcommon/tests/stringize_test.cpp
+++ b/indra/llcommon/tests/stringize_test.cpp
@@ -80,7 +80,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>()
diff --git a/indra/llimage/tests/llimageworker_test.cpp b/indra/llimage/tests/llimageworker_test.cpp
index 98694aa7ee284180583c784d7ebb3d9c58802db9..a1092767092e86d1f46b81969dc59c80474af6f0 100644
--- a/indra/llimage/tests/llimageworker_test.cpp
+++ b/indra/llimage/tests/llimageworker_test.cpp
@@ -144,11 +144,11 @@ namespace tut
// Tut templating thingamagic: test group, object and test instance
typedef test_group<imagedecodethread_test> imagedecodethread_t;
typedef imagedecodethread_t::object imagedecodethread_object_t;
- tut::imagedecodethread_t tut_imagedecodethread("imagedecodethread");
+ tut::imagedecodethread_t tut_imagedecodethread("LLImageDecodeThread");
typedef test_group<imagerequest_test> imagerequest_t;
typedef imagerequest_t::object imagerequest_object_t;
- tut::imagerequest_t tut_imagerequest("imagerequest");
+ tut::imagerequest_t tut_imagerequest("LLImageRequest");
// ---------------------------------------------------------------------------------------
// Test functions
diff --git a/indra/llinventory/tests/inventorymisc_test.cpp b/indra/llinventory/tests/inventorymisc_test.cpp
index 9773a3fed48246eccc3f2eb667399ad6112744ad..c9af7c4eac74527461a5e90a5ec003e46d7f4fc5 100644
--- a/indra/llinventory/tests/inventorymisc_test.cpp
+++ b/indra/llinventory/tests/inventorymisc_test.cpp
@@ -100,7 +100,7 @@ namespace tut
};
typedef test_group<inventory_data> inventory_test;
typedef inventory_test::object inventory_object;
- tut::inventory_test inv("llinventory");
+ tut::inventory_test inv("LLInventory");
//***class LLInventoryType***//
diff --git a/indra/llinventory/tests/llparcel_test.cpp b/indra/llinventory/tests/llparcel_test.cpp
index 80d0bdae5ab9806875e55fd344b08c75d3a93504..f2e4b03ff76ed5d40c41f0d5a6f6048c242c6f73 100644
--- a/indra/llinventory/tests/llparcel_test.cpp
+++ b/indra/llinventory/tests/llparcel_test.cpp
@@ -40,7 +40,7 @@ namespace tut
};
typedef test_group<llinventoryparcel_data> llinventoryparcel_test;
typedef llinventoryparcel_test::object llinventoryparcel_object;
- tut::llinventoryparcel_test llinventoryparcel("llinventoryparcel");
+ tut::llinventoryparcel_test llinventoryparcel("LLInventoryParcel");
template<> template<>
void llinventoryparcel_object::test<1>()
diff --git a/indra/llmath/tests/llmodularmath_test.cpp b/indra/llmath/tests/llmodularmath_test.cpp
index e6525542f1197cdbf260bb0c563d4a19a0d0fef2..063d3ef79f004e8a165d2c9962862556d941eafa 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 29e7793d49b7e97ad67a13276ddd357b84ab6972..9e79b299ff07f21f61e743c7c03f16d72a29d04c 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 3b424f79c6c858bf8c305114f1dc30065ab65fa1..8abf61b740d21ca7bf927c7cd9f106a584e4ce5f 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 58b78cd4915d8e624859597abfb55b75e18aa603..91a2e6c0091dde03bfc4ddedda47d48842692e0f 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 e112892c496a7c681d0187498fcfa66bcc355aae..9747996b2561fc11fa03473302a764f38f1f496c 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 4a05a8412325632f8b6ca9470c5e9506010636f2..2c00f00ab3517de30d390fc8a7af806c259d89af 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 68bcbd124f4aeae8e0ad6188963c0d3c05564742..b67346f4e5e6c6cdccd73609385f33dc1c1574b4 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 e6ef5d501229c1a404da9b94bfce2d01a73cd031..e4732bf8615d5369f8053e46a8af7d47a5641df5 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 dde5f9069b0736fca26bca232e2a35cac77d2717..fbd43625d18c67ee86719f9d9dd372231f0d8a3c 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 1408d05b817dedae32ae693272857cdb8ecd14bb..6d84ba41ef060b5706440678e2fba1b6d07b271e 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 24c1af5e614f6d90f44952c436470cadb9480068..b1f934e555288f0fd4c478ad7cdee26dc804ecd8 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 1337daa50a815de89643bc7751c48e02ae05628e..49870eef3c6766faeb4e784933731f430a178262 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<>
diff --git a/indra/llmessage/tests/llhost_test.cpp b/indra/llmessage/tests/llhost_test.cpp
index 36f819ad33e9e5302e20778d4f7fcf362fb1846d..b20bceae1de5ec431ba2e4df9aae40be3727f0ea 100644
--- a/indra/llmessage/tests/llhost_test.cpp
+++ b/indra/llmessage/tests/llhost_test.cpp
@@ -39,7 +39,7 @@ namespace tut
};
typedef test_group<host_data> host_test;
typedef host_test::object host_object;
- tut::host_test host_testcase("llhost");
+ tut::host_test host_testcase("LLHost");
template<> template<>
diff --git a/indra/llmessage/tests/llmime_test.cpp b/indra/llmessage/tests/llmime_test.cpp
index 0616c070c402716c8bc6d315ab97569af06db77b..aed5c4589cba1d567635351c7ed0ff77008924df 100644
--- a/indra/llmessage/tests/llmime_test.cpp
+++ b/indra/llmessage/tests/llmime_test.cpp
@@ -41,7 +41,7 @@ namespace tut
};
typedef test_group<mime_index> mime_index_t;
typedef mime_index_t::object mime_index_object_t;
- tut::mime_index_t tut_mime_index("mime_index");
+ tut::mime_index_t tut_mime_index("LLMime");
template<> template<>
void mime_index_object_t::test<1>()
@@ -228,7 +228,7 @@ namespace tut
};
typedef test_group<mime_parse> mime_parse_t;
typedef mime_parse_t::object mime_parse_object_t;
- tut::mime_parse_t tut_mime_parse("mime_parse");
+ tut::mime_parse_t tut_mime_parse("LLMimeParse");
template<> template<>
void mime_parse_object_t::test<1>()
diff --git a/indra/llmessage/tests/llnamevalue_test.cpp b/indra/llmessage/tests/llnamevalue_test.cpp
index da22ec80ef5fd01efdfee637b74ba2939a4a25e3..8902fdd2e8f5f38f311d85fcc5d4e8620758ea4f 100644
--- a/indra/llmessage/tests/llnamevalue_test.cpp
+++ b/indra/llmessage/tests/llnamevalue_test.cpp
@@ -49,7 +49,7 @@ namespace tut
};
typedef test_group<namevalue_test> namevalue_t;
typedef namevalue_t::object namevalue_object_t;
- tut::namevalue_t tut_namevalue("namevalue_test");
+ tut::namevalue_t tut_namevalue("LLNameValue");
template<> template<>
diff --git a/indra/llmessage/tests/llpartdata_test.cpp b/indra/llmessage/tests/llpartdata_test.cpp
index b26e7a58496ded375f5847866e0efe713af7aac8..9123bd06c7117f866f97fea5ad3d6e09b210094e 100644
--- a/indra/llmessage/tests/llpartdata_test.cpp
+++ b/indra/llmessage/tests/llpartdata_test.cpp
@@ -44,7 +44,7 @@ namespace tut
};
typedef test_group<partdata_test> partdata_test_t;
typedef partdata_test_t::object partdata_test_object_t;
- tut::partdata_test_t tut_partdata_test("partdata_test");
+ tut::partdata_test_t tut_partdata_test("LLPartData");
template<> template<>
void partdata_test_object_t::test<1>()
diff --git a/indra/llmessage/tests/llregionpresenceverifier_test.cpp b/indra/llmessage/tests/llregionpresenceverifier_test.cpp
index 06152b4c6df651abf02dea97af1833ef0980284c..5b89f2a8c672d2a089d59497c4c9a2981aa9ca79 100644
--- a/indra/llmessage/tests/llregionpresenceverifier_test.cpp
+++ b/indra/llmessage/tests/llregionpresenceverifier_test.cpp
@@ -79,7 +79,7 @@ namespace tut
namespace
{
- tut::factory tf("LLRegionPresenceVerifier test");
+ tut::factory tf("LLRegionPresenceVerifier");
}
namespace tut
diff --git a/indra/llmessage/tests/lltemplatemessagedispatcher_test.cpp b/indra/llmessage/tests/lltemplatemessagedispatcher_test.cpp
index 65fd9da690cae08f7c57e5f1af2bf46b52a688aa..3b04530c1ac9e5bd98e596a4e9360c144a9f6d09 100644
--- a/indra/llmessage/tests/lltemplatemessagedispatcher_test.cpp
+++ b/indra/llmessage/tests/lltemplatemessagedispatcher_test.cpp
@@ -98,7 +98,7 @@ namespace tut
namespace
{
- tut::factory tf("LLTemplateMessageDispatcher test");
+ tut::factory tf("LLTemplateMessageDispatcher");
}
namespace tut
diff --git a/indra/llmessage/tests/lltrustedmessageservice_test.cpp b/indra/llmessage/tests/lltrustedmessageservice_test.cpp
index 8fc5934c6157a74b39479c915d38bc77fd033125..b287a2984199429f4f7b3d4904dd319f560b4187 100644
--- a/indra/llmessage/tests/lltrustedmessageservice_test.cpp
+++ b/indra/llmessage/tests/lltrustedmessageservice_test.cpp
@@ -98,7 +98,7 @@ namespace tut
namespace
{
- tut::factory tf("LLTrustedMessageServiceData test");
+ tut::factory tf("LLTrustedMessageServiceData");
}
namespace tut
diff --git a/indra/llmessage/tests/llxfer_file_test.cpp b/indra/llmessage/tests/llxfer_file_test.cpp
index 081f898417ff7189eed5faefec9acfc30c5a0792..a8c1adf9b4db69b14bb0c8b8ce432362f72d93ff 100644
--- a/indra/llmessage/tests/llxfer_file_test.cpp
+++ b/indra/llmessage/tests/llxfer_file_test.cpp
@@ -38,7 +38,7 @@ namespace tut
};
typedef test_group<llxfer_data> llxfer_test;
typedef llxfer_test::object llxfer_object;
- tut::llxfer_test llxfer("llxfer");
+ tut::llxfer_test llxfer("LLXferFile");
template<> template<>
void llxfer_object::test<1>()
diff --git a/indra/llplugin/tests/llplugincookiestore_test.cpp b/indra/llplugin/tests/llplugincookiestore_test.cpp
index cc8663285fffd1916b915bab78e6cc6b455ebe50..aefa1ca1444b8b10985b17deaaa051cbf9c0d22c 100644
--- a/indra/llplugin/tests/llplugincookiestore_test.cpp
+++ b/indra/llplugin/tests/llplugincookiestore_test.cpp
@@ -112,7 +112,7 @@ namespace tut
typedef test_group<LLPluginCookieStoreFixture> factory;
typedef factory::object object;
- factory tf("LLPluginCookieStore test");
+ factory tf("LLPluginCookieStore");
// Tests
template<> template<>
diff --git a/indra/llprimitive/tests/llmediaentry_test.cpp b/indra/llprimitive/tests/llmediaentry_test.cpp
index 5234ea25f9fb8e2d268acf80bbd5cb705b02d774..16e5f894e24c2e0543b7aaa4c08664b76a17cffd 100644
--- a/indra/llprimitive/tests/llmediaentry_test.cpp
+++ b/indra/llprimitive/tests/llmediaentry_test.cpp
@@ -169,7 +169,7 @@ namespace tut
namespace
{
// this is for naming our tests to make pretty output
- tut::factory tf("MediaEntry Test");
+ tut::factory tf("LLMediaEntry");
}
namespace tut
diff --git a/indra/llprimitive/tests/llprimitive_test.cpp b/indra/llprimitive/tests/llprimitive_test.cpp
index e181a59dd635799d7d41eb30205be49221f7fa32..0d60c7cd15e70941f2bfaaa53b5cb4680206700d 100644
--- a/indra/llprimitive/tests/llprimitive_test.cpp
+++ b/indra/llprimitive/tests/llprimitive_test.cpp
@@ -96,7 +96,7 @@ namespace tut
typedef test_group<llprimitive> llprimitive_t;
typedef llprimitive_t::object llprimitive_object_t;
- tut::llprimitive_t tut_llprimitive("llprimitive");
+ tut::llprimitive_t tut_llprimitive("LLPrimitive");
template<> template<>
void llprimitive_object_t::test<1>()
diff --git a/indra/newview/tests/llagentaccess_test.cpp b/indra/newview/tests/llagentaccess_test.cpp
index a0a9659475082398b17a90d90f7e859597667eea..c970d7997566dadc78bf2aa1091ea3fbb6ea77de 100644
--- a/indra/newview/tests/llagentaccess_test.cpp
+++ b/indra/newview/tests/llagentaccess_test.cpp
@@ -74,7 +74,7 @@ namespace tut
typedef test_group<agentaccess> agentaccess_t;
typedef agentaccess_t::object agentaccess_object_t;
- tut::agentaccess_t tut_agentaccess("agentaccess");
+ tut::agentaccess_t tut_agentaccess("LLAgentAccess");
template<> template<>
void agentaccess_object_t::test<1>()
diff --git a/indra/newview/tests/lldateutil_test.cpp b/indra/newview/tests/lldateutil_test.cpp
index 530171b87ebeb717bbe4d3017034c08391a9d502..99b346cff88d0d480fc2d8c532ebd5ec36eec1e3 100644
--- a/indra/newview/tests/lldateutil_test.cpp
+++ b/indra/newview/tests/lldateutil_test.cpp
@@ -103,7 +103,7 @@ namespace tut
typedef test_group<dateutil> dateutil_t;
typedef dateutil_t::object dateutil_object_t;
- tut::dateutil_t tut_dateutil("dateutil");
+ tut::dateutil_t tut_dateutil("LLDateUtil");
template<> template<>
void dateutil_object_t::test<1>()
diff --git a/indra/newview/tests/lllogininstance_test.cpp b/indra/newview/tests/lllogininstance_test.cpp
index a0697af6c30b6c18097ff4658e1949d76847f9c8..55823fc386f420c8f96545f92dca22a914df80b9 100644
--- a/indra/newview/tests/lllogininstance_test.cpp
+++ b/indra/newview/tests/lllogininstance_test.cpp
@@ -314,7 +314,7 @@ namespace tut
typedef test_group<lllogininstance_data> lllogininstance_group;
typedef lllogininstance_group::object lllogininstance_object;
- lllogininstance_group llsdmgr("lllogininstance");
+ lllogininstance_group llsdmgr("LLLoginInstance");
template<> template<>
void lllogininstance_object::test<1>()
diff --git a/indra/newview/tests/llmediadataclient_test.cpp b/indra/newview/tests/llmediadataclient_test.cpp
index 5f3dc5b1623feb8dd0e140dc21565c3fc8f4f45c..0254c5881f76c8bfba620aaab54b80575774e05e 100644
--- a/indra/newview/tests/llmediadataclient_test.cpp
+++ b/indra/newview/tests/llmediadataclient_test.cpp
@@ -236,7 +236,7 @@ namespace tut
typedef test_group<mediadataclient> mediadataclient_t;
typedef mediadataclient_t::object mediadataclient_object_t;
- tut::mediadataclient_t tut_mediadataclient("mediadataclient");
+ tut::mediadataclient_t tut_mediadataclient("LLMediaDataClient");
void ensure(const std::string &msg, int value, int expected)
{
diff --git a/indra/newview/tests/llsecapi_test.cpp b/indra/newview/tests/llsecapi_test.cpp
index 90cacfe3c9f78fc4b21a3756d1c9b96fab780695..703603e2dbff8911f91ad9bebff4ada5728149ee 100644
--- a/indra/newview/tests/llsecapi_test.cpp
+++ b/indra/newview/tests/llsecapi_test.cpp
@@ -87,7 +87,7 @@ namespace tut
// Tut templating thingamagic: test group, object and test instance
typedef test_group<secapiTest> secapiTestFactory;
typedef secapiTestFactory::object secapiTestObject;
- tut::secapiTestFactory tut_test("llsecapi");
+ tut::secapiTestFactory tut_test("LLSecAPI");
// ---------------------------------------------------------------------------------------
// Test functions
diff --git a/indra/newview/tests/llsechandler_basic_test.cpp b/indra/newview/tests/llsechandler_basic_test.cpp
index c48498ebcd83e4839eb989106887cabde955a312..daa10819fc036d8683ed445c7d750a162f6580d1 100644
--- a/indra/newview/tests/llsechandler_basic_test.cpp
+++ b/indra/newview/tests/llsechandler_basic_test.cpp
@@ -311,7 +311,7 @@ namespace tut
// Tut templating thingamagic: test group, object and test instance
typedef test_group<sechandler_basic_test> sechandler_basic_test_factory;
typedef sechandler_basic_test_factory::object sechandler_basic_test_object;
- tut::sechandler_basic_test_factory tut_test("llsechandler_basic");
+ tut::sechandler_basic_test_factory tut_test("LLSecHandler");
// ---------------------------------------------------------------------------------------
// Test functions
diff --git a/indra/newview/tests/llslurl_test.cpp b/indra/newview/tests/llslurl_test.cpp
index 40425a5caff09685f453c26b2e04de52d415cd78..f96f79006a12aa0948d39f2ce9eb1e85192219fd 100644
--- a/indra/newview/tests/llslurl_test.cpp
+++ b/indra/newview/tests/llslurl_test.cpp
@@ -101,7 +101,7 @@ namespace tut
// Tut templating thingamagic: test group, object and test instance
typedef test_group<slurlTest> slurlTestFactory;
typedef slurlTestFactory::object slurlTestObject;
- tut::slurlTestFactory tut_test("llslurl");
+ tut::slurlTestFactory tut_test("LLSlurl");
// ---------------------------------------------------------------------------------------
// Test functions
diff --git a/indra/newview/tests/lltextureinfo_test.cpp b/indra/newview/tests/lltextureinfo_test.cpp
index 7fa8602adcc9b17138138c5f247ad2ca785271ea..73ace1de37ed89a4fee48d17ec64c97fb57dc04b 100644
--- a/indra/newview/tests/lltextureinfo_test.cpp
+++ b/indra/newview/tests/lltextureinfo_test.cpp
@@ -68,7 +68,7 @@ namespace tut
// Tut templating thingamagic: test group, object and test instance
typedef test_group<textureinfo_test> textureinfo_t;
typedef textureinfo_t::object textureinfo_object_t;
- tut::textureinfo_t tut_textureinfo("textureinfo");
+ tut::textureinfo_t tut_textureinfo("LLTectureInfo");
// ---------------------------------------------------------------------------------------
diff --git a/indra/newview/tests/lltextureinfodetails_test.cpp b/indra/newview/tests/lltextureinfodetails_test.cpp
index 3cd4c10da234ace56d4594b07963b7500eaf7039..31ec5f9d4ee73fc1728f9152f0b2d9570e26ae34 100644
--- a/indra/newview/tests/lltextureinfodetails_test.cpp
+++ b/indra/newview/tests/lltextureinfodetails_test.cpp
@@ -67,7 +67,7 @@ namespace tut
// Tut templating thingamagic: test group, object and test instance
typedef test_group<textureinfodetails_test> textureinfodetails_t;
typedef textureinfodetails_t::object textureinfodetails_object_t;
- tut::textureinfodetails_t tut_textureinfodetails("textureinfodetails");
+ tut::textureinfodetails_t tut_textureinfodetails("LLTextureInfoDetails");
// ---------------------------------------------------------------------------------------
diff --git a/indra/newview/tests/lltexturestatsuploader_test.cpp b/indra/newview/tests/lltexturestatsuploader_test.cpp
index caeabd08b3ae08cae7c42db62c7b122c52e05c4f..cfb2c267cc7ee7e26a78969f8bd9e410334a380c 100644
--- a/indra/newview/tests/lltexturestatsuploader_test.cpp
+++ b/indra/newview/tests/lltexturestatsuploader_test.cpp
@@ -90,7 +90,7 @@ namespace tut
// Tut templating thingamagic: test group, object and test instance
typedef test_group<texturestatsuploader_test> texturestatsuploader_t;
typedef texturestatsuploader_t::object texturestatsuploader_object_t;
- tut::texturestatsuploader_t tut_texturestatsuploader("texturestatsuploader");
+ tut::texturestatsuploader_t tut_texturestatsuploader("LLTextureStatsUploader");
// ---------------------------------------------------------------------------------------
diff --git a/indra/newview/tests/llviewerhelputil_test.cpp b/indra/newview/tests/llviewerhelputil_test.cpp
index 4c71f15db1d2d072b8eb0ab08c5b90a594ddbeee..a0f1d1c3c34499998e1cc6a0f1abd3679dd6fe67 100644
--- a/indra/newview/tests/llviewerhelputil_test.cpp
+++ b/indra/newview/tests/llviewerhelputil_test.cpp
@@ -109,7 +109,7 @@ namespace tut
typedef test_group<viewerhelputil> viewerhelputil_t;
typedef viewerhelputil_t::object viewerhelputil_object_t;
- tut::viewerhelputil_t tut_viewerhelputil("viewerhelputil");
+ tut::viewerhelputil_t tut_viewerhelputil("LLViewerHelpUtil");
template<> template<>
void viewerhelputil_object_t::test<1>()
diff --git a/indra/newview/tests/llviewernetwork_test.cpp b/indra/newview/tests/llviewernetwork_test.cpp
index d5d6ca671d4a3c1400aff8305f0763e001074670..dd7761475e34da0a88782a4346a7c7b58711fe59 100644
--- a/indra/newview/tests/llviewernetwork_test.cpp
+++ b/indra/newview/tests/llviewernetwork_test.cpp
@@ -127,7 +127,7 @@ namespace tut
// Tut templating thingamagic: test group, object and test instance
typedef test_group<viewerNetworkTest> viewerNetworkTestFactory;
typedef viewerNetworkTestFactory::object viewerNetworkTestObject;
- tut::viewerNetworkTestFactory tut_test("llviewernetwork");
+ tut::viewerNetworkTestFactory tut_test("LLViewerNetwork");
// ---------------------------------------------------------------------------------------
// Test functions
diff --git a/indra/newview/tests/llworldmap_test.cpp b/indra/newview/tests/llworldmap_test.cpp
index 443279c06230c19bbdf514053a5db5bb0fbaef34..b976ac5ea900a9010d06b9da08498e1dd8480a8f 100644
--- a/indra/newview/tests/llworldmap_test.cpp
+++ b/indra/newview/tests/llworldmap_test.cpp
@@ -144,15 +144,15 @@ namespace tut
// Tut templating thingamagic: test group, object and test instance
typedef test_group<iteminfo_test> iteminfo_t;
typedef iteminfo_t::object iteminfo_object_t;
- tut::iteminfo_t tut_iteminfo("iteminfo");
+ tut::iteminfo_t tut_iteminfo("LLItemInfo");
typedef test_group<siminfo_test> siminfo_t;
typedef siminfo_t::object siminfo_object_t;
- tut::siminfo_t tut_siminfo("siminfo");
+ tut::siminfo_t tut_siminfo("LLSimInfo");
typedef test_group<worldmap_test> worldmap_t;
typedef worldmap_t::object worldmap_object_t;
- tut::worldmap_t tut_worldmap("worldmap");
+ tut::worldmap_t tut_worldmap("LLWorldMap");
// ---------------------------------------------------------------------------------------
// Test functions
diff --git a/indra/newview/tests/llworldmipmap_test.cpp b/indra/newview/tests/llworldmipmap_test.cpp
index 272e59061d8f71165ff854a77df6bf0a9149c9fd..54887ae219c1636b10e876025cef00ac2f9b2ac1 100644
--- a/indra/newview/tests/llworldmipmap_test.cpp
+++ b/indra/newview/tests/llworldmipmap_test.cpp
@@ -89,7 +89,7 @@ namespace tut
// Tut templating thingamagic: test group, object and test instance
typedef test_group<worldmipmap_test> worldmipmap_t;
typedef worldmipmap_t::object worldmipmap_object_t;
- tut::worldmipmap_t tut_worldmipmap("worldmipmap");
+ tut::worldmipmap_t tut_worldmipmap("LLWorldMipmap");
// ---------------------------------------------------------------------------------------
// Test functions
diff --git a/indra/test/test.cpp b/indra/test/test.cpp
index 57797f9d9fb07fce46577e80b4d4268e05d87054..ffdb0cb976a311f79a8233ddc4fa7409f139473e 100644
--- a/indra/test/test.cpp
+++ b/indra/test/test.cpp
@@ -56,7 +56,7 @@
namespace tut
{
std::string sSourceDir;
-
+
test_runner_singleton runner;
}
@@ -64,54 +64,66 @@ class LLTestCallback : public tut::callback
{
public:
LLTestCallback(bool verbose_mode, std::ostream *stream) :
- mVerboseMode(verbose_mode),
- mTotalTests(0),
- mPassedTests(0),
- mFailedTests(0),
- mSkippedTests(0),
- mStream(stream)
+ mVerboseMode(verbose_mode),
+ mTotalTests(0),
+ mPassedTests(0),
+ mFailedTests(0),
+ mSkippedTests(0),
+ mStream(stream)
{
}
- void run_started()
+ ~LLTestCallback()
+ {
+ }
+
+ virtual void run_started()
{
//std::cout << "run_started" << std::endl;
}
- void test_completed(const tut::test_result& tr)
+ virtual void group_started(const std::string& name) {
+ std::cout << "Unit test group_started name=" << name << std::endl;
+ }
+
+ virtual void group_completed(const std::string& name) {
+ std::cout << "Unit test group_completed name=" << name << std::endl;
+ }
+
+ virtual void test_completed(const tut::test_result& tr)
{
++mTotalTests;
std::ostringstream out;
out << "[" << tr.group << ", " << tr.test << "] ";
switch(tr.result)
{
- case tut::test_result::ok:
- ++mPassedTests;
- out << "ok";
- break;
- case tut::test_result::fail:
- ++mFailedTests;
- out << "fail";
- break;
- case tut::test_result::ex:
- ++mFailedTests;
- out << "exception";
- break;
- case tut::test_result::warn:
- ++mFailedTests;
- out << "test destructor throw";
- break;
- case tut::test_result::term:
- ++mFailedTests;
- out << "abnormal termination";
- break;
- case tut::test_result::skip:
- ++mSkippedTests;
- out << "skipped known failure";
- break;
- default:
- ++mFailedTests;
- out << "unknown";
+ case tut::test_result::ok:
+ ++mPassedTests;
+ out << "ok";
+ break;
+ case tut::test_result::fail:
+ ++mFailedTests;
+ out << "fail";
+ break;
+ case tut::test_result::ex:
+ ++mFailedTests;
+ out << "exception";
+ break;
+ case tut::test_result::warn:
+ ++mFailedTests;
+ out << "test destructor throw";
+ break;
+ case tut::test_result::term:
+ ++mFailedTests;
+ out << "abnormal termination";
+ break;
+ case tut::test_result::skip:
+ ++mSkippedTests;
+ out << "skipped known failure";
+ break;
+ default:
+ ++mFailedTests;
+ out << "unknown";
}
if(mVerboseMode || (tr.result != tut::test_result::ok))
{
@@ -128,7 +140,7 @@ public:
}
}
- void run_completed()
+ virtual void run_completed()
{
if (mStream)
{
@@ -137,10 +149,9 @@ public:
run_completed_(std::cout);
}
- int getFailedTests() const { return mFailedTests; }
-
-private:
- void run_completed_(std::ostream &stream)
+ virtual int getFailedTests() const { return mFailedTests; }
+
+ virtual void run_completed_(std::ostream &stream)
{
stream << "\tTotal Tests:\t" << mTotalTests << std::endl;
stream << "\tPassed Tests:\t" << mPassedTests;
@@ -153,7 +164,7 @@ private:
if (mSkippedTests > 0)
{
stream << "\tSkipped known failures:\t" << mSkippedTests
- << std::endl;
+ << std::endl;
}
if(mFailedTests > 0)
@@ -174,6 +185,94 @@ protected:
std::ostream *mStream;
};
+// TeamCity specific class which emits service messages
+// http://confluence.jetbrains.net/display/TCD3/Build+Script+Interaction+with+TeamCity;#BuildScriptInteractionwithTeamCity-testReporting
+
+class LLTCTestCallback : public LLTestCallback
+{
+public:
+ LLTCTestCallback(bool verbose_mode, std::ostream *stream) :
+ LLTestCallback(verbose_mode, stream),
+ mTCStream()
+ {
+ }
+
+ ~LLTCTestCallback()
+ {
+ }
+
+ virtual void group_started(const std::string& name) {
+ LLTestCallback::group_started(name);
+ mTCStream << "\n##teamcity[testSuiteStarted name='" << name << "']" << std::endl;
+ }
+
+ virtual void group_completed(const std::string& name) {
+ LLTestCallback::group_completed(name);
+ mTCStream << "##teamcity[testSuiteFinished name='" << name << "']" << std::endl;
+ }
+
+ virtual void test_completed(const tut::test_result& tr)
+ {
+ LLTestCallback::test_completed(tr);
+
+ switch(tr.result)
+ {
+ case tut::test_result::ok:
+ mTCStream << "##teamcity[testStarted name='" << tr.group << "." << tr.test << "']" << std::endl;
+ mTCStream << "##teamcity[testFinished name='" << tr.group << "." << tr.test << "']" << std::endl;
+ break;
+ case tut::test_result::fail:
+ mTCStream << "##teamcity[testStarted name='" << tr.group << "." << tr.test << "']" << std::endl;
+ mTCStream << "##teamcity[testFailed name='" << tr.group << "." << tr.test << "' message='" << tr.message << "']" << std::endl;
+ mTCStream << "##teamcity[testFinished name='" << tr.group << "." << tr.test << "']" << std::endl;
+ break;
+ case tut::test_result::ex:
+ mTCStream << "##teamcity[testStarted name='" << tr.group << "." << tr.test << "']" << std::endl;
+ mTCStream << "##teamcity[testFailed name='" << tr.group << "." << tr.test << "' message='" << tr.message << "']" << std::endl;
+ mTCStream << "##teamcity[testFinished name='" << tr.group << "." << tr.test << "']" << std::endl;
+ break;
+ case tut::test_result::warn:
+ mTCStream << "##teamcity[testStarted name='" << tr.group << "." << tr.test << "']" << std::endl;
+ mTCStream << "##teamcity[testFailed name='" << tr.group << "." << tr.test << "' message='" << tr.message << "']" << std::endl;
+ mTCStream << "##teamcity[testFinished name='" << tr.group << "." << tr.test << "']" << std::endl;
+ break;
+ case tut::test_result::term:
+ mTCStream << "##teamcity[testStarted name='" << tr.group << "." << tr.test << "']" << std::endl;
+ mTCStream << "##teamcity[testFailed name='" << tr.group << "." << tr.test << "' message='" << tr.message << "']" << std::endl;
+ mTCStream << "##teamcity[testFinished name='" << tr.group << "." << tr.test << "']" << std::endl;
+ break;
+ case tut::test_result::skip:
+ mTCStream << "##teamcity[testStarted name='" << tr.group << "." << tr.test << "']" << std::endl;
+ mTCStream << "##teamcity[testIgnored name='" << tr.group << "." << tr.test << "']" << std::endl;
+ mTCStream << "##teamcity[testFinished name='" << tr.group << "." << tr.test << "']" << std::endl;
+ break;
+ default:
+ break;
+ }
+
+ }
+
+ virtual void run_completed()
+ {
+ LLTestCallback::run_completed();
+
+ // dump the TC reporting results to cout
+ tc_run_completed_(std::cout);
+ }
+
+ virtual void tc_run_completed_(std::ostream &stream)
+ {
+
+ // dump the TC reporting results to cout
+ stream << mTCStream.str() << std::endl;
+ }
+
+protected:
+ std::ostringstream mTCStream;
+
+};
+
+
static const apr_getopt_option_t TEST_CL_OPTIONS[] =
{
{"help", 'h', 0, "Print the help message."},
@@ -185,13 +284,14 @@ static const apr_getopt_option_t TEST_CL_OPTIONS[] =
{"touch", 't', 1, "Touch the given file if all tests succeed"},
{"wait", 'w', 0, "Wait for input before exit."},
{"debug", 'd', 0, "Emit full debug logs."},
+ {"suitename", 'x', 1, "Run tests using this suitename"},
{0, 0, 0, 0}
};
void stream_usage(std::ostream& s, const char* app)
{
s << "Usage: " << app << " [OPTIONS]" << std::endl
- << std::endl;
+ << std::endl;
s << "This application runs the unit tests." << std::endl << std::endl;
@@ -201,7 +301,7 @@ void stream_usage(std::ostream& s, const char* app)
{
s << " ";
s << " -" << (char)option->optch << ", --" << option->name
- << std::endl;
+ << std::endl;
s << "\t" << option->description << std::endl << std::endl;
++option;
}
@@ -242,9 +342,9 @@ int main(int argc, char **argv)
LLError::initForApplication(".");
LLError::setFatalFunction(wouldHaveCrashed);
LLError::setDefaultLevel(LLError::LEVEL_ERROR);
- //< *TODO: should come from error config file. Note that we
- // have a command line option that sets this to debug.
-
+ //< *TODO: should come from error config file. Note that we
+ // have a command line option that sets this to debug.
+
#ifdef CTYPE_WORKAROUND
ctype_workaround();
#endif
@@ -267,6 +367,7 @@ int main(int argc, char **argv)
bool verbose_mode = false;
bool wait_at_exit = false;
std::string test_group;
+ std::string suite_name;
// values use for options parsing
apr_status_t apr_err;
@@ -274,7 +375,7 @@ int main(int argc, char **argv)
int opt_id = 0;
std::ofstream *output = NULL;
const char *touch = NULL;
-
+
while(true)
{
apr_err = apr_getopt_long(os, TEST_CL_OPTIONS, &opt_id, &opt_arg);
@@ -283,55 +384,68 @@ int main(int argc, char **argv)
{
char buf[255]; /* Flawfinder: ignore */
std::cerr << "Error parsing options: "
- << apr_strerror(apr_err, buf, 255) << std::endl;
+ << apr_strerror(apr_err, buf, 255) << std::endl;
return 1;
}
switch (opt_id)
{
- case 'g':
- test_group.assign(opt_arg);
- break;
- case 'h':
- stream_usage(std::cout, argv[0]);
- return 0;
- break;
- case 'l':
- stream_groups(std::cout, argv[0]);
- return 0;
- case 'v':
- verbose_mode = true;
- break;
- case 'o':
- output = new std::ofstream;
- output->open(opt_arg);
- break;
- case 's': // --sourcedir
- tut::sSourceDir = opt_arg;
- // For convenience, so you can use tut::sSourceDir + "myfile"
- tut::sSourceDir += '/';
- break;
- case 't':
- touch = opt_arg;
- break;
- case 'w':
- wait_at_exit = true;
- break;
- case 'd':
- // *TODO: should come from error config file. We set it to
- // ERROR by default, so this allows full debug levels.
- LLError::setDefaultLevel(LLError::LEVEL_DEBUG);
- break;
- default:
- stream_usage(std::cerr, argv[0]);
- return 1;
- break;
+ case 'g':
+ test_group.assign(opt_arg);
+ break;
+ case 'h':
+ stream_usage(std::cout, argv[0]);
+ return 0;
+ break;
+ case 'l':
+ stream_groups(std::cout, argv[0]);
+ return 0;
+ case 'v':
+ verbose_mode = true;
+ break;
+ case 'o':
+ output = new std::ofstream;
+ output->open(opt_arg);
+ break;
+ case 's': // --sourcedir
+ tut::sSourceDir = opt_arg;
+ // For convenience, so you can use tut::sSourceDir + "myfile"
+ tut::sSourceDir += '/';
+ break;
+ case 't':
+ touch = opt_arg;
+ break;
+ case 'w':
+ wait_at_exit = true;
+ break;
+ case 'd':
+ // *TODO: should come from error config file. We set it to
+ // ERROR by default, so this allows full debug levels.
+ LLError::setDefaultLevel(LLError::LEVEL_DEBUG);
+ break;
+ case 'x':
+ suite_name.assign(opt_arg);
+ break;
+ default:
+ stream_usage(std::cerr, argv[0]);
+ return 1;
+ break;
}
}
// run the tests
- LLTestCallback callback(verbose_mode, output);
- tut::runner.get().set_callback(&callback);
-
+
+ LLTestCallback* mycallback;
+ if (getenv("TEAMCITY_PROJECT_NAME"))
+ {
+ mycallback = new LLTCTestCallback(verbose_mode, output);
+ }
+ else
+ {
+ mycallback = new LLTestCallback(verbose_mode, output);
+ }
+
+ tut::runner.get().set_callback(mycallback);
+
if(test_group.empty())
{
tut::runner.get().run_tests();
@@ -341,14 +455,14 @@ int main(int argc, char **argv)
tut::runner.get().run_tests(test_group);
}
- bool success = (callback.getFailedTests() == 0);
+ bool success = (mycallback->getFailedTests() == 0);
if (wait_at_exit)
{
std::cerr << "Press return to exit..." << std::endl;
std::cin.get();
}
-
+
if (output)
{
output->close();
@@ -362,9 +476,11 @@ int main(int argc, char **argv)
s << "ok" << std::endl;
s.close();
}
-
+
apr_terminate();
-
+
int retval = (success ? 0 : 1);
return retval;
+
+ //delete mycallback;
}
diff --git a/indra/viewer_components/login/tests/lllogin_test.cpp b/indra/viewer_components/login/tests/lllogin_test.cpp
index 577f5dac89583d347b4aa37cf060dad48b3bbf04..95d0421273acdddaf612613e19ec5cb8aff3c035 100644
--- a/indra/viewer_components/login/tests/lllogin_test.cpp
+++ b/indra/viewer_components/login/tests/lllogin_test.cpp
@@ -226,7 +226,7 @@ namespace tut
typedef test_group<llviewerlogin_data> llviewerlogin_group;
typedef llviewerlogin_group::object llviewerlogin_object;
- llviewerlogin_group llviewerlogingrp("llviewerlogin");
+ llviewerlogin_group llviewerlogingrp("LLViewerLogin");
template<> template<>
void llviewerlogin_object::test<1>()