Skip to content

Commit

Permalink
Fix recursion problem in uzfs_test.sh (#63)
Browse files Browse the repository at this point in the history
Signed-off-by: Jan Kryl <[email protected]>
  • Loading branch information
Jan Kryl committed Mar 14, 2018
1 parent a55ebd7 commit 36f75a4
Showing 1 changed file with 21 additions and 18 deletions.
39 changes: 21 additions & 18 deletions tests/cbtest/script/test_uzfs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -95,26 +95,29 @@ init_test()
sleep 1
}

#
# DO NOT use log_must* in this function otherwise we risk recursion.
#
close_test()
{
log_must kill -SIGKILL $TGT_PID
log_must rm "$TMPDIR/test_disk1.img"
log_must rm "$TMPDIR/test_disk2.img"
log_must rm "$TMPDIR/test_disk3.img"
log_must rm "$TMPDIR/test_disk4.img"
log_must rm "$TMPDIR/test_disk5.img"
log_must rm "$TMPDIR/test_disk6.img"
log_must rm "$TMPDIR/test_disk7.img"
log_must rm "$TMPDIR/test_disk8.img"
log_must rm "$TMPDIR/test_spare1.img"
log_must rm "$TMPDIR/test_spare2.img"
log_must rm "$TMPDIR/test_spare3.img"
log_must rm "$TMPDIR/test_spare4.img"
log_must rm "$TMPDIR/test_spare5.img"
log_must rm "$TMPDIR/test_spare6.img"
log_must rm "$TMPDIR/test_spare7.img"
log_must rm "$TMPDIR/test_spare8.img"
log_must rm "$TMPDIR/test_log.img"
kill -SIGKILL $TGT_PID
rm "$TMPDIR/test_disk1.img"
rm "$TMPDIR/test_disk2.img"
rm "$TMPDIR/test_disk3.img"
rm "$TMPDIR/test_disk4.img"
rm "$TMPDIR/test_disk5.img"
rm "$TMPDIR/test_disk6.img"
rm "$TMPDIR/test_disk7.img"
rm "$TMPDIR/test_disk8.img"
rm "$TMPDIR/test_spare1.img"
rm "$TMPDIR/test_spare2.img"
rm "$TMPDIR/test_spare3.img"
rm "$TMPDIR/test_spare4.img"
rm "$TMPDIR/test_spare5.img"
rm "$TMPDIR/test_spare6.img"
rm "$TMPDIR/test_spare7.img"
rm "$TMPDIR/test_spare8.img"
rm "$TMPDIR/test_log.img"
}

dump_data()
Expand Down

0 comments on commit 36f75a4

Please sign in to comment.