diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-12-05 19:58:50 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-04-10 18:51:13 +0000 |
| commit | 2c6801cb37ed5a14435cf2f76ae115eeda0d210e (patch) | |
| tree | b935509fa35eb3bfa1d216322409db3d83565063 /mkspecs/features/configure_base.prf | |
| parent | 0e204c7dc42627619db9684a9bca031ee545faf7 (diff) | |
configure: cache test output as well
that way we can create a config.log which is consistent with the end
state even if (some) tests are not executed this time around.
Change-Id: Ia953ede62d6640aab912559f435ceb1f9ec6d9dc
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'mkspecs/features/configure_base.prf')
| -rw-r--r-- | mkspecs/features/configure_base.prf | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/mkspecs/features/configure_base.prf b/mkspecs/features/configure_base.prf index e870e2ee10..73e0273f18 100644 --- a/mkspecs/features/configure_base.prf +++ b/mkspecs/features/configure_base.prf @@ -23,9 +23,29 @@ QMAKE_MAKE_NAME = $$basename(QMAKE_MAKE) # Make sure we don't inherit MAKEFLAGS - -i in particular is fatal. QMAKE_MAKE = "$${SETENV_PFX}MAKEFLAGS=$$SETENV_SFX $$QMAKE_MAKE" +QMAKE_PERSIST_LOG = false +QMAKE_PERSISTED_LOG = + defineTest(qtLog) { write_file($$QMAKE_CONFIG_LOG, 1, append) $$QMAKE_CONFIG_VERBOSE: for (l, 1): log("$$l$$escape_expand(\\n)") + $$QMAKE_PERSIST_LOG { + QMAKE_PERSISTED_LOG += $$1 + export(QMAKE_PERSISTED_LOG) + } +} + +defineTest(qtPersistLog) { + QMAKE_PERSIST_LOG = true + QMAKE_PERSISTED_LOG = + export(QMAKE_PERSIST_LOG) + export(QMAKE_PERSISTED_LOG) +} + +defineReplace(qtPersistedLog) { + QMAKE_PERSIST_LOG = false + export(QMAKE_PERSIST_LOG) + return($$QMAKE_PERSISTED_LOG) } defineTest(qtRunLoggedCommand) { |