[src/trunk]: src Add regression tests for PR bin/2642 and PR bin/23836, both ...

[jruoho <jruoho%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3ea26517f351
branches:  trunk
changeset: 778207:3ea26517f351
user:      jruoho <jruoho%NetBSD.org@localhost>
date:      Mon Mar 19 07:05:18 2012 +0000

description:
Add regression tests for PR bin/2642 and PR bin/23836, both fixed long ago.

diffstat:

 distrib/sets/lists/tests/mi |   5 ++-
 etc/mtree/NetBSD.dist.tests |   3 +-
 tests/usr.bin/Makefile      |   4 +-
 tests/usr.bin/cmp/Makefile  |   8 +++++
 tests/usr.bin/cmp/t_cmp.sh  |  67 +++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 83 insertions(+), 4 deletions(-)

diffs (136 lines):

diff -r 48fdb763926e -r 3ea26517f351 distrib/sets/lists/tests/mi
--- a/distrib/sets/lists/tests/mi       Mon Mar 19 06:39:22 2012 +0000
+++ b/distrib/sets/lists/tests/mi       Mon Mar 19 07:05:18 2012 +0000
@@ -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
diff -r 48fdb763926e -r 3ea26517f351 etc/mtree/NetBSD.dist.tests
--- a/etc/mtree/NetBSD.dist.tests       Mon Mar 19 06:39:22 2012 +0000
+++ b/etc/mtree/NetBSD.dist.tests       Mon Mar 19 07:05:18 2012 +0000
@@ -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
diff -r 48fdb763926e -r 3ea26517f351 tests/usr.bin/Makefile
--- a/tests/usr.bin/Makefile    Mon Mar 19 06:39:22 2012 +0000
+++ b/tests/usr.bin/Makefile    Mon Mar 19 07:05:18 2012 +0000
@@ -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
 
diff -r 48fdb763926e -r 3ea26517f351 tests/usr.bin/cmp/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/usr.bin/cmp/Makefile        Mon Mar 19 07:05:18 2012 +0000
@@ -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>
diff -r 48fdb763926e -r 3ea26517f351 tests/usr.bin/cmp/t_cmp.sh
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/usr.bin/cmp/t_cmp.sh        Mon Mar 19 07:05:18 2012 +0000
@@ -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
+}