Module Name: src
Committed By: jruoho
Date: Wed Jun 24 09:21:43 UTC 2020
Modified Files:
src/distrib/sets/lists/tests: mi
src/etc/mtree: NetBSD.dist.tests
Added Files:
src/tests/usr.bin/patch: Makefile t_patch.sh
Log Message:
Add a test case for bin/54620.
To generate a diff of this commit:
cvs rdiff -u -r1.844 -r1.845 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.162 -r1.163 src/etc/mtree/NetBSD.dist.tests
cvs rdiff -u -r0 -r1.1 src/tests/usr.bin/patch/Makefile \
src/tests/usr.bin/patch/t_patch.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.844 src/distrib/sets/lists/tests/mi:1.845
--- src/distrib/sets/lists/tests/mi:1.844 Wed Jun 24 09:11:26 2020
+++ src/distrib/sets/lists/tests/mi Wed Jun 24 09:21:43 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.844 2020/06/24 09:11:26 jruoho Exp $
+# $NetBSD: mi,v 1.845 2020/06/24 09:21:43 jruoho Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -4562,6 +4562,10 @@
./usr/tests/usr.bin/netpgpverify/Atffile tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/netpgpverify/Kyuafile tests-usr.bin-tests compattestfile,atf,kyua
./usr/tests/usr.bin/netpgpverify/t_netpgpverify tests-usr.bin-tests compattestfile,atf
+./usr/tests/usr.bin/patch tests-usr.bin-tests compattestfile,atf
+./usr/tests/usr.bin/patch/Atffile tests-usr.bin-tests compattestfile,atf
+./usr/tests/usr.bin/patch/Kyuafile tests-usr.bin-tests compattestfile,atf,kyua
+./usr/tests/usr.bin/patch/t_patch tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/pkill tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/pkill/Atffile tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/pkill/Kyuafile tests-usr.bin-tests compattestfile,atf,kyua
Index: src/etc/mtree/NetBSD.dist.tests
diff -u src/etc/mtree/NetBSD.dist.tests:1.162 src/etc/mtree/NetBSD.dist.tests:1.163
--- src/etc/mtree/NetBSD.dist.tests:1.162 Sun Apr 19 13:22:58 2020
+++ src/etc/mtree/NetBSD.dist.tests Wed Jun 24 09:21:43 2020
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist.tests,v 1.162 2020/04/19 13:22:58 maxv Exp $
+# $NetBSD: NetBSD.dist.tests,v 1.163 2020/06/24 09:21:43 jruoho Exp $
./usr/libdata/debug/usr/tests
./usr/libdata/debug/usr/tests/atf
@@ -422,6 +422,7 @@
./usr/tests/usr.bin/mkdep
./usr/tests/usr.bin/nbperf
./usr/tests/usr.bin/netpgpverify
+./usr/tests/usr.bin/patch
./usr/tests/usr.bin/pkill
./usr/tests/usr.bin/pr
./usr/tests/usr.bin/printf
Added files:
Index: src/tests/usr.bin/patch/Makefile
diff -u /dev/null src/tests/usr.bin/patch/Makefile:1.1
--- /dev/null Wed Jun 24 09:21:43 2020
+++ src/tests/usr.bin/patch/Makefile Wed Jun 24 09:21:43 2020
@@ -0,0 +1,8 @@
+# $NetBSD: Makefile,v 1.1 2020/06/24 09:21:43 jruoho Exp $
+
+.include <bsd.own.mk>
+
+TESTSDIR= ${TESTSBASE}/usr.bin/patch
+TESTS_SH= t_patch
+
+.include <bsd.test.mk>
Index: src/tests/usr.bin/patch/t_patch.sh
diff -u /dev/null src/tests/usr.bin/patch/t_patch.sh:1.1
--- /dev/null Wed Jun 24 09:21:43 2020
+++ src/tests/usr.bin/patch/t_patch.sh Wed Jun 24 09:21:43 2020
@@ -0,0 +1,78 @@
+# $NetBSD: t_patch.sh,v 1.1 2020/06/24 09:21:43 jruoho Exp $
+#
+# Copyright (c) 2020 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+patch_lines() {
+
+ printf "%$1s" | tr " " "a" > longlines 2>/dev/null
+
+ cat << EOF > longlines.patch
+--- ./longlines.orig 2019-10-16 09:25:30.667656644 +0000
++++ ./longlines
+@@ -1 +1 @@
+EOF
+ printf -- "-%$1s\n" | tr " " "a" >> longlines.patch 2>/dev/null
+ printf -- "+%$1s" | tr " " "b" >> longlines.patch 2>/dev/null
+
+ patch longlines < longlines.patch
+
+ if [ ! $? -eq 0 ]; then
+ atf_fail "Failed to patch long lines"
+ fi
+}
+
+atf_test_case lines
+lines_head()
+{
+ atf_set "descr" "Test patching lines"
+}
+
+lines_body()
+{
+ lines="1 10 100 1000 8100"
+
+ for line in $lines; do
+ patch_lines $line
+ done
+}
+
+atf_test_case long_lines
+long_lines_head()
+{
+ atf_set "descr" "Test patching long lines (PR bin/54620)"
+}
+
+long_lines_body()
+{
+ atf_expect_fail "PR bin/54620"
+ patch_lines 10000
+}
+
+atf_init_test_cases()
+{
+ atf_add_test_case lines
+ atf_add_test_case long_lines
+}
