X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Ftest-framework.sh;h=3221f47f135ed242936398b26956792a75c38c9e;hp=fed69645092bcd9c5ee4a72f1c82f88f77d4b52a;hb=530b16b187de9a27723205d9d759f260bfd350b8;hpb=6d57484b718a986aea0ac83802b1b966df576ed8 diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh index fed6964..3221f47 100755 --- a/lustre/tests/test-framework.sh +++ b/lustre/tests/test-framework.sh @@ -3378,12 +3378,14 @@ stopall() { } cleanup_echo_devs () { - local devs=$($LCTL dl | grep echo | awk '{print $4}') + trap 0 + local dev + local devs=$($LCTL dl | grep echo | awk '{print $4}') - for dev in $devs; do - $LCTL --device $dev cleanup - $LCTL --device $dev detach - done + for dev in $devs; do + $LCTL --device $dev cleanup + $LCTL --device $dev detach + done } cleanupall() {