svn commit: r291277 - user/ngie/more-tests2/sbin/geom/class/tests/uzip
Garrett Cooper
ngie at FreeBSD.org
Wed Nov 25 01:15:27 UTC 2015
Author: ngie
Date: Wed Nov 25 01:15:25 2015
New Revision: 291277
URL: https://svnweb.freebsd.org/changeset/base/291277
Log:
- Convert 1_test into a TAP testcase
- Use conf.sh
- Simplify the setup/cleanup steps
Modified:
user/ngie/more-tests2/sbin/geom/class/tests/uzip/1_test.sh
user/ngie/more-tests2/sbin/geom/class/tests/uzip/Makefile
Modified: user/ngie/more-tests2/sbin/geom/class/tests/uzip/1_test.sh
==============================================================================
--- user/ngie/more-tests2/sbin/geom/class/tests/uzip/1_test.sh Wed Nov 25 01:14:00 2015 (r291276)
+++ user/ngie/more-tests2/sbin/geom/class/tests/uzip/1_test.sh Wed Nov 25 01:15:25 2015 (r291277)
@@ -1,37 +1,22 @@
#!/bin/sh
-#
# $FreeBSD$
-#
-mntpoint="/mnt/test-1"
+testsdir=$(dirname $0)
+. $testsdir/conf.sh
-#
-# prepare
-kldload geom_uzip
-UUE=$(dirname $0)/1.img.uzip.uue
+echo "1..1"
+
+UUE=$testsdir/1.img.uzip.uue
uudecode $UUE
-num=`mdconfig -an -f $(basename $UUE .uue)` || exit 1
+us0=$(attach_md -f $(basename $UUE .uue)) || exit 1
sleep 1
-#
-# mount
-mkdir -p "${mntpoint}"
-mount -o ro /dev/md${num}.uzip "${mntpoint}" || exit 1
+mount -o ro /dev/${us0}.uzip "${mntpoint}" || exit 1
-#
-# compare
#cat "${mntpoint}/etalon.txt"
-diff -u etalon/etalon.txt "${mntpoint}/etalon.txt"
+diff -I '\$FreeBSD.*\$' -u $testsdir/etalon/etalon.txt "${mntpoint}/etalon.txt"
if [ $? -eq 0 ]; then
- echo "PASS"
+ echo "ok 1"
else
- echo "FAIL"
+ echo "not ok 1"
fi
-
-#
-# cleanup
-umount "${mntpoint}"
-rmdir "${mntpoint}"
-mdconfig -d -u ${num}
-sleep 1
-kldunload geom_uzip
Modified: user/ngie/more-tests2/sbin/geom/class/tests/uzip/Makefile
==============================================================================
--- user/ngie/more-tests2/sbin/geom/class/tests/uzip/Makefile Wed Nov 25 01:14:00 2015 (r291276)
+++ user/ngie/more-tests2/sbin/geom/class/tests/uzip/Makefile Wed Nov 25 01:15:25 2015 (r291277)
@@ -21,6 +21,9 @@ ${UZIMAGE}: ${IMAGE} ${ZIMAGE}
printf "FreeBSD$$\n#\n\n" >> ${.TARGET}
uuencode ${ZIMAGE} ${ZIMAGE} >>${.TARGET}
+FILES+= conf.sh
+FILESNAME_conf.sh= conf.sh
+
FILES+= ${UZIMAGE}
FILESDIR= ${TESTSDIR}
@@ -28,6 +31,6 @@ FILESGROUPS= FILES etalon
etalon+= etalon/etalon.txt
etalonDIR= ${TESTSDIR}/etalon
-PLAIN_TESTS_SH+= 1_test
+TAP_TESTS_SH+= 1_test
.include <bsd.test.mk>
More information about the svn-src-user
mailing list