Commit bd4a04ce authored by Michael Arntzenius's avatar Michael Arntzenius

fix resource_test to not exceed resource limit

parent c53eec69
...@@ -5,7 +5,7 @@ for k in sorted(dir(resource)): ...@@ -5,7 +5,7 @@ for k in sorted(dir(resource)):
continue continue
print k, getattr(resource, k) print k, getattr(resource, k)
TIME_LIMIT = 100 TIME_LIMIT = 5
resource.setrlimit(resource.RLIMIT_CPU, (TIME_LIMIT + 1, TIME_LIMIT + 1)) resource.setrlimit(resource.RLIMIT_CPU, (TIME_LIMIT + 1, TIME_LIMIT + 1))
MAX_MEM_MB = 100 MAX_MEM_MB = 100
......
...@@ -238,6 +238,8 @@ def run_test(fn, check_stats, run_memcheck): ...@@ -238,6 +238,8 @@ def run_test(fn, check_stats, run_memcheck):
failed.append(fn) failed.append(fn)
return r return r
else: else:
# show last line of stderr so we have some idea went wrong
print "Last line of stderr: " + last_stderr_line
raise Exception(msg) raise Exception(msg)
elif out != expected_out: elif out != expected_out:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment