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

Detect unusable nodes on fs

Browse Source 
Test whether nodes could be used on given filesystem where TMP
dir is being used and skip teardown quicker in fail case.
(makes the problem quickly obvious if you try to such fs).

Skip teardown_dev if we have not created any devs yet.

and do not mkdir /dev/mapper dir  when LVM_TEST_DEVDIR is set.

Drop this test from t-000-basic.sh.
This commit is contained in:
Zdenek Kabelac 2011-09-24 20:54:35 +00:00
parent d2c116058e
commit 518164ce96
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/lib/aux.sh
View File

@ -164,7 +164,7 @@ teardown() {
echo -n .
teardown_devs
test -d $DM_DEV_DIR/mapper && teardown_devs
echo -n .

11
test/lib/test.sh
View File

@ -34,10 +34,15 @@ trap 'aux teardown' EXIT # don't forget to clean up
export LVM_SYSTEM_DIR=$TESTDIR/etc
DM_DEV_DIR=$TESTDIR/dev
test -n "$LVM_TEST_DEVDIR" && DM_DEV_DIR="$LVM_TEST_DEVDIR"
mkdir $LVM_SYSTEM_DIR $TESTDIR/lib $DM_DEV_DIR
if test -n "$LVM_TEST_DEVDIR" ; then
DM_DEV_DIR="$LVM_TEST_DEVDIR"
else
mknod $DM_DEV_DIR/testnull c 1 3 || exit 1;
echo >$DM_DEV_DIR/testnull || { echo "Filesystem does support devices in $DM_DEV_DIR (mounted with nodev?)"; exit 1; }
mkdir -p $DM_DEV_DIR/mapper
fi
export DM_DEV_DIR
mkdir $LVM_SYSTEM_DIR $TESTDIR/lib
mkdir -p $DM_DEV_DIR $DM_DEV_DIR/mapper
cd $TESTDIR

7
test/t-000-basic.sh
View File

@ -1,4 +1,4 @@
# Copyright (C) 2009 Red Hat, Inc. All rights reserved.
# Copyright (C) 2009-2011 Red Hat, Inc. All rights reserved.
#
# This copyrighted material is made available to anyone wishing to use,
# modify, copy, or redistribute it subject to the terms and conditions
@ -20,11 +20,6 @@ lvm pvmove --version|sed -n "1s/.*: *\([0-9][^ ]*\) .*/\1/p" > actual
# ensure they are the same
diff -u actual expected
mknod $DM_DEV_DIR/null c 1 3 || \
error "Can't create nodes on filesystem"
echo >$DM_DEV_DIR/null || \
error "Filesystem for tests does not allow using device nodes (check nodev)"
# ensure we can create devices (uses dmsetup, etc)
aux prepare_devs 5