We want BOXDIR to be always absolute.

[moe.git] / bin / lib

diff --git a/bin/lib b/bin/lib
index bbe3beb9c1ec62f6765b05a7208b32957961a029..792a546ca9c6f4f475b2dd553762e5c18ca7a92e 100644 (file)
--- a/bin/lib
+++ b/bin/lib
@@ -57,7 +57,7 @@ function box-init
        if [ -z "$TEST_USER" -o "$TEST_USER" == $EVAL_USER ] ; then
                pcont "running locally (INSECURE), "
                TEST_USER=$EVAL_USER
-               BOXDIR=box
+               BOXDIR=`pwd`/box
                BOXCMD=bin/box
                mkdir -p box
        else
@@ -268,7 +268,15 @@ function test-prolog
        esac
        if [ -n "$EV_PEDANT" -a $IN_TYPE != none ] ; then
                pcont "<pedant> "
-               bin/pedant <$TDIR/$TEST.in | tr '\n' ' ' >&2
+               if [ "$EV_PEDANT" = 1 ] ; then
+                       EV_PEDANT=" "
+               fi
+               bin/pedant <$TDIR/$TEST.in >$TDIR/$TEST.pedant $EV_PEDANT
+               if [ -s $TDIR/$TEST.pedant ] ; then
+                       pend
+                       sed 's/^/\t/' <$TDIR/$TEST.pedant >&2
+                       pstart -e '\t'
+               fi
        fi
        case $OUT_TYPE in
                file)   echo "Output file: $PROBLEM.out"