diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2011-08-31 14:14:06 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-08-31 13:12:43 +0200 |
| commit | f0d7e705ee66f82dfd32ce93670eba4f9186c4c0 (patch) | |
| tree | 538e511cc850d55645b62475d7d51a91df61b479 /tests/auto/selftests/expected_assert.xml | |
| parent | 3526560d60ef82cd04e4fdf2e0ab751c0aca9731 (diff) | |
Remove XFAIL from selftests for some platforms
The selftest for assert messages calls QEXPECT_FAIL if the assert
message doesn't exactly match the expected output. This is because
Q_ASSERT uses __FILE__, which is compiler-dependant.
The expected output for this test contains various hard-coded unix
paths meaning that the test never passes on any platform. This commit
removes those paths from the test data so that the test passes for
compilers that don't put path information in __FILE__. This commit also
makes the XFAIL message more accurate -- absolute paths in assert
messages don't come from QTestLib, they come from Q_ASSERT's use of
__FILE__.
Change-Id: I9aae212379b43a29ae83715717cc978b4b619420
Reviewed-on: http://codereview.qt.nokia.com/3908
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/selftests/expected_assert.xml')
| -rw-r--r-- | tests/auto/selftests/expected_assert.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/selftests/expected_assert.xml b/tests/auto/selftests/expected_assert.xml index 3a7152c71a..60085aa2b9 100644 --- a/tests/auto/selftests/expected_assert.xml +++ b/tests/auto/selftests/expected_assert.xml @@ -12,7 +12,7 @@ </TestFunction> <TestFunction name="testNumber2"> <Message type="qfatal" file="" line="0"> - <Description><![CDATA[ASSERT: "false" in file /local/user_builds/qt/4.6/tests/auto/selftests/assert/tst_assert.cpp, line 62]]></Description> + <Description><![CDATA[ASSERT: "false" in file tst_assert.cpp, line 62]]></Description> </Message> <Incident type="fail" file="Unknown file" line="0"> <Description><![CDATA[Received a fatal error.]]></Description> |