diff options
| author | Petr Rockai <prockai@redhat.com> | 2014-06-28 12:51:18 +0200 |
|---|---|---|
| committer | Petr Rockai <prockai@redhat.com> | 2015-02-05 13:47:19 +0100 |
| commit | 0abad40f416a3831c9e4b44924468bd7b591a4fa (patch) | |
| tree | dcc3a9db7f34c2080cdf87e0402c483ec6ea058a /nix | |
| parent | e3ac180ab37a5cfe39ac739d48b9176c0e4f6003 (diff) | |
| download | lvm2-0abad40f416a3831c9e4b44924468bd7b591a4fa.tar.gz | |
NIX: Existence of results list no longer indicates that the suite has finished.
Diffstat (limited to 'nix')
| -rw-r--r-- | nix/default.nix | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/nix/default.nix b/nix/default.nix index 8de3eba03..55ad8e14b 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -27,17 +27,14 @@ let dmsetup targets export LVM_TEST_BACKING_DEVICE=/dev/vdb - if ! test -e /tmp/xchg/results-ndev/list; then - lvm2-testsuite --batch --outdir /tmp/xchg/results-ndev --continue \ - --flavours ndev-vanilla,ndev-cluster,ndev-lvmetad - fi - - if ! test -e /tmp/xchg/results-udev/list; then - (/usr/lib/systemd/systemd-udevd || /usr/lib/udev/udevd || /sbin/udevd || \ - find / -xdev -name \*udevd) & - lvm2-testsuite --batch --outdir /tmp/xchg/results-udev --continue \ - --flavours udev-vanilla,udev-cluster,udev-lvmetad - fi + + lvm2-testsuite --batch --outdir /tmp/xchg/results-ndev --continue \ + --flavours ndev-vanilla,ndev-cluster,ndev-lvmetad + + (/usr/lib/systemd/systemd-udevd || /usr/lib/udev/udevd || /sbin/udevd || \ + find / -xdev -name \*udevd) >& /tmp/udevd.log & + lvm2-testsuite --batch --outdir /tmp/xchg/results-udev --continue \ + --flavours udev-vanilla,udev-cluster,udev-lvmetad --watch /tmp/udevd.log # if we made it this far, all test results are in |