diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2011-09-16 11:25:29 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-17 03:21:44 +0200 |
| commit | 0676e5179331d1834c16a1269034f4ffe2caaf6d (patch) | |
| tree | 6ad8c870795897ca2cce894759d1c7165f7e32ec /tests/auto/testlib | |
| parent | 1efd2de0470b1321b561a1f1131f360d46946e6f (diff) | |
Fix XFAIL in testlib selftest
Commit 949be8cbdd2d346647accbbd9bdab879256470ec modified the assert test
case but failed to update the line number of the assert in the expected
test output files.
Change-Id: I0d4f55c0b8bc1de8487dd8c6267aa459000cda26
Reviewed-on: http://codereview.qt-project.org/5048
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/testlib')
4 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/testlib/selftests/expected_assert.lightxml b/tests/auto/testlib/selftests/expected_assert.lightxml index c9a1978e9e..c2cc1da7ab 100644 --- a/tests/auto/testlib/selftests/expected_assert.lightxml +++ b/tests/auto/testlib/selftests/expected_assert.lightxml @@ -10,7 +10,7 @@ </TestFunction> <TestFunction name="testNumber2"> <Message type="qfatal" file="" line="0"> - <Description><![CDATA[ASSERT: "false" in file tst_assert.cpp, line 62]]></Description> + <Description><![CDATA[ASSERT: "false" in file tst_assert.cpp, line 66]]></Description> </Message> <Incident type="fail" file="Unknown file" line="0"> <Description><![CDATA[Received a fatal error.]]></Description> diff --git a/tests/auto/testlib/selftests/expected_assert.txt b/tests/auto/testlib/selftests/expected_assert.txt index f57eb55604..3b66d0d9ba 100644 --- a/tests/auto/testlib/selftests/expected_assert.txt +++ b/tests/auto/testlib/selftests/expected_assert.txt @@ -2,7 +2,7 @@ Config: Using QTest library 4.3.0, Qt 4.3.0 PASS : tst_Assert::initTestCase() PASS : tst_Assert::testNumber1() -QFATAL : tst_Assert::testNumber2() ASSERT: "false" in file tst_assert.cpp, line 62 +QFATAL : tst_Assert::testNumber2() ASSERT: "false" in file tst_assert.cpp, line 66 FAIL! : tst_Assert::testNumber2() Received a fatal error. Loc: [Unknown file(0)] Totals: 2 passed, 1 failed, 0 skipped diff --git a/tests/auto/testlib/selftests/expected_assert.xml b/tests/auto/testlib/selftests/expected_assert.xml index 60085aa2b9..27aa04fcf6 100644 --- a/tests/auto/testlib/selftests/expected_assert.xml +++ b/tests/auto/testlib/selftests/expected_assert.xml @@ -12,7 +12,7 @@ </TestFunction> <TestFunction name="testNumber2"> <Message type="qfatal" file="" line="0"> - <Description><![CDATA[ASSERT: "false" in file tst_assert.cpp, line 62]]></Description> + <Description><![CDATA[ASSERT: "false" in file tst_assert.cpp, line 66]]></Description> </Message> <Incident type="fail" file="Unknown file" line="0"> <Description><![CDATA[Received a fatal error.]]></Description> diff --git a/tests/auto/testlib/selftests/expected_assert.xunitxml b/tests/auto/testlib/selftests/expected_assert.xunitxml index 87617003c5..0aebe72745 100644 --- a/tests/auto/testlib/selftests/expected_assert.xunitxml +++ b/tests/auto/testlib/selftests/expected_assert.xunitxml @@ -7,10 +7,10 @@ <testcase result="pass" name="initTestCase"/> <testcase result="pass" name="testNumber1"/> <testcase result="fail" name="testNumber2"> - <!-- message="ASSERT: "false" in file tst_assert.cpp, line 62" type="qfatal" --> + <!-- message="ASSERT: "false" in file tst_assert.cpp, line 66" type="qfatal" --> <failure message="Received a fatal error." result="fail"/> </testcase> <system-err> -<![CDATA[ASSERT: "false" in file tst_assert.cpp, line 62]]> +<![CDATA[ASSERT: "false" in file tst_assert.cpp, line 66]]> </system-err> </testsuite> |