 @@ -1,14 +1,14 @@
-/*	$NetBSD: audiotest.c,v 1.11 2020/05/01 05:45:57 isaki Exp $	*/
+/*	$NetBSD: audiotest.c,v 1.12 2020/06/26 07:50:12 jruoho Exp $	*/
 /*
  * Copyright (C) 2019 Tetsuya Isaki. 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.
+ *
 @@ -16,27 +16,27 @@
  * 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 AUTHOR 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.
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: audiotest.c,v 1.11 2020/05/01 05:45:57 isaki Exp $");
+__RCSID("$NetBSD: audiotest.c,v 1.12 2020/06/26 07:50:12 jruoho Exp $");
 #include <errno.h>
 #include <fcntl.h>
 #define __STDC_FORMAT_MACROS	/* for PRIx64 */
 #include <inttypes.h>
 #include <pthread.h>
 #include <stdarg.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <util.h>
 @@ -710,27 +710,27 @@ consumer_thread(void *arg)
 	/* throw away data anyway */
 	for (;;) {
 		r = read(padfd, buf, sizeof(buf));
 		if (r < 1)
 			break;
+	}
 	pthread_exit(NULL);
+}
 /*
  * XXX
- * Closing pad descriptor before audio descriptor causes panic (kern/54427).
+ * Closing pad descriptor before audio descriptor causes panic (PR kern/54427).
  * To avoid this, close non-pad descriptor first using atexit(3) for now.
  * This is just a workaround and this function should be removed.
  */
 void cleanup_audiofd()
+{
 	int fd;
 	for (fd = 3; fd <= maxfd; fd++) {
 		if (fd != padfd)
 			close(fd);
+	}
 	maxfd = 3;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: t_basic.c,v 1.4 2017/01/13 21:30:40 christos Exp $	*/
+/*	$NetBSD: t_basic.c,v 1.5 2020/06/26 07:50:12 jruoho Exp $	*/
 #include <sys/types.h>
 #include <sys/mount.h>
 #include <atf-c.h>
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <string.h>
 #include <stdlib.h>
 @@ -123,31 +123,31 @@ ATF_TC_BODY(basic, tc)
 	    || errno != ENOENT) {
 		atf_tc_fail("stat kiekko should return ENOENT, got %d", error);
+	}
 	/* done */
+}
 ATF_TC(twistymount);
 ATF_TC_HEAD(twistymount, tc)
+{
 	/* this is expected to fail until the PR is fixed */
 	atf_tc_set_md_var(tc, "descr", "\"recursive\" mounts deadlock"
-	    " (kern/43439)");
+	    " (PR kern/43439)");
+}
 /*
- * Mapping to identifiers in kern/43439:
+ * Mapping to identifiers in PR kern/43439:
  *  /td		= /home/current/pkgsrc
  *  /td/dist	= /home/current/pkgsrc/distiles
  *  /mp		= /usr/pkgsrc
  *  /mp/dist	= /usr/pkgsrc/distfiles -- "created" by first null mount
  */
 ATF_TC_BODY(twistymount, tc)
+{
 	int mkd = 0;
 	rump_init();
 	if (rump_sys_mkdir("/td", 0777) == -1)

 @@ -1,14 +1,14 @@
-/* $NetBSD: t_mmap.c,v 1.13 2017/05/23 13:04:29 christos Exp $ */
+/* $NetBSD: t_mmap.c,v 1.14 2020/06/26 07:50:11 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.
 @@ -45,27 +45,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: t_mmap.c,v 1.13 2017/05/23 13:04:29 christos Exp $");
+__RCSID("$NetBSD: t_mmap.c,v 1.14 2020/06/26 07:50:11 jruoho Exp $");
 #include <sys/param.h>
 #include <sys/disklabel.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
 #include <sys/socket.h>
 #include <sys/sysctl.h>
 #include <sys/wait.h>
 #include <atf-c.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <signal.h>
 @@ -161,27 +161,28 @@ ATF_TC_HEAD(mmap_block, tc)
+{
 	atf_tc_set_md_var(tc, "descr", "Test mmap(2) with a block device");
 	atf_tc_set_md_var(tc, "require.user", "root");
+}
 ATF_TC_BODY(mmap_block, tc)
+{
 	static const int mib[] = { CTL_HW, HW_DISKNAMES };
 	static const unsigned int miblen = __arraycount(mib);
 	char *map, *dk, *drives, dev[PATH_MAX];
 	size_t len;
 	int fd = -1;
-	atf_tc_skip("The test case causes a panic (PR kern/38889, kern/46592)");
+	atf_tc_skip("The test case causes a panic " \
 	    "(PR kern/38889, PR kern/46592)");
 	ATF_REQUIRE(sysctl(mib, miblen, NULL, &len, NULL, 0) == 0);
 	drives = malloc(len);
 	ATF_REQUIRE(drives != NULL);
 	ATF_REQUIRE(sysctl(mib, miblen, drives, &len, NULL, 0) == 0);
 	for (dk = strtok(drives, " "); dk != NULL; dk = strtok(NULL, " ")) {
 		if (strncmp(dk, "dk", 2) == 0)
 			snprintf(dev, sizeof(dev), _PATH_DEV "%s", dk);
 		else
 			snprintf(dev, sizeof(dev), _PATH_DEV "%s%c", dk,
 			    'a' + RAW_PART);
 		fprintf(stderr, "trying: %s\n", dev);

 @@ -1,14 +1,14 @@
-/* $NetBSD: t_pipe.c,v 1.6 2019/12/27 09:25:58 msaitoh Exp $ */
+/* $NetBSD: t_pipe.c,v 1.7 2020/06/26 07:50:11 jruoho Exp $ */
 /*-
  * Copyright (c) 2001, 2008 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.
 @@ -19,27 +19,27 @@
  * 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.
  */
 #include <sys/cdefs.h>
 __COPYRIGHT("@(#) Copyright (c) 2008\
  The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_pipe.c,v 1.6 2019/12/27 09:25:58 msaitoh Exp $");
+__RCSID("$NetBSD: t_pipe.c,v 1.7 2020/06/26 07:50:11 jruoho Exp $");
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <poll.h>
 #include <sched.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 @@ -60,27 +60,27 @@ sighand(int sig)
 	if (sig == SIGALRM) {
 		kill(pid, SIGINFO);
+	}
 	if (sig == SIGINFO) {
 		nsiginfo++;
+	}
+}
 ATF_TC(pipe_restart);
 ATF_TC_HEAD(pipe_restart, tc)
