Rewritten measuring of time.

[eval.git] / public / submit

diff --git a/public/submit b/public/submit
old mode 100644 (file)
new mode 100755 (executable)
index 15dd217..886a1c8
--- a/public/submit
+++ b/public/submit
@@ -1,25 +1,102 @@
+#!/bin/bash
 # 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 "$MO_ROOT" -a -d "$MO_ROOT" ] || { echo >&2 "MO_ROOT not set, giving up." ; exit 1 ; }
+. $MO_ROOT/bin/lib
+. $MO_ROOT/config
 
-[ -n "$1" ] || die "Usage: submit <problem>"
+function usage
+{
+       die "Usage: check [--force] [-s <source-file>] <problem> [<test-number>]"
+}
+
+FORCE=0
+if [ "$1" = --force ] ; then
+       FORCE=1
+       shift
+fi
+[ -n "$1" -a "$1" != "--help" ] || usage
+SRCFILE=
+while getopts "s:" opt ; do
+       case $opt in
+               s)      SRCFILE="$OPTARG"
+                       ;;
+               *)      usage
+                       ;;
+       esac
+done
+shift $(($OPTIND-1))
+[ -n "$1" ] || usage
 PROBLEM=$1
+PART=
+shift
+if [ -n "$1" ] ; then
+       PART="$1"
+       shift
+fi
+[ -z "$1" ] || usage
 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 "$PART" ] || die "You need to specify test number for open data problems."
+       TEST=$PART
+       pstart "Test case $TEST: "
+       open-locate $SRCFILE
+       (
+               ln $SRCN $TDIR/$TEST.out
+               syntax-check
+               test-result 1 OK
+       ) || FAILED=1
+else
+       [ -z "$PART" ] || die "Test number should be given only for open data problems."
+       locate-source $SRCFILE
+       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 an obviously WRONG solution."
+               exit 1
+       fi
+fi
+
+if [ -n "$REMOTE_SUBMIT" ] ; then
+       pstart "Submitting to the server... "
+       $MO_ROOT/bin/remote-submit $PROBLEM $PART $SDIR/$SRCN
+       pend "OK"
+       exit 0
+fi
+
+pstart "Submitting... "
+mkdir -p ~/.submit
+if [ $TASK_TYPE == open-data ] ; then
+       mkdir -p ~/.submit/$PROBLEM
+       cp $SRCN ~/.submit/$PROBLEM/$PART.out
+else
+       rm -rf ~/.submit/$PROBLEM
+       mkdir -p ~/.submit/$PROBLEM
+       cp $SRCN ~/.submit/$PROBLEM/
+fi
 pend "OK"