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 5adeca68e6f362d235424da8a2382c6c92ff5d3e..f0476f2ec699acbdf8f77cc47feb4211a7822a89 100644 (file)
--- 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 806bdd9560fc2eec2635aa124bd892ae78a40116..246511efd848e024ca2adfa8a148631bd8931743 100644 (file)
--- 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=