diff options
| author | Petr Rockai <prockai@redhat.com> | 2014-06-28 12:51:18 +0200 |
|---|---|---|
| committer | Petr Rockai <prockai@redhat.com> | 2014-11-18 19:01:30 +0100 |
| commit | daedd58a2ba3c149737071b9fe12b34c54833283 (patch) | |
| tree | bdc52253121e1b3ccff6fce2f6164a0a11b583aa | |
| parent | c60d327a5868a71178385e64b1a9cf4e4e41e924 (diff) | |
| download | lvm2-daedd58a2ba3c149737071b9fe12b34c54833283.tar.gz | |
NIX: Existence of results list no longer indicates that the suite has finished.
| -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 |