diff options
| author | Joerg Thalheim <joerg@thalheim.io> | 2017-11-08 17:03:59 +0000 |
|---|---|---|
| committer | Joerg Thalheim <joerg@thalheim.io> | 2017-11-08 17:04:39 +0000 |
| commit | 00344162a7d1a4ed438e863b99652cf298b2ad00 (patch) | |
| tree | 3bddb34d21683be0d6c630a6503608b3bacdd8b1 /nixos/lib/test-driver/Machine.pm | |
| parent | f162d54b7602a620f288309bc5d9c832069140b4 (diff) | |
| download | nixpkgs-00344162a7d1a4ed438e863b99652cf298b2ad00.tar nixpkgs-00344162a7d1a4ed438e863b99652cf298b2ad00.tar.gz nixpkgs-00344162a7d1a4ed438e863b99652cf298b2ad00.tar.bz2 nixpkgs-00344162a7d1a4ed438e863b99652cf298b2ad00.tar.lz nixpkgs-00344162a7d1a4ed438e863b99652cf298b2ad00.tar.xz nixpkgs-00344162a7d1a4ed438e863b99652cf298b2ad00.tar.zst nixpkgs-00344162a7d1a4ed438e863b99652cf298b2ad00.zip | |
Revert "nixos/test-instrumentation: softcode DISPLAY"
This reverts commit 4531ec59551fa3f3c9dfb442dff2ec669c467922. This broke waitForX: https://github.com/NixOS/nixpkgs/commit/b11ac5d29dcccdb7474a23ac1d8a6c40553adcd5#commitcomment-25486347 cc @Lassulus
Diffstat (limited to 'nixos/lib/test-driver/Machine.pm')
| -rw-r--r-- | nixos/lib/test-driver/Machine.pm | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm index dbed242eb86..a7ed5d1faa3 100644 --- a/nixos/lib/test-driver/Machine.pm +++ b/nixos/lib/test-driver/Machine.pm @@ -602,11 +602,8 @@ 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/X$display ]"); + ($status, $out) = $self->execute("[ -e /tmp/.X11-unix/X0 ]"); return 1 if $status == 0; } }); |