diff options
| -rwxr-xr-x | abe-bisect.sh | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/abe-bisect.sh b/abe-bisect.sh index 7c751726..73bbe81b 100755 --- a/abe-bisect.sh +++ b/abe-bisect.sh @@ -65,8 +65,11 @@ BADSHA1=`git log --format=format:"%H" --grep=trunk@${BAD} master` echo GOOD: $GOODSHA1 echo BAD: $BADSHA1 -[ x"$GOODSHA1" = x ] && echo "ERROR: Could not find good commit ($GOOD)" && exit 1 -[ x"$BADSHA1" = x ] && echo "ERROR: Could not find bad commit ($BAD)" && exit 1 +MAILBODY=${rundir}/mail-body.txt +rm -f $MAILBODY + +[ x"$GOODSHA1" = x ] && (echo "ERROR: Could not find good commit ($GOOD)" | tee $MAILBODY) && exit 1 +[ x"$BADSHA1" = x ] && (echo "ERROR: Could not find bad commit ($BAD)" | tee $MAILBODY) && exit 1 # Build list of gcc configure options depending on cpu/fpu/mode GCC_OVERRIDE_CONFIGURE= @@ -90,7 +93,7 @@ ${ABE}/abe.sh --target ${TARGET} \ --check gcc \ --excludecheck gdb >& gcc-${GOODSHA1}.log if [ $? -ne 0 ]; then - echo "ERROR: failure while building/testing GOOD ($GOOD}" + echo "ERROR: failure while building/testing GOOD ($GOOD}" | tee $MAILBODY exit 1 fi @@ -106,7 +109,7 @@ ${ABE}/abe.sh --target ${TARGET} \ --check gcc \ --excludecheck gdb >& gcc-${BADSHA1}.log if [ $? -ne 0 ]; then - echo "ERROR: failure while building/testing BAD ($BAD}" + echo "ERROR: failure while building/testing BAD ($BAD}" | tee $MAILBODY exit 1 fi @@ -116,7 +119,7 @@ bad_nb_pass=$(grep ${TESTNAME} $sums | grep -c PASS) # make sure BAD has more failures than GOOD if [ $bad_nb_fail -le $good_nb_fail ]; then - echo "ERROR: BAD ($BAD) does not have more failures ($bad_nb_fail) than GOOD ($GOOD) ($good_nb_fail)" + echo "ERROR: BAD ($BAD) does not have more failures ($bad_nb_fail) than GOOD ($GOOD) ($good_nb_fail)" | tee $MAILBODY exit 1 fi @@ -125,4 +128,5 @@ popd git bisect good ${GOODSHA1} git bisect bad ${BADSHA1} -RUNDIR=${rundir} ABE=${ABE} EXP=${EXP} TESTNAME=${TESTNAME} TARGET=${TARGET} CPU=${CPU} FPU=${FPU} MODE=${MODE} SIMU=${SIMU} TARGETBOARD=${TARGETBOARD} GOODPASS=${good_nb_pass} GOODFAIL=${good_nb_fail} BADPASS=${bad_nb_pass} BADFAIL=${bad_nb_fail} git bisect run ${mydir}/abe-bisect-helper.sh +RUNDIR=${rundir} ABE=${ABE} EXP=${EXP} TESTNAME=${TESTNAME} TARGET=${TARGET} CPU=${CPU} FPU=${FPU} MODE=${MODE} SIMU=${SIMU} TARGETBOARD=${TARGETBOARD} GOODPASS=${good_nb_pass} GOODFAIL=${good_nb_fail} BADPASS=${bad_nb_pass} BADFAIL=${bad_nb_fail} git bisect run ${mydir}/abe-bisect-helper.sh | tee bisect.log +git bisect visualize | tee $MAILBODY |