diff options
author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-09-29 14:07:02 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-09-29 14:08:49 +0200 |
commit | 189dc655bbb3b4f9e1e11596f5a0f4682326066d (patch) | |
tree | 67527f791542775394332c2995887994bde9adc9 /tests/auto/testlib/selftests/expected_multiexec.txt | |
parent | 6fd5870df0fbad0187b6d8bf7e3b12afb2e7a66f (diff) | |
parent | dfe853bff90444edf92a993e391df853780c9e8d (diff) |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
src/corelib/tools/qbytearray.cpp
src/gui/image/qimage.cpp
src/gui/image/qppmhandler.cpp
src/gui/kernel/qguiapplication.cpp
src/gui/painting/qpaintengine_raster.cpp
Change-Id: I7c1a8e7ebdfd7f7ae767fdb932823498a7660765
Diffstat (limited to 'tests/auto/testlib/selftests/expected_multiexec.txt')
-rw-r--r-- | tests/auto/testlib/selftests/expected_multiexec.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/testlib/selftests/expected_multiexec.txt b/tests/auto/testlib/selftests/expected_multiexec.txt index b2f1d7009c..f3cd942e38 100644 --- a/tests/auto/testlib/selftests/expected_multiexec.txt +++ b/tests/auto/testlib/selftests/expected_multiexec.txt @@ -3,33 +3,33 @@ Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HER PASS : tst_Nothing::initTestCase() PASS : tst_Nothing::nothing() PASS : tst_Nothing::cleanupTestCase() -Totals: 3 passed, 0 failed, 0 skipped +Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted ********* Finished testing of tst_Nothing ********* ********* Start testing of tst_Nothing ********* Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ PASS : tst_Nothing::initTestCase() PASS : tst_Nothing::nothing() PASS : tst_Nothing::cleanupTestCase() -Totals: 3 passed, 0 failed, 0 skipped +Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted ********* Finished testing of tst_Nothing ********* ********* Start testing of tst_Nothing ********* Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ PASS : tst_Nothing::initTestCase() PASS : tst_Nothing::nothing() PASS : tst_Nothing::cleanupTestCase() -Totals: 3 passed, 0 failed, 0 skipped +Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted ********* Finished testing of tst_Nothing ********* ********* Start testing of tst_Nothing ********* Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ PASS : tst_Nothing::initTestCase() PASS : tst_Nothing::nothing() PASS : tst_Nothing::cleanupTestCase() -Totals: 3 passed, 0 failed, 0 skipped +Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted ********* Finished testing of tst_Nothing ********* ********* Start testing of tst_Nothing ********* Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ PASS : tst_Nothing::initTestCase() PASS : tst_Nothing::nothing() PASS : tst_Nothing::cleanupTestCase() -Totals: 3 passed, 0 failed, 0 skipped +Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted ********* Finished testing of tst_Nothing ********* |