configure: inline a few more tests

these were new on dev while the original migration happened on 5.9, or
came from new changes which hadn't adapted yet.

Change-Id: I5e48437061a97e6df6e93881c98471455e177631
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

18 files changed, 59 insertions, 383 deletions

diff --git a/config.tests/qpa/vulkan/vulkan.cpp b/config.tests/qpa/vulkan/vulkan.cpp
deleted file mode 100644
index 22f5edf9f2..0000000000
--- a/config.tests/qpa/vulkan/vulkan.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the config.tests of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** 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 Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** 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-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-// This is a header-only test. Qt does not rely on linking to a Vulkan library directly.
-
-#include <vulkan/vulkan.h>
-
-// The pData parameter has changed from uint32_t* to void* at some point.
-// Ensure the headers have the updated one to prevent compile errors later on.
-PFN_vkCmdUpdateBuffer cmdUpdBuf;
-void testUpdateBuffer(VkCommandBuffer commandBuffer, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize dataSize, const void* pData)
-{
-    cmdUpdBuf(commandBuffer, dstBuffer, dstOffset, dataSize, pData);
-}
-
-int main(int, char **)
-{
-    VkInstanceCreateInfo info;
-    testUpdateBuffer(0, 0, 0, 0, 0);
-
-    return 0;
-}
diff --git a/config.tests/qpa/vulkan/vulkan.pro b/config.tests/qpa/vulkan/vulkan.pro
deleted file mode 100644
index 5f05bc49aa..0000000000
--- a/config.tests/qpa/vulkan/vulkan.pro
+++ /dev/null
@@ -1 +0,0 @@
-SOURCES = vulkan.cpp
diff --git a/config.tests/unix/cxx11_random/cxx11_random.cpp b/config.tests/unix/cxx11_random/cxx11_random.cpp
deleted file mode 100644
index d6872667fd..0000000000
--- a/config.tests/unix/cxx11_random/cxx11_random.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 Intel Corporation.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite 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 <random>
-
-int main()
-{
-    std::mt19937 mt(0);
-    return 0;
-}
diff --git a/config.tests/unix/cxx11_random/cxx11_random.pro b/config.tests/unix/cxx11_random/cxx11_random.pro
deleted file mode 100644
index 0cd5fff9d9..0000000000
--- a/config.tests/unix/cxx11_random/cxx11_random.pro
+++ /dev/null
@@ -1 +0,0 @@
-SOURCES = cxx11_random.cpp
diff --git a/config.tests/unix/futimens/futimens.cpp b/config.tests/unix/futimens/futimens.cpp
deleted file mode 100644
index 1b66386ca1..0000000000
--- a/config.tests/unix/futimens/futimens.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 Raphael Gozzo <raphael.rg91@gmail.com>
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the config.tests of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** 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 Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** 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-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <sys/stat.h>
-
-int main(int, char **)
-{
-    futimens(-1,0);
-    return 0;
-}
-
diff --git a/config.tests/unix/futimens/futimens.pro b/config.tests/unix/futimens/futimens.pro
deleted file mode 100644
index 83a122252a..0000000000
--- a/config.tests/unix/futimens/futimens.pro
+++ /dev/null
@@ -1,6 +0,0 @@
-SOURCES += futimens.cpp
-
-# Block futimens() on Apple platforms unless it's available on ALL deployment
-# targets. This simplifies the logic at the call site dramatically, as it isn't
-# strictly needed compared to futimes().
-darwin: QMAKE_CXXFLAGS += -Werror=unguarded-availability
diff --git a/config.tests/unix/futimes/futimes.cpp b/config.tests/unix/futimes/futimes.cpp
deleted file mode 100644
index 553b39068e..0000000000
--- a/config.tests/unix/futimes/futimes.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 Raphael Gozzo <raphael.rg91@gmail.com>
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the config.tests of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** 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 Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** 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-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <sys/time.h>
-
-int main(int, char **)
-{
-    futimes(-1,0);
-    return 0;
-}
-
diff --git a/config.tests/unix/futimes/futimes.pro b/config.tests/unix/futimes/futimes.pro
deleted file mode 100644
index 8e7f2c0f62..0000000000
--- a/config.tests/unix/futimes/futimes.pro
+++ /dev/null
@@ -1 +0,0 @@
-SOURCES += futimes.cpp
diff --git a/config.tests/unix/getauxval/getauxval.cpp b/config.tests/unix/getauxval/getauxval.cpp
deleted file mode 100644
index 62f71e95d2..0000000000
--- a/config.tests/unix/getauxval/getauxval.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 Intel Corporation.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite 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 <sys/auxv.h>
-
-int main()
-{
-    return getauxval(AT_NULL);
-}
diff --git a/config.tests/unix/getauxval/getauxval.pro b/config.tests/unix/getauxval/getauxval.pro
deleted file mode 100644
index ea46cb0bae..0000000000
--- a/config.tests/unix/getauxval/getauxval.pro
+++ /dev/null
@@ -1 +0,0 @@
-SOURCES = getauxval.cpp
diff --git a/config.tests/unix/getentropy/getentropy.cpp b/config.tests/unix/getentropy/getentropy.cpp
deleted file mode 100644
index 6cb4dc3a95..0000000000
--- a/config.tests/unix/getentropy/getentropy.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 Intel Corporation.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite 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 <unistd.h>
-
-int main()
-{
-    char buf[32];
-    return getentropy(buf, sizeof(buf));
-}
diff --git a/config.tests/unix/getentropy/getentropy.pro b/config.tests/unix/getentropy/getentropy.pro
deleted file mode 100644
index bdd626b513..0000000000
--- a/config.tests/unix/getentropy/getentropy.pro
+++ /dev/null
@@ -1 +0,0 @@
-SOURCES = getentropy.cpp
diff --git a/config.tests/unix/opengles32/opengles32.cpp b/config.tests/unix/opengles32/opengles32.cpp
deleted file mode 100644
index 0505510464..0000000000
--- a/config.tests/unix/opengles32/opengles32.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the config.tests of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** 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 Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** 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-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <GLES3/gl32.h>
-
-int main(int, char **)
-{
-    glFramebufferTexture(GL_TEXTURE_2D, GL_DEPTH_STENCIL_ATTACHMENT, 1, 0);
-
-    return 0;
-}
diff --git a/config.tests/unix/opengles32/opengles32.pro b/config.tests/unix/opengles32/opengles32.pro
deleted file mode 100644
index c95ba83364..0000000000
--- a/config.tests/unix/opengles32/opengles32.pro
+++ /dev/null
@@ -1,7 +0,0 @@
-# The library is expected to be the same as in ES 2.0 (libGLESv2).
-# The difference is the header and the presence of the functions in
-# the library.
-
-SOURCES = opengles32.cpp
-
-CONFIG -= qt
diff --git a/config.tests/x11/xrender/xrender.cpp b/config.tests/x11/xrender/xrender.cpp
deleted file mode 100644
index 35203cc02c..0000000000
--- a/config.tests/x11/xrender/xrender.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the config.tests of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** 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 Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** 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-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <X11/Xlib.h>
-#include <X11/extensions/Xrender.h>
-
-#if RENDER_MAJOR == 0 && RENDER_MINOR < 5
-#  error "Required Xrender version 0.6 not found."
-#else
-int main(int, char **)
-{
-    XRenderPictFormat *format;
-    format = 0;
-    return 0;
-}
-#endif
diff --git a/config.tests/x11/xrender/xrender.pro b/config.tests/x11/xrender/xrender.pro
deleted file mode 100644
index 6244ae6b47..0000000000
--- a/config.tests/x11/xrender/xrender.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCES = xrender.cpp
-CONFIG -= qt
diff --git a/src/corelib/configure.json b/src/corelib/configure.json
index 81448174b6..eb213398ca 100644
--- a/src/corelib/configure.json
+++ b/src/corelib/configure.json
@@ -277,7 +277,10 @@
         "cxx11_random": {
             "label": "C++11 <random>",
             "type": "compile",
-            "test": "unix/cxx11_random"
+            "test": {
+                "include": "random",
+                "main": "std::mt19937 mt(0);"
+            }
         },
         "eventfd": {
             "label": "eventfd",
@@ -295,22 +298,43 @@
         "futimens": {
             "label": "futimens()",
             "type": "compile",
-            "test": "unix/futimens"
+            "test": {
+                "include": "sys/stat.h",
+                "main": "futimens(-1, 0);",
+                "qmake": [
+                    "# Block futimens() on Apple platforms unless it's available on ALL",
+                    "# deployment targets. This simplifies the logic at the call site",
+                    "# dramatically, as it isn't strictly needed compared to futimes().",
+                    "darwin: QMAKE_CXXFLAGS += -Werror=unguarded-availability"
+                ]
+            }
         },
         "futimes": {
             "label": "futimes()",
             "type": "compile",
-            "test": "unix/futimes"
+            "test": {
+                "include": "sys/time.h",
+                "main": "futimes(-1, 0);"
+            }
         },
         "getauxval": {
             "label": "getauxval()",
             "type": "compile",
-            "test": "unix/getauxval"
+            "test": {
+                "include": "sys/auxv.h",
+                "main": "(void) getauxval(AT_NULL);"
+            }
         },
         "getentropy": {
             "label": "getentropy()",
             "type": "compile",
-            "test": "unix/getentropy"
+            "test": {
+                "include": "unistd.h",
+                "main": [
+                    "char buf[32];",
+                    "(void) getentropy(buf, sizeof(buf));"
+                ]
+            }
         },
         "posix-iconv": {
             "label": "POSIX iconv",
diff --git a/src/gui/configure.json b/src/gui/configure.json
index 67378114ca..caa6f065f0 100644
--- a/src/gui/configure.json
+++ b/src/gui/configure.json
@@ -521,7 +521,23 @@
         },
         "vulkan": {
             "label": "Vulkan",
-            "test": "qpa/vulkan",
+            "test": {
+                "comment": "Note: Qt does not rely on linking to a Vulkan library directly.",
+                "tail": [
+                    "// The pData parameter has changed from uint32_t* to void* at some point.",
+                    "// Ensure the headers have the updated one to prevent compile errors later on.",
+                    "PFN_vkCmdUpdateBuffer cmdUpdBuf;",
+                    "void testUpdateBuffer(VkCommandBuffer commandBuffer, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize dataSize, const void* pData)",
+                    "{",
+                    "    cmdUpdBuf(commandBuffer, dstBuffer, dstOffset, dataSize, pData);",
+                    "}"
+                ],
+                "main": [
+                    "VkInstanceCreateInfo info;",
+                    "testUpdateBuffer(0, 0, 0, 0, 0);"
+                ]
+            },
+            "headers": "vulkan/vulkan.h",
             "sources": [
                 { "type": "pkgConfig", "args": "vulkan" },
                 { "type": "makeSpec", "spec": "VULKAN" }
@@ -776,7 +792,15 @@
         },
         "xrender": {
             "label": "XRender for native painting",
-            "test": "x11/xrender",
+            "test": {
+                "tail": [
+                    "#if RENDER_MAJOR == 0 && RENDER_MINOR < 5",
+                    "#  error Required Xrender version 0.6 not found.",
+                    "#endif"
+                ],
+                "main": "XRenderPictFormat *format = 0;"
+            },
+            "headers": "X11/extensions/Xrender.h",
             "sources": [
                 "-lXrender"
             ],
@@ -1030,7 +1054,10 @@
         "opengles32": {
             "label": "OpenGL ES 3.2",
             "type": "compile",
-            "test": "unix/opengles32",
+            "test": {
+                "include": "GLES3/gl32.h",
+                "main": "glFramebufferTexture(GL_TEXTURE_2D, GL_DEPTH_STENCIL_ATTACHMENT, 1, 0);"
+            },
             "use": "opengl_es2"
         },
         "qpa_default_platform": {