* tests/nolimips-check: Look for reference outputs in the source directory, not the build directory. Use the unified diff format. --- ChangeLog | 8 ++++++++ tests/nolimips-check | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 80e75ca..2c122cc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2012-05-22 Roland Levillain <roland@lrde.epita.fr> + Fix the comparison of produced and expected tests outputs. + + * tests/nolimips-check: Look for reference outputs in the source + directory, not the build directory. + Use the unified diff format. + +2012-05-22 Roland Levillain <roland@lrde.epita.fr> + Get rid of mutable references, rejected by g++ since version 4.6. * src/task/boolean_task.hh (task::BooleanTask::flag_) diff --git a/tests/nolimips-check b/tests/nolimips-check index e20c2fb..24a0e71 100755 --- a/tests/nolimips-check +++ b/tests/nolimips-check @@ -24,7 +24,7 @@ SRCDIR=$top_srcdir/tests/$MODULE for STDASM in $SRCDIR/*.s; do ASM=`basename $STDASM` - STDREF=$BUILDDIR/`echo $ASM | sed 's/\.s$/\.ref/g'` + STDREF=$SRCDIR/`echo $ASM | sed 's/\.s$/\.ref/g'` STDOUT=$BUILDDIR/`echo $ASM | sed 's/\.s$/\.out/g'` STDIN=$SRCDIR/`echo $ASM | sed 's/\.s$/\.in/g'` if test ! -f $STDIN; then @@ -39,7 +39,7 @@ for STDASM in $SRCDIR/*.s; do fail else if test -f $STDREF; then - diff $STDOUT $STDREF + diff -u $STDOUT $STDREF if test $? -ne 0; then fail fi -- 1.7.2.5