Correctly reintroduce the rudimentary smoke tests I botched up
in r289684 MFC after: 2 weeks Sponsored by: EMC / Isilon Storage Division
This commit is contained in:
Enji Cooper
parent
68847f1449
commit
7bdfc3b75e
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=289739
@ -596,6 +596,8 @@
|
||||
..
|
||||
fstyp
|
||||
..
|
||||
makefs
|
||||
..
|
||||
newsyslog
|
||||
..
|
||||
nmtree
|
||||
|
||||
@ -1,5 +1,7 @@
|
||||
# $FreeBSD$
|
||||
|
||||
.include <src.opts.mk>
|
||||
|
||||
PROG= makefs
|
||||
|
||||
CFLAGS+=-I${.CURDIR}
|
||||
@ -32,4 +34,8 @@ SRCS+= ffs_tables.c
|
||||
CFLAGS+= -I${.CURDIR}/../../lib/libnetbsd
|
||||
LIBADD= netbsd util sbuf
|
||||
|
||||
.if ${MK_TESTS} != "no"
|
||||
SUBDIR+= tests
|
||||
.endif
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
||||
15
usr.sbin/makefs/tests/Makefile
Normal file
15
usr.sbin/makefs/tests/Makefile
Normal file
@ -0,0 +1,15 @@
|
||||
# $FreeBSD$
|
||||
|
||||
ATF_TESTS_SH+= makefs_cd9660_tests
|
||||
ATF_TESTS_SH+= makefs_ffs_tests
|
||||
|
||||
BINDIR= ${TESTSDIR}
|
||||
|
||||
SCRIPTS+= makefs_tests_common.sh
|
||||
SCRIPTSNAME_makefs_tests_common.sh= makefs_tests_common.sh
|
||||
|
||||
.for t in ${ATF_TESTS_SH}
|
||||
TEST_METADATA.$t+= required_user="root"
|
||||
.endfor
|
||||
|
||||
.include <bsd.test.mk>
|
||||
62
usr.sbin/makefs/tests/makefs_cd9660_tests.sh
Executable file
62
usr.sbin/makefs/tests/makefs_cd9660_tests.sh
Executable file
@ -0,0 +1,62 @@
|
||||
#
|
||||
# Copyright 2015 EMC Corp.
|
||||
# All rights reserved.
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
# modification, are permitted provided that the following conditions are
|
||||
# met:
|
||||
#
|
||||
# * Redistributions of source code must retain the above copyright
|
||||
# notice, this list of conditions and the following disclaimer.
|
||||
# * Redistributions in binary form must reproduce the above copyright
|
||||
# notice, this list of conditions and the following disclaimer in the
|
||||
# documentation and/or other materials provided with the distribution.
|
||||
#
|
||||
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
#
|
||||
# $FreeBSD$
|
||||
#
|
||||
|
||||
. "$(dirname "$0")/makefs_tests_common.sh"
|
||||
|
||||
MAKEFS="makefs -t cd9660"
|
||||
TEST_IMAGE="test.iso"
|
||||
|
||||
atf_test_case basic_cd9660 cleanup
|
||||
basic_cd9660_body()
|
||||
{
|
||||
create_test_inputs
|
||||
|
||||
atf_check -e empty -o empty -s exit:0 \
|
||||
$MAKEFS $TEST_IMAGE $TEST_INPUTS_DIR
|
||||
atf_check -e empty -o save:$TEST_MD_DEVICE_FILE -s exit:0 \
|
||||
mdconfig -a -f $TEST_IMAGE
|
||||
atf_check -e empty -o empty -s exit:0 \
|
||||
mount_cd9660 /dev/$(cat $TEST_MD_DEVICE_FILE) $TEST_MOUNT_DIR
|
||||
atf_check -e empty -o not-empty -s exit:0 ls $TEST_MOUNT_DIR
|
||||
}
|
||||
basic_cd9660_cleanup()
|
||||
{
|
||||
ls -a
|
||||
|
||||
test_md_device=$(cat $TEST_MD_DEVICE_FILE) || return
|
||||
|
||||
umount -f /dev/$test_md_device
|
||||
mdconfig -d -u $test_md_device
|
||||
}
|
||||
|
||||
atf_init_test_cases()
|
||||
{
|
||||
|
||||
atf_add_test_case basic_cd9660
|
||||
}
|
||||
64
usr.sbin/makefs/tests/makefs_ffs_tests.sh
Executable file
64
usr.sbin/makefs/tests/makefs_ffs_tests.sh
Executable file
@ -0,0 +1,64 @@
|
||||
#
|
||||
# Copyright 2015 EMC Corp.
|
||||
# All rights reserved.
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
# modification, are permitted provided that the following conditions are
|
||||
# met:
|
||||
#
|
||||
# * Redistributions of source code must retain the above copyright
|
||||
# notice, this list of conditions and the following disclaimer.
|
||||
# * Redistributions in binary form must reproduce the above copyright
|
||||
# notice, this list of conditions and the following disclaimer in the
|
||||
# documentation and/or other materials provided with the distribution.
|
||||
#
|
||||
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
#
|
||||
# $FreeBSD$
|
||||
#
|
||||
|
||||
. "$(dirname "$0")/makefs_tests_common.sh"
|
||||
|
||||
MAKEFS="makefs -t ffs"
|
||||
TEST_IMAGE="test.img"
|
||||
|
||||
atf_test_case basic_ffs cleanup
|
||||
basic_ffs_body()
|
||||
{
|
||||
create_test_inputs
|
||||
|
||||
atf_check -e empty -o not-empty -s exit:0 \
|
||||
$MAKEFS -M 1m $TEST_IMAGE $TEST_INPUTS_DIR
|
||||
atf_check -e empty -o save:$TEST_MD_DEVICE_FILE -s exit:0 \
|
||||
mdconfig -a -f $TEST_IMAGE
|
||||
atf_check -e save:$ATF_TMPDIR/tunefs.output -o empty -s exit:0 \
|
||||
tunefs -p /dev/$(cat $TEST_MD_DEVICE_FILE)
|
||||
atf_check -e empty -o empty -s exit:0 \
|
||||
mount /dev/$(cat $TEST_MD_DEVICE_FILE) $TEST_MOUNT_DIR
|
||||
atf_check -e empty -o not-empty -s exit:0 ls $TEST_MOUNT_DIR
|
||||
}
|
||||
basic_ffs_cleanup()
|
||||
{
|
||||
ls -a
|
||||
|
||||
test_md_device=$(cat $TEST_MD_DEVICE_FILE) || return
|
||||
|
||||
umount -f /dev/$test_md_device
|
||||
mdconfig -d -u $test_md_device
|
||||
}
|
||||
|
||||
atf_init_test_cases()
|
||||
{
|
||||
|
||||
atf_add_test_case basic_ffs
|
||||
}
|
||||
81
usr.sbin/makefs/tests/makefs_tests_common.sh
Executable file
81
usr.sbin/makefs/tests/makefs_tests_common.sh
Executable file
@ -0,0 +1,81 @@
|
||||
#
|
||||
# Copyright 2015 EMC Corp.
|
||||
# All rights reserved.
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
# modification, are permitted provided that the following conditions are
|
||||
# met:
|
||||
#
|
||||
# * Redistributions of source code must retain the above copyright
|
||||
# notice, this list of conditions and the following disclaimer.
|
||||
# * Redistributions in binary form must reproduce the above copyright
|
||||
# notice, this list of conditions and the following disclaimer in the
|
||||
# documentation and/or other materials provided with the distribution.
|
||||
#
|
||||
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
#
|
||||
# $FreeBSD$
|
||||
#
|
||||
|
||||
TEST_MD_DEVICE_FILE="md.output"
|
||||
TEST_MOUNT_DIR="mnt"
|
||||
|
||||
create_test_dir()
|
||||
{
|
||||
[ -z "$ATF_TMPDIR" ] || return 0
|
||||
|
||||
export ATF_TMPDIR=$(pwd)
|
||||
|
||||
TEST_MD_DEVICE_FILE="${ATF_TMPDIR}/${TEST_MD_DEVICE_FILE}"
|
||||
TEST_MOUNT_DIR="${ATF_TMPDIR}/${TEST_MOUNT_DIR}"
|
||||
|
||||
# XXX: need to nest this because of how kyua creates $TMPDIR; otherwise
|
||||
# it will run into EPERM issues later
|
||||
TEST_INPUTS_DIR="${ATF_TMPDIR}/test/inputs"
|
||||
|
||||
atf_check -e empty -s exit:0 mkdir -m 0777 -p $TEST_MOUNT_DIR
|
||||
atf_check -e empty -s exit:0 mkdir -m 0777 -p $TEST_INPUTS_DIR
|
||||
cd $TEST_INPUTS_DIR
|
||||
}
|
||||
|
||||
create_test_inputs()
|
||||
{
|
||||
create_test_dir
|
||||
|
||||
atf_check -e empty -s exit:0 mkdir -m 0755 -p a/b/1
|
||||
atf_check -e empty -s exit:0 ln -s a/b c
|
||||
atf_check -e empty -s exit:0 touch d
|
||||
atf_check -e empty -s exit:0 ln d e
|
||||
atf_check -e empty -s exit:0 touch .f
|
||||
atf_check -e empty -s exit:0 mkdir .g
|
||||
atf_check -e empty -s exit:0 mkfifo h
|
||||
atf_check -e ignore -s exit:0 dd if=/dev/zero of=i count=1000 bs=1
|
||||
atf_check -e empty -s exit:0 touch klmn
|
||||
atf_check -e empty -s exit:0 touch opqr
|
||||
atf_check -e empty -s exit:0 touch stuv
|
||||
atf_check -e empty -s exit:0 install -m 0755 /dev/null wxyz
|
||||
atf_check -e empty -s exit:0 touch 0b00000001
|
||||
atf_check -e empty -s exit:0 touch 0b00000010
|
||||
atf_check -e empty -s exit:0 touch 0b00000011
|
||||
atf_check -e empty -s exit:0 touch 0b00000100
|
||||
atf_check -e empty -s exit:0 touch 0b00000101
|
||||
atf_check -e empty -s exit:0 touch 0b00000110
|
||||
atf_check -e empty -s exit:0 touch 0b00000111
|
||||
atf_check -e empty -s exit:0 touch 0b00001000
|
||||
atf_check -e empty -s exit:0 touch 0b00001001
|
||||
atf_check -e empty -s exit:0 touch 0b00001010
|
||||
atf_check -e empty -s exit:0 touch 0b00001011
|
||||
atf_check -e empty -s exit:0 touch 0b00001100
|
||||
atf_check -e empty -s exit:0 touch 0b00001101
|
||||
atf_check -e empty -s exit:0 touch 0b00001110
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user