X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=public%2Fsubmit;h=7b077240b9daa2cd6950b6e10dd06d5a5ba76d30;hb=d2e4be15ac340a763aa9e6fbf18ea8c4c2078101;hp=15dd21742e9428c932c3cf0862d4fb088d9985c8;hpb=c119e07ea8001ba944e6d9c33e4e73f98fe750ee;p=eval.git

diff --git a/public/submit b/public/submit
index 15dd217..7b07724 100644
--- a/public/submit
+++ b/public/submit
@@ -1,25 +1,71 @@
 # The Evaluator -- Public Submit Script
-# (c) 2001 Martin Mares <mj@ucw.cz>
+# (c) 2001--2004 Martin Mares <mj@ucw.cz>
 
 set -e
 [ -n "$MO_PUBLIC" -a -d "$MO_PUBLIC" ] || { echo >&2 "MO_PUBLIC not set, giving up." ; exit 1 ; }
 . $MO_PUBLIC/bin/lib
 . $MO_PUBLIC/config
 
-[ -n "$1" ] || die "Usage: submit <problem>"
+FORCE=0
+if [ "$1" = --force ] ; then
+	FORCE=1
+	shift
+fi
+[ -n "$1" -o "$1" = "--help" ] || die "Usage: submit [--force] <problem> [<test-number>]"
 PROBLEM=$1
 public-setup
 . $PDIR/config
-locate-source
-compile
-TEST=$SAMPLE_TEST
-PTSFILE=$TDIR/points
-pstart "Checking on sample input: "
-test-run
-syntax-check
-pend "OK"
-pstart "Submiting: "
-mkdir -p ~/.submit/$PROBLEM
-rm -rf ~/.submit/$PROBLEM/*
-cp $SRCN ~/.submit/$PROBLEM/
+
+function test-verdict
+{
+	pend "$2"
+	[ $1 == 0 ] && exit 1 || exit 0
+}
+
+FAILED=0
+if [ $TASK_TYPE == open-data ] ; then
+	[ -n "$2" ] || die "You need to specify test number for open data problems."
+	TEST=$2
+	pstart "Test case $TEST: "
+	open-locate
+	(
+		ln $SRCN $TDIR/$TEST.out
+		syntax-check
+		test-result 1 OK
+	) || FAILED=1
+else
+	[ -z "$2" ] || die "Test number should be given only for open data problems."
+	locate-source
+	compile
+	for TEST in $SAMPLE_TESTS ; do
+		(
+		pstart "Checking on sample input $TEST: "
+		test-run
+		syntax-check
+		output-check
+		die "How could I get there? It's a buuuuug!"
+		) || FAILED=$(($FAILED+1))
+	done
+fi
+
+if [ $FAILED != 0 ] ; then
+	if [ $FORCE != 0 ] ; then
+		pend "TESTS FAILED, but --force given, so submitting anyway."
+	else
+		pend "TESTS FAILED. Nothing has been submitted!"
+		pend "Use submit --force if you really want to submit a WRONG solution."
+		exit 1
+	fi
+fi
+
+pstart "Submitting... "
+mkdir -p ~/.submit
+if [ $TASK_TYPE == open-data ] ; then
+	mkdir -p ~/.submit/$PROBLEM
+	cp $SRCN ~/.submit/$PROBLEM/$TEST.out
+else
+	rm -rf ~/.submit/$PROBLEM
+	mkdir -p ~/.submit/$PROBLEM
+	cp $SRCN ~/.submit/$PROBLEM/
+fi
 pend "OK"