diff options
author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 08:54:45 +0200 |
---|---|---|
committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 08:54:45 +0200 |
commit | b62bd0584a7872b6917917009b707785b3abd077 (patch) | |
tree | 9981f274712c098cabbff0c4667672a3934e5393 /tests/auto/testlib/selftests/expected_benchlibcallgrind.txt | |
parent | 5e10745dca1d10025404a9f268f03ae697fb10cc (diff) | |
parent | 97baad65f65783d2b5ff938f6217aec9434f2e5f (diff) |
Merge branch 'refactor'
Conflicts:
mkspecs/qws/linux-lsb-g++/qmake.conf
src/gui/image/qpixmap_mac.cpp
src/gui/painting/qpaintengine_x11.cpp
src/gui/painting/qtessellator.cpp
src/gui/text/qfontengine_qws.cpp
src/gui/text/qfontengine_x11.cpp
src/gui/widgets/qlinecontrol.cpp
src/opengl/qgl.h
src/opengl/qgl_x11egl.cpp
src/plugins/plugins.pro
Change-Id: If52dcd55cd55f2983a756c2f843967702b60a310
Diffstat (limited to 'tests/auto/testlib/selftests/expected_benchlibcallgrind.txt')
-rw-r--r-- | tests/auto/testlib/selftests/expected_benchlibcallgrind.txt | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/tests/auto/testlib/selftests/expected_benchlibcallgrind.txt b/tests/auto/testlib/selftests/expected_benchlibcallgrind.txt new file mode 100644 index 0000000000..f1727114b5 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_benchlibcallgrind.txt @@ -0,0 +1,9 @@ +********* Start testing of tst_BenchlibCallgrind ********* +Config: Using QTest library 4.5.0, Qt 4.5.0 +PASS : tst_BenchlibCallgrind::initTestCase() +RESULT : tst_BenchlibCallgrind::twoHundredMillionInstructions(): + 200,000,000 instruction reads per iteration (total: 200000000, iterations: 1) +PASS : tst_BenchlibCallgrind::twoHundredMillionInstructions() +PASS : tst_BenchlibCallgrind::cleanupTestCase() +Totals: 3 passed, 0 failed, 0 skipped +********* Finished testing of tst_BenchlibCallgrind ********* |