tests/func.sh: Fix some total breakage in the test scripts

We will never mandate an obsolete file system such as ext[2-4] for
running the test suite, nor should the test version of mdadm be
installed on the system for the tests to be run.

Signed-off-by: Jes Sorensen <jsorensen@fb.com>
Fixes: 20d10b4be8 ("mdadm/test: Refactor and revamp 'test' script")
This commit is contained in:
Jes Sorensen 2018-04-11 17:01:50 -04:00
parent b91ad097d6
commit 59416da78f
2 changed files with 4 additions and 20 deletions

2
test
View File

@ -5,7 +5,7 @@ mdadm=$PWD/mdadm
targetdir="/var/tmp" targetdir="/var/tmp"
logdir="$targetdir" logdir="$targetdir"
config=/tmp/mdadm.conf config=/tmp/mdadm.conf
testdir= testdir=$PWD/tests
devlist= devlist=
savelogs=0 savelogs=0

View File

@ -101,8 +101,8 @@ check_env() {
echo "test: testing can only be done as 'root'." echo "test: testing can only be done as 'root'."
exit 1 exit 1
} }
[ -x "raid6check" -a -x $mdadm ] || { [ \! -x $mdadm ] && {
echo "test: please run 'make everything' before perform testing." echo "test: please run make everything before perform testing."
exit 1 exit 1
} }
cmds=(mdadm lsblk df udevadm losetup mkfs.ext3 fsck seq) cmds=(mdadm lsblk df udevadm losetup mkfs.ext3 fsck seq)
@ -113,23 +113,6 @@ check_env() {
exit 1 exit 1
} }
done done
mdadm_src_ver="$($mdadm -V 2>&1)"
mdadm_sbin_ver="$($(which mdadm) -V 2>&1)"
if [ "$mdadm_src_ver" != "$mdadm_sbin_ver" ]
then
# it's nessesary to 'make install' mdadm to /SBIN/DIR,
# such as systemd/mdadm-grow-continue@.service, would
# run as an instance by systemd when reshape happens,
# thus ensure that the correct mdadm is in testing.
echo "test: please run 'make install' before testing."
exit 1
fi
if ! $(df -T . | grep -iq ext)
then
# 'external file' bitmap only supports with ext[2-4] file system
echo "test: please run test suite with ext[2-4] file system."
exit 1
fi
if $(lsblk -a | grep -iq raid) if $(lsblk -a | grep -iq raid)
then then
# donot run mdadm -Ss directly if there are RAIDs working. # donot run mdadm -Ss directly if there are RAIDs working.
@ -231,6 +214,7 @@ check() {
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
die "This command shouldn't run successfully" die "This command shouldn't run successfully"
fi fi
;;
spares ) spares )
spares=$(tr '] ' '\012\012' < /proc/mdstat | grep -c '(S)' || exit 0) spares=$(tr '] ' '\012\012' < /proc/mdstat | grep -c '(S)' || exit 0)
[ $spares -ne $2 ] && [ $spares -ne $2 ] &&