Date: Tue, 17 Nov 2015 01:01:03 +0000 (UTC) From: Garrett Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r290965 - user/ngie/more-tests2/sbin/geom/class/tests/gate Message-ID: <201511170101.tAH113ka047677@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Tue Nov 17 01:01:02 2015 New Revision: 290965 URL: https://svnweb.freebsd.org/changeset/base/290965 Log: - Use conf.sh - Consolidate the cleanup steps and always execute on exit - Be more verbose on md5 failure - Use better variable names - Expect the testcase to fail, as noted in bug 204616 PR: 204616 Modified: user/ngie/more-tests2/sbin/geom/class/tests/gate/2_test.sh Modified: user/ngie/more-tests2/sbin/geom/class/tests/gate/2_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/gate/2_test.sh Tue Nov 17 00:40:25 2015 (r290964) +++ user/ngie/more-tests2/sbin/geom/class/tests/gate/2_test.sh Tue Nov 17 01:01:02 2015 (r290965) @@ -1,31 +1,48 @@ #!/bin/sh # $FreeBSD$ -base=`basename $0` -us=45 -work=`mktemp /tmp/$base.XXXXXX` || exit 1 -src=`mktemp /tmp/$base.XXXXXX` || exit 1 - -dd if=/dev/random of=$work bs=1m count=1 >/dev/null 2>&1 -dd if=/dev/random of=$src bs=1m count=1 >/dev/null 2>&1 -sum=`md5 -q $src` +. `dirname $0`/conf.sh -ggatel create -u $us $work +base=`basename $0` +us=46 +work=`mktemp -u $base.XXXXXX` || exit 1 +src=`mktemp -u $base.XXXXXX` || exit 1 + +test_cleanup() +{ + ggatel destroy -f -u $us + rm -f $work $src + + geom_test_cleanup +} +trap test_cleanup ABRT EXIT INT TERM + +dd if=/dev/random of=$work bs=1m count=1 conv=sync +dd if=/dev/random of=$src bs=1m count=1 conv=sync + +if ! ggatel create -u $us $work; then + echo 'ggatel create failed' + echo 'Bail out!' + exit 1 +fi -dd if=${src} of=/dev/ggate${us} bs=1m count=1 >/dev/null 2>&1 +dd if=${src} of=/dev/ggate${us} bs=1m count=1 +sleep 1 echo '1..2' -if [ `md5 -q $work` != $sum ]; then - echo 'not ok 1 - md5 checksum' +src_checksum=$(md5 -q $src) +work_checksum=$(md5 -q $work) +if [ "$work_checksum" != "$src_checksum" ]; then + echo "not ok 1 - md5 checksums didn't match ($work_checksum != $src_checksum) # TODO: bug 204616" + echo 'not ok 2 # SKIP' else echo 'ok 1 - md5 checksum' - if [ `cat /dev/ggate${us} | md5 -q` != $sum ]; then - echo 'not ok 2 - md5 checksum' + + ggate_checksum=$(md5 -q /dev/ggate${us}) + if [ "$ggate_checksum" != "$src_checksum" ]; then + echo "not ok 2 - md5 checksums didn't match ($ggate_checksum != $src_checksum)" else echo 'ok 2 - md5 checksum' fi fi - -ggatel destroy -u $us -rm -f $work $src
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511170101.tAH113ka047677>