From 172cb04177b67c6634415a41a68e67bc406c84f4 Mon Sep 17 00:00:00 2001 From: Aaron Kennedy Date: Wed, 15 Jun 2011 14:07:30 +1000 Subject: [PATCH] Cleanup autotest pro file --- tests/auto/declarative/declarative.pro | 207 +++++++++++---------- tests/auto/declarative/{node => nodes}/nodes.pro | 0 .../declarative/{node => nodes}/tst_nodestest.cpp | 0 3 files changed, 109 insertions(+), 98 deletions(-) rename tests/auto/declarative/{node => nodes}/nodes.pro (100%) rename tests/auto/declarative/{node => nodes}/tst_nodestest.cpp (100%) diff --git a/tests/auto/declarative/declarative.pro b/tests/auto/declarative/declarative.pro index 6067c70..d72f745 100644 --- a/tests/auto/declarative/declarative.pro +++ b/tests/auto/declarative/declarative.pro @@ -1,107 +1,118 @@ TEMPLATE = subdirs + +METATYPETESTS += \ + qdeclarativemetatype \ + qmetaobjectbuilder + +PUBLICTESTS += \ + examples \ + geometry \ + nodes \ + parserstress \ + qdeclarativecomponent \ + qdeclarativecontext \ + qdeclarativeengine \ + qdeclarativeerror \ + qdeclarativefolderlistmodel \ + qdeclarativeinfo \ + qdeclarativelayoutitem \ + qdeclarativelistreference \ + qdeclarativemoduleplugin \ + qdeclarativeparticles \ + qdeclarativepixmapcache \ + qdeclarativeqt \ + qdeclarativeview \ + qdeclarativeviewer \ + qdeclarativexmlhttprequest \ + moduleqt47 + +PRIVATETESTS += \ + qdeclarativeanchors \ + qdeclarativeanimatedimage \ + qdeclarativeanimations \ + qdeclarativeapplication \ + qdeclarativebehaviors \ + qdeclarativebinding \ + qdeclarativeborderimage \ + qdeclarativeconnection \ + qdeclarativedebug \ + qdeclarativedebugclient \ + qdeclarativedebughelper \ + qdeclarativedebugservice \ + qdeclarativeecmascript \ + qdeclarativeflickable \ + qdeclarativeflipable \ + qdeclarativefocusscope \ + qdeclarativefontloader \ + qdeclarativegridview \ + qdeclarativeimage \ + qdeclarativeimageprovider \ + qdeclarativeinstruction \ + qdeclarativeitem \ + qdeclarativelanguage \ + qdeclarativelistmodel \ + qdeclarativelistview \ + qdeclarativeloader \ + qdeclarativemousearea \ + qdeclarativepathview \ + qdeclarativepincharea \ + qdeclarativepositioners \ + qdeclarativeproperty \ + qdeclarativepropertymap \ + qdeclarativerepeater \ + # qdeclarativescriptdebugging \ + qdeclarativesmoothedanimation \ + qdeclarativespringanimation \ + qdeclarativestyledtext \ + qdeclarativesqldatabase \ + qdeclarativestates \ + qdeclarativesystempalette \ + qdeclarativetext \ + qdeclarativetextedit \ + qdeclarativetextinput \ + qdeclarativetimer \ + qdeclarativevaluetypes \ + qdeclarativevisualdatamodel \ + qdeclarativeworkerscript \ + qdeclarativexmllistmodel \ + qpacketprotocol \ + qdeclarativev4 \ + v8 + +SGTESTS = \ + qsganimatedimage \ + qsgborderimage \ + qsgcanvas \ + qsgflickable \ + qsgflipable \ + qsgfocusscope \ + qsggridview \ + qsgimage \ + qsgitem \ + qsglistview \ + qsgloader \ + qsgmousearea \ + qsgpathview \ + qsgpincharea \ + qsgpositioners \ + qsgrepeater \ + qsgtext \ + qsgtextedit \ + qsgtextinput \ + qsgvisualdatamodel \ + + +SUBDIRS += $$PUBLICTESTS + !symbian: { -SUBDIRS += \ - qdeclarativemetatype \ - qmetaobjectbuilder + SUBDIRS += $$METATYPETESTS } -SUBDIRS += \ - examples \ - geometry \ - node \ - parserstress \ - qdeclarativecomponent \ - qdeclarativecontext \ - qdeclarativeengine \ - qdeclarativeerror \ - qdeclarativefolderlistmodel \ - qdeclarativeinfo \ - qdeclarativelayoutitem \ - qdeclarativelistreference \ - qdeclarativemoduleplugin \ - qdeclarativeparticles \ - qdeclarativepixmapcache \ - qdeclarativeqt \ - qdeclarativeview \ - qdeclarativeviewer \ - qdeclarativexmlhttprequest \ - moduleqt47 - contains(QT_CONFIG, private_tests) { - SUBDIRS += \ - qdeclarativeanchors \ - qdeclarativeanimatedimage \ - qdeclarativeanimations \ - qdeclarativeapplication \ - qdeclarativebehaviors \ - qdeclarativebinding \ - qdeclarativeborderimage \ - qdeclarativeconnection \ - qdeclarativedebug \ - qdeclarativedebugclient \ - qdeclarativedebughelper \ - qdeclarativedebugservice \ - qdeclarativeecmascript \ - qdeclarativeflickable \ - qdeclarativeflipable \ - qdeclarativefocusscope \ - qdeclarativefontloader \ - qdeclarativegridview \ - qdeclarativeimage \ - qdeclarativeimageprovider \ - qdeclarativeinstruction \ - qdeclarativeitem \ - qdeclarativelanguage \ - qdeclarativelistmodel \ - qdeclarativelistview \ - qdeclarativeloader \ - qdeclarativemousearea \ - qdeclarativepathview \ - qdeclarativepincharea \ - qdeclarativepositioners \ - qdeclarativeproperty \ - qdeclarativepropertymap \ - qdeclarativerepeater \ -# qdeclarativescriptdebugging \ - qdeclarativesmoothedanimation \ - qdeclarativespringanimation \ - qdeclarativestyledtext \ - qdeclarativesqldatabase \ - qdeclarativestates \ - qdeclarativesystempalette \ - qdeclarativetext \ - qdeclarativetextedit \ - qdeclarativetextinput \ - qdeclarativetimer \ - qdeclarativevaluetypes \ - qdeclarativevisualdatamodel \ - qdeclarativeworkerscript \ - qdeclarativexmllistmodel \ - qpacketprotocol \ - qdeclarativev4 \ - qsganimatedimage \ - qsgborderimage \ - qsgcanvas \ - qsgflickable \ - qsgflipable \ - qsgfocusscope \ - qsggridview \ - qsgimage \ - qsgitem \ - qsglistview \ - qsgloader \ - qsgmousearea \ - qsgpathview \ - qsgpincharea \ - qsgpositioners \ - qsgrepeater \ - qsgtext \ - qsgtextedit \ - qsgtextinput \ - qsgvisualdatamodel \ - v8 - + SUBDIRS += $$PRIVATETESTS + SUBDIRS += $$SGTESTS } # Tests which should run in Pulse PULSE_TESTS = $$SUBDIRS + diff --git a/tests/auto/declarative/node/nodes.pro b/tests/auto/declarative/nodes/nodes.pro similarity index 100% rename from tests/auto/declarative/node/nodes.pro rename to tests/auto/declarative/nodes/nodes.pro diff --git a/tests/auto/declarative/node/tst_nodestest.cpp b/tests/auto/declarative/nodes/tst_nodestest.cpp similarity index 100% rename from tests/auto/declarative/node/tst_nodestest.cpp rename to tests/auto/declarative/nodes/tst_nodestest.cpp -- 2.7.4