Module Name: src
Committed By: jruoho
Date: Mon Mar 19 07:05:18 UTC 2012
Modified Files:
src/distrib/sets/lists/tests: mi
src/etc/mtree: NetBSD.dist.tests
src/tests/usr.bin: Makefile
Added Files:
src/tests/usr.bin/cmp: Makefile t_cmp.sh
Log Message:
Add regression tests for PR bin/2642 and PR bin/23836, both fixed long ago.
To generate a diff of this commit:
cvs rdiff -u -r1.450 -r1.451 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.66 -r1.67 src/etc/mtree/NetBSD.dist.tests
cvs rdiff -u -r1.11 -r1.12 src/tests/usr.bin/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/usr.bin/cmp/Makefile \
src/tests/usr.bin/cmp/t_cmp.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.450 src/distrib/sets/lists/tests/mi:1.451
--- src/distrib/sets/lists/tests/mi:1.450 Sun Mar 18 15:32:23 2012
+++ src/distrib/sets/lists/tests/mi Mon Mar 19 07:05:18 2012
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.450 2012/03/18 15:32:23 christos Exp $
+# $NetBSD: mi,v 1.451 2012/03/19 07:05:18 jruoho Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -2806,6 +2806,9 @@
./usr/tests/usr.bin/cc tests-usr.bin-tests
./usr/tests/usr.bin/cc/Atffile tests-usr.bin-tests atf
./usr/tests/usr.bin/cc/t_hello tests-usr.bin-tests atf
+./usr/tests/usr.bin/cmp tests-usr.bin-tests
+./usr/tests/usr.bin/cmp/Atffile tests-usr.bin-tests atf
+./usr/tests/usr.bin/cmp/t_cmp tests-usr.bin-tests atf
./usr/tests/usr.bin/config tests-usr.bin-tests
./usr/tests/usr.bin/config/Atffile tests-usr.bin-tests atf
./usr/tests/usr.bin/config/Makefile.regress tests-usr.bin-tests atf
Index: src/etc/mtree/NetBSD.dist.tests
diff -u src/etc/mtree/NetBSD.dist.tests:1.66 src/etc/mtree/NetBSD.dist.tests:1.67
--- src/etc/mtree/NetBSD.dist.tests:1.66 Sun Mar 18 12:40:43 2012
+++ src/etc/mtree/NetBSD.dist.tests Mon Mar 19 07:05:18 2012
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist.tests,v 1.66 2012/03/18 12:40:43 jruoho Exp $
+# $NetBSD: NetBSD.dist.tests,v 1.67 2012/03/19 07:05:18 jruoho Exp $
./usr/libdata/debug/usr/tests
./usr/libdata/debug/usr/tests/atf
@@ -264,6 +264,7 @@
./usr/tests/usr.bin/basename
./usr/tests/usr.bin/bzip2
./usr/tests/usr.bin/cc
+./usr/tests/usr.bin/cmp
./usr/tests/usr.bin/config
./usr/tests/usr.bin/config/support
./usr/tests/usr.bin/config/support/arch
Index: src/tests/usr.bin/Makefile
diff -u src/tests/usr.bin/Makefile:1.11 src/tests/usr.bin/Makefile:1.12
--- src/tests/usr.bin/Makefile:1.11 Sun Mar 18 12:40:42 2012
+++ src/tests/usr.bin/Makefile Mon Mar 19 07:05:18 2012
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.11 2012/03/18 12:40:42 jruoho Exp $
+# $NetBSD: Makefile,v 1.12 2012/03/19 07:05:18 jruoho Exp $
#
.include <bsd.own.mk>
TESTSDIR= ${TESTSBASE}/usr.bin
-TESTS_SUBDIRS= awk basename bzip2 cc config cut \
+TESTS_SUBDIRS= awk basename bzip2 cc cmp config cut \
diff dirname find grep gzip id m4 make mkdep \
pr rump_server shmif_dumpbus sdiff sed sort unifdef xlint
Added files:
Index: src/tests/usr.bin/cmp/Makefile
diff -u /dev/null src/tests/usr.bin/cmp/Makefile:1.1
--- /dev/null Mon Mar 19 07:05:19 2012
+++ src/tests/usr.bin/cmp/Makefile Mon Mar 19 07:05:18 2012
@@ -0,0 +1,8 @@
+# $NetBSD: Makefile,v 1.1 2012/03/19 07:05:18 jruoho Exp $
+
+.include <bsd.own.mk>
+
+TESTSDIR= ${TESTSBASE}/usr.bin/cmp
+TESTS_SH= t_cmp
+
+.include <bsd.test.mk>
Index: src/tests/usr.bin/cmp/t_cmp.sh
diff -u /dev/null src/tests/usr.bin/cmp/t_cmp.sh:1.1
--- /dev/null Mon Mar 19 07:05:19 2012
+++ src/tests/usr.bin/cmp/t_cmp.sh Mon Mar 19 07:05:18 2012
@@ -0,0 +1,67 @@
+# $NetBSD: t_cmp.sh,v 1.1 2012/03/19 07:05:18 jruoho Exp $
+#
+# Copyright (c) 2012 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Jukka Ruohonen.
+#
+# 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
+#
+
+atf_test_case missing
+missing_head() {
+ atf_set "descr" "Test that cmp(1) with '-s' is silent " \
+ "when files are missing (PR bin/2642)"
+}
+
+missing_body() {
+
+ echo a > a
+
+ atf_check -s not-exit:0 -o empty -e empty -x "cmp -s a x"
+ atf_check -s not-exit:0 -o empty -e empty -x "cmp -s x a"
+ atf_check -s not-exit:0 -o empty -e empty -x "cmp -s x y"
+ atf_check -s not-exit:0 -o empty -e empty -x "cmp -s y x"
+}
+
+atf_test_case skip
+skip_head() {
+ atf_set "descr" "Test that cmp(1) handles skip " \
+ "parameters correctly (PR bin/23836)"
+}
+
+skip_body() {
+
+ echo 0123456789abcdef > a
+ echo abcdef > b
+
+ atf_check -s exit:0 -o empty -e empty -x "cmp a b '10'"
+ atf_check -s exit:0 -o empty -e empty -x "cmp a b '0xa'"
+ atf_check -s exit:1 -o not-empty -e empty -x "cmp a b '9'"
+}
+
+atf_init_test_cases()
+{
+ atf_add_test_case missing
+ atf_add_test_case skip
+}
