shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

Use udev transactions in testsuite.

Browse Source
This commit is contained in:
Peter Rajnoha 2010-02-15 16:30:13 +00:00
parent 3c134e0165
commit be40fe90ae
3 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WHATS_NEW
View File

@ -1,5 +1,6 @@
Version 2.02.61 -
===================================
Use udev transactions in testsuite.
Don't use LVM_UDEV_DISABLE_CHECKING env. var. anymore and set the state automatically.
Add lvm2app exports lvm_pv_get_size(), lvm_pv_get_free(), and lvm_pv_get_dev_size().
Fix off by 512 sizes for lvm2app.

6
test/Makefile.in
View File

@ -31,8 +31,7 @@ SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
T = $(wildcard $(srcdir)/t-*.sh)
ifeq ("@UDEV_SYNC@", "yes")
dm_udev_disable_checking = 1
lvm_udev_disable_checking = 1
dm_udev_synchronisation = 1
endif
ifeq ("@APPLIB@", "yes")
@ -61,8 +60,7 @@ init.sh: $(srcdir)/Makefile.in $(srcdir)/test-utils.sh .bin-dir-stamp bin/not bi
echo 'abs_srcdir=$(abs_srcdir)' >> $@-t
echo 'abs_builddir=$(abs_builddir)' >> $@-t
echo 'export PATH' >> $@-t
echo 'export DM_UDEV_DISABLE_CHECKING=$(dm_udev_disable_checking)' >> $@-t
echo 'export LVM_UDEV_DISABLE_CHECKING=$(lvm_udev_disable_checking)' >> $@-t
echo 'export DM_UDEV_SYNCHRONISATION=$(dm_udev_synchronisation)' >> $@-t
chmod a-w $@-t
mv $@-t $@
if test "$(srcdir)" != "."; then cp $(srcdir)/test-utils.sh \

29
test/test-utils.sh
View File

@ -24,7 +24,20 @@ STACKTRACE() {
echo "$i ${FUNC}() called from ${BASH_SOURCE[$i]}:${BASH_LINENO[$i]}"
i=$(($i + 1));
done
}
}
init_udev_transaction() {
if test "$DM_UDEV_SYNCHRONISATION" = 1; then
export DM_UDEV_COOKIE=$(dmsetup udevcreatecookie)
fi
}
finish_udev_transaction() {
if test "$DM_UDEV_SYNCHRONISATION" = 1; then
dmsetup udevreleasecookie
unset DM_UDEV_COOKIE
fi
}
teardown() {
echo $LOOP
@ -32,12 +45,15 @@ teardown() {
test -n "$PREFIX" && {
rm -rf $G_root_/dev/$PREFIX*
init_udev_transaction
while dmsetup table | grep -q ^$PREFIX; do
for s in `dmsetup table | grep ^$PREFIX| awk '{ print substr($1,1,length($1)-1) }'`; do
dmsetup resume $s 2>/dev/null > /dev/null || true
dmsetup remove $s 2>/dev/null > /dev/null || true
done
done
finish_udev_transaction
}
# NOTE: SCSI_DEBUG_DEV test must come before the LOOP test because
@ -180,6 +196,7 @@ prepare_devs() {
local size=$(($loopsz/$n))
init_udev_transaction
for i in `seq 1 $n`; do
local name="${PREFIX}$pvname$i"
local dev="$G_dev_/mapper/$name"
@ -188,6 +205,7 @@ prepare_devs() {
echo 0 $size linear $LOOP $((($i-1)*$size)) > $name.table
dmsetup create $name $name.table
done
finish_udev_transaction
# set up some default names
vg=${PREFIX}vg
@ -201,6 +219,8 @@ prepare_devs() {
}
disable_dev() {
init_udev_transaction
for dev in "$@"; do
# first we make the device inaccessible
echo 0 10000000 error | dmsetup load $dev
@ -208,14 +228,19 @@ disable_dev() {
# now let's try to get rid of it if it's unused
#dmsetup remove $dev
done
finish_udev_transaction
}
enable_dev() {
init_udev_transaction
for dev in "$@"; do
local name=`echo "$dev" | sed -e 's,.*/,,'`
dmsetup create $name $name.table || dmsetup load $name $name.table
dmsetup resume $dev
done
finish_udev_transaction
}
backup_dev() {