Chromium Code Reviews| Index: SConstruct |
| =================================================================== |
| --- SConstruct (revision 7131) |
| +++ SConstruct (working copy) |
| @@ -1540,7 +1540,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 |
| @@ -1812,7 +1812,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) |
| # ---------------------------------------------------------- |
| @@ -1892,7 +1892,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, |
| @@ -2004,6 +2005,10 @@ |
| # |flag_value| is false (empty). |
| if flag_value: |
| script_flags.append('--' + flag_name) |
| + # Make sure flag values are strings (or SCons objects) when building |
| + # up the command. Right now, this only means convert ints to strings. |
| + if type(flag_value) == int: |
|
Nick Bray
2011/11/11 22:42:39
isinstance(flag_value, int)
jvoung - send to chromium...
2011/11/11 23:28:27
Done.
|
| + flag_value = str(flag_value) |
| script_flags.append(flag_value) |
| # Other extra flags |