diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-09-03 12:35:33 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-10 00:27:21 +0200 |
| commit | 703253d31b27ad03251b296c23177a25c7ec0340 (patch) | |
| tree | ec8ecb74b34bc51eb584b73763a750d50ff11652 /config.tests/unix | |
| parent | ecf7f0d9543c05edd2439df9a57268e4049ebee4 (diff) | |
in non-verbose mode, suppress qmake output as well
otherwise missing pkg-config requirements, etc. will be visible.
Change-Id: I5a5c0f35cf75e1fcc09ddbc7fcc54cef6bfec8b5
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: J-P Nurmi <j-p.nurmi@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'config.tests/unix')
| -rwxr-xr-x | config.tests/unix/compile.test | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/config.tests/unix/compile.test b/config.tests/unix/compile.test index c63c36e1b6..3f8c5c51a2 100755 --- a/config.tests/unix/compile.test +++ b/config.tests/unix/compile.test @@ -72,11 +72,12 @@ test -r Makefile && $MAKE distclean >/dev/null 2>&1 # Make sure output from possible previous tests is gone rm -f "$EXE" "${EXE}.exe" -OUTDIR=$OUTDIR "$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "CONFIG-=debug_and_release" "LIBS*=$LFLAGS" "LIBS+=$MAC_ARCH_LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" "QT_BUILD_TREE=$OUTDIR" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile" - +set -- "$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "CONFIG-=debug_and_release" "LIBS*=$LFLAGS" "LIBS+=$MAC_ARCH_LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" "QT_BUILD_TREE=$OUTDIR" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile" if [ "$VERBOSE" = "yes" ]; then + OUTDIR=$OUTDIR "$@" $MAKE else + OUTDIR=$OUTDIR "$@" >/dev/null 2>&1 $MAKE >/dev/null 2>&1 fi |