svn commit: r366059 - in head: bin/cp bin/cp/tests etc/mtree

Kyle Evans kevans at FreeBSD.org
Wed Sep 23 03:01:15 UTC 2020


Author: kevans
Date: Wed Sep 23 03:01:14 2020
New Revision: 366059
URL: https://svnweb.freebsd.org/changeset/base/366059

Log:
  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.
  
  MFC after:	1 week

Added:
  head/bin/cp/tests/
  head/bin/cp/tests/Makefile   (contents, props changed)
  head/bin/cp/tests/cp_test.sh   (contents, props changed)
Modified:
  head/bin/cp/Makefile
  head/etc/mtree/BSD.tests.dist

Modified: head/bin/cp/Makefile
==============================================================================
--- head/bin/cp/Makefile	Wed Sep 23 02:37:27 2020	(r366058)
+++ head/bin/cp/Makefile	Wed Sep 23 03:01:14 2020	(r366059)
@@ -1,9 +1,14 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 # $FreeBSD$
 
+.include <src.opts.mk>
+
 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 <bsd.prog.mk>

Added: head/bin/cp/tests/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/bin/cp/tests/Makefile	Wed Sep 23 03:01:14 2020	(r366059)
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+PACKAGE=	tests
+
+ATF_TESTS_SH=	cp_test
+
+.include <bsd.test.mk>

Added: head/bin/cp/tests/cp_test.sh
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/bin/cp/tests/cp_test.sh	Wed Sep 23 03:01:14 2020	(r366059)
@@ -0,0 +1,63 @@
+#
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
+# Copyright (c) 2020 Kyle Evans <kevans at FreeBSD.org>
+#
+# 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
+20atf_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
+}

Modified: head/etc/mtree/BSD.tests.dist
==============================================================================
--- head/etc/mtree/BSD.tests.dist	Wed Sep 23 02:37:27 2020	(r366058)
+++ head/etc/mtree/BSD.tests.dist	Wed Sep 23 03:01:14 2020	(r366059)
@@ -12,6 +12,8 @@
         ..
         chmod
         ..
+        cp
+        ..
         date
         ..
         dd


More information about the svn-src-all mailing list