X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=eval%2Feval.cf;h=dedc41b27048a64249bb1cbe3429c806f3e6870b;hb=b5ef6bb91d88949931339721484770bfecc109f4;hp=0c56c5b260f9381124c22c83dfce91dcf812a5df;hpb=4b4a4ee2d962681c449a6cf62e75e72016d51cf4;p=eval.git

diff --git a/eval/eval.cf b/eval/eval.cf
index 0c56c5b..dedc41b 100644
--- a/eval/eval.cf
+++ b/eval/eval.cf
@@ -1,9 +1,6 @@
 # Configuration file for the MO Evaluator
 # (c) 2001--2008 Martin Mares <mj@ucw.cz>
 
-# The root of the whole directory hierarchy
-MO_ROOT=/mo
-
 # User and group used by the evaluator itself
 EVAL_USER=mo-eval
 EVAL_GROUP=mo-eval
@@ -16,23 +13,6 @@ EVAL_GROUP=mo-eval
 TEST_USERS="mo-test1 mo-test2"
 TEST_GROUP=mo-test
 
-# These values are used when creating logins for eval and contestants
-# (group id's are from the same range)
-EVAL_UID_MIN=65000
-CT_UID_MIN=65100
-CT_UID_MAX=65199
-
-# 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 uses an explicit list of contestants CT_USER_LIST (username<tab>fullname),
-# or (if undefined) scans /etc/passwd for users with UID between CT_UID_MIN and CT_UID_MAX.
-CT_USER_LIST=userlist
-
-# (optional) Use remote submitting
-REMOTE_SUBMIT=1
-REMOTE_SUBMIT_USER=mo-submit
-REMOTE_SUBMIT_GROUP=mo-submit
-
 ### Programming language settings
 
 # Known source file extensions
@@ -65,6 +45,10 @@ POST_COMPILE_HOOK=
 PRE_RUN_HOOK=
 POST_RUN_HOOK=
 
+# Command used to execute the compiled program, may be ./$PROGRAM (default) or an
+# interpreter with $PROGRAM as a parameter.
+TEST_EXEC_CMD=
+
 ## Settings for individual languages
 
 # C
@@ -76,7 +60,7 @@ EXT_cpp_COMP='/usr/bin/g++ -O2 -g -o $EXE $EXTRA_CXXFLAGS $SRC -lm'
 EXTRA_CXXFLAGS=
 
 # Pascal
-EXT_pas_COMP='/usr/bin/fpc -Ci -Cr -Ct -g -O2 -Sg -o$EXE $EXTRA_PFLAGS $SRC'
+EXT_pas_COMP='/usr/bin/fpc -Ci -g -O2 -Sg -o$EXE $EXTRA_PFLAGS $SRC'
 EXTRA_PFLAGS=
 EXT_pas_EXIT_CODE_HOOK=fpc-exit-code
 
@@ -90,7 +74,7 @@ EXT_pas_EXIT_CODE_HOOK=fpc-exit-code
 
 # 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)
+# HDIR		home directory of the evaluator (i.e., this file is $HDIR/cf/eval)
 # PDIR		directory containing problem data
 # SDIR		directory containing contestant's solution
 # TDIR		directory containing testing results
@@ -106,6 +90,8 @@ 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
+# dir 		input from all files in the directory $TEST.in; these are copied to $BOXDIR
+# 		and if they include .stdin, it will be available as program's std. input.
 # none		no input/output
 IO_TYPE=stdio
 #IN_TYPE=stdio
@@ -126,6 +112,9 @@ TIME_LIMIT=10
 # Memory limit in kilobytes
 MEM_LIMIT=16384
 
+# Stack size limit in kilobytes (0=limited only by MEM_LIMIT)
+STACK_LIMIT=0
+
 # Command used for filtering of program output (optional)
 # If turned on, program output (*.raw) is ran through this filter and the
 # checkers are applied to the output of the filter (*.out).
@@ -153,7 +142,7 @@ OUTPUT_CHECK='diff -bBu $TDIR/$TEST.ok $TDIR/$TEST.out'
 #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 $LANG_SANDBOX_OPTS $BOX_EXTRAS'
+TEST_SANDBOX_OPTS='-a2 -f -m$MEM_LIMIT -k$STACK_LIMIT -t$TIME_LIMIT $LANG_SANDBOX_OPTS $BOX_EXTRAS'
 
 # Extra options to be overridden in task configuration
 BOX_EXTRAS=