fa8cffa4c9
We try our best to pass on the file location of a failure, including for
fatal errors, but the reporting or logging machinery should not assume
there is one.
By passing on nullptr for the file location we allow the logging backends
to decide how to handle the situation, e.g. by not emitting extra fields
for failure location.
This effectively reverts c25687fa0b,
in favor of relying on the backends to cope with null filename,
which they already did.
As qFatal uses QMessageLogger, which by default disables file/line
information in release builds, we need to explicitly enable this in
our self-tests, to get uniform test results. Similarly, we disable
file/line info from testlib itself, as reporting Qt internal file
and line information for user diagnostics is less useful. The odd
one out there is qtestdata.cpp, which still ends up in test output
due to using QTEST_ASSERT instead of qFatal for its diagnostics.
Cleaning up that, and unifying how we report testlib issues to the
user, is left for another day.
Pick-to: 6.2
Change-Id: Ib9451b8eed86fe3ade4a4dcaf0037e1a3450321c
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
160 lines
6.3 KiB
Plaintext
160 lines
6.3 KiB
Plaintext
<Environment>
|
|
<QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
|
|
<QtBuild/>
|
|
<QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
|
|
</Environment>
|
|
<TestFunction name="initTestCase">
|
|
<Incident type="pass" file="" line="0" />
|
|
<Duration msecs="0"/>
|
|
</TestFunction>
|
|
<TestFunction name="xfailAndContinue">
|
|
<Message type="qdebug" file="" line="0">
|
|
<Description><![CDATA[begin]]></Description>
|
|
</Message>
|
|
<Incident type="xfail" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0">
|
|
<Description><![CDATA[This should xfail]]></Description>
|
|
</Incident>
|
|
<Message type="qdebug" file="" line="0">
|
|
<Description><![CDATA[after]]></Description>
|
|
</Message>
|
|
<Incident type="pass" file="" line="0" />
|
|
<Duration msecs="0"/>
|
|
</TestFunction>
|
|
<TestFunction name="xfailAndAbort">
|
|
<Message type="qdebug" file="" line="0">
|
|
<Description><![CDATA[begin]]></Description>
|
|
</Message>
|
|
<Incident type="xfail" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0">
|
|
<Description><![CDATA[This should xfail]]></Description>
|
|
</Incident>
|
|
<Incident type="pass" file="" line="0" />
|
|
<Duration msecs="0"/>
|
|
</TestFunction>
|
|
<TestFunction name="xfailTwice">
|
|
<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0">
|
|
<Description><![CDATA[Already expecting a fail]]></Description>
|
|
</Incident>
|
|
<Duration msecs="0"/>
|
|
</TestFunction>
|
|
<TestFunction name="xfailWithQString">
|
|
<Incident type="xfail" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0">
|
|
<Description><![CDATA[A string]]></Description>
|
|
</Incident>
|
|
<Incident type="xfail" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0">
|
|
<Description><![CDATA[Bug 5 (The message)]]></Description>
|
|
</Incident>
|
|
<Incident type="pass" file="" line="0" />
|
|
<Duration msecs="0"/>
|
|
</TestFunction>
|
|
<TestFunction name="xfailDataDrivenWithQVerify">
|
|
<Incident type="pass" file="" line="0">
|
|
<DataTag><![CDATA[Pass 1]]></DataTag>
|
|
</Incident>
|
|
<Incident type="pass" file="" line="0">
|
|
<DataTag><![CDATA[Pass 2]]></DataTag>
|
|
</Incident>
|
|
<Incident type="xfail" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0">
|
|
<DataTag><![CDATA[Abort]]></DataTag>
|
|
<Description><![CDATA[This test should xfail]]></Description>
|
|
</Incident>
|
|
<Incident type="pass" file="" line="0">
|
|
<DataTag><![CDATA[Abort]]></DataTag>
|
|
</Incident>
|
|
<Incident type="xfail" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0">
|
|
<DataTag><![CDATA[Continue]]></DataTag>
|
|
<Description><![CDATA[This test should xfail]]></Description>
|
|
</Incident>
|
|
<Incident type="pass" file="" line="0">
|
|
<DataTag><![CDATA[Continue]]></DataTag>
|
|
</Incident>
|
|
<Duration msecs="0"/>
|
|
</TestFunction>
|
|
<TestFunction name="xfailDataDrivenWithQCompare">
|
|
<Incident type="pass" file="" line="0">
|
|
<DataTag><![CDATA[Pass 1]]></DataTag>
|
|
</Incident>
|
|
<Incident type="pass" file="" line="0">
|
|
<DataTag><![CDATA[Pass 2]]></DataTag>
|
|
</Incident>
|
|
<Incident type="xfail" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0">
|
|
<DataTag><![CDATA[Abort]]></DataTag>
|
|
<Description><![CDATA[This test should xfail]]></Description>
|
|
</Incident>
|
|
<Incident type="pass" file="" line="0">
|
|
<DataTag><![CDATA[Abort]]></DataTag>
|
|
</Incident>
|
|
<Incident type="xfail" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0">
|
|
<DataTag><![CDATA[Continue]]></DataTag>
|
|
<Description><![CDATA[This test should xfail]]></Description>
|
|
</Incident>
|
|
<Incident type="pass" file="" line="0">
|
|
<DataTag><![CDATA[Continue]]></DataTag>
|
|
</Incident>
|
|
<Duration msecs="0"/>
|
|
</TestFunction>
|
|
<TestFunction name="xfailOnWrongRow">
|
|
<Incident type="pass" file="" line="0">
|
|
<DataTag><![CDATA[right row]]></DataTag>
|
|
</Incident>
|
|
<Duration msecs="0"/>
|
|
</TestFunction>
|
|
<TestFunction name="xfailOnAnyRow">
|
|
<Incident type="xfail" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0">
|
|
<DataTag><![CDATA[first row]]></DataTag>
|
|
<Description><![CDATA[This test should xfail]]></Description>
|
|
</Incident>
|
|
<Incident type="pass" file="" line="0">
|
|
<DataTag><![CDATA[first row]]></DataTag>
|
|
</Incident>
|
|
<Incident type="xfail" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0">
|
|
<DataTag><![CDATA[second row]]></DataTag>
|
|
<Description><![CDATA[This test should xfail]]></Description>
|
|
</Incident>
|
|
<Incident type="pass" file="" line="0">
|
|
<DataTag><![CDATA[second row]]></DataTag>
|
|
</Incident>
|
|
<Duration msecs="0"/>
|
|
</TestFunction>
|
|
<TestFunction name="xfailWithoutVerify">
|
|
<Incident type="fail" file="" line="0">
|
|
<DataTag><![CDATA[first row]]></DataTag>
|
|
<Description><![CDATA[QEXPECT_FAIL was called without any subsequent verification statements]]></Description>
|
|
</Incident>
|
|
<Incident type="fail" file="" line="0">
|
|
<DataTag><![CDATA[second row]]></DataTag>
|
|
<Description><![CDATA[QEXPECT_FAIL was called without any subsequent verification statements]]></Description>
|
|
</Incident>
|
|
<Duration msecs="0"/>
|
|
</TestFunction>
|
|
<TestFunction name="xpass">
|
|
<Incident type="xpass" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0">
|
|
<Description><![CDATA['true' returned TRUE unexpectedly. ()]]></Description>
|
|
</Incident>
|
|
<Duration msecs="0"/>
|
|
</TestFunction>
|
|
<TestFunction name="xpassDataDrivenWithQVerify">
|
|
<Incident type="xpass" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0">
|
|
<DataTag><![CDATA[XPass]]></DataTag>
|
|
<Description><![CDATA['true' returned TRUE unexpectedly. ()]]></Description>
|
|
</Incident>
|
|
<Incident type="pass" file="" line="0">
|
|
<DataTag><![CDATA[Pass]]></DataTag>
|
|
</Incident>
|
|
<Duration msecs="0"/>
|
|
</TestFunction>
|
|
<TestFunction name="xpassDataDrivenWithQCompare">
|
|
<Incident type="xpass" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0">
|
|
<DataTag><![CDATA[XPass]]></DataTag>
|
|
<Description><![CDATA[QCOMPARE(1, 1) returned TRUE unexpectedly.]]></Description>
|
|
</Incident>
|
|
<Incident type="pass" file="" line="0">
|
|
<DataTag><![CDATA[Pass]]></DataTag>
|
|
</Incident>
|
|
<Duration msecs="0"/>
|
|
</TestFunction>
|
|
<TestFunction name="cleanupTestCase">
|
|
<Incident type="pass" file="" line="0" />
|
|
<Duration msecs="0"/>
|
|
</TestFunction>
|
|
<Duration msecs="0"/>
|