--- a/tests/auto/selftests/expected_xunit.txt	Fri May 14 16:40:13 2010 +0300
+++ b/tests/auto/selftests/expected_xunit.txt	Thu May 27 13:40:48 2010 +0300
@@ -1,40 +1,25 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<testsuite errors="5" failures="3" tests="9" name="tst_Xunit">
-  <properties>
-    <property value="<INSERT_QT_VERSION_HERE>" name="QTestVersion"/>
-    <property value="<INSERT_QT_VERSION_HERE>" name="QtVersion"/>
-  </properties>
-  <testcase result="pass" name="initTestCase"/>
-  <testcase result="pass" name="testFunc1">
-    <!-- message="just a QWARN() !" type="warn" -->
-  </testcase>
-  <testcase result="fail" name="testFunc2">
-    <!-- message="a qDebug() call with comment&#x002D;ending stuff &#x002D;&#x002D;&gt;" type="qdebug" -->
-    <failure message="Compared values are not the same
+********* Start testing of tst_Xunit *********
+Config: Using QTest library 4.6.3, Qt 4.6.3
+PASS   : tst_Xunit::initTestCase()
+WARNING: tst_Xunit::testFunc1() just a QWARN() !
+PASS   : tst_Xunit::testFunc1()
+QDEBUG : tst_Xunit::testFunc2() a qDebug() call with comment-ending stuff -->
+FAIL!  : tst_Xunit::testFunc2() Compared values are not the same
    Actual (2): 2
-   Expected (3): 3" result="fail"/>
-  </testcase>
-  <testcase name="testFunc3">
-    <!-- message="skipping this function!" type="skip" -->
-  </testcase>
-  <testcase result="fail" name="testFunc4">
-    <failure message="a forced failure!" result="fail"/>
-  </testcase>
-  <testcase result="xfail" name="testFunc5">
-    <!-- message="this failure is expected" type="info" -->
-  </testcase>
-  <testcase result="xfail" name="testFunc6">
-    <!-- message="this failure is also expected" type="info" -->
-  </testcase>
-  <testcase result="xpass" name="testFunc7">
-    <failure message="&apos;true&apos; returned FALSE. ()" result="xpass"/>
-  </testcase>
-  <testcase result="pass" name="cleanupTestCase"/>
-  <system-err>
-<![CDATA[just a QWARN() !]]>
-<![CDATA[a qDebug() call with comment-ending stuff -->]]>
-<![CDATA[skipping this function!]]>
-<![CDATA[this failure is expected]]>
-<![CDATA[this failure is also expected]]>
-  </system-err>
-</testsuite>
+   Expected (3): 3
+   Loc: [/local/user_builds/qt/4.6/tests/auto/selftests/xunit/tst_xunit.cpp(74)]
+SKIP   : tst_Xunit::testFunc3() skipping this function!
+   Loc: [/local/user_builds/qt/4.6/tests/auto/selftests/xunit/tst_xunit.cpp(79)]
+FAIL!  : tst_Xunit::testFunc4() a forced failure!
+   Loc: [/local/user_builds/qt/4.6/tests/auto/selftests/xunit/tst_xunit.cpp(84)]
+XFAIL  : tst_Xunit::testFunc5() this failure is expected
+   Loc: [/local/user_builds/qt/4.6/tests/auto/selftests/xunit/tst_xunit.cpp(98)]
+PASS   : tst_Xunit::testFunc5()
+XFAIL  : tst_Xunit::testFunc6() this failure is also expected
+   Loc: [/local/user_builds/qt/4.6/tests/auto/selftests/xunit/tst_xunit.cpp(104)]
+PASS   : tst_Xunit::testFunc6()
+XPASS  : tst_Xunit::testFunc7() 'true' returned FALSE. ()
+   Loc: [/local/user_builds/qt/4.6/tests/auto/selftests/xunit/tst_xunit.cpp(110)]
+PASS   : tst_Xunit::cleanupTestCase()
+Totals: 5 passed, 3 failed, 1 skipped
+********* Finished testing of tst_Xunit *********