koma/i3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests: Implement multi-monitor tests using Xdmx

Browse Source
This commit is contained in:
Michael Stapelberg
2011-12-24 15:34:28 +01:00
parent 8a67f15ef4
commit dd9743b272
4 changed files with 133 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
testcases/lib/SocketActivation.pm
View File

@ -85,8 +85,10 @@ sub activate_i3 {
# Construct the command to launch i3. Use maximum debug level, disable
# the interactive signalhandler to make it crash immediately instead.
# Also disable logging to SHM since we want to redirect the logs anyways.
my $i3cmd = abs_path("../i3") . " -V -d all --disable-signalhandler --shmlog-size=0";
# Also disable logging to SHM since we redirect the logs anyways.
# Force Xinerama because we use Xdmx for multi-monitor tests.
my $i3cmd = abs_path("../i3") . q| -V -d all --disable-signalhandler| .
q| --shmlog-size=0 --force-xinerama|;
# For convenience:
my $outdir = $args{outdir};

96
testcases/lib/StartXDummy.pm
View File

@ -9,6 +9,8 @@ use v5.10;
our @EXPORT = qw(start_xdummy);
my $x_socketpath = '/tmp/.X11-unix/X';
# reads in a whole file
sub slurp {
open(my $fh, '<', shift) or return '';
@ -16,6 +18,42 @@ sub slurp {
<$fh>;
}
# forks an Xdummy or Xdmx process
sub fork_xserver {
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;
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);
});
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,8 +62,6 @@ the Xdummy processes and a list of PIDs of the processes.
=cut
my $x_socketpath = '/tmp/.X11-unix/X';
sub start_xdummy {
my ($parallel, $numtests) = @_;
@ -39,11 +75,17 @@ 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, plus two extra xdummys to combine to a
# multi-monitor setup using Xdmx.
$parallel ||= ($num_cores * 2) + 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 . '*');
@ -52,37 +94,33 @@ 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(@complete_run::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($displaynum, './Xdummy', ":$displaynum",
'-config', '/dev/null');
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;
# 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;
}
1