SConscript (10649:104ef22a25f3) SConscript (10710:9b71309d29f9)
1# -*- mode:python -*-
2
3# Copyright (c) 2004-2006 The Regents of The University of Michigan
4# All rights reserved.
5#
6# Redistribution and use in source and binary forms, with or without
7# modification, are permitted provided that the following conditions are
8# met: redistributions of source code must retain the above copyright

--- 93 unchanged lines hidden (view full) ---

102 # Prefix test run with batch job submission command if appropriate.
103 # Batch command also supports timeout arg (in seconds, not minutes).
104 timeout = 15 * 60 # used to be a param, probably should be again
105 if env['BATCH']:
106 cmd = '%s -t %d %s' % (env['BATCH_CMD'], timeout, cmd)
107 # The slowest regression (bzip2) requires ~2.8 hours;
108 # 4 hours was chosen to be conservative.
109 elif env['TIMEOUT']:
1# -*- mode:python -*-
2
3# Copyright (c) 2004-2006 The Regents of The University of Michigan
4# All rights reserved.
5#
6# Redistribution and use in source and binary forms, with or without
7# modification, are permitted provided that the following conditions are
8# met: redistributions of source code must retain the above copyright

--- 93 unchanged lines hidden (view full) ---

102 # Prefix test run with batch job submission command if appropriate.
103 # Batch command also supports timeout arg (in seconds, not minutes).
104 timeout = 15 * 60 # used to be a param, probably should be again
105 if env['BATCH']:
106 cmd = '%s -t %d %s' % (env['BATCH_CMD'], timeout, cmd)
107 # The slowest regression (bzip2) requires ~2.8 hours;
108 # 4 hours was chosen to be conservative.
109 elif env['TIMEOUT']:
110 cmd = 'timeout 4h %s' % cmd
110 cmd = 'timeout --foreground 4h %s' % cmd
111
112 # Create a default value for the status string, changed as needed
113 # based on the status.
114 status_str = "passed."
115
116 pre_exec_time = time.time()
117 status = env.Execute(env.subst(cmd, target=target, source=source))
118 if status == 0:

--- 256 unchanged lines hidden --- 		111
112 # Create a default value for the status string, changed as needed
113 # based on the status.
114 status_str = "passed."
115
116 pre_exec_time = time.time()
117 status = env.Execute(env.subst(cmd, target=target, source=source))
118 if status == 0:

--- 256 unchanged lines hidden ---