The Big Cleanup.

Beware, syntax and semantics of many config options was changed.

diff --git a/TODO b/TODO
index b0f161f304a11e095c075626177763272e4ec640..2683cd682170133b73c97e219fc4432b108f0fc0 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,21 +1,17 @@
 Evaluator
 ~~~~~~~~~
 Evaluator
 ~~~~~~~~~

-!!! timed-out interactive tasks !!!
-lepsi time limity
-zkopirovat *.ok i kdyz program spadne na run-time error
-konfigurovatelne vstupni a vystupni soubory
-konfigurovatelny pristup k timerum a /proc/self/stat (pripadne /proc/self/fd)
-better formatting of the score table
-online ukazovani runtime a memory
+box: konfigurovatelny pristup k timerum a /proc/self/stat (pripadne /proc/self/fd)
+score: better formatting of the score table

 score: alignment of table cells
 score: alignment of table cells

-input files shouldn't be mandatory (esp. for interactive tasks)

 stdio tasks: don't allow them to read the files
 stdio tasks: don't allow them to read the files

-interactive tasks: allow logging to the main log?

 interactive tasks: solve deadlocks?
 interactive tasks: solve deadlocks?

-weird characters in checker command descriptions: use automatic escaping?
-moving handling of points file to bin/ev
+interactive tasks: logging of messages
+a tool for creating accounts with passwords (according to userlist?) ; replace UID ranges completely?
+fix mo-* to use mo-get-users
+post-sandbox hook

 
 

-better messages on failed submit
+guide: compile <file>, not only <task>
+guide: status

 
 Environment
 ~~~~~~~~~~~
 
 Environment
 ~~~~~~~~~~~

diff --git a/bin/ev b/bin/ev
index b2573b0958d3539520c2dab51026758e60d6f0cd..554e5dc874778df2d980539088e1d30365475242 100755 (executable)
--- a/bin/ev
+++ b/bin/ev
@@ -1,6 +1,6 @@
 #!/bin/bash
 # The Evaluator -- Master Control Script
 #!/bin/bash
 # The Evaluator -- Master Control Script

-# (c) 2001--2003 Martin Mares <mj@ucw.cz>
+# (c) 2001--2004 Martin Mares <mj@ucw.cz>

 
 set -e
 if [ ! -f config -o ! -f bin/lib ] ; then
 
 set -e
 if [ ! -f config -o ! -f bin/lib ] ; then


@@ -10,15 +10,7 @@ fi
 . bin/lib
 . config
 
 . bin/lib
 . config
 

-# Set up environment:
-#   HDIR       home dir of the evaluator
-#   PDIR       problem specific data
-#   SDIR       contestant's solution
-#   TDIR       test results
-#   BOXDIR     sandbox
-#   PROBLEM    problem we're evaluating
-
-[ -n "$2" ] || die "Usage: ev <contestant> <problem> [<program>]"
+[ -n "$2" -a -z "$4" ] || die "Usage: ev <contestant> <problem> [<program>]"

 CONTESTANT=$1
 PROBLEM=$2
 dir-init
 CONTESTANT=$1
 PROBLEM=$2
 dir-init


@@ -30,29 +22,31 @@ box-init
 locate-source $3
 compile || true
 
 locate-source $3
 compile || true
 

-# Perform the tests
+# Initialize the points file

 PTSFILE=$TDIR/points
 PTSFILE=$TDIR/points

+>$PTSFILE
+
+function test-verdict
+{
+       if [ $1 == 0 ] ; then
+               pend "$2"
+       else
+               pend "$2 ($1 points)"
+       fi
+       echo >>$PTSFILE "$TEST $1 $2"
+       exit 0
+}
+
+# Perform the tests

 for TEST in $TESTS ; do
        (
        [ -f $PDIR/$TEST.config ] && . $PDIR/$TEST.config
        exec >$TDIR/$TEST.log
        pstart "Test $TEST... "
 for TEST in $TESTS ; do
        (
        [ -f $PDIR/$TEST.config ] && . $PDIR/$TEST.config
        exec >$TDIR/$TEST.log
        pstart "Test $TEST... "

-       echo "Test $TEST"
-       echo >>$PTSFILE -n "$TEST "
-       if [ ! -f $TDIR/$PROBLEM ] ; then
-               echo >>$PTSFILE "0 Compile error."
-               die "No executable file"
-       fi
-       test-run || exit 0
-       syntax-check || exit 0
-       output-check || exit 0
-       if [ -f $TDIR/$TEST.pts ] ; then
-               PTS=`cat $TDIR/$TEST.pts`
-       else
-               PTS=$POINTS_PER_TEST
-       fi
-       echo "Test completed OK ($PTS points)"
-       echo >>$PTSFILE "$PTS OK"
-       pend "OK, $PTS points"
+       echo "Test $TEST ($POINTS_PER_TEST points)"
+       test-run
+       syntax-check
+       output-check
+       die "You must never see this message."

        )
 done
        )
 done

