Merge branch 'fix-ws-con'

[i3/i3] / testcases / lib / StartXDummy.pm

diff --git a/testcases/lib/StartXDummy.pm b/testcases/lib/StartXDummy.pm
index 2f3cfeb654df49d5bbac39d8e40d853b71e497e1..592feb8501ea4a0c4b0e239e6ceb60e1b16ca1e1 100644 (file)
--- a/testcases/lib/StartXDummy.pm
+++ b/testcases/lib/StartXDummy.pm
@@ -9,6 +9,9 @@ use v5.10;
 
 our @EXPORT = qw(start_xdummy);
 
+my @pids;
+my $x_socketpath = '/tmp/.X11-unix/X';
+
 # reads in a whole file
 sub slurp {
     open(my $fh, '<', shift) or return '';
@@ -16,6 +19,47 @@ sub slurp {
     <$fh>;
 }
 
+# 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.
+        if (!$keep_xdummy_output) {
+            close STDOUT;
+            close STDERR;
+        }
+
+        exec @_;
+        exit 1;
+    }
+    push(@complete_run::CLEANUP, sub {
+        kill(15, $pid);
+        # Unlink the X11 socket, Xdmx seems to leave it there.
+        unlink($x_socketpath . $displaynum);
+    });
+
+    push @pids, $pid;
+
+    return $x_socketpath . $displaynum;
+}
+
+# Blocks until the socket paths specified in the given array reference actually
+# exist.
+sub wait_for_x {
+    my ($sockets_waiting) = @_;
+
+    # Wait until Xdmx actually runs. Pretty ugly solution, but as long as we
+    # can’t socket-activate X11…
+    while (1) {
+        @$sockets_waiting = grep { ! -S $_ } @$sockets_waiting;
+        last unless @$sockets_waiting;
+        sleep 0.1;
+    }
+}
+
 =head2 start_xdummy($parallel)
 
 Starts C<$parallel> (or number of cores * 2 if undef) Xdummy processes (see
@@ -24,14 +68,24 @@ the Xdummy processes and a list of PIDs of the processes.
 
 =cut
 
-my $x_socketpath = '/tmp/.X11-unix/X';
-
 sub start_xdummy {
-    my ($parallel) = @_;
+    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');
@@ -39,7 +93,11 @@ sub start_xdummy {
     # If /proc/cpuinfo does not exist, we fall back to 2 cores.
     $num_cores ||= 2;
 
-    $parallel ||= $num_cores * 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;
 
     # First get the last used display number, then increment it by one.
     # Effectively falls back to 1 if no X server is running.
@@ -49,35 +107,19 @@ sub start_xdummy {
     say "Starting $parallel Xdummy instances, starting at :$displaynum...";
 
     my @sockets_waiting;
-    for my $idx (0 .. ($parallel-1)) {
-        my $pid = fork();
-        die "Could not fork: $!" unless defined($pid);
-        if ($pid == 0) {
-            # Child, close stdout/stderr, then start Xdummy.
-            close STDOUT;
-            close STDERR;
-            # make sure this display isn’t in use yet
-            $displaynum++ while -e ($x_socketpath . $displaynum);
-
-            # 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.
-            exec './Xdummy', ":$displaynum", '-config', '/dev/null';
-            exit 1;
-        }
-        push(@main::CLEANUP, sub { kill(15, $pid) });
+    for (1 .. $parallel) {
+        # 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($keep_xdummy_output, $displaynum,
+                './Xdummy', ":$displaynum", '-config', '/dev/null',
+                '-configdir', '/dev/null', '-nolisten', 'tcp');
         push(@displays, ":$displaynum");
-        push(@sockets_waiting, $x_socketpath . $displaynum);
+        push(@sockets_waiting, $socket);
         $displaynum++;
     }
 
-    # Wait until the X11 sockets actually appear. Pretty ugly solution, but as
-    # long as we can’t socket-activate X11…
-    while (1) {
-        @sockets_waiting = grep { ! -S $_ } @sockets_waiting;
-        last unless @sockets_waiting;
-        sleep 0.1;
-    }
+    wait_for_x(\@sockets_waiting);
 
     return @displays;
 }