Lots of minor improvements.

[eval.git] / config

diff --git a/config b/config
index edc6da2a3023c021845404b5545d1d4d99190386..84bf889b68dce056625b86d0eef75c4d1c78bc61 100644 (file)
--- a/config
+++ b/config
@@ -2,32 +2,40 @@
 # (c) 2001 Martin Mares <mj@ucw.cz>
 
 # Directories and users
-MO_ROOT=/aux/mo
+MO_ROOT=/home/mo
 EVAL_USER=mo-eval
 EVAL_GROUP=mo-eval
 TEST_USERS="mo-test1 mo-test2"
 
-# Currently used test user
-TEST_USER=mo-eval
+# UID range assigned to contestants
+CT_UID_MIN=21000
+CT_UID_MAX=29999
+
+# Test user for sandboxing
+TEST_USER=${TEST_USER:mo-test1}
 
 ### all of the following variables can be overriden in per-task config file
 
+# Default task type (file or interactive)
+TASK_TYPE=file
+
 # Known source file extensions
 EXTENSIONS="c C cpp p pas"
 
+# Extra compiler flags (null, but can be overriden)
+EXTRA_CFLAGS=
+
 # For each source extension, we must give compiler command
-COMP_c='/usr/bin/gcc -o $EXE $SRC'
-COMP_C='/usr/bin/g++ -o $EXE $SRC'
+COMP_c='/usr/bin/gcc -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 -o $EXE $SRC'
+COMP_p='/usr/bin/fpc -Ci -Cr -g -O2 -So -Sg -o$EXE $EXTRA_CFLAGS $SRC'
 COMP_pas="$COMP_p"
 
 # Sandbox options used when compiling
 COMP_SANDBOX_OPTS='-m65536 -t60 -w -e'
 
-# Shell command used to run the tests
-TEST_RUN_METHOD="test-run-with-files"
-
 # Sandbox options used when testing
-TEST_SANDBOX_OPTS='-a2 -f -m$MEM_LIMIT -t$TIME_LIMIT -w'
+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'