+{
 	atf_tc_set_md_var(tc, "descr", "Checks that writing to pipe "
 	    "works correctly after being interrupted and restarted "
-	    "(kern/14087)");
+	    "(PR kern/14087)");
+}
 ATF_TC_BODY(pipe_restart, tc)
+{
 	int pp[2], st;
 	ssize_t sz, todo, done;
 	char *f;
 	sigset_t asigset, osigset, emptysigset;
 	/* Initialise signal masks */
 	RL(sigemptyset(&emptysigset));
 	RL(sigemptyset(&asigset));
 	RL(sigaddset(&asigset, SIGINFO));

	@@ -1,14 +1,14 @@		@@ -1,14 +1,14 @@
1	# $NetBSD: t_awk.sh,v 1.6 2019/01/19 01:02:12 christos Exp $	1	# $NetBSD: t_awk.sh,v 1.7 2020/06/26 07:50:11 jruoho Exp $
2	#	2	#
3	# Copyright (c) 2012 The NetBSD Foundation, Inc.	3	# Copyright (c) 2012 The NetBSD Foundation, Inc.
4	# All rights reserved.	4	# All rights reserved.
5	#	5	#
6	# This code is derived from software contributed to The NetBSD Foundation	6	# This code is derived from software contributed to The NetBSD Foundation
7	# by Christos Zoulas	7	# by Christos Zoulas
8	#	8	#
9	# Redistribution and use in source and binary forms, with or without	9	# Redistribution and use in source and binary forms, with or without
10	# modification, are permitted provided that the following conditions	10	# modification, are permitted provided that the following conditions
11	# are met:	11	# are met:
12	# 1. Redistributions of source code must retain the above copyright	12	# 1. Redistributions of source code must retain the above copyright
13	# notice, this list of conditions and the following disclaimer.	13	# notice, this list of conditions and the following disclaimer.
14	# 2. Redistributions in binary form must reproduce the above copyright	14	# 2. Redistributions in binary form must reproduce the above copyright
	@@ -83,27 +83,27 @@ multibyte_head() {		@@ -83,27 +83,27 @@ multibyte_head() {
83	}	83	}
84		84
85	multibyte_body() {	85	multibyte_body() {
86	export LANG=en_US.UTF-8	86	export LANG=en_US.UTF-8
87		87
88	h_check tolower	88	h_check tolower
89	h_check toupper	89	h_check toupper
90	}	90	}
91		91
92	atf_test_case period	92	atf_test_case period
93		93
94	period_head() {	94	period_head() {
95	atf_set "descr" "Checks that the period character is recognised" \	95	atf_set "descr" "Checks that the period character is recognised" \
96	"in awk program regardless of locale (bin/42320)"	96	"in awk program regardless of locale (PR bin/42320)"
97	}	97	}
98		98
99	period_body() {	99	period_body() {
100	export LANG=ru_RU.KOI8-R	100	export LANG=ru_RU.KOI8-R
101		101
102	h_check period -v x=0.5	102	h_check period -v x=0.5
103	}	103	}
104		104
105	atf_test_case assign_NF	105	atf_test_case assign_NF
106		106
107	assign_NF_head() {	107	assign_NF_head() {
108	atf_set "descr" 'Checks that assign to NF changes $0 and $n (PR/44063)'	108	atf_set "descr" 'Checks that assign to NF changes $0 and $n (PR/44063)'
109	}	109	}

	@@ -1,25 +1,25 @@		@@ -1,25 +1,25 @@
1	#include <sys/types.h>	1	#include <sys/types.h>
2		2
3	#include <rump/rump.h>	3	#include <rump/rump.h>
4	#include <rump/rump_syscalls.h>	4	#include <rump/rump_syscalls.h>
5		5
6	#include <atf-c.h>	6	#include <atf-c.h>
7		7
8	ATF_TC(extattrctl_namei);	8	ATF_TC(extattrctl_namei);
9	ATF_TC_HEAD(extattrctl_namei, tc)	9	ATF_TC_HEAD(extattrctl_namei, tc)
10	{	10	{
11		11
12	atf_tc_set_md_var(tc, "descr", "extattrctl namei safety (kern/43328)");	12	atf_tc_set_md_var(tc, "descr", "extattrctl namei safety (PR kern/43328)");
13	}	13	}
14		14
15	ATF_TC_BODY(extattrctl_namei, tc)	15	ATF_TC_BODY(extattrctl_namei, tc)
16	{	16	{
17		17
18	rump_init();	18	rump_init();
19		19
20	rump_sys_extattrctl("/anyfile", 0, "/", 0, 0);	20	rump_sys_extattrctl("/anyfile", 0, "/", 0, 0);
21	}	21	}
22		22
23	ATF_TP_ADD_TCS(tp)	23	ATF_TP_ADD_TCS(tp)
24	{	24	{
25	ATF_TP_ADD_TC(tp, extattrctl_namei);	25	ATF_TP_ADD_TC(tp, extattrctl_namei);