diff options
| author | Chris Adams <christopher.adams@nokia.com> | 2011-12-05 13:16:54 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-06 01:05:56 +0100 |
| commit | 2a5bd344ee27bfd61c0e83ce25df5cf843cebdee (patch) | |
| tree | 23955744981ae5d6b0904b965e5275fbfad33e55 /tests/auto/qtquick2/qdeclarativepixmapcache | |
| parent | 80474586da6f3e257038c80093bc56f9fd21d8a4 (diff) | |
Disable tst_qdeclarativepixmapcache::dataLeak() by default
This test produces spurious output in the expected case and therefore
needs to be suppressed by default.
Change-Id: Ib309f96c0291180f2011451605eea7f9cea5744b
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'tests/auto/qtquick2/qdeclarativepixmapcache')
| -rw-r--r-- | tests/auto/qtquick2/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/tests/auto/qtquick2/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp b/tests/auto/qtquick2/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp index 2e326263c0..4dd384748f 100644 --- a/tests/auto/qtquick2/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp +++ b/tests/auto/qtquick2/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp @@ -52,6 +52,8 @@ #include <qfuture.h> #endif +#define PIXMAP_DATA_LEAK_TEST 0 + inline QUrl TEST_FILE(const QString &filename) { return QUrl::fromLocalFile(TESTDATA(filename)); @@ -79,7 +81,9 @@ private slots: void networkCrash(); #endif void lockingCrash(); +#if PIXMAP_DATA_LEAK_TEST void dataLeak(); +#endif private: QDeclarativeEngine engine; TestHTTPServer server; @@ -406,6 +410,10 @@ void tst_qdeclarativepixmapcache::lockingCrash() } } + +#if PIXMAP_DATA_LEAK_TEST +// This test should not be enabled by default as it +// produces spurious output in the expected case. #include <QtQuick/QQuickView> class DataLeakView : public QQuickView { @@ -452,6 +460,8 @@ void tst_qdeclarativepixmapcache::dataLeak() // which has been deleted by the QDeclarativePixmapStore // destructor. } +#endif +#undef PIXMAP_DATA_LEAK_TEST QTEST_MAIN(tst_qdeclarativepixmapcache) |