From 896772ed85992014d66687409030634a57d74bb2 Mon Sep 17 00:00:00 2001 From: Luca Versari Date: Fri, 13 Sep 2013 22:28:52 +0200 Subject: [PATCH 1/2] Fixed wallclock_timeout when timeout = 0 --- cms/grading/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cms/grading/__init__.py b/cms/grading/__init__.py index d2dce6c2f3..e546535f81 100644 --- a/cms/grading/__init__.py +++ b/cms/grading/__init__.py @@ -302,7 +302,8 @@ def evaluation_step_before_run(sandbox, command, """ # Set sandbox parameters suitable for evaluation. sandbox.timeout = time_limit - sandbox.wallclock_timeout = 2 * time_limit + 1 + if sandbox.timeout != 0: + sandbox.wallclock_timeout = 2 * time_limit + 1 sandbox.address_space = memory_limit * 1024 if stdin_redirect is not None: From b32b1341b9d3f34278e448c532115c1f41d13180 Mon Sep 17 00:00:00 2001 From: Luca Versari Date: Fri, 13 Sep 2013 22:29:07 +0200 Subject: [PATCH 2/2] Do not output sandbox directory at sandbox start --- isolate/isolate.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/isolate/isolate.c b/isolate/isolate.c index 37b34f7f97..cf51202b7a 100644 --- a/isolate/isolate.c +++ b/isolate/isolate.c @@ -1294,8 +1294,6 @@ init(void) cg_prepare(); set_quota(); - - puts(box_dir); } static void