Wed Jun 24 09:21:43 2020 UTC ()
Add a test case for bin/54620.


(jruoho)
diff -r1.844 -r1.845 src/distrib/sets/lists/tests/mi
diff -r1.162 -r1.163 src/etc/mtree/NetBSD.dist.tests
diff -r0 -r1.1 src/tests/usr.bin/patch/Makefile
diff -r0 -r1.1 src/tests/usr.bin/patch/t_patch.sh

cvs diff -r1.844 -r1.845 src/distrib/sets/lists/tests/mi (expand / switch to unified diff)

--- src/distrib/sets/lists/tests/mi 2020/06/24 09:11:26 1.844
+++ src/distrib/sets/lists/tests/mi 2020/06/24 09:21:43 1.845
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: mi,v 1.844 2020/06/24 09:11:26 jruoho Exp $ 1# $NetBSD: mi,v 1.845 2020/06/24 09:21:43 jruoho Exp $
2# 2#
3# Note: don't delete entries from here - mark them as "obsolete" instead. 3# Note: don't delete entries from here - mark them as "obsolete" instead.
4# 4#
5./etc/mtree/set.tests tests-sys-root 5./etc/mtree/set.tests tests-sys-root
6./usr/libdata/debug/usr/tests tests-base-debug compattestdir 6./usr/libdata/debug/usr/tests tests-base-debug compattestdir
7./usr/libdata/debug/usr/tests/atf tests-atf-debug compattestfile,atf 7./usr/libdata/debug/usr/tests/atf tests-atf-debug compattestfile,atf
8./usr/libdata/debug/usr/tests/atf/atf-c tests-atf-debug compattestfile,atf 8./usr/libdata/debug/usr/tests/atf/atf-c tests-atf-debug compattestfile,atf
9./usr/libdata/debug/usr/tests/atf/atf-c++ tests-atf-debug compattestfile,atf 9./usr/libdata/debug/usr/tests/atf/atf-c++ tests-atf-debug compattestfile,atf
10./usr/libdata/debug/usr/tests/atf/atf-c++/detail tests-atf-debug compattestfile,atf 10./usr/libdata/debug/usr/tests/atf/atf-c++/detail tests-atf-debug compattestfile,atf
11./usr/libdata/debug/usr/tests/atf/atf-c/detail tests-atf-debug compattestfile,atf 11./usr/libdata/debug/usr/tests/atf/atf-c/detail tests-atf-debug compattestfile,atf
12./usr/libdata/debug/usr/tests/atf/atf-compile tests-obsolete obsolete 12./usr/libdata/debug/usr/tests/atf/atf-compile tests-obsolete obsolete
13./usr/libdata/debug/usr/tests/atf/atf-report tests-obsolete obsolete 13./usr/libdata/debug/usr/tests/atf/atf-report tests-obsolete obsolete
14./usr/libdata/debug/usr/tests/atf/atf-run tests-obsolete obsolete 14./usr/libdata/debug/usr/tests/atf/atf-run tests-obsolete obsolete
@@ -4552,26 +4552,30 @@ @@ -4552,26 +4552,30 @@
4552./usr/tests/usr.bin/mkdep/Atffile tests-usr.bin-tests compattestfile,atf 4552./usr/tests/usr.bin/mkdep/Atffile tests-usr.bin-tests compattestfile,atf
4553./usr/tests/usr.bin/mkdep/Kyuafile tests-usr.bin-tests compattestfile,atf,kyua 4553./usr/tests/usr.bin/mkdep/Kyuafile tests-usr.bin-tests compattestfile,atf,kyua
4554./usr/tests/usr.bin/mkdep/t_mkdep tests-usr.bin-tests compattestfile,atf 4554./usr/tests/usr.bin/mkdep/t_mkdep tests-usr.bin-tests compattestfile,atf
4555./usr/tests/usr.bin/nbperf tests-usr.bin-tests compattestfile,atf 4555./usr/tests/usr.bin/nbperf tests-usr.bin-tests compattestfile,atf
4556./usr/tests/usr.bin/nbperf/Atffile tests-usr.bin-tests compattestfile,atf 4556./usr/tests/usr.bin/nbperf/Atffile tests-usr.bin-tests compattestfile,atf
4557./usr/tests/usr.bin/nbperf/Kyuafile tests-usr.bin-tests compattestfile,atf,kyua 4557./usr/tests/usr.bin/nbperf/Kyuafile tests-usr.bin-tests compattestfile,atf,kyua
4558./usr/tests/usr.bin/nbperf/h_nbperf tests-usr.bin-tests compattestfile,atf 4558./usr/tests/usr.bin/nbperf/h_nbperf tests-usr.bin-tests compattestfile,atf
4559./usr/tests/usr.bin/nbperf/hash_driver.c tests-usr.bin-tests compattestfile,atf 4559./usr/tests/usr.bin/nbperf/hash_driver.c tests-usr.bin-tests compattestfile,atf
4560./usr/tests/usr.bin/nbperf/t_nbperf tests-usr.bin-tests compattestfile,atf 4560./usr/tests/usr.bin/nbperf/t_nbperf tests-usr.bin-tests compattestfile,atf
4561./usr/tests/usr.bin/netpgpverify tests-usr.bin-tests compattestfile,atf 4561./usr/tests/usr.bin/netpgpverify tests-usr.bin-tests compattestfile,atf
4562./usr/tests/usr.bin/netpgpverify/Atffile tests-usr.bin-tests compattestfile,atf 4562./usr/tests/usr.bin/netpgpverify/Atffile tests-usr.bin-tests compattestfile,atf
4563./usr/tests/usr.bin/netpgpverify/Kyuafile tests-usr.bin-tests compattestfile,atf,kyua 4563./usr/tests/usr.bin/netpgpverify/Kyuafile tests-usr.bin-tests compattestfile,atf,kyua
4564./usr/tests/usr.bin/netpgpverify/t_netpgpverify tests-usr.bin-tests compattestfile,atf 4564./usr/tests/usr.bin/netpgpverify/t_netpgpverify tests-usr.bin-tests compattestfile,atf
 4565./usr/tests/usr.bin/patch tests-usr.bin-tests compattestfile,atf
 4566./usr/tests/usr.bin/patch/Atffile tests-usr.bin-tests compattestfile,atf
 4567./usr/tests/usr.bin/patch/Kyuafile tests-usr.bin-tests compattestfile,atf,kyua
 4568./usr/tests/usr.bin/patch/t_patch tests-usr.bin-tests compattestfile,atf
