diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-10 22:28:10 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-10 22:28:10 (GMT) |
| commit | 21391b0c408a931a95285fae2def170d64489883 (patch) | |
| tree | 6c3786dfd4baaf358ca227e51541b74181bf98c3 | |
| parent | b53ea893caf1626a1ebfd61545525d101f1c2833 (diff) | |
| parent | e8f9a5048987caf45f59e802326c198ca56f5293 (diff) | |
| download | Qt-21391b0c408a931a95285fae2def170d64489883.zip Qt-21391b0c408a931a95285fae2def170d64489883.tar.gz Qt-21391b0c408a931a95285fae2def170d64489883.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging:
BM2: Little fix to make the `make check-trusted' to work on Linux and Windows.
| -rw-r--r-- | tests/benchmarks/trusted-benchmarks.pri | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/benchmarks/trusted-benchmarks.pri b/tests/benchmarks/trusted-benchmarks.pri index 632dcff..a835cbd 100644 --- a/tests/benchmarks/trusted-benchmarks.pri +++ b/tests/benchmarks/trusted-benchmarks.pri @@ -1,8 +1,11 @@ # Edit the list of trusted benchmarks in each of the sub-targets +# command terminating newline in Makefile +NL=$$escape_expand(\\n\\t) + check-trusted.depends = qmake for(benchmark, TRUSTED_BENCHMARKS) { - check-trusted.commands += (cd $$benchmark && $(MAKE) -f $(MAKEFILE) check); + check-trusted.commands += -cd $$benchmark && $(MAKE) -f $(MAKEFILE) check$${NL} } QMAKE_EXTRA_TARGETS += check-trusted |