mirror of
git://sourceware.org/git/lvm2.git
synced 2024-10-28 11:55:55 +03:00
tests: use manglename none for dmsetup
This commit is contained in:
parent
9196942312
commit
77d4e317a4
@ -151,7 +151,7 @@ teardown_devs_prefixed() {
|
|||||||
local need_udev_wait=0
|
local need_udev_wait=0
|
||||||
init_udev_transaction
|
init_udev_transaction
|
||||||
for dm in $(dm_info name --sort open | grep "$prefix"); do
|
for dm in $(dm_info name --sort open | grep "$prefix"); do
|
||||||
dmsetup remove --mangle none "$dm" &>/dev/null || remfail=yes
|
dmsetup remove "$dm" &>/dev/null || remfail=yes
|
||||||
need_udev_wait=1
|
need_udev_wait=1
|
||||||
done
|
done
|
||||||
finish_udev_transaction
|
finish_udev_transaction
|
||||||
@ -164,7 +164,7 @@ teardown_devs_prefixed() {
|
|||||||
test $num_devs -lt $num_remaining_devs -a $num_devs -ne 0; do
|
test $num_devs -lt $num_remaining_devs -a $num_devs -ne 0; do
|
||||||
test "$stray" -eq 0 || echo "Removing $num_devs stray mapped devices with names beginning with $prefix: "
|
test "$stray" -eq 0 || echo "Removing $num_devs stray mapped devices with names beginning with $prefix: "
|
||||||
for dm in $(dm_info name --sort open | grep "$prefix") ; do
|
for dm in $(dm_info name --sort open | grep "$prefix") ; do
|
||||||
dmsetup remove --mangle none -f "$dm" || true
|
dmsetup remove -f "$dm" || true
|
||||||
done
|
done
|
||||||
num_remaining_devs=$num_devs
|
num_remaining_devs=$num_devs
|
||||||
done
|
done
|
||||||
|
@ -48,6 +48,7 @@ if test -n "$LVM_TEST_FLAVOUR"; then
|
|||||||
. flavour_overrides
|
. flavour_overrides
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
DM_DEFAULT_NAME_MANGLING_MODE=none
|
||||||
DM_DEV_DIR="$TESTDIR/dev"
|
DM_DEV_DIR="$TESTDIR/dev"
|
||||||
LVM_SYSTEM_DIR="$TESTDIR/etc"
|
LVM_SYSTEM_DIR="$TESTDIR/etc"
|
||||||
mkdir "$LVM_SYSTEM_DIR" "$TESTDIR/lib" "$DM_DEV_DIR"
|
mkdir "$LVM_SYSTEM_DIR" "$TESTDIR/lib" "$DM_DEV_DIR"
|
||||||
@ -63,7 +64,7 @@ fi
|
|||||||
# abort on the internal dm errors in the tests (allowing test user override)
|
# abort on the internal dm errors in the tests (allowing test user override)
|
||||||
DM_ABORT_ON_INTERNAL_ERRORS=${DM_ABORT_ON_INTERNAL_ERRORS:-1}
|
DM_ABORT_ON_INTERNAL_ERRORS=${DM_ABORT_ON_INTERNAL_ERRORS:-1}
|
||||||
|
|
||||||
export DM_DEV_DIR LVM_SYSTEM_DIR DM_ABORT_ON_INTERNAL_ERRORS
|
export DM_DEFAULT_NAME_MANGLING_MODE DM_DEV_DIR LVM_SYSTEM_DIR DM_ABORT_ON_INTERNAL_ERRORS
|
||||||
|
|
||||||
echo "$TESTNAME" >TESTNAME
|
echo "$TESTNAME" >TESTNAME
|
||||||
|
|
||||||
|
@ -159,7 +159,7 @@ teardown_udev_cookies() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dm_info() {
|
dm_info() {
|
||||||
should dmsetup info --mangle none --noheadings -c -o "$@"
|
should dmsetup info --noheadings -c -o "$@"
|
||||||
}
|
}
|
||||||
|
|
||||||
dm_table() {
|
dm_table() {
|
||||||
|
Loading…
Reference in New Issue
Block a user