tests: split off losetup scsi_debug part

It's a pity that we would skip the whole test if scsi_debug is not
available.

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>

diff --git a/tests/expected/losetup/losetup-blkdev b/tests/expected/losetup/losetup-blkdev-show
similarity index 100%
rename from tests/expected/losetup/losetup-blkdev
rename to tests/expected/losetup/losetup-blkdev-show

diff --git a/tests/expected/losetup/losetup-file b/tests/expected/losetup/losetup-file-show
similarity index 100%
rename from tests/expected/losetup/losetup-file
rename to tests/expected/losetup/losetup-file-show

diff --git a/tests/ts/losetup/losetup b/tests/ts/losetup/losetup
index 80451899896c2eefe321ee40926d217054c6d35f..3c4fcb74fe50264773f29a34cecac51a125e1a47 100755 (executable)
--- a/tests/ts/losetup/losetup
+++ b/tests/ts/losetup/losetup
@@ -34,24 +34,14 @@ rm -f $TS_OUTPUT
 ts_skip_nonroot
 ts_check_losetup
 
-
-# set global variable TS_DEVICE
-ts_scsi_debug_init dev_size_mb=11
-REFILE=$(ts_image_init 10)
-
-function lo_print {
-       local lo=$1
-       echo "offset:    $( $TS_CMD_LOSETUP --list --raw -n -O OFFSET $lo )"
-       echo "sizelimit: $( $TS_CMD_LOSETUP --list --raw -n -O SIZELIMIT $lo )"
-       echo "size:      $( $TS_CMD_LSBLK -o SIZE -b -n -r $lo )"
-}
+. "$TS_SELF/losetup_functions.sh"
 
 #
 # file-* tests: Backing file is a regular file
 #
-BACKFILE="$REFILE"
+BACKFILE=$(ts_image_init 10)
 
-ts_init_subtest "file"
+ts_init_subtest "file-show"
 LODEV=$( $TS_CMD_LOSETUP --find --show $BACKFILE )
 if [ -z "$LODEV" ]; then
        ts_log "Failed to create loop device"
@@ -91,54 +81,6 @@ ts_finalize_subtest
 
 rm -rf $BACKFILE
 
-#
-# Backing file is a block device
-#
-BACKFILE="$TS_DEVICE"
-
-ts_init_subtest "blkdev"
-LODEV=$( $TS_CMD_LOSETUP --find --show $BACKFILE )
-if [ -z "$LODEV" ]; then
-       ts_log "Failed to create loop device"
-fi
-lo_print $LODEV >> $TS_OUTPUT
-$TS_CMD_LOSETUP -d $LODEV
-ts_finalize_subtest
-
-ts_init_subtest "blkdev-offset"
-LODEV=$( $TS_CMD_LOSETUP --offset 1MiB --find --show $BACKFILE )
-if [ -z "$LODEV" ]; then
-       ts_log "Failed to create loop device"
-fi
-lo_print $LODEV >> $TS_OUTPUT
-$TS_CMD_LOSETUP -d $LODEV
-ts_finalize_subtest
-
-
-ts_init_subtest "blkdev-sizelimit"
-LODEV=$( $TS_CMD_LOSETUP --sizelimit 3MiB --find --show $BACKFILE )
-if [ -z "$LODEV" ]; then
-       ts_log "Failed to create loop device"
-fi
-lo_print $LODEV >> $TS_OUTPUT
-$TS_CMD_LOSETUP -d $LODEV
-ts_finalize_subtest
-
-
-ts_init_subtest "blkdev-section"
-LODEV=$( $TS_CMD_LOSETUP --offset 1MiB --sizelimit 3MiB --find --show $BACKFILE )
-if [ -z "$LODEV" ]; then
-       ts_log "Failed to create loop device"
-fi
-lo_print $LODEV >> $TS_OUTPUT
-$TS_CMD_LOSETUP -d $LODEV
-ts_finalize_subtest
-
 udevadm settle
 
-rmmod scsi_debug
-
 ts_finalize
-
-
-

diff --git a/tests/ts/losetup/losetup-blkdev b/tests/ts/losetup/losetup-blkdev
new file mode 100755 (executable)
index 0000000..0181a7d
--- /dev/null
+++ b/tests/ts/losetup/losetup-blkdev
@@ -0,0 +1,80 @@
+#!/bin/bash
+
+#
+# Copyright (C) 2013 Karel Zak <kzak@redhat.com>
+#
+# This file is part of util-linux.
+#
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This file is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+
+TS_TOPDIR="${0%/*}/../.."
+TS_DESC="losetup-blkdev"
+
+. $TS_TOPDIR/functions.sh
+ts_init "$*"
+
+ts_check_test_command "$TS_CMD_LOSETUP"
+
+ts_skip_nonroot
+ts_check_losetup
+
+. "$TS_SELF/losetup_functions.sh"
+
+#
+# Backing file is a block device
+#
+ts_scsi_debug_init dev_size_mb=11
+BACKFILE="$TS_DEVICE"
+
+ts_init_subtest "show"
+LODEV=$( $TS_CMD_LOSETUP --find --show $BACKFILE )
+if [ -z "$LODEV" ]; then
+       ts_log "Failed to create loop device"
+fi
+lo_print $LODEV >> $TS_OUTPUT
+$TS_CMD_LOSETUP -d $LODEV
+ts_finalize_subtest
+
+ts_init_subtest "offset"
+LODEV=$( $TS_CMD_LOSETUP --offset 1MiB --find --show $BACKFILE )
+if [ -z "$LODEV" ]; then
+       ts_log "Failed to create loop device"
+fi
+lo_print $LODEV >> $TS_OUTPUT
+$TS_CMD_LOSETUP -d $LODEV
+ts_finalize_subtest
+
+
+ts_init_subtest "sizelimit"
+LODEV=$( $TS_CMD_LOSETUP --sizelimit 3MiB --find --show $BACKFILE )
+if [ -z "$LODEV" ]; then
+       ts_log "Failed to create loop device"
+fi
+lo_print $LODEV >> $TS_OUTPUT
+$TS_CMD_LOSETUP -d $LODEV
+ts_finalize_subtest
+
+
+ts_init_subtest "section"
+LODEV=$( $TS_CMD_LOSETUP --offset 1MiB --sizelimit 3MiB --find --show $BACKFILE )
+if [ -z "$LODEV" ]; then
+       ts_log "Failed to create loop device"
+fi
+lo_print $LODEV >> $TS_OUTPUT
+$TS_CMD_LOSETUP -d $LODEV
+ts_finalize_subtest
+
+udevadm settle
+
+rmmod scsi_debug
+
+ts_finalize

diff --git a/tests/ts/losetup/losetup_functions.sh b/tests/ts/losetup/losetup_functions.sh
new file mode 100644 (file)
index 0000000..d17c82a
--- /dev/null
+++ b/tests/ts/losetup/losetup_functions.sh
@@ -0,0 +1,7 @@
+
+function lo_print {
+       local lo=$1
+       echo "offset:    $( $TS_CMD_LOSETUP --list --raw -n -O OFFSET $lo )"
+       echo "sizelimit: $( $TS_CMD_LOSETUP --list --raw -n -O SIZELIMIT $lo )"
+       echo "size:      $( $TS_CMD_LSBLK -o SIZE -b -n -r $lo )"
+}