X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=bin%2Flib;h=7eed64eb9736f6953a98300b6a53b55fde314644;hb=d2e4be15ac340a763aa9e6fbf18ea8c4c2078101;hp=a042892982df4ec6fcd0946128333b6b83bb8b41;hpb=0ef7fd9921eb6018b54793ced6592d15979edbc0;p=eval.git

diff --git a/bin/lib b/bin/lib
index a042892..7eed64e 100644
--- a/bin/lib
+++ b/bin/lib
@@ -202,8 +202,7 @@ function test-prolog
 			;;
 		stdio)	echo "Input file: <stdin> (from $PDIR/$TEST.in)"
 			ln $PDIR/$TEST.in $TDIR/$TEST.in
-			cp $PDIR/$TEST.in $BOXDIR/$PROBLEM.in
-			BOX_EXTRAS="$BOX_EXTRAS -i$PROBLEM.in"
+			BOX_EXTRAS="$BOX_EXTRAS -i$TDIR/$TEST.in"
 			;;
 		none)	echo "Input file: <none>"
 			;;
@@ -215,7 +214,7 @@ function test-prolog
 			BOX_EXTRAS="$BOX_EXTRAS -o/dev/null"
 			;;
 		stdio)	echo "Output file: <stdout>"
-			BOX_EXTRAS="$BOX_EXTRAS -o$PROBLEM.out"
+			BOX_EXTRAS="$BOX_EXTRAS -o$TDIR/$TEST.out"
 			;;
 		none)	echo "Output file: <none>"
 			;;
@@ -237,8 +236,7 @@ function test-epilog
 		file)	[ -f $BOXDIR/$PROBLEM.out ] || test-result 0 "No output file."
 			cp $BOXDIR/$PROBLEM.out $TDIR/$TEST.out
 			;;
-		stdio)	[ -f $BOXDIR/$PROBLEM.out ] || test-result 0 "No output file."
-			cp $BOXDIR/$PROBLEM.out $TDIR/$TEST.out
+		stdio)	[ -f $TDIR/$TEST.out ] || test-result 0 "No output file."
 			;;
 	esac
 }
@@ -252,7 +250,8 @@ function test-run-file
 	BOXOPTS="`eval echo $TEST_SANDBOX_OPTS`$BOX_EXTRAS"
 	echo "Sandbox options: $BOXOPTS"
 	if ! $BOXCMD $BOXOPTS -- ./$PROBLEM 2>$TMPDIR/exec.out ; then
-		MSG=`head -1 $TMPDIR/exec.out`
+		cat $TMPDIR/exec.out
+		MSG=`tail -1 $TMPDIR/exec.out`
 		test-result 0 "$MSG"
 	fi
 	cat $TMPDIR/exec.out
@@ -270,7 +269,8 @@ function test-run-interactive
 	ICCMD=`eval echo $IA_CHECK`
 	echo "Interactive checker: $ICCMD"
 	if ! $HDIR/bin/iwrapper $BOXCMD $BOXOPTS -- ./$PROBLEM @@ $ICCMD 2>$TMPDIR/exec.out ; then
-		MSG="`head -1 $TMPDIR/exec.out`"
+		cat $TMPDIR/exec.out
+		MSG="`tail -1 $TMPDIR/exec.out`"
 		test-result 0 "$MSG"
 	fi
 	cat $TMPDIR/exec.out
@@ -286,7 +286,8 @@ function syntax-check
 	SCHECK=`eval echo $SYNTAX_CHECK`
 	echo "Syntax check command: $SCHECK"
 	if ! eval $SCHECK 2>$TMPDIR/exec.out ; then
-		MSG=`head -1 $TMPDIR/exec.out`
+		cat $TMPDIR/exec.out
+		MSG=`tail -1 $TMPDIR/exec.out`
 		if [ -z "$MSG" ] ; then MSG="Wrong syntax." ; fi
 		test-result 0 "$MSG"
 	fi
@@ -303,11 +304,13 @@ function output-check
 	OCHECK=`eval echo $OUTPUT_CHECK`
 	echo "Output check command: $OCHECK"
 	if ! eval $OCHECK 2>$TMPDIR/exec.out ; then
-		MSG=`head -1 $TMPDIR/exec.out`
+		cat $TMPDIR/exec.out
+		MSG=`tail -1 $TMPDIR/exec.out`
 		if [ -z "$MSG" ] ; then MSG="Wrong answer." ; fi
 		test-result 0 "$MSG"
 	fi
-	MSG=`head -1 $TMPDIR/exec.out`
+	cat $TMPDIR/exec.out
+	MSG=`tail -1 $TMPDIR/exec.out`
 	if [ -z "$MSG" ] ; then MSG="OK" ; fi
 	test-result $POINTS_PER_TEST "$MSG"
 }