diff options
author | ngie <ngie@FreeBSD.org> | 2017-03-30 06:20:24 +0000 |
---|---|---|
committer | ngie <ngie@FreeBSD.org> | 2017-03-30 06:20:24 +0000 |
commit | 9e3201421004311eb511297aa3f5b73721d44484 (patch) | |
tree | 6246257382c216e919a3fe0a5507d3c0636080b3 | |
parent | d7afc0b192ce298496f1924a40713cf03caef24a (diff) | |
download | FreeBSD-src-9e3201421004311eb511297aa3f5b73721d44484.zip FreeBSD-src-9e3201421004311eb511297aa3f5b73721d44484.tar.gz |
MFC r315776:
Rename tests from <foo> to <foo>_test to match the FreeBSD test suite
naming scheme
usr.bin/diff/diff_test was renamed to usr.bin/diff/netbsd_diff_test
to avoid collisions with the renamed FreeBSD test.
-rw-r--r-- | ObsoleteFiles.inc | 16 | ||||
-rw-r--r-- | usr.bin/col/tests/Makefile | 2 | ||||
-rwxr-xr-x | usr.bin/col/tests/col_test.sh (renamed from usr.bin/col/tests/col.sh) | 0 | ||||
-rw-r--r-- | usr.bin/ident/tests/Makefile | 2 | ||||
-rwxr-xr-x | usr.bin/ident/tests/ident_test.sh (renamed from usr.bin/ident/tests/ident.sh) | 0 | ||||
-rw-r--r-- | usr.bin/mkimg/tests/Makefile | 2 | ||||
-rwxr-xr-x | usr.bin/mkimg/tests/mkimg_test.sh | 164 | ||||
-rw-r--r-- | usr.bin/sdiff/tests/Makefile | 2 | ||||
-rwxr-xr-x | usr.bin/sdiff/tests/sdiff_test.sh (renamed from usr.bin/sdiff/tests/sdiff.sh) | 0 | ||||
-rw-r--r-- | usr.bin/soelim/tests/Makefile | 2 | ||||
-rwxr-xr-x | usr.bin/soelim/tests/soelim_test.sh (renamed from usr.bin/soelim/tests/soelim.sh) | 0 | ||||
-rw-r--r-- | usr.sbin/pw/tests/Makefile | 20 | ||||
-rwxr-xr-x | usr.sbin/pw/tests/pw_config_test.sh (renamed from usr.sbin/pw/tests/pw_config.sh) | 0 | ||||
-rwxr-xr-x | usr.sbin/pw/tests/pw_etcdir_test.sh (renamed from usr.sbin/pw/tests/pw_etcdir.sh) | 0 | ||||
-rwxr-xr-x | usr.sbin/pw/tests/pw_groupadd_test.sh (renamed from usr.sbin/pw/tests/pw_groupadd.sh) | 0 | ||||
-rwxr-xr-x | usr.sbin/pw/tests/pw_groupdel_test.sh (renamed from usr.sbin/pw/tests/pw_groupdel.sh) | 0 | ||||
-rwxr-xr-x | usr.sbin/pw/tests/pw_groupmod_test.sh (renamed from usr.sbin/pw/tests/pw_groupmod.sh) | 0 | ||||
-rwxr-xr-x | usr.sbin/pw/tests/pw_lock_test.sh (renamed from usr.sbin/pw/tests/pw_lock.sh) | 0 | ||||
-rwxr-xr-x | usr.sbin/pw/tests/pw_useradd_test.sh (renamed from usr.sbin/pw/tests/pw_useradd.sh) | 0 | ||||
-rwxr-xr-x | usr.sbin/pw/tests/pw_userdel_test.sh (renamed from usr.sbin/pw/tests/pw_userdel.sh) | 0 | ||||
-rwxr-xr-x | usr.sbin/pw/tests/pw_usermod_test.sh (renamed from usr.sbin/pw/tests/pw_usermod.sh) | 0 | ||||
-rwxr-xr-x | usr.sbin/pw/tests/pw_usernext_test.sh (renamed from usr.sbin/pw/tests/pw_usernext.sh) | 0 |
22 files changed, 195 insertions, 15 deletions
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 98d58d7..84e2e16 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -38,6 +38,22 @@ # xargs -n1 | sort | uniq -d; # done +# 20170322: rename <x> to <x>_test to match the FreeBSD test suite name scheme +OLD_FILES+=usr/tests/usr.bin/col/col +OLD_FILES+=usr/tests/usr.bin/ident/ident +OLD_FILES+=usr/tests/usr.bin/mkimg/mkimg +OLD_FILES+=usr/tests/usr.bin/sdiff/sdiff +OLD_FILES+=usr/tests/usr.bin/soelim/soelim +OLD_FILES+=usr/tests/usr.sbin/pw/pw_config_test +OLD_FILES+=usr/tests/usr.sbin/pw/pw_etcdir_test +OLD_FILES+=usr/tests/usr.sbin/pw/pw_lock_test +OLD_FILES+=usr/tests/usr.sbin/pw/pw_groupadd_test +OLD_FILES+=usr/tests/usr.sbin/pw/pw_groupdel_test +OLD_FILES+=usr/tests/usr.sbin/pw/pw_groupmod_test +OLD_FILES+=usr/tests/usr.sbin/pw/pw_useradd_test +OLD_FILES+=usr/tests/usr.sbin/pw/pw_userdel_test +OLD_FILES+=usr/tests/usr.sbin/pw/pw_usermod_test +OLD_FILES+=usr/tests/usr.sbin/pw/pw_usernext_test # 20170308: rename some tests OLD_FILES+=usr/tests/bin/pwait/pwait OLD_FILES+=usr/tests/usr.bin/timeout/timeout diff --git a/usr.bin/col/tests/Makefile b/usr.bin/col/tests/Makefile index 43ae05b..fd28df0 100644 --- a/usr.bin/col/tests/Makefile +++ b/usr.bin/col/tests/Makefile @@ -2,7 +2,7 @@ PACKAGE= tests -ATF_TESTS_SH= col +ATF_TESTS_SH= col_test ${PACKAGE}FILES+= \ rlf.in \ diff --git a/usr.bin/col/tests/col.sh b/usr.bin/col/tests/col_test.sh index c072aab..c072aab 100755 --- a/usr.bin/col/tests/col.sh +++ b/usr.bin/col/tests/col_test.sh diff --git a/usr.bin/ident/tests/Makefile b/usr.bin/ident/tests/Makefile index a1c6449..95bd4a5 100644 --- a/usr.bin/ident/tests/Makefile +++ b/usr.bin/ident/tests/Makefile @@ -2,7 +2,7 @@ PACKAGE= tests -ATF_TESTS_SH= ident +ATF_TESTS_SH= ident_test ${PACKAGE}FILES+= \ test.in \ test.out \ diff --git a/usr.bin/ident/tests/ident.sh b/usr.bin/ident/tests/ident_test.sh index 5a31182..5a31182 100755 --- a/usr.bin/ident/tests/ident.sh +++ b/usr.bin/ident/tests/ident_test.sh diff --git a/usr.bin/mkimg/tests/Makefile b/usr.bin/mkimg/tests/Makefile index 321a5a6..bdf9a78 100644 --- a/usr.bin/mkimg/tests/Makefile +++ b/usr.bin/mkimg/tests/Makefile @@ -2,7 +2,7 @@ PACKAGE= tests -ATF_TESTS_SH= mkimg +ATF_TESTS_SH= mkimg_test SOURCES!= cd ${.CURDIR}; echo *.uu ${PACKAGE}FILES+= ${SOURCES:S,.gz.uu,,g} diff --git a/usr.bin/mkimg/tests/mkimg_test.sh b/usr.bin/mkimg/tests/mkimg_test.sh new file mode 100755 index 0000000..76abceb --- /dev/null +++ b/usr.bin/mkimg/tests/mkimg_test.sh @@ -0,0 +1,164 @@ +# $FreeBSD$ + +mkimg_blksz_list="512 4096" +mkimg_format_list="qcow qcow2 raw vhd vhdf vmdk" +mkimg_geom_list="1x1 63x255" +mkimg_scheme_list="apm bsd ebr gpt mbr vtoc8" + +bootcode() +{ + case $1 in + bsd) echo 8192 ;; + gpt|mbr) echo 512 ;; + *) echo 0 ;; + esac + return 0 +} + +mkcontents() +{ + local byte count name + + byte=$1 + count=$2 + + name=_tmp-$byte-$count.bin + jot -b $byte $(($count/2)) > $name + echo $name + return 0 +} + +makeimage() +{ + local blksz bootarg bootsz format geom nhds nsecs partarg pfx scheme + + format=$1 + scheme=$2 + blksz=$3 + geom=$4 + pfx=$5 + shift 5 + + nsecs=${geom%x*} + nhds=${geom#*x} + + bootsz=`bootcode $scheme` + if test $bootsz -gt 0; then + bootarg="-b `mkcontents B $bootsz`" + else + bootarg="" + fi + + partarg="" + for P in $*; do + partarg="$partarg -p $P" + done + if test -z "$partarg"; then + local swap ufs + swap="-p freebsd-swap::128K" + ufs="-p freebsd-ufs:=`mkcontents P 4194304`" + partarg="$ufs $swap" + fi + + imagename=$pfx-$geom-$blksz-$scheme.$format + + mkimg -y -f $format -o $imagename -s $scheme -P $blksz -H $nhds -T $nsecs \ + $bootarg $partarg + echo $imagename + return 0 +} + +mkimg_rebase() +{ + local baseline image result tmpfile update + + image=$1 + result=$2 + + baseline=$image.gz.uu + update=yes + + if test -f $baseline; then + tmpfile=_tmp-baseline + uudecode -p $baseline | gunzip -c > $tmpfile + if cmp -s $tmpfile $result; then + update=no + fi + fi + + if test $update = yes; then + # Prevent keyword expansion when writing the keyword. + (echo -n '# $'; echo -n FreeBSD; echo '$') > $baseline + gzip -c $result | uuencode $image.gz >> $baseline + fi + + rm $image $result _tmp-* + return 0 +} + +mkimg_test() +{ + local blksz format geom scheme + + geom=$1 + blksz=$2 + scheme=$3 + format=$4 + + case $scheme in + ebr|mbr) + bsd=`makeimage raw bsd $blksz $geom _tmp` + partinfo="freebsd:=$bsd" + ;; + *) + partinfo="" + ;; + esac + image=`makeimage $format $scheme $blksz $geom img $partinfo` + result=$image.out + hexdump -C $image > $result + if test "x$mkimg_update_baseline" = "xyes"; then + mkimg_rebase $image $result + else + baseline=`atf_get_srcdir`/$image + atf_check -s exit:0 cmp -s $baseline $result + fi + return 0 +} + +atf_test_case rebase +rebase_body() +{ + local nm + + mkimg_update_baseline=yes + for nm in $mkimg_tests; do + ${nm}_body + done + return 0 +} + +atf_init_test_cases() +{ + local B F G S nm + + for G in $mkimg_geom_list; do + for B in $mkimg_blksz_list; do + for S in $mkimg_scheme_list; do + for F in $mkimg_format_list; do + nm="${S}_${G}_${B}_${F}" + atf_test_case $nm + eval "${nm}_body() { mkimg_test $G $B $S $F; }" + mkimg_tests="${mkimg_tests} ${nm}" + atf_add_test_case $nm + done + done + done + done + + # XXX hack to make updating the baseline easier + if test "${__RUNNING_INSIDE_ATF_RUN}" != "internal-yes-value"; then + atf_add_test_case rebase + fi +} + diff --git a/usr.bin/sdiff/tests/Makefile b/usr.bin/sdiff/tests/Makefile index b01c3b6..28979e4 100644 --- a/usr.bin/sdiff/tests/Makefile +++ b/usr.bin/sdiff/tests/Makefile @@ -2,7 +2,7 @@ PACKAGE= tests -ATF_TESTS_SH= sdiff +ATF_TESTS_SH= sdiff_test ${PACKAGE}FILES+= \ d_dot.in \ diff --git a/usr.bin/sdiff/tests/sdiff.sh b/usr.bin/sdiff/tests/sdiff_test.sh index 51aac6b..51aac6b 100755 --- a/usr.bin/sdiff/tests/sdiff.sh +++ b/usr.bin/sdiff/tests/sdiff_test.sh diff --git a/usr.bin/soelim/tests/Makefile b/usr.bin/soelim/tests/Makefile index 9528694..9727110 100644 --- a/usr.bin/soelim/tests/Makefile +++ b/usr.bin/soelim/tests/Makefile @@ -2,7 +2,7 @@ PACKAGE= tests -ATF_TESTS_SH= soelim +ATF_TESTS_SH= soelim_test ${PACKAGE}FILES+= nonexisting.in \ basic.in \ diff --git a/usr.bin/soelim/tests/soelim.sh b/usr.bin/soelim/tests/soelim_test.sh index 69c92e4..69c92e4 100755 --- a/usr.bin/soelim/tests/soelim.sh +++ b/usr.bin/soelim/tests/soelim_test.sh diff --git a/usr.sbin/pw/tests/Makefile b/usr.sbin/pw/tests/Makefile index 1ae14f3..496064b 100644 --- a/usr.sbin/pw/tests/Makefile +++ b/usr.sbin/pw/tests/Makefile @@ -7,16 +7,16 @@ BINDIR= ${TESTSDIR} PROGS+= crypt LIBADD+= crypt -ATF_TESTS_SH= pw_etcdir \ - pw_lock \ - pw_config \ - pw_groupadd \ - pw_groupdel \ - pw_groupmod \ - pw_useradd \ - pw_userdel \ - pw_usermod \ - pw_usernext +ATF_TESTS_SH= pw_etcdir_test \ + pw_lock_test \ + pw_config_test \ + pw_groupadd_test \ + pw_groupdel_test \ + pw_groupmod_test \ + pw_useradd_test \ + pw_userdel_test \ + pw_usermod_test \ + pw_usernext_test .for tp in ${ATF_TESTS_SH} TEST_METADATA.${tp}+= required_user="root" diff --git a/usr.sbin/pw/tests/pw_config.sh b/usr.sbin/pw/tests/pw_config_test.sh index fb6489a..fb6489a 100755 --- a/usr.sbin/pw/tests/pw_config.sh +++ b/usr.sbin/pw/tests/pw_config_test.sh diff --git a/usr.sbin/pw/tests/pw_etcdir.sh b/usr.sbin/pw/tests/pw_etcdir_test.sh index b237789..b237789 100755 --- a/usr.sbin/pw/tests/pw_etcdir.sh +++ b/usr.sbin/pw/tests/pw_etcdir_test.sh diff --git a/usr.sbin/pw/tests/pw_groupadd.sh b/usr.sbin/pw/tests/pw_groupadd_test.sh index 5fa7bef..5fa7bef 100755 --- a/usr.sbin/pw/tests/pw_groupadd.sh +++ b/usr.sbin/pw/tests/pw_groupadd_test.sh diff --git a/usr.sbin/pw/tests/pw_groupdel.sh b/usr.sbin/pw/tests/pw_groupdel_test.sh index 88cc0e0..88cc0e0 100755 --- a/usr.sbin/pw/tests/pw_groupdel.sh +++ b/usr.sbin/pw/tests/pw_groupdel_test.sh diff --git a/usr.sbin/pw/tests/pw_groupmod.sh b/usr.sbin/pw/tests/pw_groupmod_test.sh index 5806925..5806925 100755 --- a/usr.sbin/pw/tests/pw_groupmod.sh +++ b/usr.sbin/pw/tests/pw_groupmod_test.sh diff --git a/usr.sbin/pw/tests/pw_lock.sh b/usr.sbin/pw/tests/pw_lock_test.sh index 5ec1b09..5ec1b09 100755 --- a/usr.sbin/pw/tests/pw_lock.sh +++ b/usr.sbin/pw/tests/pw_lock_test.sh diff --git a/usr.sbin/pw/tests/pw_useradd.sh b/usr.sbin/pw/tests/pw_useradd_test.sh index b1ff8d4..b1ff8d4 100755 --- a/usr.sbin/pw/tests/pw_useradd.sh +++ b/usr.sbin/pw/tests/pw_useradd_test.sh diff --git a/usr.sbin/pw/tests/pw_userdel.sh b/usr.sbin/pw/tests/pw_userdel_test.sh index d03501a..d03501a 100755 --- a/usr.sbin/pw/tests/pw_userdel.sh +++ b/usr.sbin/pw/tests/pw_userdel_test.sh diff --git a/usr.sbin/pw/tests/pw_usermod.sh b/usr.sbin/pw/tests/pw_usermod_test.sh index 6a13130..6a13130 100755 --- a/usr.sbin/pw/tests/pw_usermod.sh +++ b/usr.sbin/pw/tests/pw_usermod_test.sh diff --git a/usr.sbin/pw/tests/pw_usernext.sh b/usr.sbin/pw/tests/pw_usernext_test.sh index 89f938e..89f938e 100755 --- a/usr.sbin/pw/tests/pw_usernext.sh +++ b/usr.sbin/pw/tests/pw_usernext_test.sh |