diff --git a/bin/ev-open b/bin/ev-open
index 735baf2f95d55b5818e681339ee2f6aad1d148f3..663943e6ddb9e141895330e6824783e943fc6f15 100755 (executable)
--- a/bin/ev-open
+++ b/bin/ev-open
@@ -1,6 +1,6 @@
 #!/bin/bash
 # The Evaluator for Open Data Problems
 #!/bin/bash
 # The Evaluator for Open Data Problems

-# (c) 2001 Martin Mares <mj@ucw.cz>
+# (c) 2001--2004 Martin Mares <mj@ucw.cz>

 
 set -e
 if [ ! -f config -o ! -f bin/lib ] ; then
 
 set -e
 if [ ! -f config -o ! -f bin/lib ] ; then


@@ -10,14 +10,6 @@ fi
 . bin/lib
 . config
 
 . bin/lib
 . config
 

-# Set up environment:
-#   HDIR       home dir of the evaluator
-#   PDIR       problem specific data
-#   SDIR       contestant's solution
-#   TDIR       test results
-#   BOXDIR     sandbox
-#   PROBLEM    problem we're evaluating
-

 [ -n "$2" ] || die "Usage: ev-open <contestant> <problem>"
 CONTESTANT=$1
 PROBLEM=$2
 [ -n "$2" ] || die "Usage: ev-open <contestant> <problem>"
 CONTESTANT=$1
 PROBLEM=$2


@@ -25,23 +17,33 @@ dir-init
 log-init
 . $PDIR/config
 
 log-init
 . $PDIR/config
 

+# Initialize the points file
+PTSFILE=$TDIR/points
+>$PTSFILE
+
+function test-verdict
+{
+       if [ $1 == 0 ] ; then
+               pend "$2"
+       else
+               pend "$2 ($1 points)"
+       fi
+       echo >>$PTSFILE "$TEST $1 $2"
+       exit 0
+}
+

 # Perform the tests
 PTSFILE=$TDIR/points
 for TEST in $TESTS ; do
        (
        [ -f $PDIR/$TEST.config ] && . $PDIR/$TEST.config
        exec >$TDIR/$TEST.log
 # Perform the tests
 PTSFILE=$TDIR/points
 for TEST in $TESTS ; do
        (
        [ -f $PDIR/$TEST.config ] && . $PDIR/$TEST.config
        exec >$TDIR/$TEST.log

-       pstart "Test $TEST ($POINTS_PER_TEST points)... "
+       pstart "Test $TEST... "

        echo "Test $TEST ($POINTS_PER_TEST points)"
        echo "Test $TEST ($POINTS_PER_TEST points)"

-       echo >>$PTSFILE -n "$TEST "
-       if [ ! -f $SDIR/$TEST.out ] ; then
-               echo >>$PTSFILE "0 No solution."
-               die "No solution."
-       fi
-       syntax-check || exit 0
-       output-check || exit 0
-       echo "Test completed OK ($POINTS_PER_TEST points)"
-       echo >>$PTSFILE "$POINTS_PER_TEST OK"
-       pend "OK"
+       [ -f $SDIR/$TEST.out ] || test-result 0 "No solution."
+       ln $SDIR/$TEST.out $TDIR/$TEST.out
+       syntax-check
+       output-check
+       die "You must never see this message."

        )
 done
        )
 done

diff --git a/bin/lib b/bin/lib
index 537bf58764c8d81ed514e65bf49d1c71b3967c97..a042892982df4ec6fcd0946128333b6b83bb8b41 100644 (file)
--- a/bin/lib
+++ b/bin/lib
@@ -1,5 +1,5 @@
 # The Evaluator -- Shell Function Library
 # The Evaluator -- Shell Function Library

-# (c) 2001 Martin Mares <mj@ucw.cz>
+# (c) 2001--2004 Martin Mares <mj@ucw.cz>

 
 # General settings
 shopt -s dotglob
 
 # General settings
 shopt -s dotglob


