d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stress2: Handle "gunion create" error exit

Browse Source
This commit is contained in:
Peter Holm 2022-07-15 10:17:23 +02:00
parent 60052a11db
commit b4a6661801
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/test/stress2/misc/gunion.sh
View File

@ -50,7 +50,10 @@ cp -r ../../stress2 $mp1
umount $mp1
mdconfig -a -t swap -s 5g -u $md2
gunion create -v /dev/md$md2 /dev/md$md1
set +e
gunion create -v /dev/md$md2 /dev/md$md1; s=$?
[ $s -ne 0 ] && echo "gunion create returned $s"
set -e
mount /dev/md$md2-md$md1.union $mntpoint
export RUNDIR=$mntpoint/stressX
@ -71,7 +74,7 @@ for i in `jot 6`; do
done
fsck_ffs -fyR /dev/md$md2-md$md1.union > $log 2>&1
grep -Eq "IS CLEAN|MARKED CLEAN" $log || { s=2; cat $log; }
set +e
set -e
gunion commit /dev/md$md2-md$md1.union
gunion list | egrep Block\|Current | egrep -v 0 && s=3
gunion destroy /dev/md$md2-md$md1.union

7
tools/test/stress2/misc/gunion2.sh
View File

@ -50,7 +50,10 @@ cp -r ../../stress2 $mp1
umount $mp1
mdconfig -a -t swap -s 5g -u $md2
gunion create -v /dev/md$md2 /dev/md$md1
set +e
gunion create -v /dev/md$md2 /dev/md$md1; s=$?
[ $s -ne 0 ] && echo "gunion create returned $s"
set -e
mount /dev/md$md2-md$md1.union $mntpoint
export CTRLDIR=$mntpoint/stressX.control
@ -79,7 +82,7 @@ testcases/swap/swap
"
export TESTPROGS=`echo $TESTPROGS | sed 's/\n/ /g'`
set +e
set -e
chmod 777 $mntpoint
su $testuser -c \
"(cd $mntpoint/stress2; ./testcases/run/run $TESTPROGS)"