Module Name: src
Committed By: jruoho
Date: Tue May 3 15:13:51 UTC 2011
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/diff: Makefile d_mallocv1.in d_mallocv2.in t_diff.sh
Log Message:
Add a test case for PR bin/26453.
To generate a diff of this commit:
cvs rdiff -u -r1.325 -r1.326 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.45 -r1.46 src/etc/mtree/NetBSD.dist.tests
cvs rdiff -u -r1.4 -r1.5 src/tests/usr.bin/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/usr.bin/diff/Makefile \
src/tests/usr.bin/diff/d_mallocv1.in src/tests/usr.bin/diff/d_mallocv2.in \
src/tests/usr.bin/diff/t_diff.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.325 src/distrib/sets/lists/tests/mi:1.326
--- src/distrib/sets/lists/tests/mi:1.325 Tue May 3 08:36:15 2011
+++ src/distrib/sets/lists/tests/mi Tue May 3 15:13:51 2011
@@ -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
Index: src/etc/mtree/NetBSD.dist.tests
diff -u src/etc/mtree/NetBSD.dist.tests:1.45 src/etc/mtree/NetBSD.dist.tests:1.46
--- src/etc/mtree/NetBSD.dist.tests:1.45 Tue May 3 08:36:15 2011
+++ src/etc/mtree/NetBSD.dist.tests Tue May 3 15:13:50 2011
@@ -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
Index: src/tests/usr.bin/Makefile
diff -u src/tests/usr.bin/Makefile:1.4 src/tests/usr.bin/Makefile:1.5
--- src/tests/usr.bin/Makefile:1.4 Tue May 3 08:36:15 2011
+++ src/tests/usr.bin/Makefile Tue May 3 15:13:50 2011
@@ -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>
Added files:
Index: src/tests/usr.bin/diff/Makefile
diff -u /dev/null src/tests/usr.bin/diff/Makefile:1.1
--- /dev/null Tue May 3 15:13:51 2011
+++ src/tests/usr.bin/diff/Makefile Tue May 3 15:13:50 2011
@@ -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>
Index: src/tests/usr.bin/diff/d_mallocv1.in
diff -u /dev/null src/tests/usr.bin/diff/d_mallocv1.in:1.1
--- /dev/null Tue May 3 15:13:51 2011
+++ src/tests/usr.bin/diff/d_mallocv1.in Tue May 3 15:13:50 2011
@@ -0,0 +1,5 @@
+18086b1e91f730facb2d6e1b
+c562653b24814eb3651b1e68301a3c14b96302bb
+6d017f7aef74662ed8dd51eef14281eaad223298db370bfaca
+30c04231cb3de404e4b8a5359a74066fd963291d7986be835834ab07870c097682a953bfff38784780eef844de47fb36c34f8e034c96cfa64d9cb5decee472138236e9fb79e9fe1fba6b7757b970f22477d167832206900473f09f3e8c822db6d9a8273340ed6743d99638d6cf192d821b6f33d23278b1a929f303a80865c426d01add11b2f2416babd13e70b44d8eeb731c09c7163af9d1a23cbe20ddb08b0f67ecaa2eed511263a67e9c12e59ef113f0b9e4e4e140b43896078a7571c61826ba099b3dd8c4b096a9785b4434e97ea99e662ba6fdb60a41547ccae4c67d3e1f3ef515198e91f009c75c9e80fda90d13ee29d8aad5d87cc2437ce60e6ce55700837fb0815bfd2495f8aa1a33fe67c1ae28a885506a78ca6257f5a5f2a8042e28680acc83b1aecb3a9cb51911126f2f0deaf14fcfa5f165e9a5c3f8f2d1c3f4683b2d75927a7bc802d63b680a5e22768cc0439854ccd49e58a002794f541bddd6ef6fbd4f9869843a72d0ae9d438c90353a46c0c9863a16b1de206c717ab7ce6ea6f648a38efa12b70bbe3388b35adec7a789ea98de217520d7d6ce699841e17e5946bf5a8b3c7a2c3e2d6767422baf3159ff08d913ec78011ab7d34bc24af26c24a8d46f7261c7705a7b270e27590c29583c659a0df8dada4e7a0532f115040165d18f74a55a4f39bb1dcfd865e94
a
+ 488ca910cc447e121b2a19450239e75d24
Index: src/tests/usr.bin/diff/d_mallocv2.in
diff -u /dev/null src/tests/usr.bin/diff/d_mallocv2.in:1.1
--- /dev/null Tue May 3 15:13:51 2011
+++ src/tests/usr.bin/diff/d_mallocv2.in Tue May 3 15:13:50 2011
@@ -0,0 +1,5 @@
+18086b1e91f730facb2d6e1b
+c562653b24814eb3651b1e68301a3c14b96302bb
+6d017f7aef74662ed8dd51eef14281eaad223298db370bfaca
+30c04231cb3de404e4b8a5359a74066fd963291d7986be835834ab07870c097682a953bfff38784780eef844de47fb36c34f8e034c96cfa64d9cb5decee472138236e9fb79e9fe1fba6b7757b970f22477d167832206900473f09f3e8c822db6d9a8273340ed6743d99638d6cf192d821b6f33d23278b1a929f303a80865c426d01add11b2f2416babd13e70b44d8eeb731c09c7163af9d1a23cbe20ddb08b0f67ecaa2eed511263a67e9c12e59ef113f0b9e4e4e140b43896078a7571c61826ba099b3dd8c4b096a9785b4434e97ea99e662ba6fdb60a41547ccae4c67d3e1f3ef515198e91f009c75c9e80fda90d13ee29d8aad5d87cc2437ce60e6ce55700837fb0815bfd2495f8aa1a33fe67c1ae28a885506a78ca6257f5a5f2a8042e28680acc83b1aecb3a9cb51911126f2f0deaf14fcfa5f165e9a5c3f8f2d1c3f4683b2d75927a7bc802d63b680a5e22768cc0439854ccd49e58a002794f541bddd6ef6fbd4f9869843a72d0ae9d438c90353a46c0c9863a16b1de206c717ab7ce6ea6f648a38efa12b70bbe3388b35adec7a789ea98de217520d7d6ce699841e17e5946bf5a8b3c7a2c3e2d6767422baf3159ff08d913ec78011ab7d34bc24af26c24a8d46f7261c7705a7b270e27590c29583c659a0df8dada4e7a0532f115040165d18f74a55a4f39bb1dcfd865e94
a
+ 488ca910cc447e121b2a19450239e75d24
Index: src/tests/usr.bin/diff/t_diff.sh
diff -u /dev/null src/tests/usr.bin/diff/t_diff.sh:1.1
--- /dev/null Tue May 3 15:13:51 2011
+++ src/tests/usr.bin/diff/t_diff.sh Tue May 3 15:13:50 2011
@@ -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
+}