@@ -30,6 +30,15 @@ function pend
 
 function die
 {
 
 function die
 {

+       # Report an internal error
+       echo >&2 "$@"
+       [ -n "$HAVE_LOG" ] && echo "Fatal error: $@"
+       exit 2
+}
+
+function fatal
+{
+       # Report a fatal error in the program being tested

        echo >&2 "$@"
        [ -n "$HAVE_LOG" ] && echo "Fatal error: $@"
        exit 1
        echo >&2 "$@"
        [ -n "$HAVE_LOG" ] && echo "Fatal error: $@"
        exit 1


@@ -40,9 +49,9 @@ function die
 function box-init
 {
        pstart "Preparing sandbox... "
 function box-init
 {
        pstart "Preparing sandbox... "

-       [ -n "$TEST_USER" ] || die "TEST_USER not set. Please fix."
-       if [ $TEST_USER == $EVAL_USER ] ; then
+       if [ -z "$TEST_USER" -o "$TEST_USER" == $EVAL_USER ] ; then

                pcont "running locally (INSECURE), "
                pcont "running locally (INSECURE), "

+               TEST_USER=$EVAL_USER

                BOXDIR=box
                BOXCMD=bin/box
                mkdir -p box
                BOXDIR=box
                BOXCMD=bin/box
                mkdir -p box


@@ -74,11 +83,12 @@ function dir-init
        PDIR=problems/$PROBLEM
        SDIR=solutions/$CONTESTANT/$PROBLEM
        TDIR=testing/$CONTESTANT/$PROBLEM
        PDIR=problems/$PROBLEM
        SDIR=solutions/$CONTESTANT/$PROBLEM
        TDIR=testing/$CONTESTANT/$PROBLEM

+       TMPDIR=tmp

        [ -d $PDIR ] || die "Problem $PROBLEM not known"
        [ -d $PDIR ] || die "Problem $PROBLEM not known"

-       [ -d $SDIR ] || die "Solution of $PROBLEM not found"
-       mkdir -p $TDIR
-       rm -rf $TDIR
-       cp -a $SDIR $TDIR
+       [ -d $SDIR ] || fatal "Solution of $PROBLEM not found"
+       mkdir -p $TDIR $TMPDIR
+       rm -rf $TDIR $TMPDIR
+       mkdir -p $TDIR $TMPDIR

        cat >$TDIR/log <<EOF
 Testing solution of $PROBLEM by $CONTESTANT
 Test started at `date`
        cat >$TDIR/log <<EOF
 Testing solution of $PROBLEM by $CONTESTANT
 Test started at `date`


@@ -86,7 +96,6 @@ Contestant's solution directory: $SDIR
 Problem directory: $PDIR
 Testing directory: $TDIR
 EOF
 Problem directory: $PDIR
 Testing directory: $TDIR
 EOF

-       >$TDIR/points

        pend "OK"
 }
 
        pend "OK"
 }
 


@@ -103,23 +112,23 @@ function locate-source
                        SRCEXT=$a
                fi
        done
                        SRCEXT=$a
                fi
        done

-       [ -n "$SRCN" ] || die "NOT FOUND"
+       [ -n "$SRCN" ] || fatal "NOT FOUND"

        pend $SRCN
        echo "Found source file: $SDIR/$SRCN"
 }
 
        pend $SRCN
        echo "Found source file: $SDIR/$SRCN"
 }
 

-# Compilation (compile SDIR/SRCN with PDIR/EXTRAS to EXE=TDIR/PROBLEM)
+# Compilation (compile SDIR/SRCN with PDIR/COMP_EXTRAS to EXE=TDIR/PROBLEM)

 
 function compile
 {
        pstart "Compiling... "
        cp -a $SDIR/$SRCN $TDIR/$SRCN
 
 function compile
 {
        pstart "Compiling... "
        cp -a $SDIR/$SRCN $TDIR/$SRCN

-       if [ -n "$EXTRAS" ] ; then
-               echo "Extras: $EXTRAS"
-               for a in $EXTRAS ; do cp $PDIR/$a $TDIR/ ; done
+       if [ -n "$COMP_EXTRAS" ] ; then
+               echo "Extras: $COMP_EXTRAS"
+               for a in $COMP_EXTRAS ; do cp $PDIR/$a $TDIR/ ; done

        fi
        box-clean
        fi
        box-clean

-       for a in $SRCN $EXTRAS ; do cp $TDIR/$a $BOXDIR/ ; done
+       for a in $SRCN $COMP_EXTRAS ; do cp $TDIR/$a $BOXDIR/ ; done

        SRC=$SRCN
        EXE=$PROBLEM
        CCMD=COMP_$SRCEXT
        SRC=$SRCN
        EXE=$PROBLEM
        CCMD=COMP_$SRCEXT


@@ -153,93 +162,119 @@ function compile
        pend "OK"
 }
 
        pend "OK"
 }
 

-# Running of test program according to current task type
+# Running of test program according to current task type (returns exit code and TEST_MSG)

 
 function test-run
 {
        test-run-$TASK_TYPE
 }
 
 
 function test-run
 {
        test-run-$TASK_TYPE
 }
 

-# Running of test program with file input/output
+function test-result
+{
+       P=$1
+       M=$2
+       if [ -s $TDIR/$TEST.pts ] ; then
+               P=`cat $TDIR/$TEST.pts`
+               rm $TDIR/$TEST.pts
+       fi
+       echo "Verdict: $M"
+       echo "Points: $P"
+       test-verdict $P "$M"
+}

 
 

