Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src Add a test case for PR bin/26453.



details:   https://anonhg.NetBSD.org/src/rev/d162632d83fc
branches:  trunk
changeset: 764771:d162632d83fc
user:      jruoho <jruoho%NetBSD.org@localhost>
date:      Tue May 03 15:13:50 2011 +0000

description:
Add a test case for PR bin/26453.

diffstat:

 distrib/sets/lists/tests/mi      |   7 +++-
 etc/mtree/NetBSD.dist.tests      |   3 +-
 tests/usr.bin/Makefile           |   4 +-
 tests/usr.bin/diff/Makefile      |  13 ++++++
 tests/usr.bin/diff/d_mallocv1.in |   5 ++
 tests/usr.bin/diff/d_mallocv2.in |   5 ++
 tests/usr.bin/diff/t_diff.sh     |  79 ++++++++++++++++++++++++++++++++++++++++
 7 files changed, 112 insertions(+), 4 deletions(-)

diffs (172 lines):

diff -r b273f00fe7c9 -r d162632d83fc distrib/sets/lists/tests/mi
--- a/distrib/sets/lists/tests/mi       Tue May 03 14:26:11 2011 +0000
+++ b/distrib/sets/lists/tests/mi       Tue May 03 15:13:50 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.325 2011/05/03 08:36:15 jruoho Exp $
+# $NetBSD: mi,v 1.326 2011/05/03 15:13:51 jruoho Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -2311,6 +2311,11 @@
 ./usr/tests/toolchain/cc/t_hello               tests-syscall-tests     atf
 ./usr/tests/usr.bin                            tests-util-tests
 ./usr/tests/usr.bin/Atffile                    tests-sbin-tests        atf
+./usr/tests/usr.bin/diff                       tests-util-tests
+./usr/tests/usr.bin/diff/Atffile               tests-util-tests        atf
+./usr/tests/usr.bin/diff/d_mallocv1.in         tests-util-tests        atf
+./usr/tests/usr.bin/diff/d_mallocv2.in         tests-util-tests        atf
+./usr/tests/usr.bin/diff/t_diff                        tests-util-tests        atf
 ./usr/tests/usr.bin/pr                         tests-util-tests
 ./usr/tests/usr.bin/pr/Atffile                 tests-util-tests        atf
 ./usr/tests/usr.bin/pr/d_basic.in              tests-util-tests        atf
diff -r b273f00fe7c9 -r d162632d83fc etc/mtree/NetBSD.dist.tests
--- a/etc/mtree/NetBSD.dist.tests       Tue May 03 14:26:11 2011 +0000
+++ b/etc/mtree/NetBSD.dist.tests       Tue May 03 15:13:50 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: NetBSD.dist.tests,v 1.45 2011/05/03 08:36:15 jruoho Exp $
+#      $NetBSD: NetBSD.dist.tests,v 1.46 2011/05/03 15:13:50 jruoho Exp $
 
 ./usr/libdata/debug/usr/tests
 ./usr/libdata/debug/usr/tests/atf
@@ -238,6 +238,7 @@
 ./usr/tests/toolchain
 ./usr/tests/toolchain/cc
 ./usr/tests/usr.bin
+./usr/tests/usr.bin/diff
 ./usr/tests/usr.bin/pr
 ./usr/tests/usr.bin/rump_server
 ./usr/tests/usr.bin/shmif_dumpbus
diff -r b273f00fe7c9 -r d162632d83fc tests/usr.bin/Makefile
--- a/tests/usr.bin/Makefile    Tue May 03 14:26:11 2011 +0000
+++ b/tests/usr.bin/Makefile    Tue May 03 15:13:50 2011 +0000
@@ -1,10 +1,10 @@
-#      $NetBSD: Makefile,v 1.4 2011/05/03 08:36:15 jruoho Exp $
+#      $NetBSD: Makefile,v 1.5 2011/05/03 15:13:50 jruoho Exp $
 #
 
 .include <bsd.own.mk>
 
 TESTSDIR=       ${TESTSBASE}/usr.bin
 
-TESTS_SUBDIRS+= pr rump_server shmif_dumpbus unifdef
+TESTS_SUBDIRS+= diff pr rump_server shmif_dumpbus unifdef
 
 .include <bsd.test.mk>
