@@ -3,8 +3,8 @@ # Check that existing autotests for files that are being commited are not currently failing # QMAKE=qmake -$QMAKE --version 2>&1 | grep 4.3 > /dev/null -if [ $? == 0 ] ; then +$QMAKE --version 2>&1 | grep 3.3 > /dev/null +if [ $? -eq 0 ] ; then QMAKE=qmake-qt4 fi dir=`dirname $0` @@ -16,7 +16,7 @@ for file in `git-diff-index --name-only HEAD | grep .cpp` ; do tempfoo=`basename $0` TMPFILE=`mktemp -t ${tempfoo}` || exit 1 - (cd "$dir/../../autotests/$file/"; QMAKE; make; ./$file >> $TMPFILE) + (cd "$dir/../../autotests/$file/"; $QMAKE; make; ./$file >> $TMPFILE) output=`cat $TMPFILE | grep ' failed,' | sed -e 's/.*passed, //g' -e 's/ failed.*//g'` if [ "${output}" != "0" ] ; then echo "Autotests failed for $file, please fix before committing." git_hooks/pre-commit_autotest 7e3c9dcdd109eb07402a6dbb2ebeacd620893777 Benjamin C Meyer ben@meyerhome.net http://github.com/ariya/arora/commit/c98a1205321cc1095a61df8f374e8b54a10abf33 c98a1205321cc1095a61df8f374e8b54a10abf33 2008-08-05T09:29:09-07:00 2008-08-05T09:29:09-07:00 Correctly detect qt3's qmake on debian a57313ba8d1aab19d4fefeac13bd6d2f2f5219ab Benjamin C Meyer ben@meyerhome.net