From 8ad18813fb701122bc3d688be02041a63ff2b579 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Tue, 11 Oct 2011 15:56:19 +1000 Subject: Avoid building empty, inapplicable QWS tests. 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 --- tests/auto/gui.pro | 7 +++++++ tests/auto/qcopchannel/tst_qcopchannel.cpp | 2 +- tests/auto/qdirectpainter/tst_qdirectpainter.cpp | 6 ------ tests/auto/qmultiscreen/tst_qmultiscreen.cpp | 6 ------ tests/auto/qtransformedscreen/tst_qtransformedscreen.cpp | 6 ------ tests/auto/qwsembedwidget/tst_qwsembedwidget.cpp | 6 ------ tests/auto/qwsinputmethod/tst_qwsinputmethod.cpp | 6 ------ tests/auto/qwswindowsystem/tst_qwswindowsystem.cpp | 6 ------ 8 files changed, 8 insertions(+), 37 deletions(-) (limited to 'tests/auto') diff --git a/tests/auto/gui.pro b/tests/auto/gui.pro index 180cf047c6..607ea68357 100644 --- a/tests/auto/gui.pro +++ b/tests/auto/gui.pro @@ -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 -= \ diff --git a/tests/auto/qcopchannel/tst_qcopchannel.cpp b/tests/auto/qcopchannel/tst_qcopchannel.cpp index f9d478bb43..8556295bbd 100644 --- a/tests/auto/qcopchannel/tst_qcopchannel.cpp +++ b/tests/auto/qcopchannel/tst_qcopchannel.cpp @@ -42,7 +42,7 @@ #include -#if defined(Q_WS_QWS) && !defined(QT_NO_PROCESS) +#if !defined(QT_NO_PROCESS) //TESTED_CLASS= //TESTED_FILES= diff --git a/tests/auto/qdirectpainter/tst_qdirectpainter.cpp b/tests/auto/qdirectpainter/tst_qdirectpainter.cpp index d33098dfdd..550c2e96c0 100644 --- a/tests/auto/qdirectpainter/tst_qdirectpainter.cpp +++ b/tests/auto/qdirectpainter/tst_qdirectpainter.cpp @@ -42,8 +42,6 @@ #include -#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 diff --git a/tests/auto/qmultiscreen/tst_qmultiscreen.cpp b/tests/auto/qmultiscreen/tst_qmultiscreen.cpp index 6f255e9897..9d74d59f85 100644 --- a/tests/auto/qmultiscreen/tst_qmultiscreen.cpp +++ b/tests/auto/qmultiscreen/tst_qmultiscreen.cpp @@ -42,8 +42,6 @@ #include -#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 diff --git a/tests/auto/qtransformedscreen/tst_qtransformedscreen.cpp b/tests/auto/qtransformedscreen/tst_qtransformedscreen.cpp index b62bf007ba..7aa19bcf82 100644 --- a/tests/auto/qtransformedscreen/tst_qtransformedscreen.cpp +++ b/tests/auto/qtransformedscreen/tst_qtransformedscreen.cpp @@ -42,8 +42,6 @@ #include -#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 diff --git a/tests/auto/qwsembedwidget/tst_qwsembedwidget.cpp b/tests/auto/qwsembedwidget/tst_qwsembedwidget.cpp index 00f9ab2868..2b6f87a262 100644 --- a/tests/auto/qwsembedwidget/tst_qwsembedwidget.cpp +++ b/tests/auto/qwsembedwidget/tst_qwsembedwidget.cpp @@ -42,8 +42,6 @@ #include -#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 diff --git a/tests/auto/qwsinputmethod/tst_qwsinputmethod.cpp b/tests/auto/qwsinputmethod/tst_qwsinputmethod.cpp index 18482ee548..c700abd9be 100644 --- a/tests/auto/qwsinputmethod/tst_qwsinputmethod.cpp +++ b/tests/auto/qwsinputmethod/tst_qwsinputmethod.cpp @@ -42,8 +42,6 @@ #include -#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 diff --git a/tests/auto/qwswindowsystem/tst_qwswindowsystem.cpp b/tests/auto/qwswindowsystem/tst_qwswindowsystem.cpp index 80de6e96ad..dc520a4482 100644 --- a/tests/auto/qwswindowsystem/tst_qwswindowsystem.cpp +++ b/tests/auto/qwswindowsystem/tst_qwswindowsystem.cpp @@ -42,8 +42,6 @@ #include -#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 -- cgit v1.2.3