diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-05-20 19:31:18 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-05-20 19:31:19 +0200 |
| commit | 36c025a8d66b244b6017746b415881ef1814b1e2 (patch) | |
| tree | 419c55a80f161e3882a3060cbcf0762d7a151841 /config.tests/unix/compile.test | |
| parent | d55f2b1fb9c910bc118f75967a0e6273f8aa98d1 (diff) | |
| parent | 8e8bd90e4445415df7b7f516444e594d3e678c1a (diff) | |
Merge 5.7 into 5.7.0
Change-Id: I416c79d9afde98efc9e78b3a74e17dfbb2409602
Diffstat (limited to 'config.tests/unix/compile.test')
| -rwxr-xr-x | config.tests/unix/compile.test | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/config.tests/unix/compile.test b/config.tests/unix/compile.test index 1228629aea..f5db1847b8 100755 --- a/config.tests/unix/compile.test +++ b/config.tests/unix/compile.test @@ -66,9 +66,6 @@ while [ "$#" -gt 0 ]; do shift done -# debuggery -[ "$VERBOSE" = "yes" ] && echo "$DESCRIPTION auto-detection... ($*)" - test -d "$OUTDIR/$TEST" || mkdir -p "$OUTDIR/$TEST" cd "$OUTDIR/$TEST" @@ -96,6 +93,7 @@ set -- \ "$SRCDIR/$TEST/$EXE.pro" \ -o "$OUTDIR/$TEST/Makefile" if [ "$VERBOSE" = "yes" ]; then + echo OUTDIR=$OUTDIR "$@" && $MAKE && SUCCESS=yes else OUTDIR=$OUTDIR "$@" >/dev/null 2>&1 && $MAKE >/dev/null 2>&1 && SUCCESS=yes @@ -103,9 +101,9 @@ fi # done if [ "$SUCCESS" != "yes" ]; then - [ "$VERBOSE" = "yes" ] && echo "$DESCRIPTION disabled." + [ "$VERBOSE" = "yes" ] && echo "$DESCRIPTION disabled." || echo " no." exit 1 else - [ "$VERBOSE" = "yes" ] && echo "$DESCRIPTION enabled." + [ "$VERBOSE" = "yes" ] && echo "$DESCRIPTION enabled." || echo " yes." exit 0 fi |