X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=config;h=d0c94492a5872b1e2b43b05a177a9df5576bfe84;hb=d047668d020b301d034f0acd7f2873e926bba6e1;hp=950d03e1ed3f22311cd639dcc4380b82afb26f61;hpb=918aa6209a25efeaad3d9cac1b66366ed645f878;p=moe.git

diff --git a/config b/config
index 950d03e..d0c9449 100644
--- a/config
+++ b/config
@@ -1,8 +1,8 @@
 # Configuration file for the MO Evaluator
-# (c) 2001--2004 Martin Mares <mj@ucw.cz>
+# (c) 2001--2007 Martin Mares <mj@ucw.cz>
 
 # The root of the whole directory hierarchy
-MO_ROOT=/aux/mo
+MO_ROOT=/mo
 
 # User and group used by the evaluator itself
 EVAL_USER=mo-eval
@@ -14,21 +14,31 @@ EVAL_GROUP=mo-eval
 # with EVAL_USER privileges, but beware, this is INSECURE.
 #TEST_USER=${TEST_USER:-mo-test1}
 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 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
+# 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
+
 ### Per-task configuration variables (default values, override in per-task config)
 
 ## Compiler settings:
 
 # Known source file extensions
-EXTENSIONS="c C cpp p pas"
+EXTENSIONS="c cc C cpp p pas"
 
 # Extra compiler flags for C (null, but can be overriden)
 EXTRA_CFLAGS=
@@ -37,16 +47,17 @@ EXTRA_CFLAGS=
 EXTRA_PFLAGS=
 
 # For each source extension, we must give compiler command
-COMP_c='/usr/bin/gcc -O2 -g -o $EXE $EXTRA_CFLAGS $SRC'
+COMP_c='/usr/bin/gcc -std=gnu99 -O2 -g -o $EXE $EXTRA_CFLAGS $SRC'
 COMP_C='/usr/bin/g++ -O2 -g -o $EXE $EXTRA_CFLAGS $SRC'
 COMP_cpp="$COMP_C"
-COMP_p='/usr/bin/fpc -Ci -Cr -g -O2 -So -Sg -o$EXE $EXTRA_PFLAGS $SRC'
+COMP_cc="$COMP_C"
+COMP_p='/usr/bin/fpc -Ci -Cr -Ct -g -O2 -Sg -o$EXE $EXTRA_PFLAGS $SRC'
 COMP_pas="$COMP_p"
 
 # Sandbox options used when compiling
-COMP_SANDBOX_OPTS='-m65536 -t60 -w -e -i/dev/null'
+COMP_SANDBOX_OPTS='-m262144 -w60 -e -i/dev/null'
 
-# Sandbox initializaton commands for compilation
+# Sandbox initialization commands for compilation
 COMP_SANDBOX_INIT=
 
 # List of extra files needed for compilation. They are copied to the compiler
@@ -87,7 +98,7 @@ SAMPLE_TESTS="0"
 # Number of points per test
 POINTS_PER_TEST=1
 
-# Time limit in seconds
+# Time limit in seconds (can be fractional, but beware of noise)
 TIME_LIMIT=10
 
 # Memory limit in kilobytes
@@ -108,14 +119,13 @@ 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
+# fd0 and fd1 are connected to fd1 and fd0 of the program tested
 # 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 initialization commands
 SANDBOX_INIT=