From 94607fbaa455b789939c3f4ed6f87540ff658916 Mon Sep 17 00:00:00 2001 From: Kyle Evans Date: Wed, 30 Sep 2020 00:56:08 +0000 Subject: [PATCH] MFC r366059-r366060: cp(1): tests r366059: cp: add some basic tests There are some tests available in the NetBSD test suite, but we don't currently pass all of those; further investigation will go into that. For now, just add a basic test as well as a test that copies from /dev/null to a file. The /dev/null test confirms that the file gets created if it's empty, then that it truncates the file if it's non-empty. This matches some usage that was previously employed in the build and was replaced in r366042 by a simpler shell construct. I will also plan on coming back to expand these in due time. r366060: cp: tests: fix weird 20 insertion This slipped in at the last moment. =( --- bin/cp/Makefile | 5 ++++ bin/cp/tests/Makefile | 7 +++++ bin/cp/tests/cp_test.sh | 64 ++++++++++++++++++++++++++++++++++++++++ etc/mtree/BSD.tests.dist | 2 ++ 4 files changed, 78 insertions(+) create mode 100644 bin/cp/tests/Makefile create mode 100755 bin/cp/tests/cp_test.sh diff --git a/bin/cp/Makefile b/bin/cp/Makefile index d20f60e537d..0c4c7b5eff5 100644 --- a/bin/cp/Makefile +++ b/bin/cp/Makefile @@ -1,9 +1,14 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 # $FreeBSD$ +.include + PACKAGE=runtime PROG= cp SRCS= cp.c utils.c CFLAGS+= -DVM_AND_BUFFER_CACHE_SYNCHRONIZED -D_ACL_PRIVATE +HAS_TESTS= +SUBDIR.${MK_TESTS}= tests + .include diff --git a/bin/cp/tests/Makefile b/bin/cp/tests/Makefile new file mode 100644 index 00000000000..faad22df713 --- /dev/null +++ b/bin/cp/tests/Makefile @@ -0,0 +1,7 @@ +# $FreeBSD$ + +PACKAGE= tests + +ATF_TESTS_SH= cp_test + +.include diff --git a/bin/cp/tests/cp_test.sh b/bin/cp/tests/cp_test.sh new file mode 100755 index 00000000000..753e69f2d61 --- /dev/null +++ b/bin/cp/tests/cp_test.sh @@ -0,0 +1,64 @@ +# +# SPDX-License-Identifier: BSD-2-Clause-FreeBSD +# +# Copyright (c) 2020 Kyle Evans +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. 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 AUTHOR 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 AUTHOR 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$ + +check_size() +{ + file=$1 + sz=$2 + + atf_check -o inline:"$sz\n" stat -f '%z' $file +} + +atf_test_case basic +basic_body() +{ + echo "foo" > bar + + atf_check cp bar baz + check_size baz 4 +} + +atf_test_case chrdev +chrdev_body() +{ + echo "foo" > bar + + check_size bar 4 + atf_check cp /dev/null trunc + check_size trunc 0 + atf_check cp bar trunc + check_size trunc 4 + atf_check cp /dev/null trunc + check_size trunc 0 +} + +atf_init_test_cases() +{ + atf_add_test_case basic + atf_add_test_case chrdev +} diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index 29101266c95..325339d371f 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -12,6 +12,8 @@ .. chmod .. + cp + .. date .. dd -- 2.45.0