Move alsa test to configure

Change-Id: Ifdd476c0b58763be009d208a5f9d4c23305b6baa
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>

3 files changed, 14 insertions, 45 deletions

diff --git a/config.tests/alsa/alsa.pro b/config.tests/alsa/alsa.pro
deleted file mode 100644
index 7322b6fb8..000000000
--- a/config.tests/alsa/alsa.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCES = alsatest.cpp
-
diff --git a/config.tests/alsa/alsatest.cpp b/config.tests/alsa/alsatest.cpp
deleted file mode 100644
index 0b0ca71ec..000000000
--- a/config.tests/alsa/alsatest.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <alsa/asoundlib.h>
-#if SND_LIB_VERSION < 0x1000a  // 1.0.10
-#error "Alsa version found too old, require >= 1.0.10"
-#endif
-
-int main(int argc, char **argv)
-{
-}
-
diff --git a/src/core/configure.json b/src/core/configure.json
index d3e0f87e0..345434090 100644
--- a/src/core/configure.json
+++ b/src/core/configure.json
@@ -43,6 +43,19 @@
     },
 
     "libraries": {
+        "webengine-alsa": {
+            "label": "alsa",
+            "test": {
+                "tail": [
+                    "#if SND_LIB_VERSION < 0x1000a  // 1.0.10",
+                    "#error Alsa version found too old, require >= 1.0.10",
+                    "#endif"
+                ]
+            },
+            "headers" : ["alsa/asoundlib.h"],
+            "sources" : [{ "type": "pkgConfig", "args": "alsa" }
+            ]
+        },
         "webengine-dbus": {
             "label": "d-bus",
             "sources": [
@@ -236,11 +249,6 @@
         }
     },
     "tests" : {
-        "webengine-alsa": {
-            "label": "alsa",
-            "test": "alsa",
-            "type": "compile"
-        },
         "webengine-host-compiler": {
             "label": "host compiler",
             "test": "hostcompiler",
@@ -465,7 +473,7 @@
         },
         "webengine-alsa": {
             "label": "Use ALSA",
-            "condition": "config.unix && tests.webengine-alsa",
+            "condition": "config.unix && libs.webengine-alsa",
             "output": [ "privateFeature" ]
         },
         "webengine-v8-snapshot": {