diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2012-03-05 10:44:04 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2012-03-05 10:44:48 +0100 |
| commit | d51abed57a8f677a0d4eac57fd3f16bd4662190a (patch) | |
| tree | b3e173db4b72edbff6cb8dcc203c3d4526a1b51b /tests/auto/testlib/selftests/selftests.qrc | |
| parent | 07ae18f96e87a2db40ae014f28893f1080efa7ae (diff) | |
| parent | 0862d7f78af978cf513097b3bdc33cd8096dee75 (diff) | |
Merge remote-tracking branch 'origin/master' into api_changes
Change-Id: Ibcb1f7070f50968b77b66112750ce5c70fc0b6d0
Diffstat (limited to 'tests/auto/testlib/selftests/selftests.qrc')
| -rw-r--r-- | tests/auto/testlib/selftests/selftests.qrc | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/tests/auto/testlib/selftests/selftests.qrc b/tests/auto/testlib/selftests/selftests.qrc index d05ac2a516..03de05fb89 100644 --- a/tests/auto/testlib/selftests/selftests.qrc +++ b/tests/auto/testlib/selftests/selftests.qrc @@ -71,11 +71,14 @@ <file>expected_failinitdata.txt</file> <file>expected_failinitdata.xml</file> <file>expected_failinitdata.xunitxml</file> - <file>expected_fatal.txt</file> <file>expected_fetchbogus.lightxml</file> <file>expected_fetchbogus.txt</file> <file>expected_fetchbogus.xml</file> <file>expected_fetchbogus.xunitxml</file> + <file>expected_findtestdata.lightxml</file> + <file>expected_findtestdata.txt</file> + <file>expected_findtestdata.xml</file> + <file>expected_findtestdata.xunitxml</file> <file>expected_float.txt</file> <file>expected_globaldata.lightxml</file> <file>expected_globaldata.txt</file> @@ -123,10 +126,14 @@ <file>expected_subtest.txt</file> <file>expected_subtest.xml</file> <file>expected_subtest.xunitxml</file> - <file>expected_findtestdata.lightxml</file> - <file>expected_findtestdata.txt</file> - <file>expected_findtestdata.xml</file> - <file>expected_findtestdata.xunitxml</file> + <file>expected_verbose1.lightxml</file> + <file>expected_verbose1.txt</file> + <file>expected_verbose1.xml</file> + <file>expected_verbose1.xunitxml</file> + <file>expected_verbose2.lightxml</file> + <file>expected_verbose2.txt</file> + <file>expected_verbose2.xml</file> + <file>expected_verbose2.xunitxml</file> <file>expected_warnings.lightxml</file> <file>expected_warnings.txt</file> <file>expected_warnings.xml</file> |