From: Martin Mares <mj@ucw.cz>
Date: Sun, 3 Feb 2008 22:49:08 +0000 (+0100)
Subject: BOX_EXTRAS a part of TEST_SANDBOX_OPTS now.
X-Git-Tag: python-dummy-working~241
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=84149d5ccbed49d0c4d3e0e1c746ad2527086022;p=eval.git

BOX_EXTRAS a part of TEST_SANDBOX_OPTS now.

WARNING: You need to adjust your configs if you override TEST_SANDBOX_OPTS.
---

diff --git a/bin/lib b/bin/lib
index 5adeca6..f0476f2 100644
--- a/bin/lib
+++ b/bin/lib
@@ -358,7 +358,7 @@ function test-run-file
 {
 	test-prolog
 	pcont "<run> "
-	BOXOPTS="$(expand-var TEST_SANDBOX_OPTS) $(expand-var BOX_EXTRAS)"
+	BOXOPTS=$(expand-var TEST_SANDBOX_OPTS)
 	echo "Sandbox options: $BOXOPTS"
 	if ! $BOXCMD $BOXOPTS -- ./$PROBLEM 2>$TMPDIR/exec.out ; then
 		cat $TMPDIR/exec.out
@@ -375,7 +375,7 @@ function test-run-interactive
 {
 	test-prolog
 	pcont "<run> "
-	BOXOPTS="$(expand-var TEST_SANDBOX_OPTS) $(expand-var BOX_EXTRAS)"
+	BOXOPTS=$(expand-var TEST_SANDBOX_OPTS)
 	echo "Sandbox options: $BOXOPTS"
 	ICCMD=$(expand-var IA_CHECK)
 	echo "Interactive checker: $ICCMD"
diff --git a/config b/config
index 806bdd9..246511e 100644
--- a/config
+++ b/config
@@ -132,7 +132,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'
+TEST_SANDBOX_OPTS='-a2 -f -m$MEM_LIMIT -t$TIME_LIMIT $BOX_EXTRAS'
 
 # Sandbox initialization commands
 SANDBOX_INIT=