Move re2 test to configure

Change-Id: I76aa5c544a5930982e1d1b0ed28a75e88ec65e48
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

3 files changed, 16 insertions, 47 deletions

diff --git a/config.tests/re2/re2.cpp b/config.tests/re2/re2.cpp
deleted file mode 100644
index bd3b80a82..000000000
--- a/config.tests/re2/re2.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 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 <re2/re2.h>
-
-int main(int, char **)
-{
-    std::string s("dummytest");
-    RE2 re2(s);
-    return 0;
-}
diff --git a/config.tests/re2/re2.pro b/config.tests/re2/re2.pro
deleted file mode 100644
index b1a26d918..000000000
--- a/config.tests/re2/re2.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-SOURCES += re2.cpp
-LIBS += -lre2
-CONFIG -= qt
diff --git a/src/core/configure.json b/src/core/configure.json
index 7ec1b0714..14211a2f1 100644
--- a/src/core/configure.json
+++ b/src/core/configure.json
@@ -146,12 +146,25 @@
                 { "type": "pkgConfig", "args": "poppler-cpp" }
             ]
         },
-        "pulseaudio": {
+        "webengine-pulseaudio": {
             "label": "pulseaudio >= 0.9.10",
             "sources": [
                 { "type": "pkgConfig", "args": "libpulse >= 0.9.10 libpulse-mainloop-glib" }
             ]
         },
+        "webengine-re2": {
+            "label": "re2",
+            "test" : {
+                "main": [
+                    "std::string s;",
+                    "RE2 re2(s);"
+                ]
+            },
+            "headers": "re2/re2.h",
+            "sources": [
+                { "type": "pkgConfig", "args": "re2" }
+            ]
+        },
         "webengine-icu": {
             "label": "icu >= 63",
             "sources": [
@@ -346,11 +359,6 @@
             "label": "embedded",
             "type": "embedded"
         },
-        "webengine-re2": {
-            "label": "re2",
-            "test": "re2",
-            "type": "compile"
-        },
         "webengine-glibc": {
             "label": "glibc > 2.26",
             "type": "compile",
@@ -550,7 +558,7 @@
         "webengine-pulseaudio": {
             "label": "Use PulseAudio",
             "autoDetect": "config.unix",
-            "condition": "libs.pulseaudio",
+            "condition": "libs.webengine-pulseaudio",
             "output": [ "privateFeature" ]
         },
         "webengine-pepper-plugins": {
@@ -650,7 +658,7 @@
         "webengine-system-re2": {
             "label": "re2",
             "autoDetect": "config.unix",
-            "condition": "tests.webengine-re2",
+            "condition": "libs.webengine-re2",
             "output": [ "privateFeature" ]
         },
         "webengine-system-ninja": {