configure: enable inline tests to contain auxiliary files

... and use that to migrate the pch test. Change-Id: I2ce884442cab6124c37142f571cf6f82191ee4f5 Reviewed-by: Joerg Bornemann <[email protected]>
redshiftzero · Dec 19, 2018 · 73b8769 · 73b8769
1 parent b6cd5fd
commit 73b8769
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 50 deletions.
diff --git a/config.tests/common/pch/header.h b/config.tests/common/pch/header.h
diff --git a/config.tests/common/pch/pch.pro b/config.tests/common/pch/pch.pro
diff --git a/config.tests/common/pch/source.cpp b/config.tests/common/pch/source.cpp
diff --git a/configure.json b/configure.json
@@ -324,7 +324,21 @@
         "precompile_header": {
             "label": "precompiled header support",
             "type": "compile",
-            "test": "common/pch"
+            "test": {
+                "files": {
+                    "header.h": "#define HEADER_H"
+                },
+                "tail": [
+                    "#ifndef HEADER_H",
+                    "#error no go",
+                    "#endif"
+                ],
+                "qmake": [
+                    "CONFIG += precompile_header",
+                    "PRECOMPILED_DIR = .pch",
+                    "PRECOMPILED_HEADER = header.h"
+                ]
+            }
         },
         "use_gold_linker": {
             "label": "gold linker",

diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf
@@ -1170,6 +1170,11 @@ defineTest(qtConfPrepareCompileTestSource) {
         "}"
     write_file($$test_dir/main.$$suffix, contents)|error()
 
+    for (test, tests) {
+        for (file, $$qtConfScalarOrList($${test}.test.files._KEYS_)): \
+            write_file($$test_dir/$$file, $$qtConfScalarOrList($${test}.test.files.$${file}))|error()
+    }
+
     # Create stub .pro file
     contents = "SOURCES = main.$$suffix"
     # Custom project code