diff options
| author | Petr Rockai <prockai@redhat.com> | 2014-09-30 16:50:31 +0200 |
|---|---|---|
| committer | Petr Rockai <prockai@redhat.com> | 2014-10-01 08:22:54 +0200 |
| commit | 3875ab72df6ad8d8d9def4d95b31fd1ae98e712f (patch) | |
| tree | a8403bb665a130ef5992d343940d84993c8dcca6 | |
| parent | cd455004763372bbe5efe0cccbc18d47586dbce2 (diff) | |
| download | lvm2-3875ab72df6ad8d8d9def4d95b31fd1ae98e712f.tar.gz | |
test: Fix prepare_scsi_debug_dev.
| -rw-r--r-- | test/lib/aux.sh | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/test/lib/aux.sh b/test/lib/aux.sh index 18724c48c..53f9617eb 100644 --- a/test/lib/aux.sh +++ b/test/lib/aux.sh @@ -333,9 +333,9 @@ prepare_scsi_debug_dev() { # Create symlink to scsi_debug device in $DM_DEV_DIR SCSI_DEBUG_DEV="$DM_DEV_DIR/$(basename $DEBUG_DEV)" echo "$SCSI_DEBUG_DEV" > SCSI_DEBUG_DEV - echo "$SCSI_DEBUG_DEV" > LOOP + echo "$SCSI_DEBUG_DEV" > BACKING_DEV # Setting $LOOP provides means for prepare_devs() override - test "$LVM_TEST_DEVDIR" = "/dev" || ln -snf "$DEBUG_DEV" "$SCSI_DEBUG_DEV" + test "$DEBUG_DEV" = "$SCSI_DEBUG_DEV" || ln -snf "$DEBUG_DEV" "$SCSI_DEBUG_DEV" } cleanup_scsi_debug_dev() { @@ -344,7 +344,9 @@ cleanup_scsi_debug_dev() { } prepare_backing_dev() { - if test -b "$LVM_TEST_BACKING_DEVICE"; then + if test -f BACKING_DEV; then + BACKING_DEV=$(< BACKING_DEV) + elif test -b "$LVM_TEST_BACKING_DEVICE"; then BACKING_DEV="$LVM_TEST_BACKING_DEVICE" echo "$BACKING_DEV" > BACKING_DEV else @@ -373,6 +375,7 @@ prepare_devs() { test -n "$LVM_TEST_BACKING_DEVICE"; then # maybe the backing device is too small for this test LVM_TEST_BACKING_DEVICE= + rm -f BACKING_DEV prepare_devs "$@" return $? fi |