diff -r b273f00fe7c9 -r d162632d83fc tests/usr.bin/diff/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/usr.bin/diff/Makefile       Tue May 03 15:13:50 2011 +0000
@@ -0,0 +1,13 @@
+# $NetBSD: Makefile,v 1.1 2011/05/03 15:13:50 jruoho Exp $
+
+.include <bsd.own.mk>
+
+TESTSDIR=      ${TESTSBASE}/usr.bin/diff
+
+TESTS_SH=      t_diff
+
+FILESDIR=      ${TESTSDIR}
+FILES+=                d_mallocv1.in
+FILES+=                d_mallocv2.in
+
+.include <bsd.test.mk>
diff -r b273f00fe7c9 -r d162632d83fc tests/usr.bin/diff/d_mallocv1.in
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/usr.bin/diff/d_mallocv1.in  Tue May 03 15:13:50 2011 +0000
@@ -0,0 +1,5 @@
+18086b1e91f730facb2d6e1b
+c562653b24814eb3651b1e68301a3c14b96302bb
+6d017f7aef74662ed8dd51eef14281eaad223298db370bfaca
+30c04231cb3de404e4b8a5359a74066fd963291d7986be835834ab07870c097682a953bfff38784780eef844de47fb36c34f8e034c96cfa64d9cb5decee472138236e9fb79e9fe1fba6b7757b970f22477d167832206900473f09f3e8c822db6d9a8273340ed6743d99638d6cf192d821b6f33d23278b1a929f303a80865c426d01add11b2f2416babd13e70b44d8eeb731c09c7163af9d1a23cbe20ddb08b0f67ecaa2eed511263a67e9c12e59ef113f0b9e4e4e140b43896078a7571c61826ba099b3dd8c4b096a9785b4434e97ea99e662ba6fdb60a41547ccae4c67d3e1f3ef515198e91f009c75c9e80fda90d13ee29d8aad5d87cc2437ce60e6ce55700837fb0815bfd2495f8aa1a33fe67c1ae28a885506a78ca6257f5a5f2a8042e28680acc83b1aecb3a9cb51911126f2f0deaf14fcfa5f165e9a5c3f8f2d1c3f4683b2d75927a7bc802d63b680a5e22768cc0439854ccd49e58a002794f541bddd6ef6fbd4f9869843a72d0ae9d438c90353a46c0c9863a16b1de206c717ab7ce6ea6f648a38efa12b70bbe3388b35adec7a789ea98de217520d7d6ce699841e17e5946bf5a8b3c7a2c3e2d6767422baf3159ff08d913ec78011ab7d34bc24af26c24a8d46f7261c7705a7b270e27590c29583c659a0df8dada4e7a0532f115040165d18f74a55a4f39bb1dcfd865e94a
+ 488ca910cc447e121b2a19450239e75d24
diff -r b273f00fe7c9 -r d162632d83fc tests/usr.bin/diff/d_mallocv2.in
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/usr.bin/diff/d_mallocv2.in  Tue May 03 15:13:50 2011 +0000
@@ -0,0 +1,5 @@
+18086b1e91f730facb2d6e1b
+c562653b24814eb3651b1e68301a3c14b96302bb
+6d017f7aef74662ed8dd51eef14281eaad223298db370bfaca
+30c04231cb3de404e4b8a5359a74066fd963291d7986be835834ab07870c097682a953bfff38784780eef844de47fb36c34f8e034c96cfa64d9cb5decee472138236e9fb79e9fe1fba6b7757b970f22477d167832206900473f09f3e8c822db6d9a8273340ed6743d99638d6cf192d821b6f33d23278b1a929f303a80865c426d01add11b2f2416babd13e70b44d8eeb731c09c7163af9d1a23cbe20ddb08b0f67ecaa2eed511263a67e9c12e59ef113f0b9e4e4e140b43896078a7571c61826ba099b3dd8c4b096a9785b4434e97ea99e662ba6fdb60a41547ccae4c67d3e1f3ef515198e91f009c75c9e80fda90d13ee29d8aad5d87cc2437ce60e6ce55700837fb0815bfd2495f8aa1a33fe67c1ae28a885506a78ca6257f5a5f2a8042e28680acc83b1aecb3a9cb51911126f2f0deaf14fcfa5f165e9a5c3f8f2d1c3f4683b2d75927a7bc802d63b680a5e22768cc0439854ccd49e58a002794f541bddd6ef6fbd4f9869843a72d0ae9d438c90353a46c0c9863a16b1de206c717ab7ce6ea6f648a38efa12b70bbe3388b35adec7a789ea98de217520d7d6ce699841e17e5946bf5a8b3c7a2c3e2d6767422baf3159ff08d913ec78011ab7d34bc24af26c24a8d46f7261c7705a7b270e27590c29583c659a0df8dada4e7a0532f115040165d18f74a55a4f39bb1dcfd865e94a
+ 488ca910cc447e121b2a19450239e75d24
diff -r b273f00fe7c9 -r d162632d83fc tests/usr.bin/diff/t_diff.sh
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/usr.bin/diff/t_diff.sh      Tue May 03 15:13:50 2011 +0000
@@ -0,0 +1,79 @@
+#! /usr/bin/atf-sh
+#
+# $NetBSD: t_diff.sh,v 1.1 2011/05/03 15:13:50 jruoho Exp $
+#
+# Copyright (c) 2011 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 mallocv
+mallocv_head() {
+       atf_set "descr" "Test diff(1) with MALLOC_OPTIONS=V"
+}
+
+mallocv_body() {
+
+       atf_expect_fail "PR bin/26453"
+
+       atf_check -s ignore \
+               -e not-inline:"diff: memory exhausted\n" \
+               -x "env MALLOC_OPTIONS=V diff " \
+                  "$(atf_get_srcdir)/d_mallocv1.in" \
+                  "$(atf_get_srcdir)/d_mallocv2.in"
+}
+
+atf_test_case nomallocv
+nomallocv_head() {
+       atf_set "descr" "Test diff(1) with no MALLOC_OPTIONS=V"
+}
+
+nomallocv_body() {
+
+       atf_check -s exit:0 \
+               -e inline:"" \
+               -x "diff " \
+                  "$(atf_get_srcdir)/d_mallocv1.in" \
+                  "$(atf_get_srcdir)/d_mallocv2.in"
+}
+
+atf_test_case same
+same_head() {
+       atf_set "descr" "Test diff(1) with identical files"
+}
+
+same_body() {
+
+       atf_check -s exit:0 \
+               -e inline:"" \
+               -x "diff $(atf_get_srcdir)/t_diff $(atf_get_srcdir)/t_diff"
+}
+
+atf_init_test_cases() {
+       atf_add_test_case mallocv
+       atf_add_test_case nomallocv
+       atf_add_test_case same
+}



Home | Main Index | Thread Index | Old Index