summaryrefslogtreecommitdiffstats
path: root/src/testlib
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'qt/master'Jason Barron2009-08-105-5/+40
|\
| * Link with winscw againHarald Fernengel2009-08-101-1/+1
| | | | | | | | | | compiler mangles "struct" and "class" differently, so make sure that QTestCharBuffer is always forward declared as "struct".
| * Add QBENCMARK_ONCE to QTestLib.Morten Sorvig2009-08-104-4/+39
| | | | | | | | | | | | | | | | | | | | The code block associated with QBENCHMARK_ONCE macro will only be executed once, whether the backend returns a valid result or not. The "-iterations" command line argument is also ignored. This is useful for benchmarking code that has side effects. Revby: jasplin
* | Merge commit 'qt/master-stable'Jason Barron2009-08-1015-223/+264
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qobject.cpp src/corelib/tools/qsharedpointer_impl.h src/gui/widgets/qdatetimeedit.cpp src/gui/widgets/qlinecontrol.cpp src/gui/widgets/qlineedit.cpp tests/auto/qcssparser/qcssparser.pro tests/auto/qicoimageformat/tst_qicoimageformat.cpp tests/auto/qmultiscreen/qmultiscreen.pro tests/auto/qresourceengine/qresourceengine.pro tests/auto/qresourceengine/tst_qresourceengine.cpp tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp
| * Refactor QTestCharBuffer a bitHarald Fernengel2009-08-0715-218/+257
| | | | | | | | | | | | | | | | | | Use a static buffer for small strings, and making it oom safe. We can now see messages up to 512 bytes even if we run out of memory (important for OOM tests). Also, testlogging (< 512 bytes per line) should again work without a single allocation. Reviewed-By: Rohan McGovern <rohan.mcgovern@nokia.com>
| * fixing outputMessage in qplaintestlogger.cpp for Windows CEJoerg Bornemann2009-08-061-5/+7
| | | | | | | | | | | | | | | | There's a restriction to output only 255 characters per line. The loop we had before was wrong and did some read operations somewhere behinde the end of the message string. Reviewed-by: thartman
* | Merge commit 'origin/master'Jason Barron2009-08-041-4/+14
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qglobal.h src/corelib/kernel/qmetatype.cpp src/corelib/kernel/qobject.cpp src/corelib/thread/qthread_unix.cpp src/gui/graphicsview/qgraphicssceneevent.h src/gui/itemviews/qheaderview.h src/gui/kernel/qapplication_qws.cpp src/gui/kernel/qgesture.h src/gui/kernel/qgesturerecognizer.h src/gui/painting/qpaintengine_raster.cpp src/network/access/qhttpnetworkreply.cpp src/network/access/qnetworkcookie.h src/network/socket/qnativesocketengine_unix.cpp
| * | Squashed commit of the topic/exceptions branch.Harald Fernengel2009-08-031-4/+14
| | | | | | | | | | | | | | | Contains some smaller fixes and renaming of macros. Looks big, but isn't scary at all ;)
* | | Merge commit 'qt/master-stable'Jason Barron2009-08-0414-244/+364
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: config.tests/unix/openssl/openssl.pri demos/embedded/embedded.pro examples/itemviews/chart/chart.pro examples/network/network.pro examples/painting/painterpaths/painterpaths.pro examples/threads/mandelbrot/mandelbrot.pro qmake/project.cpp src/3rdparty/libtiff/libtiff/tif_config.h src/corelib/arch/arch.pri src/corelib/global/qglobal.cpp src/corelib/kernel/kernel.pri src/corelib/kernel/qcore_unix_p.h src/corelib/kernel/qobject.cpp src/corelib/thread/qthread_unix.cpp src/corelib/tools/qsharedpointer_impl.h src/corelib/tools/tools.pri src/gui/kernel/qaction.h src/gui/kernel/qapplication.cpp src/gui/painting/qregion.h src/gui/widgets/qlineedit.cpp src/gui/widgets/qlineedit_p.h src/network/socket/qnativesocketengine_unix.cpp tests/auto/qdir/tst_qdir.cpp tests/auto/qdiriterator/tst_qdiriterator.cpp tests/auto/qhttp/qhttp.pro tests/auto/qline/qline.pro tests/auto/qnetworkreply/tst_qnetworkreply.cpp tests/auto/qresourceengine/qresourceengine.pro tests/auto/qsharedpointer/qsharedpointer.pro tests/auto/qstring/qstring.pro tests/auto/qtcpsocket/qtcpsocket.pro tests/auto/qtcpsocket/tst_qtcpsocket.cpp
| * | Doc: fix warnings.Volker Hilsheimer2009-07-311-0/+2
| | |
| * | Fixed corrupt testlogs on Windows and other places where vsnprintf isRohan McGovern2009-07-311-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not C99-compliant. C99 says vsnprintf returns >= `size' when not enough memory was available. In practice, on Windows, glibc < 2.0.6, and probably plenty of other places it returns -1 instead. Reviewed-by: Rhys Weatherley
| * | Convert all testlib loggers to use dynamically allocated strings.Rohan McGovern2009-07-304-132/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most log elements in all loggers can now be of (more or less) arbitrary length. Selftests pass and are memcheck-clean. The increase in heap usage seems negligible (it's below the default minimum threshold of massif). Task: 253861 Reviewed-by: Michael Goddard
| * | Make QTestBasicStreamer use dynamically allocated strings.Rohan McGovern2009-07-3010-102/+153
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit contains the bare minimum needed for the API to use dynamic allocation; some parts of the code still use static buffers and therefore have constraints on the size of output messages. Task: 253861 Reviewed-by: Michael Goddard
| * | Allow testlib loggers to dynamically allocate storage for strings.Rohan McGovern2009-07-304-9/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This enables very long failure messages (e.g. including an entire build log in a failure message). This change modifies only the plain test logger to use this feature. Task: 253861 Reviewed-by: Michael Goddard
| * | Doc: Documentation for new toString(QVariant) overloadVolker Hilsheimer2009-07-291-0/+7
| | |
* | | Merge commit 'qt/master-stable'Jason Barron2009-07-301-0/+25
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: demos/demos.pro src/gui/graphicsview/qgraphicsitem_p.h
| * | Added a QVariant testlib toString specialization.Rohan McGovern2009-07-281-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | If comparing two variants fails, the failure message will now output the type and value of the variants (rather than "Compared values are not the same"). Reviewed-by: Thiago
* | | Fix compilation of QTestLib on Symbian.Jason Barron2009-07-291-2/+2
| | | | | | | | | | | | Open C doesn't support signals so #ifdef this code out.
* | | Merge commit 'qt/master-stable'Jason Barron2009-07-282-4/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe src/corelib/io/io.pri src/corelib/io/qfilesystemwatcher.cpp tests/auto/qfileinfo/tst_qfileinfo.cpp tools/configure/configureapp.cpp
| * | Fix warnings when compiling Qt (tst_warnings).Thiago Macieira2009-07-252-4/+4
| | | | | | | | | | | | | | | Don't use old-style casts in Qt code. And avoid signed/unsigned comparisons (sizeof returns size_t, which is unsigned).
* | | Merge commit 'qt/master-stable'Jason Barron2009-07-273-29/+198
|\ \ \ | |/ / | | / | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe qmake/Makefile.unix qmake/generators/makefile.cpp src/corelib/global/qglobal.h src/corelib/kernel/kernel.pri src/corelib/kernel/qcoreevent.cpp src/corelib/kernel/qsharedmemory_unix.cpp src/gui/graphicsview/qgraphicsscene.cpp src/gui/kernel/qaction.cpp src/gui/kernel/qaction.h src/gui/kernel/qaction_p.h src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication.h src/gui/kernel/qwidget.cpp src/gui/kernel/qwidget.h src/gui/kernel/qwidget_mac.mm src/gui/painting/qgraphicssystemfactory.cpp src/gui/styles/qwindowsstyle.cpp src/gui/text/qfontengine_qpf.cpp src/gui/widgets/qabstractscrollarea_p.h src/network/access/qnetworkaccessdebugpipebackend.cpp src/network/socket/qlocalsocket_unix.cpp src/network/socket/qnativesocketengine_p.h src/network/socket/qnativesocketengine_unix.cpp src/openvg/qpaintengine_vg.cpp tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp tests/auto/qcssparser/qcssparser.pro tests/auto/qdir/tst_qdir.cpp tests/auto/qfile/tst_qfile.cpp tests/auto/qobject/tst_qobject.cpp tests/auto/qpathclipper/qpathclipper.pro tests/auto/qprocess/tst_qprocess.cpp tests/auto/qsettings/tst_qsettings.cpp tests/auto/qsharedpointer/qsharedpointer.pro tests/auto/qsqlquerymodel/qsqlquerymodel.pro tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro tests/auto/qsqltablemodel/qsqltablemodel.pro tests/auto/qsqlthread/qsqlthread.pro tests/auto/qwidget/tst_qwidget.cpp
| * Fixed valgrind warnings related to sigaction from every testcase.Rohan McGovern2009-07-211-1/+1
| | | | | | | | Whoops, don't do sigaction for (nonexistent) signal 0.
| * Compile with QT_NO_PROCESS or QT_NO_SETTINGSHarald Fernengel2009-07-211-3/+3
| | | | | | | | | | | | Feature define logic was wrong Reviewed-by: Robert Griebl
| * Doc: add \since 4.6 for new APIsVolker Hilsheimer2009-07-191-6/+0
| |
| * Doc: Documentation for QTouchEventSequenceVolker Hilsheimer2009-07-181-12/+102
| |
| * Fixed failure of badxml selftest on Windows.Rohan McGovern2009-07-171-8/+17
| | | | | | | | | | | | Don't try to write to files with special characters in the name. Also fix bizarre indent.
| * Use Unix signal handlers to properly close the test log when a test isRohan McGovern2009-07-151-5/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | terminated by a signal. The new XML testloggers in Qt 4.6 only output a testlog after the test completes. Therefore, if a test crashes, no testlog will be output at all. This is a functional regression from Qt 4.5 and earlier where the testlog would be output up to the point where the crash occurred. This is a Unix-specific fix for this problem. This change is also useful for hanging tests; if the test is killed with SIGTERM it will output the test log up to the current test before it exits.
| * src/testlib: LPCWSTR -> wchar_t*Marius Storm-Olsen2009-07-011-1/+1
| | | | | | | | | | Merge-request: 604 Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
* | Merge commit 'origin/master' into 4.6-mergedJason Barron2009-07-093-35/+11
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qcoreevent.cpp src/corelib/tools/qdumper.cpp src/gui/kernel/qwidget.cpp src/gui/kernel/qwidget_p.h src/gui/kernel/qwidget_s60.cpp src/gui/text/qfontdatabase.cpp src/network/access/qnetworkreplyimpl.cpp src/sql/drivers/ibase/qsql_ibase.cpp src/testlib/qtestcase.cpp src/testlib/testlib.pro tests/auto/network-settings.h tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp tests/auto/qobjectrace/tst_qobjectrace.cpp tests/auto/qsqldatabase/tst_qsqldatabase.cpp tools/configure/configureapp.cpp translations/qt_ru.ts
| * | Fixed warnings because of multiple macro definitions.axis2009-07-061-1/+1
| | |
| * | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-06-3040-81/+81
| |\ \
| | * \ Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-06-2940-80/+80
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore src/gui/dialogs/qfiledialog_p.h src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontdatabase.cpp tests/auto/network-settings.h tests/auto/qitemdelegate/tst_qitemdelegate.cpp
| | * \ \ Merge branch 'warningRemovals'axis2009-06-291-1/+1
| | |\ \ \
| | | * | | Fixed various useless warnings.axis2009-06-291-1/+1
| | | | | |
| * | | | | Missed these exports when removing NokiaX86 specific hacks.Miikka Heikkinen2009-06-301-2/+2
| |/ / / /
| * | | | Removed the need for NokiaX86 compiler specific hacks from qtestcase.h byMiikka Heikkinen2009-06-292-88/+64
| |/ / / | | | | | | | | | | | | properly exporting the toString specializations in qtestcase.cpp.
* | | | Merge commit 'qt/master-stable' into 4.6-mergedJason Barron2009-06-3060-118/+273
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore configure.exe src/corelib/concurrent/qtconcurrentthreadengine.h src/corelib/global/qnamespace.h src/gui/graphicsview/qgraphicssceneevent.h src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication.h src/gui/kernel/qapplication_p.h src/gui/kernel/qapplication_qws.cpp src/gui/kernel/qwidget.h src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontdatabase.cpp src/network/access/qnetworkaccesshttpbackend.cpp tests/auto/network-settings.h tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro tests/auto/qvariant/tst_qvariant.cpp
| * | | Fix old/missing license headers from multitouch+gestures merge.Jason McDonald2009-06-291-2/+2
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | Fixed link error of some test tools due to multiply definedRohan McGovern2009-06-271-0/+1
| | | | | | | | | | | | | | | | QTest::touchEvent().
| * | | Add QTouchEvent::DeviceType and deviceType()Bradley T. Hughes2009-06-241-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This enum indicates what kind of device generated the touch event (TouchScreen or TouchPad). We use this information to control how touch events are sent, specifically we restrict touch events to a single widget/QGraphicsItem on touch-pads, since there is no direct relationship between the physical touch location on the pad and the on- using the touch-pad).
| * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-231-1/+1
| |\ \ \
| | * | | Mention -maxwarnings in debug outputHarald Fernengel2009-06-221-1/+1
| | | | | | | | | | | | | | | | | | | | Fixes the very frequently asked question "how do I see the full output?"
| * | | | compile after small API changesBradley T. Hughes2009-06-181-3/+2
| | | | |
| * | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-1758-116/+116
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsscene_p.h
| | * | | Update license headers in files that are new in 4.6.Jason McDonald2009-06-1718-36/+36
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | | Merge license header changes from 4.5Volker Hilsheimer2009-06-1640-80/+80
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Update license headers as requested by the marketing department.Jason McDonald2009-06-1640-80/+80
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | | Merge of masterBradley T. Hughes2009-06-151-0/+60
| | | | |
| * | | | remove duplicated code and API (merge QTouchEvent and QGraphicsSceneTouchEvent)Bradley T. Hughes2009-06-111-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the API for these 2 classes is identical, the implementation is almost identical, they share the same data structures, so bite the bullet and merge them. this means we go back to using screenPos() instead of globalPos() again
| * | | | s,RawKeyEvent,RawTouchEvent,gBradley T. Hughes2009-06-081-2/+2
| | | | | | | | | | | | | | | | | | | | how embarassing :/