diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-04-12 19:12:47 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-04-12 19:13:47 +0200 |
| commit | 9153d8ed640e4df38422cad89a72a43c9df9f057 (patch) | |
| tree | 13ad012f954bd44233c3eba440141c2b66e9487f /nixos/lib/test-driver | |
| parent | 1541fa351b4d664c51dddaeaa67ee0652892f405 (diff) | |
| download | nixlib-9153d8ed640e4df38422cad89a72a43c9df9f057.tar nixlib-9153d8ed640e4df38422cad89a72a43c9df9f057.tar.gz nixlib-9153d8ed640e4df38422cad89a72a43c9df9f057.tar.bz2 nixlib-9153d8ed640e4df38422cad89a72a43c9df9f057.tar.lz nixlib-9153d8ed640e4df38422cad89a72a43c9df9f057.tar.xz nixlib-9153d8ed640e4df38422cad89a72a43c9df9f057.tar.zst nixlib-9153d8ed640e4df38422cad89a72a43c9df9f057.zip | |
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).
Diffstat (limited to 'nixos/lib/test-driver')
| -rw-r--r-- | nixos/lib/test-driver/Machine.pm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm index 8ac0a31f2875..37d6518fd8d7 100644 --- a/nixos/lib/test-driver/Machine.pm +++ b/nixos/lib/test-driver/Machine.pm @@ -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; } }); |