nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Michael Stapelberg 2012-08-18 16:27:00 +02:00
parent ad21037cd2
commit be6190a516
2 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
testcases/complete-run.pl
View File

@ -51,9 +51,11 @@ my %options = (
coverage => 0, coverage => 0,
restart => 0, restart => 0,
); );
my $keep_xdummy_output = 0;
my $result = GetOptions( my $result = GetOptions(
"coverage-testing" => \$options{coverage}, "coverage-testing" => \$options{coverage},
"keep-xdummy-output" => \$keep_xdummy_output,
"valgrind" => \$options{valgrind}, "valgrind" => \$options{valgrind},
"strace" => \$options{strace}, "strace" => \$options{strace},
"xtrace" => \$options{xtrace}, "xtrace" => \$options{xtrace},
@ -77,7 +79,7 @@ my $numtests = scalar @testfiles;
# No displays specified, let’s start some Xdummy instances. # No displays specified, let’s start some Xdummy instances.
if (@displays == 0) { 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 # 1: create an output directory for this test-run

26
testcases/lib/StartXDummy.pm
View File

@ -9,6 +9,7 @@ use v5.10;
our @EXPORT = qw(start_xdummy); our @EXPORT = qw(start_xdummy);
my @pids;
my $x_socketpath = '/tmp/.X11-unix/X'; my $x_socketpath = '/tmp/.X11-unix/X';
# reads in a whole file # reads in a whole file
@ -20,13 +21,16 @@ sub slurp {
# forks an Xdummy or Xdmx process # forks an Xdummy or Xdmx process
sub fork_xserver { sub fork_xserver {
my $keep_xdummy_output = shift;
my $displaynum = shift; my $displaynum = shift;
my $pid = fork(); my $pid = fork();
die "Could not fork: $!" unless defined($pid); die "Could not fork: $!" unless defined($pid);
if ($pid == 0) { if ($pid == 0) {
# Child, close stdout/stderr, then start Xdummy. # Child, close stdout/stderr, then start Xdummy.
close STDOUT; if (!$keep_xdummy_output) {
close STDERR; close STDOUT;
close STDERR;
}
exec @_; exec @_;
exit 1; exit 1;
@ -37,6 +41,8 @@ sub fork_xserver {
unlink($x_socketpath . $displaynum); unlink($x_socketpath . $displaynum);
}); });
push @pids, $pid;
return $x_socketpath . $displaynum; return $x_socketpath . $displaynum;
} }
@ -63,11 +69,20 @@ the Xdummy processes and a list of PIDs of the processes.
=cut =cut
sub start_xdummy { sub start_xdummy {
my ($parallel, $numtests) = @_; my ($parallel, $numtests, $keep_xdummy_output) = @_;
my @displays = (); my @displays = ();
my @childpids = (); 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 # Yeah, I know it’s non-standard, but Perl’s POSIX module doesn’t have
# _SC_NPROCESSORS_CONF. # _SC_NPROCESSORS_CONF.
my $cpuinfo = slurp('/proc/cpuinfo'); my $cpuinfo = slurp('/proc/cpuinfo');
@ -93,8 +108,9 @@ sub start_xdummy {
# We use -config /dev/null to prevent Xdummy from using the system # We use -config /dev/null to prevent Xdummy from using the system
# Xorg configuration. The tests should be independant from the # Xorg configuration. The tests should be independant from the
# actual system X configuration. # actual system X configuration.
my $socket = fork_xserver($displaynum, './Xdummy', ":$displaynum", my $socket = fork_xserver($keep_xdummy_output, $displaynum,
'-config', '/dev/null', '-nolisten', 'tcp'); './Xdummy', ":$displaynum", '-config', '/dev/null',
'-nolisten', 'tcp');
push(@displays, ":$displaynum"); push(@displays, ":$displaynum");
push(@sockets_waiting, $socket); push(@sockets_waiting, $socket);
$displaynum++; $displaynum++;