diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-04-11 14:09:28 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-14 12:21:46 +0200 |
| commit | f946a1d0c16aec03364ef02f9f1708830bab0d79 (patch) | |
| tree | 238d6145009380597fc6b5f4798183ca620ae74f /config.tests | |
| parent | ff9afeed512e20e0fe19b4583c89df3802064b50 (diff) | |
| download | qtbase-f946a1d0c16aec03364ef02f9f1708830bab0d79.tar.gz qtbase-f946a1d0c16aec03364ef02f9f1708830bab0d79.tar.bz2 qtbase-f946a1d0c16aec03364ef02f9f1708830bab0d79.zip | |
check qmake/make exit code instead of looking for an executable
it's a bit braindead to look whether we managed to build an executable
if we can simply use the exit codes of qmake and make to test for
success.
the windows equivalent is already doing that.
this also allows us to do tests that can fail despite building an
executable, or not build one in the first place.
Change-Id: Ib69f9d005309d55a790dd3d89db1ee913e45b26b
Reviewed-by: Wolfgang Bremer <wbremer@blackberry.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'config.tests')
| -rwxr-xr-x | config.tests/unix/compile.test | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/config.tests/unix/compile.test b/config.tests/unix/compile.test index 22064b85e9..f99237cb50 100755 --- a/config.tests/unix/compile.test +++ b/config.tests/unix/compile.test @@ -69,15 +69,11 @@ rm -f "$EXE" "${EXE}.exe" set -- "$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "CONFIG+=android_app" "CONFIG-=debug_and_release app_bundle lib_bundle" "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 + OUTDIR=$OUTDIR "$@" && $MAKE && SUCCESS=yes else - OUTDIR=$OUTDIR "$@" >/dev/null 2>&1 - $MAKE >/dev/null 2>&1 + OUTDIR=$OUTDIR "$@" >/dev/null 2>&1 && $MAKE >/dev/null 2>&1 && SUCCESS=yes fi -( [ -f "$EXE" ] || [ -f "${EXE}.exe" ] ) && SUCCESS=yes - # done if [ "$SUCCESS" != "yes" ]; then [ "$VERBOSE" = "yes" ] && echo "$DESCRIPTION disabled." |