Move xml2,glibc test to configure

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

5 files changed, 24 insertions, 98 deletions

diff --git a/config.tests/glibc/glibc.cpp b/config.tests/glibc/glibc.cpp
deleted file mode 100644
index e78994b64..000000000
--- a/config.tests/glibc/glibc.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2019 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 <features.h>
-
-#if __GLIBC__ < 2 || __GLIBC_MINOR__ < 27
-#error glibc versions below 2.27 are not supported
-#endif
-
-int main(int , char **) {
-  return 0;
-}
-
diff --git a/config.tests/glibc/glibc.pro b/config.tests/glibc/glibc.pro
deleted file mode 100644
index f72bfb804..000000000
--- a/config.tests/glibc/glibc.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-TARGET = glibc
-SOURCES = glibc.cpp
-CONFIG -= qt
-CONFIG += console
-
diff --git a/config.tests/xml2/xml2.cpp b/config.tests/xml2/xml2.cpp
deleted file mode 100644
index 497653d9c..000000000
--- a/config.tests/xml2/xml2.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 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 <libxml/xmlversion.h>
-#if !defined(LIBXML_ICU_ENABLED)
-#error "libxml icu not enabled"
-#endif
-
-int main(int argc, char **argv)
-{
-}
-
diff --git a/config.tests/xml2/xml2.pro b/config.tests/xml2/xml2.pro
deleted file mode 100644
index 6fad45f2f..000000000
--- a/config.tests/xml2/xml2.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-SOURCES = xml2.cpp
-CONFIG += link_pkgconfig
-PKGCONFIG += libxml-2.0
diff --git a/src/core/configure.json b/src/core/configure.json
index 345434090..b4d39696f 100644
--- a/src/core/configure.json
+++ b/src/core/configure.json
@@ -128,12 +128,6 @@
                 { "type": "pkgConfig", "args": "libevent" }
             ]
         },
-        "webengine-libxml2": {
-            "label": "libxml2 and libxslt",
-            "sources": [
-                { "type": "pkgConfig", "args": "libxml-2.0 libxslt" }
-            ]
-        },
         "webengine-jsoncpp": {
             "label": "jsoncpp",
             "sources": [
@@ -216,6 +210,21 @@
                 "-ljpeg"
             ]
         },
+        "webengine-libxml2": {
+            "label": "compatible libxml2 and libxslt",
+            "type": "compile",
+            "test": {
+                "tail": [
+                    "#if !defined(LIBXML_ICU_ENABLED)",
+                    "#error libxml icu not enabled",
+                    "#endif"
+                ]
+            },
+            "headers": "libxml/xmlversion.h",
+            "sources": [
+                { "type": "pkgConfig", "args": "libxml-2.0 libxslt" }
+            ]
+        },
         "webengine-lcms2": {
             "label": "lcms2",
             "sources": [
@@ -321,12 +330,14 @@
         "webengine-glibc": {
             "label": "glibc > 2.26",
             "type": "compile",
-            "test": "glibc"
-        },
-        "webengine-libxml2-compatible": {
-            "label" : "compatible system libxml2",
-            "test" : "xml2",
-            "type": "compile"
+            "test": {
+                "include": "features.h",
+                "tail": [
+                    "#if __GLIBC__ < 2 || __GLIBC_MINOR__ < 27",
+                    "#error glibc versions below 2.27 are not supported",
+                    "#endif"
+                ]
+            }
         },
         "webengine-sanitizer": {
             "label" : "sanitizer support",
@@ -636,9 +647,7 @@
         },
         "webengine-system-libxml2": {
             "label": "libxml2 and libxslt",
-            "condition": "config.unix
-                         && libs.webengine-libxml2
-                         && tests.webengine-libxml2-compatible",
+            "condition": "config.unix && libs.webengine-libxml2",
             "output": [ "privateFeature" ]
         },
         "webengine-system-lcms2" : {