]> sourceware.org Git - lvm2.git/commitdiff
nix: install also mdadm
authorZdenek Kabelac <zkabelac@redhat.com>
Wed, 22 Apr 2015 07:00:21 +0000 (09:00 +0200)
committerZdenek Kabelac <zkabelac@redhat.com>
Wed, 22 Apr 2015 07:09:26 +0000 (09:09 +0200)
Some tests are checking functinality of lvm2 with mdadm.

nix/default.nix

index 5d2a2600644003a46de0a38558f5c770d120771d..a1cc98fdf6b9d957c7dac18f17304a706e7d9f46 100644 (file)
@@ -116,9 +116,9 @@ let
                else
                    counter=0
                fi
-               if test $counter -eq 10 || test $(cat hb.current | wc -c) -eq $(cat hb.last | wc -c); then
+               if test $counter -eq 10 || test $(wc -c <hb.current) -eq $(wc -c <hb.last); then
                    echo
-                   echo "VM got stuck; heartbeat: $(cat hb.current | wc -c) $(cat hb.last | wc -c), counter = $counter."
+                   echo "VM got stuck; heartbeat: $(wc -c <hb.current) $(wc -c <hb.last), counter = $counter."
                    echo "last journal entry: $(tail -n 1 j.current), previously $(tail -n 1 j.last)"
                    kill -- -$(cat pid)
                fi
@@ -355,6 +355,7 @@ let
                  "redhat-rpm-config" # needed for rpmbuild of lvm
                  "which" "e2fsprogs" # needed for fsadm
                  "perl-GD" # for lcov
+                 "mdadm" # for tests with lvm2 and mdadm
                  "kernel"
                ];
       centos63 = [ "clusterlib-devel" "openaislib-devel" "cman" "libudev-devel" "valgrind-devel" "procps" ];
This page took 0.037546 seconds and 5 git commands to generate.