From c8b46d3989ded1368d40e487a141b3cfb3d968ba Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@qt.io>
Date: Fri, 12 Aug 2016 10:14:51 +0200
Subject: Implement proper dependencies for configuration tests

Some test types (like the compile tests) require that other
features have been checked before, so that the compile test
sets up the right environment. Implement this through a
'testTypeDependencies' section in the json file that explicitly
encodes those dependencies for certain test types.

This replaces the 'priority' field in the feature list.

Done-with: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Change-Id: I70e7c67a4f2c971149bcac090cecbbe9cfff3f57
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
---
 configure.json | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

(limited to 'configure.json')

diff --git a/configure.json b/configure.json
index 56fda6200c..b3749a6abf 100644
--- a/configure.json
+++ b/configure.json
@@ -742,6 +742,20 @@
         }
     },
 
+    "testTypeDependencies": {
+        "linkerSupportsFlag": [ "use_gold_linker" ],
+        "compile": [ "shared", "use_gold_linker", "compiler-flags", "gcc-sysroot" ],
+        "detectPkgConfig": [ "cross_compile" ],
+        "library": [ "pkg-config" ],
+        "getPkgConfigVariable": [ "pkg-config" ],
+        "neon": [ "architecture" ]
+    },
+
+    "testTypeAliases": {
+        "compile": [ "library", "architecture" ],
+        "getPkgConfigVariable": [ "xkbConfigRoot" ]
+    },
+
     "tests": {
         "architecture": {
             "description": "target architecture",
@@ -1173,8 +1187,7 @@
                 "publicConfig",
                 { "type": "publicQtConfig", "negative": true, "name": "static" },
                 { "type": "publicConfig", "negative": true, "name": "static" }
-            ],
-            "priority": -3
+            ]
         },
         "cross_compile": {
             "description": "Cross compiling",
@@ -1187,24 +1200,20 @@
             "output": [ { "type": "publicConfig", "name": "c++11" } ]
         },
         "compiler-flags": {
-            "output": [ "compilerFlags" ],
-            "priority": -3
+            "output": [ "compilerFlags" ]
         },
         "gcc-sysroot": {
             "output": [ "gccSysroot" ],
-            "condition": "input.sysroot != ''",
-            "priority": -3
+            "condition": "input.sysroot != ''"
         },
         "use_gold_linker": {
             "description": "Using gold linker",
             "condition": "tests.use_gold_linker",
-            "output": [ "privateConfig", "useGoldLinker" ],
-            "priority": -2
+            "output": [ "privateConfig", "useGoldLinker" ]
         },
         "architecture": {
             "description": "Architecture",
-            "output": [ "architecture" ],
-            "priority": -1
+            "output": [ "architecture" ]
         },
         "pkg-config": {
             "description": "Using pkg-config",
@@ -1213,8 +1222,7 @@
             "output": [
                 { "type": "publicQtConfig", "negative": true },
                 "pkgConfig"
-            ],
-            "priority": -1
+            ]
         },
 
         "developer-build": {
-- 
cgit v1.2.3