diff options
| author | Brian C. Lane <bcl@redhat.com> | 2013-09-11 12:25:02 -0700 |
|---|---|---|
| committer | Phillip Susi <psusi@ubuntu.com> | 2014-03-02 19:16:39 -0500 |
| commit | 6a3194bf13d23c4e7fcc346f7188060d50f3cedc (patch) | |
| tree | 547f1dea667f45fb7355f7c0a095967291370917 /tests/t6001-psep.sh | |
| parent | 7be35be5de01fa90f23810fb66efc3ccdbe5679a (diff) | |
| download | parted-6a3194bf13d23c4e7fcc346f7188060d50f3cedc.tar.gz | |
tests: rewrite t6001 to use /dev/mapper
This test began failing because using a private copy of /dev/mapper
confuses the system. This fixes that and generally cleans up the test.
tests/t6001.sh: update to use /dev/mapper directly
Diffstat (limited to 'tests/t6001-psep.sh')
| -rw-r--r-- | tests/t6001-psep.sh | 42 |
1 files changed, 17 insertions, 25 deletions
diff --git a/tests/t6001-psep.sh b/tests/t6001-psep.sh index da6b8a1..809ff9e 100644 --- a/tests/t6001-psep.sh +++ b/tests/t6001-psep.sh @@ -19,10 +19,7 @@ . "${srcdir=.}/init.sh"; path_prepend_ ../parted require_root_ -lvm_init_root_dir_ - -test "x$ENABLE_DEVICE_MAPPER" = xyes \ - || skip_ "no device-mapper support" +(dmsetup --help) > /dev/null 2>&1 || skip_test_ "No dmsetup installed" # Device maps names - should be random to not conflict with existing ones on # the system @@ -41,25 +38,19 @@ cleanup_fn_() { rm -f "$f1 $f2"; } -# create a file of size N bytes -N=10M - -f1=$(pwd)/1; d1=$(loop_setup_ "$f1") \ - || skip_ "is this partition mounted with 'nodev'?" +loop_file_1=loop-file-1-$$ +loop_file_2=loop-file-2-$$ -f2=$(pwd)/2 ;d2=$(loop_setup_ "$f2") \ - || skip_ "is this partition mounted with 'nodev'?" +d1=$(loop_setup_ $loop_file_1) || framework_failure +d1_size=$(blockdev --getsz $d1) +d2=$(loop_setup_ $loop_file_2) || framework_failure +d2_size=$(blockdev --getsz $d2) -dmsetup_cmd="0 `blockdev --getsz $d1` linear $d1 0" -# setup: create a mapping -echo "$dmsetup_cmd" | dmsetup create "$linear_" || fail=1 -dev="$DM_DEV_DIR/mapper/$linear_" +dmsetup create $linear_ --table "0 $d1_size linear $d1 0" || framework_failure +dev="/dev/mapper/$linear_" # Create msdos partition table -parted -s $dev mklabel msdos > out 2>&1 || fail=1 -compare /dev/null out || fail=1 - -parted -s $dev mkpart primary fat32 1m 5m > out 2>&1 || fail=1 +parted -s $dev mklabel msdos mkpart primary fat32 1m 5m > out 2>&1 || fail=1 compare /dev/null out || fail=1 #make sure device name is correct @@ -67,17 +58,18 @@ test -e ${dev}p1 || fail=1 #repeat on name not ending in a digit # setup: create a mapping -echo "$dmsetup_cmd" | dmsetup create "$linear2_" || fail=1 -dev="$DM_DEV_DIR/mapper/$linear2_" +dmsetup create $linear2_ --table "0 $d2_size linear $d2 0" || framework_failure +dev="/dev/mapper/$linear2_" # Create msdos partition table -parted -s $dev mklabel msdos > out 2>&1 || fail=1 -compare /dev/null out || fail=1 - -parted -s $dev mkpart primary fat32 1m 5m > out 2>&1 || fail=1 +parted -s $dev mklabel msdos mkpart primary fat32 1m 5m > out 2>&1 || fail=1 compare /dev/null out || fail=1 #make sure device name is correct test -e ${dev}1 || fail=1 +if [ -n "$fail" ]; then + ls /dev/mapper +fi + Exit $fail |