Made ConfigTree.fix take list os well, added test

[eval.git] / eval / eval.cf

diff --git a/eval/eval.cf b/eval/eval.cf
index 24d6593e59d07a9748f5a1d5d4c6ba4c963edc13..dedc41b27048a64249bb1cbe3429c806f3e6870b 100644 (file)
--- 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
@@ -63,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
 
@@ -77,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
@@ -93,8 +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,
-#              can contain .stdin, which will be aviable as program stdin
+# 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
@@ -115,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).
@@ -142,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=