Second Life viewer sources 1.18.0.6

1 files changed, 24 insertions, 8 deletions

diff --git a/linden/indra/test/test.cpp b/linden/indra/test/test.cpp
index 8f6f672..1c03768 100644
--- a/linden/indra/test/test.cpp
+++ b/linden/indra/test/test.cpp
@@ -64,7 +64,8 @@ public:
                 mTotalTests(0),
                 mPassedTests(0),
                 mFailedTests(0),
-                mSkippedTests(0)
+                mSkippedTests(0),
+                mSkipedFailTests(0)
         {
         }
 
@@ -86,7 +87,7 @@ public:
                         break;
                 case tut::test_result::fail:
                         ++mFailedTests;
-                        out << "fail '" << tr.message << "'";
+                        out << "fail";
                         break;
                 case tut::test_result::ex:
                         ++mFailedTests;
@@ -104,12 +105,20 @@ public:
                         ++mSkippedTests;
                         out << "skipped";
                         break;
+                case tut::test_result::skip_fail:
+                        ++mSkipedFailTests;
+                        out << "skipped known failure";
+                        break;
                 default:
                         ++mFailedTests;
                         out << "unknown";
                 }
                 if(mVerboseMode || (tr.result != tut::test_result::ok))
                 {
+                        if(!tr.message.empty())
+                        {
+                                out << ": '" << tr.message << "'";
+                        }
                         std::cout << out.str() << std::endl;
                 }
         }
@@ -118,11 +127,17 @@ public:
         {
                 std::cout << std::endl;
                 std::cout << "Total Tests:   " << mTotalTests << std::endl;
-                std::cout << "Passed Tests : " << mPassedTests << std::endl;
+                std::cout << "Passed Tests: " << mPassedTests << std::endl;
                 
                 if (mSkippedTests > 0)
                 {
-                        std::cout << "Skipped Tests : " << mSkippedTests << std::endl;
+                        std::cout << "Skipped Tests: " << mSkippedTests << std::endl;
+                }
+
+                if (mSkipedFailTests > 0)
+                {
+                        std::cout << "Skipped known failures: " << mSkipedFailTests
+                                << std::endl;
                 }
 
                 if(mFailedTests > 0)
@@ -137,10 +152,11 @@ public:
 
 protected:
         bool mVerboseMode;
-        S32 mTotalTests;
-        S32 mPassedTests;
-        S32 mFailedTests;
-        S32 mSkippedTests;
+        int mTotalTests;
+        int mPassedTests;
+        int mFailedTests;
+        int mSkippedTests;
+        int mSkipedFailTests;
 };
 
 static const apr_getopt_option_t TEST_CL_OPTIONS[] =