complete-run: check whether Xdummy dies, add a flag to keep the Xdummy output

diff --git a/testcases/complete-run.pl b/testcases/complete-run.pl
index 4bdf5c78c04cfdf22c5b335c565efa2bf35fa3f2..5ea9d0783777d8f02f265eb7a83375f30a4426b3 100755 (executable)
--- a/testcases/complete-run.pl
+++ b/testcases/complete-run.pl
@@ -51,9 +51,11 @@ my %options = (
     coverage => 0,
     restart => 0,
 );
+my $keep_xdummy_output = 0;
 
 my $result = GetOptions(
     "coverage-testing" => \$options{coverage},
+    "keep-xdummy-output" => \$keep_xdummy_output,
     "valgrind" => \$options{valgrind},
     "strace" => \$options{strace},
     "xtrace" => \$options{xtrace},
@@ -77,7 +79,7 @@ my $numtests = scalar @testfiles;
 
 # No displays specified, let’s start some Xdummy instances.
 if (@displays == 0) {
-    @displays = start_xdummy($parallel, $numtests);
+    @displays = start_xdummy($parallel, $numtests, $keep_xdummy_output);
 }
 
 # 1: create an output directory for this test-run

diff --git a/testcases/lib/StartXDummy.pm b/testcases/lib/StartXDummy.pm
index 5c739fca022ddf4ee678d9b9eeae6fad557567dd..68ca79f68a6dd63585136b43921f1e95cdec36bb 100644 (file)
--- a/testcases/lib/StartXDummy.pm
+++ b/testcases/lib/StartXDummy.pm
@@ -9,6 +9,7 @@ use v5.10;
 
 our @EXPORT = qw(start_xdummy);
 
+my @pids;
 my $x_socketpath = '/tmp/.X11-unix/X';
 
 # reads in a whole file
@@ -20,13 +21,16 @@ sub slurp {
 
 # 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;
@@ -37,6 +41,8 @@ sub fork_xserver {
         unlink($x_socketpath . $displaynum);
     });
 
+    push @pids, $pid;
+
     return $x_socketpath . $displaynum;
 }
 
@@ -63,11 +69,20 @@ the Xdummy processes and a list of PIDs of the processes.
 =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";
+        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');
@@ -93,8 +108,9 @@ sub start_xdummy {
         # 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', '-nolisten', 'tcp');
+        my $socket = fork_xserver($keep_xdummy_output, $displaynum,
+                './Xdummy', ":$displaynum", '-config', '/dev/null',
+                '-nolisten', 'tcp');
         push(@displays, ":$displaynum");
         push(@sockets_waiting, $socket);
         $displaynum++;