4565./usr/tests/usr.bin/pkill tests-usr.bin-tests compattestfile,atf 4569./usr/tests/usr.bin/pkill tests-usr.bin-tests compattestfile,atf
4566./usr/tests/usr.bin/pkill/Atffile tests-usr.bin-tests compattestfile,atf 4570./usr/tests/usr.bin/pkill/Atffile tests-usr.bin-tests compattestfile,atf
4567./usr/tests/usr.bin/pkill/Kyuafile tests-usr.bin-tests compattestfile,atf,kyua 4571./usr/tests/usr.bin/pkill/Kyuafile tests-usr.bin-tests compattestfile,atf,kyua
4568./usr/tests/usr.bin/pkill/t_pgrep tests-usr.bin-tests compattestfile,atf 4572./usr/tests/usr.bin/pkill/t_pgrep tests-usr.bin-tests compattestfile,atf
4569./usr/tests/usr.bin/pr tests-usr.bin-tests compattestfile,atf 4573./usr/tests/usr.bin/pr tests-usr.bin-tests compattestfile,atf
4570./usr/tests/usr.bin/pr/Atffile tests-usr.bin-tests compattestfile,atf 4574./usr/tests/usr.bin/pr/Atffile tests-usr.bin-tests compattestfile,atf
4571./usr/tests/usr.bin/pr/Kyuafile tests-usr.bin-tests compattestfile,atf,kyua 4575./usr/tests/usr.bin/pr/Kyuafile tests-usr.bin-tests compattestfile,atf,kyua
4572./usr/tests/usr.bin/pr/d_basic.in tests-usr.bin-tests compattestfile,atf 4576./usr/tests/usr.bin/pr/d_basic.in tests-usr.bin-tests compattestfile,atf
4573./usr/tests/usr.bin/pr/d_basic.out tests-usr.bin-tests compattestfile,atf 4577./usr/tests/usr.bin/pr/d_basic.out tests-usr.bin-tests compattestfile,atf
4574./usr/tests/usr.bin/pr/t_basic tests-usr.bin-tests compattestfile,atf 4578./usr/tests/usr.bin/pr/t_basic tests-usr.bin-tests compattestfile,atf
4575./usr/tests/usr.bin/printf tests-usr.bin-tests compattestfile,atf 4579./usr/tests/usr.bin/printf tests-usr.bin-tests compattestfile,atf
4576./usr/tests/usr.bin/printf/Atffile tests-usr.bin-tests compattestfile,atf 4580./usr/tests/usr.bin/printf/Atffile tests-usr.bin-tests compattestfile,atf
4577./usr/tests/usr.bin/printf/Kyuafile tests-usr.bin-tests compattestfile,atf,kyua 4581./usr/tests/usr.bin/printf/Kyuafile tests-usr.bin-tests compattestfile,atf,kyua

