From 4ddffcdae313bf494ac12d098743af341add77e3 Mon Sep 17 00:00:00 2001
From: Michael Goddard <michael.goddard@nokia.com>
Date: Thu, 25 Aug 2011 17:12:05 +1000
Subject: [PATCH] Split the unit tests for widgets up as well.

Currently there seem to be some unit tests that should not depend
on widgets, so they'll have to be cleaned up later.

Change-Id: I30adc4accb3ecce86a6fe7a2fd69d3862f325a41
Reviewed-on: http://codereview.qt.nokia.com/3569
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: derick hawcroft <derick.hawcroft@nokia.com>
---
 tests/auto/auto.pro              |  3 ++-
 tests/auto/multimedia.pro        | 36 ++++++++------------------------
 tests/auto/multimediawidgets.pro | 28 +++++++++++++++++++++++++
 3 files changed, 39 insertions(+), 28 deletions(-)
 create mode 100644 tests/auto/multimediawidgets.pro

diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index b3a5771a..a8160c37 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -1,6 +1,7 @@
 TEMPLATE = subdirs
 
-SUBDIRS+=multimedia.pro
+SUBDIRS += multimedia.pro
+contains(QT_CONFIG,multimediakitwidgets): SUBDIRS += multimediawidgets.pro
 
 # These autotests consist of things such as static code checks
 # which require that the autotest is run on the same machine
diff --git a/tests/auto/multimedia.pro b/tests/auto/multimedia.pro
index 9bacbbff..d79522d9 100644
--- a/tests/auto/multimedia.pro
+++ b/tests/auto/multimedia.pro
@@ -8,15 +8,9 @@ SUBDIRS += \
     qaudioformat \
     qaudioinput \
     qaudiooutput \
-    qcamera \
-    qcamerabackend \
-    qcameraimagecapture \
-    qcameraviewfinder \
     qmediabindableinterface \
     qmediacontainercontrol \
     qmediacontent \
-    qmediaobject \
-    qmediaplayer \
     qmediaplayerbackend \
     qmediaplaylistnavigator \
     qmediarecorder \
@@ -29,9 +23,6 @@ SUBDIRS += \
     qmetadatareadercontrol \
     qmetadatawritercontrol \
 
-# This is disabled because it is unfinished
-# qmediastreamscontrol \
-
 # These is disabled until intent is clearer
 #    qvideodevicecontrol \
 #    qvideoencodercontrol \
@@ -44,24 +35,15 @@ SUBDIRS += \
 # Tests depending on private interfaces should only be built if
 # these interfaces are exported.
 contains (QT_CONFIG, private_tests) {
-  SUBDIRS += \
-    qgraphicsvideoitem \
-    qmediaimageviewer \
-    qmediaplaylist \
-    qmediapluginloader \
-    qmediaserviceprovider \
-    qpaintervideosurface \
-    qvideowidget \
-}
-
-contains (QT_CONFIG, declarative) {
-  # All the declarative tests depend on private interfaces
-  contains (QT_CONFIG, private_tests) {
     SUBDIRS += \
-    qsoundeffect \
-    qdeclarativeaudio \
+        qmediaplaylist \
+        qmediapluginloader \
+        qmediaserviceprovider
 
-
-    disabled:SUBDIRS += qdeclarativevideo
-  }
+    contains (QT_CONFIG, declarative) {
+  # All the declarative tests depend on private interfaces
+        SUBDIRS += \
+            qsoundeffect \
+            qdeclarativeaudio
+    }
 }
diff --git a/tests/auto/multimediawidgets.pro b/tests/auto/multimediawidgets.pro
new file mode 100644
index 00000000..1bd2e4e2
--- /dev/null
+++ b/tests/auto/multimediawidgets.pro
@@ -0,0 +1,28 @@
+
+TEMPLATE = subdirs
+SUBDIRS += \
+    qcamera \
+    qcamerabackend \
+    qcameraimagecapture \
+    qcameraviewfinder \
+    qmediaobject \
+    qmediaplayer
+
+# This is a commment for the mock backend directory so that maketestselftest
+# doesn't believe it's an untested directory
+# qmultimedia_common
+
+# Tests depending on private interfaces should only be built if
+# these interfaces are exported.
+contains (QT_CONFIG, private_tests) {
+  SUBDIRS += \
+    qgraphicsvideoitem \
+    qmediaimageviewer \
+    qpaintervideosurface \
+    qvideowidget \
+
+    contains (QT_CONFIG, declarative) {
+        disabled:SUBDIRS += qdeclarativevideo
+    }
+}
+