-function test-run-file
+function test-prolog

 {
        pcont "<init> "
        box-clean
        echo "Executable file: $TDIR/$PROBLEM"
 {
        pcont "<init> "
        box-clean
        echo "Executable file: $TDIR/$PROBLEM"

+       if [ ! -x $TDIR/$PROBLEM ] ; then
+               test-result 0 "Compile error."
+       fi

        cp $TDIR/$PROBLEM $BOXDIR/
        cp $TDIR/$PROBLEM $BOXDIR/

-       echo "Input: $TDIR/$PROBLEM"
-       ln $PDIR/$TEST.in $TDIR/$TEST.in
-       cp $PDIR/$TEST.in $BOXDIR/$PROBLEM.in
-       eval $SANDBOX_INIT
-       echo "Input files:"
-       ls -Al $BOXDIR
-
-       pcont "<run> "
+       BOX_EXTRAS=
+       IN_TYPE=${IN_TYPE:-$IO_TYPE}
+       OUT_TYPE=${OUT_TYPE:-$IO_TYPE}
+       case $IN_TYPE in
+               file)   echo "Input file: $PROBLEM.in (from $PDIR/$TEST.in)"
+                       ln $PDIR/$TEST.in $TDIR/$TEST.in
+                       cp $PDIR/$TEST.in $BOXDIR/$PROBLEM.in
+                       BOX_EXTRAS="$BOX_EXTRAS -i/dev/null"
+                       ;;
+               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"
+                       ;;
+               none)   echo "Input file: <none>"
+                       ;;
+               *)      die "Unknown IN_TYPE $IN_TYPE"
+                       ;;
+       esac
+       case $OUT_TYPE in
+               file)   echo "Output file: $PROBLEM.out"
+                       BOX_EXTRAS="$BOX_EXTRAS -o/dev/null"
+                       ;;
+               stdio)  echo "Output file: <stdout>"
+                       BOX_EXTRAS="$BOX_EXTRAS -o$PROBLEM.out"
+                       ;;
+               none)   echo "Output file: <none>"
+                       ;;
+               *)      die "Unknown OUT_TYPE $OUT_TYPE"
+                       ;;
+       esac

        echo "Timeout: $TIME_LIMIT s"
        echo "Memory: $MEM_LIMIT KB"
        echo "Timeout: $TIME_LIMIT s"
        echo "Memory: $MEM_LIMIT KB"

-       BOXOPTS=`eval echo $TEST_SANDBOX_OPTS`
-       echo "Sandbox options: $BOXOPTS"
-       if ! $BOXCMD $BOXOPTS -- ./$PROBLEM 2>$TDIR/exec.out ; then
-               TEST_MSG="`head -1 $TDIR/exec.out`"
-               pend "$TEST_MSG"
-               cat $TDIR/exec.out
-               rm $TDIR/exec.out
-               echo >>$PTSFILE "0 $TEST_MSG"
-               return 1
-       fi
-       cat $TDIR/exec.out
-       rm $TDIR/exec.out
-       test-fetch-output || return 1
+       eval $SANDBOX_INIT
+       echo "Sandbox contents before start:"
+       ls -Al $BOXDIR

 }
 
 }
 

