From 1b1012f2990084ffc367ddb4aaf5910835bc4641 Mon Sep 17 00:00:00 2001 From: Michael Goddard Date: Tue, 19 Jul 2011 15:51:43 +1000 Subject: 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 Reviewed-by: Jonas Rabbe --- config.tests/directshow/directshow.pro | 2 + config.tests/evr/evr.pro | 2 + config.tests/gstreamer-appsrc/gstreamer-appsrc.pro | 19 -------- config.tests/gstreamer-appsrc/main.cpp | 49 --------------------- .../gstreamer-photography.pro | 19 -------- config.tests/gstreamer-photography/main.cpp | 50 ---------------------- config.tests/gstreamer_appsrc/gstreamer_appsrc.pro | 20 +++++++++ config.tests/gstreamer_appsrc/main.cpp | 49 +++++++++++++++++++++ .../gstreamer_photography.pro | 20 +++++++++ config.tests/gstreamer_photography/main.cpp | 50 ++++++++++++++++++++++ config.tests/pulseaudio/pulseaudio.pro | 5 ++- config.tests/wmp/wmp.pro | 2 + config.tests/wmsdk/wmsdk.pro | 2 + 13 files changed, 151 insertions(+), 138 deletions(-) delete mode 100644 config.tests/gstreamer-appsrc/gstreamer-appsrc.pro delete mode 100644 config.tests/gstreamer-appsrc/main.cpp delete mode 100644 config.tests/gstreamer-photography/gstreamer-photography.pro delete mode 100644 config.tests/gstreamer-photography/main.cpp create mode 100644 config.tests/gstreamer_appsrc/gstreamer_appsrc.pro create mode 100644 config.tests/gstreamer_appsrc/main.cpp create mode 100644 config.tests/gstreamer_photography/gstreamer_photography.pro create mode 100644 config.tests/gstreamer_photography/main.cpp (limited to 'config.tests') diff --git a/config.tests/directshow/directshow.pro b/config.tests/directshow/directshow.pro index 526519851..0ad9cb763 100644 --- a/config.tests/directshow/directshow.pro +++ b/config.tests/directshow/directshow.pro @@ -2,6 +2,8 @@ CONFIG -= qt CONFIG += console TEMPLATE = app +requires(win32*) + # Input SOURCES += main.cpp diff --git a/config.tests/evr/evr.pro b/config.tests/evr/evr.pro index bbdad3ffe..c15b6c8c4 100644 --- a/config.tests/evr/evr.pro +++ b/config.tests/evr/evr.pro @@ -2,5 +2,7 @@ CONFIG -= qt CONFIG += console TEMPLATE = app +requires(win32*) + # Input SOURCES += main.cpp diff --git a/config.tests/gstreamer-appsrc/gstreamer-appsrc.pro b/config.tests/gstreamer-appsrc/gstreamer-appsrc.pro deleted file mode 100644 index 6c003e4d9..000000000 --- a/config.tests/gstreamer-appsrc/gstreamer-appsrc.pro +++ /dev/null @@ -1,19 +0,0 @@ -TEMPLATE = app -TARGET = -DEPENDPATH += . -INCLUDEPATH += . - -# Input -SOURCES += main.cpp - -CONFIG += link_pkgconfig - -PKGCONFIG += \ - gstreamer-0.10 \ - gstreamer-base-0.10 \ - gstreamer-interfaces-0.10 \ - gstreamer-audio-0.10 \ - gstreamer-video-0.10 \ - gstreamer-app-0.10 - - diff --git a/config.tests/gstreamer-appsrc/main.cpp b/config.tests/gstreamer-appsrc/main.cpp deleted file mode 100644 index 7182fd3d0..000000000 --- a/config.tests/gstreamer-appsrc/main.cpp +++ /dev/null @@ -1,49 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the Qt Mobility Components. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#define GST_USE_UNSTABLE_API - -#include - -int main(int argc, char** argv) -{ - return 0; -} diff --git a/config.tests/gstreamer-photography/gstreamer-photography.pro b/config.tests/gstreamer-photography/gstreamer-photography.pro deleted file mode 100644 index e2b530286..000000000 --- a/config.tests/gstreamer-photography/gstreamer-photography.pro +++ /dev/null @@ -1,19 +0,0 @@ -TEMPLATE = app -TARGET = -DEPENDPATH += . -INCLUDEPATH += . - -# Input -SOURCES += main.cpp - -CONFIG += link_pkgconfig - -PKGCONFIG += \ - gstreamer-0.10 \ - gstreamer-base-0.10 \ - gstreamer-interfaces-0.10 \ - gstreamer-audio-0.10 \ - gstreamer-video-0.10 - -LIBS += -lgstphotography-0.10 - diff --git a/config.tests/gstreamer-photography/main.cpp b/config.tests/gstreamer-photography/main.cpp deleted file mode 100644 index 677ee68cb..000000000 --- a/config.tests/gstreamer-photography/main.cpp +++ /dev/null @@ -1,50 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#define GST_USE_UNSTABLE_API - -#include -#include - -int main(int argc, char** argv) -{ - return 0; -} diff --git a/config.tests/gstreamer_appsrc/gstreamer_appsrc.pro b/config.tests/gstreamer_appsrc/gstreamer_appsrc.pro new file mode 100644 index 000000000..b0a6efc01 --- /dev/null +++ b/config.tests/gstreamer_appsrc/gstreamer_appsrc.pro @@ -0,0 +1,20 @@ +TEMPLATE = app +DEPENDPATH += . +INCLUDEPATH += . + +requires(unix) + +# Input +SOURCES += main.cpp + +CONFIG += link_pkgconfig + +PKGCONFIG += \ + gstreamer-0.10 \ + gstreamer-base-0.10 \ + gstreamer-interfaces-0.10 \ + gstreamer-audio-0.10 \ + gstreamer-video-0.10 \ + gstreamer-app-0.10 + + diff --git a/config.tests/gstreamer_appsrc/main.cpp b/config.tests/gstreamer_appsrc/main.cpp new file mode 100644 index 000000000..7182fd3d0 --- /dev/null +++ b/config.tests/gstreamer_appsrc/main.cpp @@ -0,0 +1,49 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the Qt Mobility Components. +** +** $QT_BEGIN_LICENSE:LGPL$ +** GNU Lesser General Public License Usage +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#define GST_USE_UNSTABLE_API + +#include + +int main(int argc, char** argv) +{ + return 0; +} diff --git a/config.tests/gstreamer_photography/gstreamer_photography.pro b/config.tests/gstreamer_photography/gstreamer_photography.pro new file mode 100644 index 000000000..c0d995227 --- /dev/null +++ b/config.tests/gstreamer_photography/gstreamer_photography.pro @@ -0,0 +1,20 @@ +TEMPLATE = app +DEPENDPATH += . +INCLUDEPATH += . + +requires(unix) + +# Input +SOURCES += main.cpp + +CONFIG += link_pkgconfig + +PKGCONFIG += \ + gstreamer-0.10 \ + gstreamer-base-0.10 \ + gstreamer-interfaces-0.10 \ + gstreamer-audio-0.10 \ + gstreamer-video-0.10 + +LIBS += -lgstphotography-0.10 + diff --git a/config.tests/gstreamer_photography/main.cpp b/config.tests/gstreamer_photography/main.cpp new file mode 100644 index 000000000..677ee68cb --- /dev/null +++ b/config.tests/gstreamer_photography/main.cpp @@ -0,0 +1,50 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** GNU Lesser General Public License Usage +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#define GST_USE_UNSTABLE_API + +#include +#include + +int main(int argc, char** argv) +{ + return 0; +} diff --git a/config.tests/pulseaudio/pulseaudio.pro b/config.tests/pulseaudio/pulseaudio.pro index 6f121fed7..3dd769fdd 100644 --- a/config.tests/pulseaudio/pulseaudio.pro +++ b/config.tests/pulseaudio/pulseaudio.pro @@ -1,8 +1,11 @@ -SOURCES = pulseaudio.cpp CONFIG -= qt LIBS += CONFIG += link_pkgconfig +requires(unix) + PKGCONFIG += \ libpulse \ libpulse-mainloop-glib + +SOURCES = pulseaudio.cpp diff --git a/config.tests/wmp/wmp.pro b/config.tests/wmp/wmp.pro index b00754e59..4c2f1578b 100644 --- a/config.tests/wmp/wmp.pro +++ b/config.tests/wmp/wmp.pro @@ -2,6 +2,8 @@ CONFIG -= qt CONFIG += console TEMPLATE = app +requires(win32*) + # Input SOURCES += main.cpp diff --git a/config.tests/wmsdk/wmsdk.pro b/config.tests/wmsdk/wmsdk.pro index bbdad3ffe..c15b6c8c4 100644 --- a/config.tests/wmsdk/wmsdk.pro +++ b/config.tests/wmsdk/wmsdk.pro @@ -2,5 +2,7 @@ CONFIG -= qt CONFIG += console TEMPLATE = app +requires(win32*) + # Input SOURCES += main.cpp -- cgit v1.2.3