Box: Let the 32-bit version refuse to run on 64-bit kernels

[moe.git] / eval / libeval.sh

diff --git a/eval/libeval.sh b/eval/libeval.sh
index 6d2ffb1932bea9a0ad7232e2dbbfd0a27aedd051..676dbef399f3b6ea2ddd5df1029ef95c747b694c 100644 (file)
--- a/eval/libeval.sh
+++ b/eval/libeval.sh
@@ -263,14 +263,14 @@ function test-result
        SG=${M#Caught fatal signal }
        SG=${SG#Committed suicide by signal }
        if [ "$SG" != "$M" ] ; then
-               SG=`kill -l $SG 2>/dev/null`
+               SG=`kill -l $SG 2>/dev/null` || SG=
                [ -z "$SG" ] || M="$M (SIG$SG)"
        fi
 
        # Translate runtime errors to readable strings
        RE=${M#Exited with error status }
        if [ -n "$EXIT_CODE_HOOK" -a "$RE" != "$M" ] ; then
-               NEWMSG=`$EXIT_CODE_HOOK $RE`
+               NEWMSG=`$EXIT_CODE_HOOK $RE` || NEWMSG=
                if [ -n "$NEWMSG" ] ; then
                        M="Runtime error $RE: $NEWMSG"
                fi
@@ -430,7 +430,7 @@ function test-run-interactive
 function test-run-open-data
 {
        [ -f $SDIR/$TEST.out ] || test-result 0 "No solution"
-       ln $SDIR/$TEST.out $TDIR/$TEST.out
+       try-ln $SDIR/$TEST.out $TDIR/$TEST.out
 }
 
 # Syntax checks
@@ -458,7 +458,7 @@ function output-check
        MSG=
        if [ -n "$OUTPUT_CHECK" -a "$OUT_TYPE" != none -a -z "$EV_NOCHECK" ] ; then
                pcont "<check> "
-               [ -f $PDIR/$TEST.out ] && ln $PDIR/$TEST.out $TDIR/$TEST.ok
+               [ -f $PDIR/$TEST.out ] && try-ln $PDIR/$TEST.out $TDIR/$TEST.ok
                OCHECK=$(expand-var OUTPUT_CHECK)
                echo "Output check command: $OCHECK"
                if ! eval $OCHECK 2>$TMPDIR/exec.out ; then