diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2011-10-11 18:21:54 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-17 03:30:55 +0200 |
| commit | a1121b977e84590b8e8c6000b40b8bd90ec9c690 (patch) | |
| tree | bff156974cd5706c8317afc1cd49268e85ac4022 /tests/auto | |
| parent | fe48366b48473282d448a8b0dd6fb9286272f465 (diff) | |
Make test .pro files more consistent.
Make the parent .pro files follow the pattern of listing all tests in
one place and then removing inapplicable tests as needed.
Change-Id: Ide1ae98d50dd63cd8c1b4d6fd53135cdff801bc3
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/auto.pro | 17 | ||||
| -rw-r--r-- | tests/auto/other.pro | 30 | ||||
| -rw-r--r-- | tests/auto/other/other.pro | 9 |
3 files changed, 35 insertions, 21 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 5eda1236b7..86fe037887 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -2,15 +2,20 @@ TEMPLATE = subdirs SUBDIRS += \ corelib.pro \ + dbus \ + host.pro \ gui.pro \ network.pro \ + opengl \ sql \ - xml \ testlib \ + tools \ + v8.pro \ + xml \ other.pro \ -!cross_compile: SUBDIRS += host.pro -!cross_compile: SUBDIRS += tools -contains(QT_CONFIG, opengl): SUBDIRS += opengl -unix:!embedded:contains(QT_CONFIG, dbus): SUBDIRS += dbus -contains(QT_CONFIG, v8): SUBDIRS += v8.pro +cross_compile: SUBDIRS -= host.pro +cross_compile: SUBDIRS -= tools +!contains(QT_CONFIG, opengl): SUBDIRS -= opengl +!unix|embedded|!contains(QT_CONFIG, dbus): SUBDIRS -= dbus +!contains(QT_CONFIG, v8): SUBDIRS -= v8.pro diff --git a/tests/auto/other.pro b/tests/auto/other.pro index 0381b6c89d..913ed31b9a 100644 --- a/tests/auto/other.pro +++ b/tests/auto/other.pro @@ -5,14 +5,22 @@ TEMPLATE=subdirs SUBDIRS=\ other \ # baselineexample \ Just an example demonstrating qbaselinetest usage + exceptionsafety_objects \ lancelot \ + macgui \ + macnativeevents \ + macplist \ qaccessibility \ + qaccessibility_mac \ qcombobox \ + qcopchannel \ + qdirectpainter \ qfocusevent \ qlayout \ qmdiarea \ qmenu \ qmenubar \ + qmultiscreen \ qsplitter \ qtabwidget \ qtextbrowser \ @@ -25,20 +33,18 @@ SUBDIRS=\ wince*|!contains(QT_CONFIG, accessibility):SUBDIRS -= qaccessibility -mac:!qpa { - SUBDIRS += macgui \ - macnativeevents \ - macplist \ - qaccessibility_mac -} +!mac|qpa: SUBDIRS -= \ + macgui \ + macnativeevents \ + macplist \ + qaccessibility_mac \ -embedded:!wince* { - SUBDIRS += qcopchannel \ - qdirectpainter \ - qmultiscreen -} +!embedded|wince*: SUBDIRS -= \ + qcopchannel \ + qdirectpainter \ + qmultiscreen \ -!win32-msvc*:!wince*:SUBDIRS += exceptionsafety_objects +win32-msvc*|wince*:SUBDIRS -= exceptionsafety_objects # Following tests depends on private API !contains(QT_CONFIG, private_tests): SUBDIRS -= \ diff --git a/tests/auto/other/other.pro b/tests/auto/other/other.pro index ae9659cadc..9f07100d3b 100644 --- a/tests/auto/other/other.pro +++ b/tests/auto/other/other.pro @@ -1,10 +1,13 @@ TEMPLATE=subdirs SUBDIRS=\ + # atwrapper \ # QTBUG-19452 + baselineexample \ + compiler \ + headersclean \ qtmd5 \ qtokenautomaton \ - baselineexample \ -!cross_compile: SUBDIRS += \ +cross_compile: SUBDIRS -= \ + atwrapper \ compiler \ headersclean \ - # atwrapper \ # QTBUG-19452 |