|  | @@ -1,4 +1,33 @@
 | 
	
		
			
				|  |  |  #!/usr/bin/python2.7
 | 
	
		
			
				|  |  | +# Copyright 2015, Google Inc.
 | 
	
		
			
				|  |  | +# All rights reserved.
 | 
	
		
			
				|  |  | +#
 | 
	
		
			
				|  |  | +# Redistribution and use in source and binary forms, with or without
 | 
	
		
			
				|  |  | +# modification, are permitted provided that the following conditions are
 | 
	
		
			
				|  |  | +# met:
 | 
	
		
			
				|  |  | +#
 | 
	
		
			
				|  |  | +#     * Redistributions of source code must retain the above copyright
 | 
	
		
			
				|  |  | +# notice, this list of conditions and the following disclaimer.
 | 
	
		
			
				|  |  | +#     * Redistributions in binary form must reproduce the above
 | 
	
		
			
				|  |  | +# copyright notice, this list of conditions and the following disclaimer
 | 
	
		
			
				|  |  | +# in the documentation and/or other materials provided with the
 | 
	
		
			
				|  |  | +# distribution.
 | 
	
		
			
				|  |  | +#     * Neither the name of Google Inc. nor the names of its
 | 
	
		
			
				|  |  | +# contributors may be used to endorse or promote products derived from
 | 
	
		
			
				|  |  | +# this software without specific prior written permission.
 | 
	
		
			
				|  |  | +#
 | 
	
		
			
				|  |  | +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 | 
	
		
			
				|  |  | +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 | 
	
		
			
				|  |  | +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 | 
	
		
			
				|  |  | +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 | 
	
		
			
				|  |  | +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 | 
	
		
			
				|  |  | +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 | 
	
		
			
				|  |  | +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 | 
	
		
			
				|  |  | +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 | 
	
		
			
				|  |  | +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 | 
	
		
			
				|  |  | +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 | 
	
		
			
				|  |  | +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |  """Run tests in parallel."""
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  import argparse
 | 
	
	
		
			
				|  | @@ -136,6 +165,7 @@ argp.add_argument('-c', '--config',
 | 
	
		
			
				|  |  |                    nargs='+',
 | 
	
		
			
				|  |  |                    default=_DEFAULT)
 | 
	
		
			
				|  |  |  argp.add_argument('-n', '--runs_per_test', default=1, type=int)
 | 
	
		
			
				|  |  | +argp.add_argument('-j', '--jobs', default=1000, type=int)
 | 
	
		
			
				|  |  |  argp.add_argument('-f', '--forever',
 | 
	
		
			
				|  |  |                    default=False,
 | 
	
		
			
				|  |  |                    action='store_const',
 | 
	
	
		
			
				|  | @@ -225,7 +255,7 @@ def _build_and_run(check_cancelled, newline_on_success, cache):
 | 
	
		
			
				|  |  |        itertools.repeat(one_run, runs_per_test))
 | 
	
		
			
				|  |  |    if not jobset.run(all_runs, check_cancelled,
 | 
	
		
			
				|  |  |                      newline_on_success=newline_on_success,
 | 
	
		
			
				|  |  | -                    maxjobs=min(c.maxjobs for c in run_configs),
 | 
	
		
			
				|  |  | +                    maxjobs=min(args.jobs, min(c.maxjobs for c in run_configs)),
 | 
	
		
			
				|  |  |                      cache=cache):
 | 
	
		
			
				|  |  |      return 2
 | 
	
		
			
				|  |  |  
 |