X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=bin%2Flib;h=2e9ed7edec8bce0578b3a33fda4e8c85dd834125;hb=99653cd8d766cabaed2b1f2628e0b041fc0837c8;hp=9c49f9e9fac26982925a13ab61c9df97b490f978;hpb=e87fab526bcdadb80727bda0b84dd28b9934fa2c;p=moe.git

diff --git a/bin/lib b/bin/lib
index 9c49f9e..2e9ed7e 100644
--- a/bin/lib
+++ b/bin/lib
@@ -1,5 +1,5 @@
 # The Evaluator -- Shell Function Library
-# (c) 2001--2007 Martin Mares <mj@ucw.cz>
+# (c) 2001--2008 Martin Mares <mj@ucw.cz>
 
 # General settings
 shopt -s dotglob
@@ -49,6 +49,20 @@ function try-ln
 	ln $1 $2 2>/dev/null || cp $1 $2
 }
 
+# Given a <prefix>, override each variable <x> by <prefix>_<x>
+
+function override-vars
+{
+	local OR V W
+	declare -a OR
+	# `${!${1}_@}' does not work, so we have to use eval
+	OR=($(eval echo '${!'$1'_@}'))
+	for V in "${OR[@]}" ; do
+		W=${V##$1_}
+		eval $W='"$'$V'"'
+	done
+}
+
 # Sandbox subroutines
 
 function box-init
@@ -57,7 +71,7 @@ function box-init
 	if [ -z "$TEST_USER" -o "$TEST_USER" == $EVAL_USER ] ; then
 		pcont "running locally (INSECURE), "
 		TEST_USER=$EVAL_USER
-		BOXDIR=box
+		BOXDIR=`pwd`/box
 		BOXCMD=bin/box
 		mkdir -p box
 	else
@@ -152,6 +166,7 @@ function locate-source
 function compile
 {
 	pstart "Compiling... "
+	override-vars "EXT_$SRCEXT"
 	# Beware, the original SRCN can be a strange user-supplied name
 	SRC=$PROBLEM.$SRCEXT
 	cp "$SDIR/$SRCN" $TDIR/$SRC
@@ -162,8 +177,7 @@ function compile
 	box-clean
 	for a in $SRC $COMP_EXTRAS ; do cp $TDIR/$a $BOXDIR/ ; done
 	EXE=$PROBLEM
-	CCMD=COMP_$SRCEXT
-	CCMD=`eval echo ${!CCMD}`
+	CCMD=`eval echo $COMP`
 	COMP_SANDBOX_OPTS=`eval echo $COMP_SANDBOX_OPTS`
 	echo "Compiler command: $CCMD"
 	echo "Compiler sandbox options: $COMP_SANDBOX_OPTS"
@@ -195,6 +209,12 @@ function compile
 
 # Running of test program according to current task type (returns exit code and TEST_MSG)
 
+function test-config
+{
+	[ -f $PDIR/$TEST.config ] && . $PDIR/$TEST.config
+	override-vars "TEST_$TEST"
+}
+
 function test-run
 {
 	test-run-$TASK_TYPE