diff options
| -rwxr-xr-x | abe-bisect-helper.sh | 20 | ||||
| -rwxr-xr-x | abe-bisect.sh | 28 |
2 files changed, 45 insertions, 3 deletions
diff --git a/abe-bisect-helper.sh b/abe-bisect-helper.sh index 983c7232..eefe14a2 100755 --- a/abe-bisect-helper.sh +++ b/abe-bisect-helper.sh @@ -34,7 +34,25 @@ git --no-pager show $REV set -x cd ${RUNDIR} -${ABE}/abe.sh --target ${TARGET} gcc=gcc.git@${REV} --set runtestflags="${EXP}=${TESTNAME}" --build all --check gcc --excludecheck gdb >& gcc-${REV}.log +# Build list of gcc configure options depending on cpu/fpu/mode +GCC_OVERRIDE_CONFIGURE= +if [ x"${CPU}" != x ]; then + GCC_OVERRIDE_CONFIGURE="${GCC_OVERRIDE_CONFIGURE} --set gcc_override_configure=--with-cpu=${CPU}" +fi +if [ x"${FPU}" != x ]; then + GCC_OVERRIDE_CONFIGURE="${GCC_OVERRIDE_CONFIGURE} --set gcc_override_configure=--with-fpu=${FPU}" +fi +if [ x"${MODE}" != x ]; then + GCC_OVERRIDE_CONFIGURE="${GCC_OVERRIDE_CONFIGURE} --set gcc_override_configure=--with-mode=${MODE}" +fi + +${ABE}/abe.sh --target ${TARGET} \ + gcc=gcc.git@${REV} \ + --set runtestflags="${EXP}=${TESTNAME}" \ + ${GCC_OVERRIDE_CONFIGURE} \ + --build all \ + --check gcc\ + --excludecheck gdb >& gcc-${REV}.log [ $? -ne 0 ] && exit 125 sums=`find builds/*/${TARGET}/gcc.git~master_rev_${REV}-stage2/ -name "*.sum"` diff --git a/abe-bisect.sh b/abe-bisect.sh index 8ce6250d..7c751726 100755 --- a/abe-bisect.sh +++ b/abe-bisect.sh @@ -68,9 +68,27 @@ 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 +# Build list of gcc configure options depending on cpu/fpu/mode +GCC_OVERRIDE_CONFIGURE= +if [ x"${CPU}" != x ]; then + GCC_OVERRIDE_CONFIGURE="${GCC_OVERRIDE_CONFIGURE} --set gcc_override_configure=--with-cpu=${CPU}" +fi +if [ x"${FPU}" != x ]; then + GCC_OVERRIDE_CONFIGURE="${GCC_OVERRIDE_CONFIGURE} --set gcc_override_configure=--with-fpu=${FPU}" +fi +if [ x"${MODE}" != x ]; then + GCC_OVERRIDE_CONFIGURE="${GCC_OVERRIDE_CONFIGURE} --set gcc_override_configure=--with-mode=${MODE}" +fi + # Sanity checks on the number of passes/fails in GOOD and BAD pushd ${rundir} -${ABE}/abe.sh --target ${TARGET} gcc=gcc.git@${GOODSHA1} --set runtestflags="${EXP}=${TESTNAME}" --build all --check gcc --excludecheck gdb >& gcc-${GOODSHA1}.log +${ABE}/abe.sh --target ${TARGET} \ + gcc=gcc.git@${GOODSHA1} \ + --set runtestflags="${EXP}=${TESTNAME}" \ + ${GCC_OVERRIDE_CONFIGURE} \ + --build all \ + --check gcc \ + --excludecheck gdb >& gcc-${GOODSHA1}.log if [ $? -ne 0 ]; then echo "ERROR: failure while building/testing GOOD ($GOOD}" exit 1 @@ -80,7 +98,13 @@ sums=`find builds/*/${TARGET}/gcc.git~master_rev_${GOODSHA1}-stage2/ -name "*.su good_nb_fail=$(grep ${TESTNAME} $sums | grep -c FAIL) good_nb_pass=$(grep ${TESTNAME} $sums | grep -c PASS) -${ABE}/abe.sh --target ${TARGET} gcc=gcc.git@${BADSHA1} --set runtestflags="${EXP}=${TESTNAME}" --build all --check gcc --excludecheck gdb >& gcc-${BADSHA1}.log +${ABE}/abe.sh --target ${TARGET} \ + gcc=gcc.git@${BADSHA1} \ + --set runtestflags="${EXP}=${TESTNAME}" \ + ${GCC_OVERRIDE_CONFIGURE} \ + --build all \ + --check gcc \ + --excludecheck gdb >& gcc-${BADSHA1}.log if [ $? -ne 0 ]; then echo "ERROR: failure while building/testing BAD ($BAD}" exit 1 |