X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=bin%2Flib;h=537bf58764c8d81ed514e65bf49d1c71b3967c97;hb=2080a3ad4227ac0b3d306afa7f355a6ae2de8213;hp=37461da8e8c618a050dce81c1d847bb3c797a49f;hpb=c2fdbe3ce6542e06346b532fb3173b9e955f24fa;p=moe.git

diff --git a/bin/lib b/bin/lib
index 37461da..537bf58 100644
--- a/bin/lib
+++ b/bin/lib
@@ -48,7 +48,7 @@ function box-init
 		mkdir -p box
 	else
 		pcont "used account $TEST_USER, "
-		BOXDIR=$MO_ROOT/$TEST_USER
+		BOXDIR=$MO_ROOT/eval/$TEST_USER
 		BOXCMD=bin/box-$TEST_USER
 	fi
 	[ -d $BOXDIR -a -f $BOXCMD ] || die "Sandbox set up incorrectly"
@@ -190,9 +190,14 @@ function test-run-file
 	fi
 	cat $TDIR/exec.out
 	rm $TDIR/exec.out
+	test-fetch-output || return 1
+}
+
+function test-fetch-output
+{
 	echo "Output files:"
 	ls -Al $BOXDIR
-	if [ ! -s $BOXDIR/$PROBLEM.out ] ; then
+	if [ ! -f $BOXDIR/$PROBLEM.out ] ; then
 		pend "No output file."
 		echo "No output file."
 		echo >>$PTSFILE "0 No output."
@@ -234,6 +239,7 @@ function test-run-interactive
 	fi
 	cat $TDIR/exec.out
 	rm $TDIR/exec.out
+	[ -z "$OUTPUT_CHECK" ] || test-fetch-output || return 1
 }
 
 # Syntax checks