AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

don't cache results of build_parts and skip_modules

Browse Source 
as these tests do nothing but validating the command line, caching the
result is more confusing than anything else.

also make the tests silent, so they don't clutter an otherwise fully
cached configure run.

Change-Id: Ifc3d65278769b36a056650f077fd6274a7e192e7
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
This commit is contained in:
Oswald Buddenhagen 2016-08-24 13:39:15 +02:00
parent b71d6ac713
commit 0f68ac2512
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
configure.json
View File

@ -858,14 +858,10 @@
"test": "unix/reduce_relocs" "test": "unix/reduce_relocs"
}, },
"skip_modules": { "skip_modules": {
"description": "modules to skip", "type": "skipModules"
"type": "skipModules",
"log": "value"
}, },
"build_parts": { "build_parts": {
"description": "parts of Qt to build", "type": "buildParts"
"type": "buildParts",
"log": "value"
}, },
"dlopen": { "dlopen": {
"description": "dlopen() in libc", "description": "dlopen() in libc",
@ -2104,7 +2100,6 @@
"output": [ { "type": "varAssign", "name": "QT_SKIP_MODULES", "value": "tests.skip_modules.value" } ] "output": [ { "type": "varAssign", "name": "QT_SKIP_MODULES", "value": "tests.skip_modules.value" } ]
}, },
"build_parts": { "build_parts": {
"description": "Qt build parts",
"output": [ { "type": "varAppend", "name": "QT_BUILD_PARTS", "value": "tests.build_parts.value" } ] "output": [ { "type": "varAppend", "name": "QT_BUILD_PARTS", "value": "tests.build_parts.value" } ]
}, },
"qreal": { "qreal": {

7
configure.pri
View File

@ -203,6 +203,9 @@ defineTest(qtConfTest_neon) {
} }
defineTest(qtConfTest_skipModules) { defineTest(qtConfTest_skipModules) {
$${1}.cache = -
export($${1}.cache)
skip = skip =
uikit { uikit {
skip += qtdoc qtmacextras qtserialport qtwebkit qtwebkit-examples skip += qtdoc qtmacextras qtserialport qtwebkit qtwebkit-examples
@ -220,8 +223,6 @@ defineTest(qtConfTest_skipModules) {
} }
$${1}.value = $$unique(skip) $${1}.value = $$unique(skip)
export($${1}.value) export($${1}.value)
$${1}.cache += value
export($${1}.cache)
return(true) return(true)
} }
@ -243,7 +244,7 @@ defineTest(qtConfTest_buildParts) {
$${1}.value = $$parts $${1}.value = $$parts
export($${1}.value) export($${1}.value)
$${1}.cache += value $${1}.cache = -
export($${1}.cache) export($${1}.cache)
return(true) return(true)
} }

2
mkspecs/features/qt_configure.prf
View File

@ -789,6 +789,8 @@ defineTest(qtLogTestResult) {
} }
defineTest(qtConfSaveResult) { defineTest(qtConfSaveResult) {
equals($${1}.cache, -): \
return()
keys = result $$eval($${1}.cache) keys = result $$eval($${1}.cache)
cont = "cache.$${2}._KEYS_ = $$keys" cont = "cache.$${2}._KEYS_ = $$keys"
for (k, keys): \ for (k, keys): \