complete-run: don’t parallelize more than the number of tests

This commit is contained in:
Michael Stapelberg
2011-12-17 11:19:31 +00:00
parent da8d0baa74
commit 81f4b6fc1a
2 changed files with 13 additions and 8 deletions

View File

@ -27,7 +27,7 @@ the Xdummy processes and a list of PIDs of the processes.
my $x_socketpath = '/tmp/.X11-unix/X';
sub start_xdummy {
my ($parallel) = @_;
my ($parallel, $numtests) = @_;
my @displays = ();
my @childpids = ();
@ -41,6 +41,9 @@ sub start_xdummy {
$parallel ||= $num_cores * 2;
# If we are running a small number of tests, dont over-parallelize.
$parallel = $numtests if $numtests < $parallel;
# First get the last used display number, then increment it by one.
# Effectively falls back to 1 if no X server is running.
my ($displaynum) = map { /(\d+)$/ } reverse sort glob($x_socketpath . '*');