From: David Teigland Date: Fri, 12 Jul 2019 21:51:49 +0000 (-0500) Subject: tests: lvm-on-md use variable run dir X-Git-Tag: v2_03_06~203 X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=aa58f9bd9b28e8b734a6d723234f9ed1de28265b;p=lvm2.git tests: lvm-on-md use variable run dir for hints file --- diff --git a/test/shell/lvm-on-md.sh b/test/shell/lvm-on-md.sh index c84808387..2877ea294 100644 --- a/test/shell/lvm-on-md.sh +++ b/test/shell/lvm-on-md.sh @@ -16,6 +16,7 @@ RUNDIR="/run" test -d "$RUNDIR" || RUNDIR="/var/run" PVS_ONLINE_DIR="$RUNDIR/lvm/pvs_online" VGS_ONLINE_DIR="$RUNDIR/lvm/vgs_online" +HINTS="$RUNDIR/lvm/hints" _clear_online_files() { # wait till udev is finished @@ -330,10 +331,10 @@ pvs > out not grep "$dev1" out not grep "$dev2" out -grep "$mddev" /run/lvm/hints -grep "$dev3" /run/lvm/hints -not grep "$dev1" /run/lvm/hints -not grep "$dev2" /run/lvm/hints +grep "$mddev" $HINTS +grep "$dev3" $HINTS +not grep "$dev1" $HINTS +not grep "$dev2" $HINTS sleep 1 @@ -363,7 +364,7 @@ not grep "$mddev" out2 not grep "$dev1" out2 not grep "$dev2" out2 grep "$dev3" out2 -cat /run/lvm/hints +cat $HINTS pvs 2>&1|tee out1 grep -v WARNING out1 > out2 @@ -372,7 +373,7 @@ not grep "$mddev" out2 not grep "$dev1" out2 not grep "$dev2" out2 grep "$dev3" out2 -cat /run/lvm/hints +cat $HINTS # The md components should still be detected and excluded. not pvs "$dev1"