diff options
| author | lassulus <lassulus@lassul.us> | 2017-11-02 17:06:31 +0100 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2017-11-07 23:01:59 +0100 |
| commit | 4531ec59551fa3f3c9dfb442dff2ec669c467922 (patch) | |
| tree | e9c0ae3c1f2b02e024865fa709b0703966808d7e /nixos/lib | |
| parent | a41342ba584db4765807492ee4c8bb2c8aa2dcd0 (diff) | |
| download | nixlib-4531ec59551fa3f3c9dfb442dff2ec669c467922.tar nixlib-4531ec59551fa3f3c9dfb442dff2ec669c467922.tar.gz nixlib-4531ec59551fa3f3c9dfb442dff2ec669c467922.tar.bz2 nixlib-4531ec59551fa3f3c9dfb442dff2ec669c467922.tar.lz nixlib-4531ec59551fa3f3c9dfb442dff2ec669c467922.tar.xz nixlib-4531ec59551fa3f3c9dfb442dff2ec669c467922.tar.zst nixlib-4531ec59551fa3f3c9dfb442dff2ec669c467922.zip | |
nixos/test-instrumentation: softcode DISPLAY
Diffstat (limited to 'nixos/lib')
| -rw-r--r-- | nixos/lib/test-driver/Machine.pm | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm index a7ed5d1faa38..dbed242eb865 100644 --- a/nixos/lib/test-driver/Machine.pm +++ b/nixos/lib/test-driver/Machine.pm @@ -602,8 +602,11 @@ sub waitForX { $self->nest("waiting for the X11 server", sub { retry sub { my ($status, $out) = $self->execute("journalctl -b SYSLOG_IDENTIFIER=systemd | grep 'session opened'"); + my $display = $ENV{'DISPLAY'}; + $display =~ s/://; + return 0 if $status != 0; - ($status, $out) = $self->execute("[ -e /tmp/.X11-unix/X0 ]"); + ($status, $out) = $self->execute("[ -e /tmp/.X11-unix/X$display ]"); return 1 if $status == 0; } }); |