AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid building empty, inapplicable QWS tests.

Browse Source 
It is better to avoid building a test when we know that it is not
applicable, rather than building an empty test that appears to pass.
Note that some of the tests were already excluded by
tests/auto/other.pro, but still had the preprocessor directives to make
an empty test.

Change-Id: I71b75c37a05f6e20dbef43d82f72b29b35ef496a
Reviewed-on: http://codereview.qt-project.org/6410
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
This commit is contained in:
Jason McDonald 2011-10-11 15:56:19 +10:00 committed by Qt by Nokia
parent 7c64ab4966
commit 8ad18813fb
8 changed files with 8 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/auto/gui.pro
View File

@ -141,6 +141,13 @@ mac*:SUBDIRS -= qwindowsurface
# This test takes too long to run on IRIX, so skip it on that platform
irix-*:SUBDIRS -= qitemview
# These tests are only valid for QWS
!embedded|wince*:SUBDIRS -= \
qtransformedscreen \
qwsembedwidget \
qwsinputmethod \
qwswindowsystem \
win32:SUBDIRS -= qtextpiecetable
!contains(QT_CONFIG, private_tests): SUBDIRS -= \

2
tests/auto/qcopchannel/tst_qcopchannel.cpp
View File

@ -42,7 +42,7 @@
#include <QtTest/QtTest>
#if defined(Q_WS_QWS) && !defined(QT_NO_PROCESS)
#if !defined(QT_NO_PROCESS)
//TESTED_CLASS=
//TESTED_FILES=

6
tests/auto/qdirectpainter/tst_qdirectpainter.cpp
View File

@ -42,8 +42,6 @@
#include <QtTest/QtTest>
#ifdef Q_WS_QWS
//TESTED_CLASS=
//TESTED_FILES=
@ -245,7 +243,3 @@ void tst_QDirectPainter::reservedSynchronous()
QTEST_MAIN(tst_QDirectPainter)
#include "tst_qdirectpainter.moc"
#else // Q_WS_QWS
QTEST_NOOP_MAIN
#endif

6
tests/auto/qmultiscreen/tst_qmultiscreen.cpp
View File

@ -42,8 +42,6 @@
#include <QtTest/QtTest>
#ifdef Q_WS_QWS
//TESTED_CLASS=
//TESTED_FILES=
@ -166,7 +164,3 @@ void tst_QMultiScreen::grabWindow()
QTEST_MAIN(tst_QMultiScreen)
#include "tst_qmultiscreen.moc"
#else // Q_WS_QWS
QTEST_NOOP_MAIN
#endif

6
tests/auto/qtransformedscreen/tst_qtransformedscreen.cpp
View File

@ -42,8 +42,6 @@
#include <QtTest/QtTest>
#if defined(Q_WS_QWS)
//TESTED_CLASS=
//TESTED_FILES=
@ -188,7 +186,3 @@ void tst_QTransformedScreen::qwsDisplay_setTransformation()
QTEST_MAIN(tst_QTransformedScreen)
#include "tst_qtransformedscreen.moc"
#else // Q_WS_QWS
QTEST_NOOP_MAIN
#endif

6
tests/auto/qwsembedwidget/tst_qwsembedwidget.cpp
View File

@ -42,8 +42,6 @@
#include <QtTest/QtTest>
#ifdef Q_WS_QWS
//TESTED_CLASS=
//TESTED_FILES=
@ -100,7 +98,3 @@ void tst_QWSEmbedWidget::embedWidget()
QTEST_MAIN(tst_QWSEmbedWidget)
#include "tst_qwsembedwidget.moc"
#else // Q_WS_QWS
QTEST_NOOP_MAIN
#endif

6
tests/auto/qwsinputmethod/tst_qwsinputmethod.cpp
View File

@ -42,8 +42,6 @@
#include <QtTest/QtTest>
#ifdef Q_WS_QWS
//TESTED_CLASS=
//TESTED_FILES=
@ -86,7 +84,3 @@ void tst_QWSInputMethod::createSubClass()
QTEST_MAIN(tst_QWSInputMethod)
#include "tst_qwsinputmethod.moc"
#else // Q_WS_QWS
QTEST_NOOP_MAIN
#endif

6
tests/auto/qwswindowsystem/tst_qwswindowsystem.cpp
View File

@ -42,8 +42,6 @@
#include <QtTest/QtTest>
#ifdef Q_WS_QWS
//TESTED_CLASS=
//TESTED_FILES=gui/embedded/qwindowsystem_qws.h gui/embedded/qwindowsystem_qws.cpp
@ -648,7 +646,3 @@ void tst_QWSWindowSystem::task188025()
QTEST_MAIN(tst_QWSWindowSystem)
#include "tst_qwswindowsystem.moc"
#else // Q_WS_QWS
QTEST_NOOP_MAIN
#endif