@ -764,7 +764,7 @@ if platform_string() == 'windows':
_windows_toolset_option ( args . compiler ) ,
_windows_toolset_option ( args . compiler ) ,
_windows_arch_option ( args . arch ) ] +
_windows_arch_option ( args . arch ) ] +
extra_args ,
extra_args ,
shell = True , timeout_seconds = 90 * 60 )
shell = True , timeout_seconds = None )
for target in targets ]
for target in targets ]
else :
else :
def make_jobspec ( cfg , targets , makefile = ' Makefile ' ) :
def make_jobspec ( cfg , targets , makefile = ' Makefile ' ) :
@ -776,7 +776,7 @@ else:
' CONFIG= %s ' % cfg ] +
' CONFIG= %s ' % cfg ] +
( [ ] if not args . travis else [ ' JENKINS_BUILD=1 ' ] ) +
( [ ] if not args . travis else [ ' JENKINS_BUILD=1 ' ] ) +
targets ,
targets ,
timeout_seconds = 30 * 60 ) ]
timeout_seconds = None ) ]
else :
else :
return [ ]
return [ ]
make_targets = { }
make_targets = { }
@ -801,7 +801,7 @@ if make_targets:
make_commands = itertools . chain . from_iterable ( make_jobspec ( cfg , list ( targets ) , makefile ) for cfg in build_configs for ( makefile , targets ) in make_targets . iteritems ( ) )
make_commands = itertools . chain . from_iterable ( make_jobspec ( cfg , list ( targets ) , makefile ) for cfg in build_configs for ( makefile , targets ) in make_targets . iteritems ( ) )
build_steps . extend ( set ( make_commands ) )
build_steps . extend ( set ( make_commands ) )
build_steps . extend ( set (
build_steps . extend ( set (
jobset . JobSpec ( cmdline , environ = build_step_environ ( cfg ) , timeout_seconds = 10 * 60 )
jobset . JobSpec ( cmdline , environ = build_step_environ ( cfg ) , timeout_seconds = None )
for cfg in build_configs
for cfg in build_configs
for l in languages
for l in languages
for cmdline in l . build_steps ( ) ) )
for cmdline in l . build_steps ( ) ) )