our @EXPORT = qw(start_xdummy);
+my @pids;
my $x_socketpath = '/tmp/.X11-unix/X';
# reads in a whole file
# forks an Xdummy or Xdmx process
sub fork_xserver {
+ my $keep_xdummy_output = shift;
my $displaynum = shift;
my $pid = fork();
die "Could not fork: $!" unless defined($pid);
if ($pid == 0) {
# Child, close stdout/stderr, then start Xdummy.
- close STDOUT;
- close STDERR;
+ if (!$keep_xdummy_output) {
+ close STDOUT;
+ close STDERR;
+ }
exec @_;
exit 1;
unlink($x_socketpath . $displaynum);
});
+ push @pids, $pid;
+
return $x_socketpath . $displaynum;
}
=cut
sub start_xdummy {
- my ($parallel, $numtests) = @_;
+ my ($parallel, $numtests, $keep_xdummy_output) = @_;
my @displays = ();
my @childpids = ();
+ $SIG{CHLD} = sub {
+ my $child = waitpid -1, POSIX::WNOHANG;
+ @pids = grep { $_ != $child } @pids;
+ return unless @pids == 0;
+ print STDERR "All Xdummy processes died.\n";
+ print STDERR "Use ./complete-run.pl --parallel 1 --keep-xdummy-output\n";
+ print STDERR "";
+ print STDERR "A frequent cause for this is missing the DUMMY Xorg module,\n";
+ print STDERR "package xserver-xorg-video-dummy on Debian.\n";
+ exit 1;
+ };
+
# Yeah, I know it’s non-standard, but Perl’s POSIX module doesn’t have
# _SC_NPROCESSORS_CONF.
my $cpuinfo = slurp('/proc/cpuinfo');
# If /proc/cpuinfo does not exist, we fall back to 2 cores.
$num_cores ||= 2;
- # If unset, we use num_cores * 2, plus two extra xdummys to combine to a
- # multi-monitor setup using Xdmx.
- $parallel ||= ($num_cores * 2) + 2;
+ # If unset, we use num_cores * 2.
+ $parallel ||= ($num_cores * 2);
# If we are running a small number of tests, don’t over-parallelize.
$parallel = $numtests if $numtests < $parallel;
- # Ensure we have at least 1 X-Server plus two X-Servers for multi-monitor
- # tests.
- $parallel = 3 if $parallel < 3;
-
# 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 . '*');
# We use -config /dev/null to prevent Xdummy from using the system
# Xorg configuration. The tests should be independant from the
# actual system X configuration.
- my $socket = fork_xserver($displaynum, './Xdummy', ":$displaynum",
- '-config', '/dev/null');
+ my $socket = fork_xserver($keep_xdummy_output, $displaynum,
+ './Xdummy', ":$displaynum", '-config', '/dev/null',
+ '-configdir', '/dev/null', '-nolisten', 'tcp');
push(@displays, ":$displaynum");
push(@sockets_waiting, $socket);
$displaynum++;
wait_for_x(\@sockets_waiting);
- # Now combine the last two displays to a multi-monitor display using Xdmx
- my $first = pop @displays;
- my $second = pop @displays;
-
- # make sure this display isn’t in use yet
- $displaynum++ while -e ($x_socketpath . $displaynum);
- say 'starting xdmx on display :' . $displaynum;
-
- my $multidpy = ":$displaynum";
- my $socket = fork_xserver($displaynum, 'Xdmx', '+xinerama', '-xinput',
- 'local', '-display', $first, '-display', $second, '-ac', $multidpy);
- wait_for_x([ $socket ]);
-
- return \@displays, $multidpy;
+ return @displays;
}
1