-function test-fetch-output
+function test-epilog

 {
 {

-       echo "Output files:"
+       echo "Sandbox contents after exit:"

        ls -Al $BOXDIR
        ls -Al $BOXDIR

-       if [ ! -f $BOXDIR/$PROBLEM.out ] ; then
-               pend "No output file."
-               echo "No output file."
-               echo >>$PTSFILE "0 No output."
-               return 1
+       case ${OUT_TYPE:-$IO_TYPE} in
+               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
+                       ;;
+       esac
+}
+
+# Running of test program with file input/output
+
+function test-run-file
+{
+       test-prolog
+       pcont "<run> "
+       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`
+               test-result 0 "$MSG"

        fi
        fi

-       cp $BOXDIR/$PROBLEM.out $TDIR/$TEST.out
+       cat $TMPDIR/exec.out
+       test-epilog

 }
 
 # Running of interactive test programs
 
 function test-run-interactive
 {
 }
 
 # Running of interactive test programs
 
 function test-run-interactive
 {

-       pcont "<init> "
-       box-clean
-       echo "Executable file: $TDIR/$PROBLEM"
-       cp $TDIR/$PROBLEM $BOXDIR/
-       echo "Input: $TDIR/$PROBLEM"
-       ln $PDIR/$TEST.in $TDIR/$TEST.in
-       cp $PDIR/$TEST.in $BOXDIR/$PROBLEM.in
-       eval $SANDBOX_INIT
-       echo "Input files:"
-       ls -Al $BOXDIR
-
+       test-prolog

        pcont "<run> "
        pcont "<run> "

-       echo "Timeout: $TIME_LIMIT s"
-       echo "Memory: $MEM_LIMIT KB"
-       BOXOPTS=`eval echo $TEST_SANDBOX_OPTS`
+       BOXOPTS="`eval echo $TEST_SANDBOX_OPTS`$BOX_EXTRAS"

        echo "Sandbox options: $BOXOPTS"
        ICCMD=`eval echo $IA_CHECK`
        echo "Interactive checker: $ICCMD"
        echo "Sandbox options: $BOXOPTS"
        ICCMD=`eval echo $IA_CHECK`
        echo "Interactive checker: $ICCMD"

-       if ! $HDIR/bin/iwrapper $BOXCMD $BOXOPTS -- ./$PROBLEM @@ $ICCMD 2>$TDIR/exec.out ; then
-               TEST_MSG="`head -1 $TDIR/exec.out`"
-               pend "$TEST_MSG"
-               cat $TDIR/exec.out
-               rm $TDIR/exec.out
-               echo "$TEST_MSG"
-               echo >>$PTSFILE "0 $TEST_MSG"
-               return 1
+       if ! $HDIR/bin/iwrapper $BOXCMD $BOXOPTS -- ./$PROBLEM @@ $ICCMD 2>$TMPDIR/exec.out ; then
+               MSG="`head -1 $TMPDIR/exec.out`"
+               test-result 0 "$MSG"

        fi
        fi

-       cat $TDIR/exec.out
-       rm $TDIR/exec.out
-       [ -z "$OUTPUT_CHECK" ] || test-fetch-output || return 1
+       cat $TMPDIR/exec.out
+       test-epilog

 }
 
 # Syntax checks
 }
 
 # Syntax checks


@@ -250,11 +285,12 @@ function syntax-check
        pcont "<syntax> "
        SCHECK=`eval echo $SYNTAX_CHECK`
        echo "Syntax check command: $SCHECK"
        pcont "<syntax> "
        SCHECK=`eval echo $SYNTAX_CHECK`
        echo "Syntax check command: $SCHECK"

-       eval $SCHECK && return 0
-       pend "Wrong syntax."
-       echo "Wrong syntax."
-       echo >>$PTSFILE "0 Wrong syntax."
-       return 1
+       if ! eval $SCHECK 2>$TMPDIR/exec.out ; then
+               MSG=`head -1 $TMPDIR/exec.out`
+               if [ -z "$MSG" ] ; then MSG="Wrong syntax." ; fi
+               test-result 0 "$MSG"
+       fi
+       cat $TMPDIR/exec.out

 }
 
 # Output checks
 }
 
 # Output checks


@@ -266,11 +302,14 @@ function output-check
        [ -f $PDIR/$TEST.out ] && ln $PDIR/$TEST.out $TDIR/$TEST.ok
        OCHECK=`eval echo $OUTPUT_CHECK`
        echo "Output check command: $OCHECK"
        [ -f $PDIR/$TEST.out ] && ln $PDIR/$TEST.out $TDIR/$TEST.ok
        OCHECK=`eval echo $OUTPUT_CHECK`
        echo "Output check command: $OCHECK"

-       eval $OCHECK && return 0
-       pend "Wrong answer."
-       echo "Wrong answer."
-       echo >>$PTSFILE "0 Wrong answer."
-       return 1
+       if ! eval $OCHECK 2>$TMPDIR/exec.out ; then
+               MSG=`head -1 $TMPDIR/exec.out`
+               if [ -z "$MSG" ] ; then MSG="Wrong answer." ; fi
+               test-result 0 "$MSG"
+       fi
+       MSG=`head -1 $TMPDIR/exec.out`
+       if [ -z "$MSG" ] ; then MSG="OK" ; fi
+       test-result $POINTS_PER_TEST "$MSG"

 }
 
 # Setup of public commands
 }
 
 # Setup of public commands


@@ -281,6 +320,7 @@ function public-setup
        PDIR=$MO_PUBLIC/problems/$PROBLEM
        SDIR=.
        TDIR=~/.test
        PDIR=$MO_PUBLIC/problems/$PROBLEM
        SDIR=.
        TDIR=~/.test

+       TMPDIR=~/.test

        [ -d $PDIR ] || die "Unknown problem $PROBLEM"
 
        pstart "Initializing... "
        [ -d $PDIR ] || die "Unknown problem $PROBLEM"
 
        pstart "Initializing... "


@@ -300,5 +340,5 @@ function open-locate
 {
        [ -f $PDIR/$TEST.in ] || die "Unknown test $TEST"
        SRCN=$SDIR/$PROBLEM$TEST.out
 {
        [ -f $PDIR/$TEST.in ] || die "Unknown test $TEST"
        SRCN=$SDIR/$PROBLEM$TEST.out

-       [ -f $SRCN ] || die "Output file $SRCN not found"
+       [ -f $SRCN ] || fatal "Output file $SRCN not found"

 }
 }

diff --git a/bin/mo-get-users b/bin/mo-get-users
index 9e9b2c278182d7d03ce5b2edcd3e24ee8bfcf00c..f85919ed8ec6b6d2c572465b1d93e0f294c40e96 100755 (executable)
--- a/bin/mo-get-users
+++ b/bin/mo-get-users
@@ -16,7 +16,7 @@ if [ -z "$CT_USER_LIST" ] ; then
        awk -F: </etc/passwd "{ gsub(\",.*\",\"\",\$5); OFS=\"\t\"; if (\$3 >= $CT_UID_MIN && \$3 <= $CT_UID_MAX) print $FORM; }"
 else
        if [ "$1" = --full ] ; then
        awk -F: </etc/passwd "{ gsub(\",.*\",\"\",\$5); OFS=\"\t\"; if (\$3 >= $CT_UID_MIN && \$3 <= $CT_UID_MAX) print $FORM; }"
 else
        if [ "$1" = --full ] ; then

-               cat $CT_USER_LIST
+               cut -d '        ' -f 1,2 <$CT_USER_LIST

        else
                cut -d '        ' -f 1 <$CT_USER_LIST
        fi
        else
                cut -d '        ' -f 1 <$CT_USER_LIST
        fi

diff --git a/config b/config
index eea4db1cc577240accddcca210a40c10c2157376..1eb34d3f674b42bc3b4fd8952b65e1be98c2890c 100644 (file)
--- a/config
+++ b/config
@@ -1,27 +1,31 @@
-# Configuration file for MO Evaluator
-# (c) 2001 Martin Mares <mj@ucw.cz>
+# Configuration file for the MO Evaluator
+# (c) 2001--2004 Martin Mares <mj@ucw.cz>

 
 

-# Directories and users
+# The root of the whole directory hierarchy

 MO_ROOT=/aux/mo
 MO_ROOT=/aux/mo

+
+# User and group used by the evaluator itself

 EVAL_USER=mo-eval
 EVAL_GROUP=mo-eval
 EVAL_USER=mo-eval
 EVAL_GROUP=mo-eval

-TEST_USERS="mo-test1 mo-test2"
-
-# UID range assigned to contestants
-CT_UID_MIN=65100
-CT_UID_MAX=65199

 
 

-# If the contestants are not present in /etc/passwd on the evaluating machine,
-# we need a list of them (username<tab>fullname).
-#CT_USER_LIST=userlist
+# Test user for the sandbox. You can let mo-setup create more test users
+# and then run several evaluators in parallel, each in its own sandbox.
+# For testing, you can also leave TEST_USER undefined and run the sandbox
+# with EVAL_USER privileges, but beware, this is INSECURE.
+#TEST_USER=${TEST_USER:-mo-test1}
+TEST_USERS="mo-test1 mo-test2"

 
 

-# Test user for sandboxing
-TEST_USER=${TEST_USER:mo-test1}
+# Sometimes we need to get a list of all contestants (not in the evaluator
+# itself, but in various auxiliary scripts). In such cases we call mo-get-users,
+# which either scans /etc/passwd for users with UID in the following range,
+# or uses an explicit list of contestants CT_USER_LIST (username<tab>fullname).
+#CT_UID_MIN=65100
+#CT_UID_MAX=65199
+CT_USER_LIST=userlist

 
 

-### all of the following variables can be overriden in per-task config file
+### Per-task configuration variables (default values, override in per-task config)

 
 

-# Default task type (file or interactive)
-TASK_TYPE=file
+## Compiler settings:

 
 # Known source file extensions
 EXTENSIONS="c C cpp p pas"
 
 # Known source file extensions
 EXTENSIONS="c C cpp p pas"


@@ -45,8 +49,73 @@ COMP_SANDBOX_OPTS='-m65536 -t60 -w -e'
 # Sandbox initializaton commands for compilation
 COMP_SANDBOX_INIT=
 
 # Sandbox initializaton commands for compilation
 COMP_SANDBOX_INIT=
 

+# List of extra files needed for compilation. They are copied to the compiler
+# sandbox from the problem's directory.
+#COMP_EXTRAS="extras.h"
+
+## Tester settings (most can be overriden in per-test config):
+
+# The following variables are automatically set by the evaluator:
+# PROBLEM      name of the problem
+# HDIR         home directory of the evaluator (i.e., this file is $HDIR/config)
+# PDIR         directory containing problem data
+# SDIR         directory containing contestant's solution
+# TDIR         directory containing testing results
+# TMPDIR       directory containing temporary files
+# TEST         name of the current test
+
+# Task type:
+# offline      off-line task
+# interactive  interactive task communicating via stdio with a testing program
+# open-data    open-data task (i.e., we don't submit program, but output files)
+TASK_TYPE=file
+
+# I/O type (IO_TYPE sets defaults for IN_TYPE and OUT_TYPE)
+# file         input from $PROBLEM.in, output to $PROBLEM.out (possible even for interactive tasks)
+# stdio                input from stdin, output to stdout
+# none         no input/output
+IO_TYPE=stdio
+#IN_TYPE=stdio
+#OUT_TYPE=stdio
+
+# A list of all tests
+TESTS="1 2 3 4 5 6 7 8 9 10"
+
+# A list of public tests (executed by submit and check scripts)
+SAMPLE_TESTS="0"
+
+# Number of points per test
+POINTS_PER_TEST=1
+
+# Time limit in seconds
+TIME_LIMIT=10
+
+# Memory limit in kilobytes
+MEM_LIMIT=16384
+
+# Command used to check output syntax (optional)
+# Returns exit code 1 if syntax is wrong, 0 if correct
+# fd1 is connect to evaluator log, feel free to log anything
+# fd2 is an optional one-line verdict
+#SYNTAX_CHECK='grep -v -- - $TDIR/$TEST.out'
+
+# Command used to check output correctness
+# Returns exit code 1 if output is incorrect, 0 if correct
+# fd1 is connect to evaluator log, feel free to log anything
+# fd2 is an optional one-line verdict
+# The checker can generate $TDIR/$TEST.pts to assign points irregularly
+OUTPUT_CHECK='diff -bBu $TDIR/$TEST.ok $TDIR/$TEST.out'
+
+# Checker for interactive tasks
+# Returns exit code 1 if test failed, 0 if passed
+# fd1 is connect to evaluator log, feel free to log anything
+# fd2 is an optional one-line verdict
+# The checker can generate $TDIR/$TEST.pts to assign points irregularly
+#IC_CHECK='$PDIR/checker $PDIR/$TEST.in $PDIR/$TEST.chk'
+

 # Sandbox options used when testing
 TEST_SANDBOX_OPTS='-a2 -f -m$MEM_LIMIT -t$TIME_LIMIT'
 # -w for wall clock measuring
 # Sandbox options used when testing
 TEST_SANDBOX_OPTS='-a2 -f -m$MEM_LIMIT -t$TIME_LIMIT'
 # -w for wall clock measuring

-# For stdio tasks append '-i$PROBLEM.in -o$PROBLEM.out'
+
+# Sandbox initialization commands

 SANDBOX_INIT=
 SANDBOX_INIT=

diff --git a/public/check b/public/check
index ea6512da50b354fe89879a728611e0392aa77d8d..ce9a86b9453622b16e15d7d7278a943dc02aef6e 100644 (file)
--- a/public/check
+++ b/public/check
@@ -1,32 +1,40 @@
 # The Evaluator -- Public Checking Script
 # The Evaluator -- Public Checking 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
 
 
 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: check <problem> [<file>]"
+[ -n "$1" ] || die "Usage: check <problem> [<test-number>]"

 PROBLEM=$1
 public-setup
 . $PDIR/config
 PROBLEM=$1
 public-setup
 . $PDIR/config

-PTSFILE=$TDIR/points
-if [ -n "$OPEN_DATA_PROBLEM" ] ; then
+
+function test-verdict
+{
+       pend "$2"
+       exit 0
+}
+
+if [ $TASK_TYPE == open-data ] ; then

        [ -n "$2" ] || die "You need to specify test number for open data problems."
        TEST=$2
        [ -n "$2" ] || die "You need to specify test number for open data problems."
        TEST=$2

-       open-locate

        pstart "Checking $TEST: "
        pstart "Checking $TEST: "

+       open-locate
+       ln $SRCN $TDIR/$TEST.out

        syntax-check
        syntax-check

-       pend "OK"
+       test-result 1 OK

 else
 else

-       [ -z "$2" ] || die "No test number should be specified for normal problems."
+       [ -z "$2" ] || die "Test number should be given only for open data problems."

        locate-source
        compile
        for TEST in $SAMPLE_TESTS ; do
        locate-source
        compile
        for TEST in $SAMPLE_TESTS ; do

+               (

                pstart "Checking on sample input $TEST: "
                test-run
                syntax-check
                output-check
                pstart "Checking on sample input $TEST: "
                test-run
                syntax-check
                output-check

-               pend "OK"
+               )

        done
 fi
        done
 fi

diff --git a/public/status b/public/status
new file mode 100644 (file)
index 0000000..fc77432
--- /dev/null
+++ b/public/status
@@ -0,0 +1,46 @@
+# The Evaluator -- Public Status Script
+# (c) 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
+
+[ -z "$1" ] || die "Usage: status"
+
+echo -e "Submitted tasks:\n"
+
+for PROBLEM in `cd $MO_PUBLIC/problems/ ; echo *` ; do
+       (
+       PDIR=$MO_PUBLIC/problems/$PROBLEM
+       SUBDIR=~/.submit/$PROBLEM
+       [ -f $PDIR/config ] || exit 0
+       echo -n "$PROBLEM: "
+       . $PDIR/config
+       if [ -d $SUBDIR ] ; then
+               if [ $TASK_TYPE == open-data ] ; then
+                       for X in $TESTS ; do
+                               [ -f $SUBDIR/$X.out ] && echo -n "$X " || echo -n "- "
+                       done
+                       echo
+               else
+                       C=0
+                       for X in $EXTENSIONS ; do
+                               if [ -f $SUBDIR/$PROBLEM.$X ] ; then
+                                       echo -n `basename $SUBDIR/$PROBLEM.$X`
+                                       C=$(($C+1))
+                               fi
+                       done
+                       if [ $C == 0 ] ; then
+                               echo ---
+                       elif [ $C == 1 ] ; then
+                               echo
+                       else
+                               echo "INCONSISTENT (you probably modified $SUBDIR manually)"
+                       fi
+               fi
+       else
+               echo ---
+       fi
+       )
+done

diff --git a/public/submit b/public/submit
index bdd475f7a512633d12033c62b7bcb27bb523071e..7b077240b9daa2cd6950b6e10dd06d5a5ba76d30 100644 (file)
--- a/public/submit
+++ b/public/submit
@@ -1,5 +1,5 @@
 # The Evaluator -- Public Submit Script
 # 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 ; }
 
 set -e
 [ -n "$MO_PUBLIC" -a -d "$MO_PUBLIC" ] || { echo >&2 "MO_PUBLIC not set, giving up." ; exit 1 ; }


@@ -11,41 +11,61 @@ if [ "$1" = --force ] ; then
        FORCE=1
        shift
 fi
        FORCE=1
        shift
 fi

-[ -n "$1" -o "$1" = "--help" ] || die "Usage: submit [--force] <problem> [<test>]"
+[ -n "$1" -o "$1" = "--help" ] || die "Usage: submit [--force] <problem> [<test-number>]"

 PROBLEM=$1
 public-setup
 . $PDIR/config
 PROBLEM=$1
 public-setup
 . $PDIR/config

-PTSFILE=$TDIR/points
+
+function test-verdict
+{
+       pend "$2"
+       [ $1 == 0 ] && exit 1 || exit 0
+}
+

 FAILED=0
 FAILED=0

-if [ -n "$OPEN_DATA_PROBLEM" ] ; then
+if [ $TASK_TYPE == open-data ] ; then

        [ -n "$2" ] || die "You need to specify test number for open data problems."
        TEST=$2
        [ -n "$2" ] || die "You need to specify test number for open data problems."
        TEST=$2

+       pstart "Test case $TEST: "

        open-locate
        open-locate

-       syntax-check || FAILED=1
+       (
+               ln $SRCN $TDIR/$TEST.out
+               syntax-check
+               test-result 1 OK
+       ) || FAILED=1

 else
 else

-       [ -z "$2" ] || die "No test number should be specified for normal problems."
+       [ -z "$2" ] || die "Test number should be given only for open data problems."

        locate-source
        compile
        for TEST in $SAMPLE_TESTS ; do
        locate-source
        compile
        for TEST in $SAMPLE_TESTS ; do

+               (

                pstart "Checking on sample input $TEST: "
                pstart "Checking on sample input $TEST: "

-               if test-run && syntax-check && output-check ; then
-                       pend "OK"
-               else
-                       FAILED=$(($FAILED+1))
-               fi
+               test-run
+               syntax-check
+               output-check
+               die "How could I get there? It's a buuuuug!"
+               ) || FAILED=$(($FAILED+1))

        done
 fi
        done
 fi

-pstart "Submitting... "
+

 if [ $FAILED != 0 ] ; then
        if [ $FORCE != 0 ] ; then
 if [ $FAILED != 0 ] ; then
        if [ $FORCE != 0 ] ; then

-               pcont "(tests failed, but --force given) "
+               pend "TESTS FAILED, but --force given, so submitting anyway."

        else
        else

-               pend "TESTS FAILED  Use submit --force if you really want to submit a wrong solution."
+               pend "TESTS FAILED. Nothing has been submitted!"
+               pend "Use submit --force if you really want to submit a WRONG solution."

                exit 1
        fi
 fi
                exit 1
        fi
 fi

+
+pstart "Submitting... "

 mkdir -p ~/.submit
 mkdir -p ~/.submit

-[ -z "$OPEN_DATA_PROBLEM" ] && rm -rf ~/.submit/$PROBLEM
-mkdir -p ~/.submit/$PROBLEM
-cp $SRCN ~/.submit/$PROBLEM/
+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"
 pend "OK"