Fix X11 tests broken by the removal of -ac

Probably missed a few. Also adding xauth to the system path (it was
already in the closure).
This commit is contained in:
Eelco Dolstra
2016-04-12 19:12:47 +02:00
parent 1541fa351b
commit 9153d8ed64
10 changed files with 18 additions and 3 deletions

View File

@@ -543,7 +543,7 @@ sub waitForX {
retry sub {
my ($status, $out) = $self->execute("journalctl -b SYSLOG_IDENTIFIER=systemd | grep 'session opened'");
return 0 if $status != 0;
($status, $out) = $self->execute("xwininfo -root > /dev/null 2>&1");
($status, $out) = $self->execute("[ -e /tmp/.X11-unix/X0 ]");
return 1 if $status == 0;
}
});