Index: SConstruct |
=================================================================== |
--- SConstruct (revision 7086) |
+++ SConstruct (working copy) |
@@ -1542,7 +1542,7 @@ |
env.MakeVerboseExtraOptions(target, log_verbosity, extra) |
# Heuristic for when to capture output... |
capture_output = (extra.pop('capture_output', False) |
- or 'process_output' in extra) |
+ or 'process_output_single' in extra) |
node = env.CommandTest(target, |
command, |
# Set to 'huge' so that the browser tester's timeout |
@@ -1814,7 +1814,7 @@ |
def ShouldUseVerboseOptions(extra): |
""" Heuristic for setting up Verbose NACLLOG options. """ |
- return ('process_output' in extra or |
+ return ('process_output_single' in extra or |
'log_golden' in extra) |
# ---------------------------------------------------------- |
@@ -1894,7 +1894,8 @@ |
'stdout_golden', 'stderr_golden', 'log_golden', |
'filter_regex', 'filter_inverse', 'filter_group_only', |
'osenv', 'arch', 'subarch', 'exit_status', 'track_cmdtime', |
- 'process_output', 'using_nacl_signal_handler'] |
+ 'num_runs', 'process_output_single', |
+ 'process_output_combined', 'using_nacl_signal_handler'] |
TEST_TIME_THRESHOLD = { |
'small': 2, |