cvs diff -r1.162 -r1.163 src/etc/mtree/NetBSD.dist.tests (expand / switch to unified diff)

--- src/etc/mtree/NetBSD.dist.tests 2020/04/19 13:22:58 1.162
+++ src/etc/mtree/NetBSD.dist.tests 2020/06/24 09:21:43 1.163
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: NetBSD.dist.tests,v 1.162 2020/04/19 13:22:58 maxv Exp $ 1# $NetBSD: NetBSD.dist.tests,v 1.163 2020/06/24 09:21:43 jruoho Exp $
2 2
3./usr/libdata/debug/usr/tests 3./usr/libdata/debug/usr/tests
4./usr/libdata/debug/usr/tests/atf 4./usr/libdata/debug/usr/tests/atf
5./usr/libdata/debug/usr/tests/atf/atf-c 5./usr/libdata/debug/usr/tests/atf/atf-c
6./usr/libdata/debug/usr/tests/atf/atf-c/detail 6./usr/libdata/debug/usr/tests/atf/atf-c/detail
7./usr/libdata/debug/usr/tests/atf/atf-c++ 7./usr/libdata/debug/usr/tests/atf/atf-c++
8./usr/libdata/debug/usr/tests/atf/atf-c++/detail 8./usr/libdata/debug/usr/tests/atf/atf-c++/detail
9./usr/libdata/debug/usr/tests/atf/formats 9./usr/libdata/debug/usr/tests/atf/formats
10./usr/libdata/debug/usr/tests/atf/test-programs 10./usr/libdata/debug/usr/tests/atf/test-programs
11./usr/libdata/debug/usr/tests/atf/tools 11./usr/libdata/debug/usr/tests/atf/tools
12./usr/libdata/debug/usr/tests/bin 12./usr/libdata/debug/usr/tests/bin
13./usr/libdata/debug/usr/tests/bin/df 13./usr/libdata/debug/usr/tests/bin/df
14./usr/libdata/debug/usr/tests/crypto 14./usr/libdata/debug/usr/tests/crypto
@@ -412,26 +412,27 @@ @@ -412,26 +412,27 @@
412./usr/tests/usr.bin/gzip 412./usr/tests/usr.bin/gzip
413./usr/tests/usr.bin/id 413./usr/tests/usr.bin/id
414./usr/tests/usr.bin/indent 414./usr/tests/usr.bin/indent
415./usr/tests/usr.bin/infocmp 415./usr/tests/usr.bin/infocmp
416./usr/tests/usr.bin/jot 416./usr/tests/usr.bin/jot
417./usr/tests/usr.bin/ld 417./usr/tests/usr.bin/ld
418./usr/tests/usr.bin/m4 418./usr/tests/usr.bin/m4
419./usr/tests/usr.bin/make 419./usr/tests/usr.bin/make
420./usr/tests/usr.bin/make/unit-tests 420./usr/tests/usr.bin/make/unit-tests
421./usr/tests/usr.bin/mixerctl 421./usr/tests/usr.bin/mixerctl
422./usr/tests/usr.bin/mkdep 422./usr/tests/usr.bin/mkdep
423./usr/tests/usr.bin/nbperf 423./usr/tests/usr.bin/nbperf
424./usr/tests/usr.bin/netpgpverify 424./usr/tests/usr.bin/netpgpverify
 425./usr/tests/usr.bin/patch
425./usr/tests/usr.bin/pkill 426./usr/tests/usr.bin/pkill
426./usr/tests/usr.bin/pr 427./usr/tests/usr.bin/pr
427./usr/tests/usr.bin/printf 428./usr/tests/usr.bin/printf
428./usr/tests/usr.bin/pwhash 429./usr/tests/usr.bin/pwhash
429./usr/tests/usr.bin/rump_server 430./usr/tests/usr.bin/rump_server
430./usr/tests/usr.bin/sdiff 431./usr/tests/usr.bin/sdiff
431./usr/tests/usr.bin/sed 432./usr/tests/usr.bin/sed
432./usr/tests/usr.bin/shmif_dumpbus 433./usr/tests/usr.bin/shmif_dumpbus
433./usr/tests/usr.bin/sort 434./usr/tests/usr.bin/sort
434./usr/tests/usr.bin/tar 435./usr/tests/usr.bin/tar
435./usr/tests/usr.bin/tmux 436./usr/tests/usr.bin/tmux
436./usr/tests/usr.bin/tr 437./usr/tests/usr.bin/tr
437./usr/tests/usr.bin/unifdef 438./usr/tests/usr.bin/unifdef

File Added: src/tests/usr.bin/patch/Makefile
# $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>

File Added: src/tests/usr.bin/patch/t_patch.sh
# $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
}