Add the configuration tests.
Add the list of tests to sync.profile, and make sure each test only happens on the platforms it's intended for. Change-Id: Id022a6b85b349f4a8a649d3449b622e4ada7f4f4 Reviewed-on: http://codereview.qt.nokia.com/1910 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
This commit is contained in:
committed by
Qt by Nokia
parent
518ae46dfe
commit
1b1012f299
@@ -2,6 +2,8 @@ CONFIG -= qt
|
|||||||
CONFIG += console
|
CONFIG += console
|
||||||
TEMPLATE = app
|
TEMPLATE = app
|
||||||
|
|
||||||
|
requires(win32*)
|
||||||
|
|
||||||
# Input
|
# Input
|
||||||
SOURCES += main.cpp
|
SOURCES += main.cpp
|
||||||
|
|
||||||
|
|||||||
@@ -2,5 +2,7 @@ CONFIG -= qt
|
|||||||
CONFIG += console
|
CONFIG += console
|
||||||
TEMPLATE = app
|
TEMPLATE = app
|
||||||
|
|
||||||
|
requires(win32*)
|
||||||
|
|
||||||
# Input
|
# Input
|
||||||
SOURCES += main.cpp
|
SOURCES += main.cpp
|
||||||
|
|||||||
@@ -1,8 +1,9 @@
|
|||||||
TEMPLATE = app
|
TEMPLATE = app
|
||||||
TARGET =
|
|
||||||
DEPENDPATH += .
|
DEPENDPATH += .
|
||||||
INCLUDEPATH += .
|
INCLUDEPATH += .
|
||||||
|
|
||||||
|
requires(unix)
|
||||||
|
|
||||||
# Input
|
# Input
|
||||||
SOURCES += main.cpp
|
SOURCES += main.cpp
|
||||||
|
|
||||||
@@ -1,8 +1,9 @@
|
|||||||
TEMPLATE = app
|
TEMPLATE = app
|
||||||
TARGET =
|
|
||||||
DEPENDPATH += .
|
DEPENDPATH += .
|
||||||
INCLUDEPATH += .
|
INCLUDEPATH += .
|
||||||
|
|
||||||
|
requires(unix)
|
||||||
|
|
||||||
# Input
|
# Input
|
||||||
SOURCES += main.cpp
|
SOURCES += main.cpp
|
||||||
|
|
||||||
@@ -1,8 +1,11 @@
|
|||||||
SOURCES = pulseaudio.cpp
|
|
||||||
CONFIG -= qt
|
CONFIG -= qt
|
||||||
LIBS +=
|
LIBS +=
|
||||||
CONFIG += link_pkgconfig
|
CONFIG += link_pkgconfig
|
||||||
|
|
||||||
|
requires(unix)
|
||||||
|
|
||||||
PKGCONFIG += \
|
PKGCONFIG += \
|
||||||
libpulse \
|
libpulse \
|
||||||
libpulse-mainloop-glib
|
libpulse-mainloop-glib
|
||||||
|
|
||||||
|
SOURCES = pulseaudio.cpp
|
||||||
|
|||||||
@@ -2,6 +2,8 @@ CONFIG -= qt
|
|||||||
CONFIG += console
|
CONFIG += console
|
||||||
TEMPLATE = app
|
TEMPLATE = app
|
||||||
|
|
||||||
|
requires(win32*)
|
||||||
|
|
||||||
# Input
|
# Input
|
||||||
SOURCES += main.cpp
|
SOURCES += main.cpp
|
||||||
|
|
||||||
|
|||||||
@@ -2,5 +2,7 @@ CONFIG -= qt
|
|||||||
CONFIG += console
|
CONFIG += console
|
||||||
TEMPLATE = app
|
TEMPLATE = app
|
||||||
|
|
||||||
|
requires(win32*)
|
||||||
|
|
||||||
# Input
|
# Input
|
||||||
SOURCES += main.cpp
|
SOURCES += main.cpp
|
||||||
|
|||||||
@@ -44,7 +44,7 @@ win32 {
|
|||||||
}
|
}
|
||||||
|
|
||||||
unix:!mac {
|
unix:!mac {
|
||||||
contains(pulseaudio_enabled, yes) {
|
contains(config_test_pulseaudio, yes) {
|
||||||
DEFINES += QT_NO_AUDIO_BACKEND
|
DEFINES += QT_NO_AUDIO_BACKEND
|
||||||
}
|
}
|
||||||
else:contains(QT_CONFIG, alsa) {
|
else:contains(QT_CONFIG, alsa) {
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
INCLUDEPATH += effects
|
INCLUDEPATH += effects
|
||||||
|
|
||||||
unix:!mac {
|
unix:!mac {
|
||||||
contains(pulseaudio_enabled, yes) {
|
contains(config_test_pulseaudio, yes) {
|
||||||
CONFIG += link_pkgconfig
|
CONFIG += link_pkgconfig
|
||||||
PKGCONFIG += libpulse
|
PKGCONFIG += libpulse
|
||||||
|
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ DEPENDPATH += .
|
|||||||
HEADERS += dsserviceplugin.h
|
HEADERS += dsserviceplugin.h
|
||||||
SOURCES += dsserviceplugin.cpp
|
SOURCES += dsserviceplugin.cpp
|
||||||
|
|
||||||
!contains(wmsdk_enabled, yes): DEFINES += QT_NO_WMSDK
|
!contains(config_test_wmsdk, yes): DEFINES += QT_NO_WMSDK
|
||||||
|
|
||||||
include (player/player.pri)
|
include (player/player.pri)
|
||||||
include (camera/camera.pri)
|
include (camera/camera.pri)
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ PKGCONFIG += \
|
|||||||
gstreamer-video-0.10
|
gstreamer-video-0.10
|
||||||
|
|
||||||
maemo*:PKGCONFIG +=gstreamer-plugins-bad-0.10
|
maemo*:PKGCONFIG +=gstreamer-plugins-bad-0.10
|
||||||
contains(gstreamer-appsrc_enabled, yes): PKGCONFIG += gstreamer-app-0.10
|
contains(config_test_gstreamer_appsrc, yes): PKGCONFIG += gstreamer-app-0.10
|
||||||
|
|
||||||
maemo6 {
|
maemo6 {
|
||||||
HEADERS += camerabuttonlistener_meego.h
|
HEADERS += camerabuttonlistener_meego.h
|
||||||
@@ -89,7 +89,7 @@ SOURCES += \
|
|||||||
include(mediaplayer/mediaplayer.pri)
|
include(mediaplayer/mediaplayer.pri)
|
||||||
include(mediacapture/mediacapture.pri)
|
include(mediacapture/mediacapture.pri)
|
||||||
|
|
||||||
contains(gstreamer-photography_enabled, yes) {
|
contains(config_test_gstreamer_photography, yes) {
|
||||||
include(camerabin/camerabin.pri)
|
include(camerabin/camerabin.pri)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ INCLUDEPATH += $$PWD
|
|||||||
|
|
||||||
DEFINES += QMEDIA_GSTREAMER_PLAYER
|
DEFINES += QMEDIA_GSTREAMER_PLAYER
|
||||||
|
|
||||||
contains(gstreamer-appsrc_enabled, yes) {
|
contains(config_test_gstreamer_appsrc, yes) {
|
||||||
HEADERS += $$PWD/qgstappsrc.h
|
HEADERS += $$PWD/qgstappsrc.h
|
||||||
SOURCES += $$PWD/qgstappsrc.cpp
|
SOURCES += $$PWD/qgstappsrc.cpp
|
||||||
|
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ win32 {
|
|||||||
}
|
}
|
||||||
|
|
||||||
win32 {
|
win32 {
|
||||||
contains(directshow_enabled, yes): SUBDIRS += directshow
|
contains(config_test_directshow, yes): SUBDIRS += directshow
|
||||||
}
|
}
|
||||||
|
|
||||||
simulator: SUBDIRS += simulator
|
simulator: SUBDIRS += simulator
|
||||||
@@ -34,7 +34,7 @@ unix:!mac {
|
|||||||
|
|
||||||
!maemo*:SUBDIRS += v4l
|
!maemo*:SUBDIRS += v4l
|
||||||
|
|
||||||
contains(pulseaudio_enabled, yes) {
|
contains(config_test_pulseaudio, yes) {
|
||||||
SUBDIRS += pulseaudio
|
SUBDIRS += pulseaudio
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
13
sync.profile
13
sync.profile
@@ -32,3 +32,16 @@
|
|||||||
"qtxmlpatterns" => "refs/heads/master",
|
"qtxmlpatterns" => "refs/heads/master",
|
||||||
"qtdeclarative" => "refs/heads/master",
|
"qtdeclarative" => "refs/heads/master",
|
||||||
);
|
);
|
||||||
|
# Compile tests
|
||||||
|
%configtests = (
|
||||||
|
# Windows tests
|
||||||
|
"directshow" => {},
|
||||||
|
"wmsdk" => {},
|
||||||
|
"wmp" => {},
|
||||||
|
"evr" => {},
|
||||||
|
|
||||||
|
# Linux tests
|
||||||
|
"gstreamer_photography" => {},
|
||||||
|
"gstreamer_appsrc" => {},
|
||||||
|
"pulseaudio" => {},
|
||||||
|
);
|
||||||
|
|||||||
Reference in New Issue
Block a user