diff config.py @ 82:06356af50bf9

Finished testcases reorganization and CPU time limit implementation We now have: * Win32-specific code in the win32 module (including bug fixes), * UNIX-specific and generic code in the unix module, * a much cleaner testcases module, * wait4-based resource limits working on Python 3 (this is a bug fix), * no warning/error reported on non-Win32 when -x is not passed but standard input does not come from a terminal, * the maxtime configuration variable replaced with two new variables named maxcputime and maxwalltime, * CPU time reported if it can be determined unless an error occurs sooner than it is determined (e. g. if the wall-clock time limit is exceeded), * memory limits enforced even if Upreckon's forking already breaks them, * CPU time limits and private virtual memory limits honoured on Win32, * CPU time limits honoured on UNIX(-like) platforms supporting wait4 or getrusage, * address space limits honoured on UNIX(-like) platforms supporting setrlimit with RLIMIT_AS/RLIMIT_VMEM, * resident set size limits honoured on UNIX(-like) platforms supporting wait4.
author Oleg Oshmyan <chortos@inbox.lv>
date Wed, 23 Feb 2011 23:35:27 +0000
parents ee8a99dcaaed
children 37c4ad87583c
line wrap: on
line diff
--- a/config.py	Wed Feb 16 15:30:57 2011 +0000
+++ b/config.py	Wed Feb 23 23:35:27 2011 +0000
@@ -26,7 +26,8 @@
 
 defaults_problem = {'kind': 'batch',
                     'usegroups': False,
-                    'maxtime': None,
+                    'maxcputime': None,
+                    'maxwalltime': None,
                     'maxmemory': None,
                     'dummies': {},
                     'testsexcluded': (),
@@ -155,7 +156,7 @@
 						newmap[key] = oldmap[key]
 			setattr(module, name, newmap)
 	if options.no_maxtime:
-		module.maxtime = 0
+		module.maxcputime = module.maxwalltime = 0
 	sys.dont_write_bytecode = dwb
 	for name in patterns:
 		if hasattr(module, name):