diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2011-01-10 16:02:33 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2011-01-10 16:02:33 (GMT) |
| commit | 38344db7e2ab83235a56d9eb552a6dff818185c2 (patch) | |
| tree | b7beb68141372fe4e4bdcb3dbf37b0897d9ef82a /tests | |
| parent | e5c522d4358bd6c9776c84c7fcfffb120d76725e (diff) | |
| parent | d64c805f8159f8d7b35ceedf3f4dfe4f659efeb6 (diff) | |
| download | Qt-38344db7e2ab83235a56d9eb552a6dff818185c2.zip Qt-38344db7e2ab83235a56d9eb552a6dff818185c2.tar.gz Qt-38344db7e2ab83235a56d9eb552a6dff818185c2.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-team
Diffstat (limited to 'tests')
| -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 |