From 1dda8ac032d279f066bea6d0efaf6e4165d4dac5 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Tue, 23 Jun 2009 18:29:03 +0200 Subject: Avoid running "make distclean" before there's a Makefile in the test dir. I have been bitten by this quite often and I had never found out why suddenly configure decided to erase all my build. It happens that my "make" replacement script command tries to search for a Makefile in the parent dirs (so I can run "make" while inside src/corelib/tools), and this caused the whole build to be erased. Reviewed-by: Trust Me --- config.tests/unix/compile.test | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config.tests/unix/compile.test b/config.tests/unix/compile.test index ff51c91..0e73852 100755 --- a/config.tests/unix/compile.test +++ b/config.tests/unix/compile.test @@ -59,7 +59,8 @@ test -d "$OUTDIR/$TEST" || mkdir -p "$OUTDIR/$TEST" cd "$OUTDIR/$TEST" -make distclean >/dev/null 2>&1 +test -e Makefile && make distclean >/dev/null 2>&1 + "$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "LIBS*=$LFLAGS" "LIBS+=$MAC_ARCH_LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile" if [ "$VERBOSE" = "yes" ]; then -- cgit v0.12