 @@ -1,186 +1,186 @@
-/*	$NetBSD: t_kevent.c,v 1.7 2015/02/05 13:55:37 isaki Exp $ */
+/*	$NetBSD: t_kevent.c,v 1.8 2020/06/25 11:12:03 jruoho Exp $ */
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundatiom
  * by Christos Zoulas.
+ *
  * 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.
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: t_kevent.c,v 1.7 2015/02/05 13:55:37 isaki Exp $");
+__RCSID("$NetBSD: t_kevent.c,v 1.8 2020/06/25 11:12:03 jruoho Exp $");
 #include <sys/types.h>
 #include <sys/event.h>
 #include <atf-c.h>
 #include <errno.h>
 #include <time.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <err.h>
 #include <sys/drvctlio.h>
 #include <sys/event.h>
 #include <sys/time.h>
 #include <sys/socket.h>
 #include <sys/wait.h>
 ATF_TC(kevent_zerotimer);
 ATF_TC_HEAD(kevent_zerotimer, tc)
+{
 	atf_tc_set_md_var(tc, "descr", "Checks that kevent with a 0 timer "
 	    "does not crash the system (PR lib/45618)");
+}
 ATF_TC_BODY(kevent_zerotimer, tc)
+{
 	struct kevent ev;
 	int kq;
 	ATF_REQUIRE((kq = kqueue()) != -1);
 	EV_SET(&ev, 1, EVFILT_TIMER, EV_ADD|EV_ENABLE, 0, 1, 0);
 	ATF_REQUIRE(kevent(kq, &ev, 1, NULL, 0, NULL) != -1);
 	ATF_REQUIRE(kevent(kq, NULL, 0, &ev, 1, NULL) == 1);
+}
 ATF_TC(kqueue_desc_passing);
 ATF_TC_HEAD(kqueue_desc_passing, tc)
+{
 	atf_tc_set_md_var(tc, "descr", "Checks that passing a kqueue to "
 		"another process does not crash the kernel (PR 46463)");
+}
 ATF_TC_BODY(kqueue_desc_passing, tc)
+{
 	pid_t child;
 	int s[2], storage, status, kq;
 	struct cmsghdr *msg;
 	struct iovec iov;
 	struct msghdr m;
 	struct kevent ev;
 	ATF_REQUIRE((kq = kqueue()) != -1);
-	// atf_tc_skip("crashes kernel (PR 46463)");
+	// atf_tc_skip("crashes kernel (PR kern/46463)");
 	ATF_REQUIRE(socketpair(AF_LOCAL, SOCK_STREAM, 0, s) != -1);
 	msg = malloc(CMSG_SPACE(sizeof(int)));
 	m.msg_iov = &iov;
 	m.msg_iovlen = 1;
 	m.msg_name = NULL;
 	m.msg_namelen = 0;
 	m.msg_control = msg;
 	m.msg_controllen = CMSG_SPACE(sizeof(int));
 	child = fork();
 	if (child == 0) {
 		close(s[0]);
 		iov.iov_base = &storage;
 		iov.iov_len = sizeof(int);
 		m.msg_iov = &iov;
 		m.msg_iovlen = 1;
 		if (recvmsg(s[1], &m, 0) == -1)
 			err(1, "child: could not recvmsg");
 		kq = *(int *)CMSG_DATA(msg);
 		printf("child (pid %d): received kq fd %d\n", getpid(), kq);
 		exit(0);
+	}
 	close(s[1]);
 	iov.iov_base = &storage;
 	iov.iov_len = sizeof(int);
 	msg->cmsg_level = SOL_SOCKET;
 	msg->cmsg_type = SCM_RIGHTS;
 	msg->cmsg_len = CMSG_LEN(sizeof(int));
 	*(int *)CMSG_DATA(msg) = kq;
 	EV_SET(&ev, 1, EVFILT_TIMER, EV_ADD|EV_ENABLE, 0, 1, 0);
 	ATF_CHECK(kevent(kq, &ev, 1, NULL, 0, NULL) != -1);
 	printf("parent (pid %d): sending kq fd %d\n", getpid(), kq);
 	if (sendmsg(s[0], &m, 0) == -1) {
 		ATF_REQUIRE_EQ_MSG(errno, EBADF, "errno is %d", errno);
 		atf_tc_skip("PR kern/46523");
+	}
 	close(kq);
 	waitpid(child, &status, 0);
 	ATF_CHECK(WIFEXITED(status) && WEXITSTATUS(status)==0);
+}
 ATF_TC(kqueue_unsupported_fd);
 ATF_TC_HEAD(kqueue_unsupported_fd, tc)
+{
 	atf_tc_set_md_var(tc, "descr", "Checks that watching an fd whose"
 	    " type is not supported does not crash the kernel");
+}
 ATF_TC_BODY(kqueue_unsupported_fd, tc)
+{
 	/* mqueue and semaphore use fnullop_kqueue also */
 	int fd, kq;
 	struct kevent ev;
 	fd = open(DRVCTLDEV, O_RDONLY);
 	if (fd == -1) {
 		switch (errno) {
 		case ENOENT:
 		case ENXIO:
 			atf_tc_skip("no " DRVCTLDEV " available for testing");
 			break;
+		}
+	}
 	ATF_REQUIRE(fd != -1);
 	ATF_REQUIRE((kq = kqueue()) != -1);
 	EV_SET(&ev, fd, EVFILT_VNODE, EV_ADD | EV_ENABLE | EV_CLEAR,
 	   NOTE_DELETE|NOTE_WRITE|NOTE_EXTEND|NOTE_ATTRIB|NOTE_LINK|
 	   NOTE_RENAME|NOTE_REVOKE, 0, 0);
 	ATF_REQUIRE(kevent(kq, &ev, 1, NULL, 0, NULL) == -1);
 	ATF_REQUIRE_ERRNO(EOPNOTSUPP, true);
 	(void)close(fd);
+}
 ATF_TP_ADD_TCS(tp)
+{
 	ATF_TP_ADD_TC(tp, kevent_zerotimer);
 	ATF_TP_ADD_TC(tp, kqueue_desc_passing);
 	ATF_TP_ADD_TC(tp, kqueue_unsupported_fd);
 	return atf_no_error();
+}

	@@ -1,81 +1,81 @@		@@ -1,81 +1,81 @@
1	/* $NetBSD: t_hypot.c,v 1.1 2016/01/24 20:26:47 gson Exp $ */	1	/* $NetBSD: t_hypot.c,v 1.2 2020/06/25 11:12:03 jruoho Exp $ */
2		2
3	/*-	3	/*-
4	* Copyright (c) 2016 The NetBSD Foundation, Inc.	4	* Copyright (c) 2016 The NetBSD Foundation, Inc.
5	* All rights reserved.	5	* All rights reserved.
6	*	6	*
7	* Redistribution and use in source and binary forms, with or without	7	* Redistribution and use in source and binary forms, with or without
8	* modification, are permitted provided that the following conditions	8	* modification, are permitted provided that the following conditions
9	* are met:	9	* are met:
10	* 1. Redistributions of source code must retain the above copyright	10	* 1. Redistributions of source code must retain the above copyright
11	* notice, this list of conditions and the following disclaimer.	11	* notice, this list of conditions and the following disclaimer.
12	* 2. Redistributions in binary form must reproduce the above copyright	12	* 2. Redistributions in binary form must reproduce the above copyright
13	* notice, this list of conditions and the following disclaimer in the	13	* notice, this list of conditions and the following disclaimer in the
14	* documentation and/or other materials provided with the distribution.	14	* documentation and/or other materials provided with the distribution.
15	*	15	*
16	* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS	16	* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
17	* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED	17	* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
18	* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR	18	* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
19	* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS	19	* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
20	* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR	20	* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
21	* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF	21	* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
22	* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS	22	* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
23	* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN	23	* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
24	* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)	24	* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
25	* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE	25	* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
26	* POSSIBILITY OF SUCH DAMAGE.	26	* POSSIBILITY OF SUCH DAMAGE.
27	*/	27	*/
28		28
29	#include <atf-c.h>	29	#include <atf-c.h>
30	#include <math.h>	30	#include <math.h>
31		31
32	ATF_TC(hypot_integer);	32	ATF_TC(hypot_integer);
33	ATF_TC_HEAD(hypot_integer, tc)	33	ATF_TC_HEAD(hypot_integer, tc)
34	{	34	{
35	atf_tc_set_md_var(tc, "descr", "Test hypot with integer args");	35	atf_tc_set_md_var(tc, "descr", "Test hypot with integer args");
36	}	36	}
37		37
38	ATF_TC_BODY(hypot_integer, tc)	38	ATF_TC_BODY(hypot_integer, tc)
39	{	39	{
40	/* volatile so hypotf() won't be evaluated at compile time */	40	/* volatile so hypotf() won't be evaluated at compile time */
41	volatile double a = 5;	41	volatile double a = 5;
42	volatile double b = 12;	42	volatile double b = 12;
43	ATF_CHECK(hypot(a, b) == 13.0);	43	ATF_CHECK(hypot(a, b) == 13.0);
44	}	44	}
45		45
46	ATF_TC(hypotf_integer);	46	ATF_TC(hypotf_integer);
47	ATF_TC_HEAD(hypotf_integer, tc)	47	ATF_TC_HEAD(hypotf_integer, tc)
48	{	48	{
49	atf_tc_set_md_var(tc, "descr", "Test hypotf with integer args");	49	atf_tc_set_md_var(tc, "descr", "Test hypotf with integer args");
50	}	50	}
51		51
52	ATF_TC_BODY(hypotf_integer, tc)	52	ATF_TC_BODY(hypotf_integer, tc)
53	{	53	{
54	volatile float a = 5;	54	volatile float a = 5;
55	volatile float b = 12;	55	volatile float b = 12;
56	ATF_CHECK(hypotf(a, b) == 13.0f);	56	ATF_CHECK(hypotf(a, b) == 13.0f);
57	}	57	}
58		58
59	ATF_TC(pr50698);	59	ATF_TC(pr50698);
60	ATF_TC_HEAD(pr50698, tc)	60	ATF_TC_HEAD(pr50698, tc)
61	{	61	{
62	atf_tc_set_md_var(tc, "descr", "Check for the bug of PR 50698");	62	atf_tc_set_md_var(tc, "descr", "Check for the bug of PR lib/50698");
63	}	63	}
64		64
65	ATF_TC_BODY(pr50698, tc)	65	ATF_TC_BODY(pr50698, tc)
66	{	66	{
67	volatile float a = 1e-18f;	67	volatile float a = 1e-18f;
68	float val = hypotf(a, a);	68	float val = hypotf(a, a);
69	ATF_CHECK(!isinf(val));	69	ATF_CHECK(!isinf(val));
70	ATF_CHECK(!isnan(val));	70	ATF_CHECK(!isnan(val));
71	}	71	}
72		72
73	ATF_TP_ADD_TCS(tp)	73	ATF_TP_ADD_TCS(tp)
74	{	74	{
75		75
76	ATF_TP_ADD_TC(tp, hypot_integer);	76	ATF_TP_ADD_TC(tp, hypot_integer);
77	ATF_TP_ADD_TC(tp, hypotf_integer);	77	ATF_TP_ADD_TC(tp, hypotf_integer);
78	ATF_TP_ADD_TC(tp, pr50698);	78	ATF_TP_ADD_TC(tp, pr50698);
79		79
80	return atf_no_error();	80	return atf_no_error();
81	}	81	}

 @@ -1,98 +1,95 @@
-# $NetBSD: t_regress.sh,v 1.2 2019/06/07 19:05:15 gson Exp $
+# $NetBSD: t_regress.sh,v 1.3 2020/06/25 11:12:03 jruoho Exp $
+#
 # Copyright (c) 2016 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.
+#
 # Regression tests for some GDB PRs
 # PR 47430
 atf_test_case threads
 threads_head() {
-	atf_set "descr" "Test that gdb works with threaded programs"
+	atf_set "descr" "Test that gdb works with " \
 		"threaded programs (PR bin/47430)"
 	atf_set "require.progs" "gdb"
+}
 threads_body() {
 	# Dig at an unused IP address so that dig fails the
 	# same way on machines with Internet connectivity
 	# as on those without.
 	cat <<EOF >test.gdb
 run +time=1 +tries=1 @127.0.0.177
 cont
 cont
 cont
 cont
 cont
 EOF
 	gdb --batch -x test.gdb dig >gdb.out
 	atf_check -s exit:1 -o ignore -e ignore grep "Program received signal SIGTRAP" gdb.out
+}
 # PR 48250
 atf_test_case pie
 pie_head() {
-	atf_set "descr" "Test that gdb works with PIE executables"
+	atf_set "descr" "Test that gdb works with " \
 		"PIE executables (PR bin/48250)"
 	atf_set "require.progs" "cc gdb"
+}
 pie_body() {
 	cat <<\EOF >test.c
 #include <stdio.h>
 int main(int argc, char **argv) { printf ("hello\n"); return 0; }
 EOF
 	cc -fpie -pie -g test.c -o test
 	cat <<EOF >test.gdb
 break main
 run
 EOF
 	gdb --batch -x test.gdb ./test >gdb.out 2>&1
 	atf_check -s exit:1 -o ignore -e ignore grep "annot access memory" gdb.out
+}
 # PR 54154
 atf_test_case xml
 xml_head() {
-	atf_set "descr" "Test that gdb was built with XML support"
+	atf_set "descr" "Test that gdb was built " \
 		"with XML support (PR bin/54154)"
 	atf_set "require.progs" "gdb"
+}
 xml_body() {
 	cat <<\EOF >target.xml
 <target version="1.0">
   <architecture>i386:x86-64</architecture>
 </target>
 EOF
 	cat <<EOF >test.gdb
 set tdesc filename "target.xml"
 EOF
 	gdb --batch -x test.gdb >gdb.out 2>&1
 	atf_check -s exit:1 -o ignore -e ignore grep "Can not parse XML" gdb.out
+}
 atf_init_test_cases() {
 	atf_add_test_case threads
 	atf_add_test_case pie
 	atf_add_test_case xml
+}

	@@ -1,48 +1,50 @@		@@ -1,48 +1,50 @@
1	# $NetBSD: t_vmstat.sh,v 1.1 2014/01/07 16:47:13 gson Exp $	1	# $NetBSD: t_vmstat.sh,v 1.2 2020/06/25 11:12:03 jruoho Exp $
2	#	2	#
3	# Copyright (c) 2013 The NetBSD Foundation, Inc.	3	# Copyright (c) 2013 The NetBSD Foundation, Inc.
4	# All rights reserved.	4	# All rights reserved.
5	#	5	#
6	# Redistribution and use in source and binary forms, with or without	6	# Redistribution and use in source and binary forms, with or without
7	# modification, are permitted provided that the following conditions	7	# modification, are permitted provided that the following conditions
8	# are met:	8	# are met:
9	# 1. Redistributions of source code must retain the above copyright	9	# 1. Redistributions of source code must retain the above copyright
10	# notice, this list of conditions and the following disclaimer.	10	# notice, this list of conditions and the following disclaimer.
11	# 2. Redistributions in binary form must reproduce the above copyright	11	# 2. Redistributions in binary form must reproduce the above copyright
12	# notice, this list of conditions and the following disclaimer in the	12	# notice, this list of conditions and the following disclaimer in the
13	# documentation and/or other materials provided with the distribution.	13	# documentation and/or other materials provided with the distribution.
14	#	14	#
15	# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS	15	# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
16	# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED	16	# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
17	# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR	17	# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
18	# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS	18	# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
19	# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR	19	# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
20	# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF	20	# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
21	# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS	21	# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
22	# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN	22	# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
23	# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)	23	# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
24	# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE	24	# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
25	# POSSIBILITY OF SUCH DAMAGE.	25	# POSSIBILITY OF SUCH DAMAGE.
26	#	26	#
27		27
28	atf_test_case default	28	atf_test_case default
29	default_head() {	29	default_head() {
30	atf_set "descr" "Test that vmstat(1) returns success when run with no arguments"	30	atf_set "descr" "Test that vmstat(1) returns " \
		31	"success when run with no arguments"
31	}	32	}
32	default_body() {	33	default_body() {
33	atf_check -s exit:0 -o ignore -e empty vmstat	34	atf_check -s exit:0 -o ignore -e empty vmstat
34	}	35	}
35		36
36	atf_test_case opt_s	37	atf_test_case opt_s
37	opt_s_head() {	38	opt_s_head() {
38	atf_set "descr" "Test that vmstat(1) returns success when run with -s (PR 44518)"	39	atf_set "descr" "Test that vmstat(1) returns " \
		40	"success when run with -s (PR bin/44518)"
39	}	41	}
40	opt_s_body() {	42	opt_s_body() {
41	atf_check -s exit:0 -o ignore -e empty vmstat -s	43	atf_check -s exit:0 -o ignore -e empty vmstat -s
42	}	44	}
43		45
44	atf_init_test_cases()	46	atf_init_test_cases()
45	{	47	{
46	atf_add_test_case default	48	atf_add_test_case default
47	atf_add_test_case opt_s	49	atf_add_test_case opt_s
48	}	50	}

 @@ -1,132 +1,132 @@
-# $NetBSD: t_integration.sh,v 1.4 2014/04/21 19:10:41 christos Exp $
+# $NetBSD: t_integration.sh,v 1.5 2020/06/25 11:12:03 jruoho Exp $
+#
 # Copyright (c) 2008, 2010 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.
+#
 LINT1=/usr/libexec/lint1
 Names=
 check_valid()
+{
 	atf_check -s exit:0 ${LINT1} -g -S "$(atf_get_srcdir)/$1" /dev/null
+}
 check_invalid()
+{
 	atf_check -s not-exit:0 -o ignore -e ignore ${LINT1} -g -S -w \
 	    "$(atf_get_srcdir)/$1" /dev/null
+}
 test_case()
+{
 	local result="${1}"; shift
 	local name="${1}"; shift
 	local descr="${*}"
 	atf_test_case ${name}
 	eval "${name}_head() {
 		atf_set \"descr\" \"${descr}\";
 		atf_set \"require.progs\" \"${LINT1}\";
 	}"
 	eval "${name}_body() {
 		${result} d_${name}.c;
 	}"
 	Names="${Names} ${name}"
+}
 test_case check_valid c99_struct_init "Checks C99 struct initialization"
 test_case check_valid c99_union_init1 "Checks C99 union initialization"
 test_case check_valid c99_union_init2 "Checks C99 union initialization"
 test_case check_valid c99_union_init3 "Checks C99 union initialization"
 test_case check_valid c99_recursive_init "Checks C99 recursive struct/union" \
     "initialization"
 test_case check_valid c9x_recursive_init "Checks C9X struct/union member" \
     "init, with nested union and trailing member"
 test_case check_valid nested_structs "Checks nested structs"
 test_case check_valid packed_structs "Checks packed structs"
 test_case check_valid cast_init "Checks cast initialization"
 test_case check_valid cast_init2 "Checks cast initialization as the rhs of a" \
     "- operand"
 test_case check_valid cast_lhs "Checks whether pointer casts are valid lhs" \
     "lvalues"
 test_case check_valid gcc_func "Checks GCC __FUNCTION__"
 test_case check_valid c99_func "Checks C99 __func__"
 test_case check_valid gcc_variable_array_init "Checks GCC variable array" \
     "initializers"
 test_case check_valid c9x_array_init "Checks C9X array initializers"
 test_case check_valid c99_decls_after_stmt "Checks C99 decls after statements"
 test_case check_valid c99_decls_after_stmt3 "Checks C99 decls after statements"
 test_case check_valid nolimit_init "Checks no limit initializers"
 test_case check_valid zero_sized_arrays "Checks zero sized arrays"
 test_case check_valid compound_literals1 "Checks compound literals"
 test_case check_valid compound_literals2 "Checks compound literals"
 test_case check_valid gcc_compound_statements1 "Checks GCC compound statements"
 test_case check_valid gcc_compound_statements2 "Checks GCC compound" \
     "statements with non-expressions"
 test_case check_valid gcc_compound_statements3 "Checks GCC compound" \
     "statements with void type"
 # XXX: Because of polymorphic __builtin_isnan and expression has null effect
 # test_case check_valid gcc_extension "Checks GCC __extension__ and __typeof__"
 test_case check_valid cvt_in_ternary "Checks CVT nodes handling in ?" \
 test_case check_valid cvt_constant "Checks constant conversion"
 test_case check_valid ellipsis_in_switch "Checks ellipsis in switch()"
 test_case check_valid c99_complex_num "Checks C99 complex numbers"
 test_case check_valid c99_complex_split "Checks C99 complex access"
 test_case check_valid c99_for_loops "Checks C99 for loops"
 test_case check_valid alignof "Checks __alignof__"
 test_case check_valid shift_to_narrower_type "Checks that type shifts that" \
     "result in narrower types do not produce warnings"
 test_case check_invalid constant_conv1 "Checks failing on information-losing" \
     "constant conversion in argument lists"
 test_case check_invalid constant_conv2 "Checks failing on information-losing" \
     "constant conversion in argument lists"
 test_case check_invalid type_conv1 "Checks failing on information-losing" \
     "type conversion in argument lists"
 test_case check_invalid type_conv2 "Checks failing on information-losing" \
     "type conversion in argument lists"
 test_case check_invalid type_conv3 "Checks failing on information-losing" \
     "type conversion in argument lists"
 test_case check_invalid incorrect_array_size "Checks failing on incorrect" \
     "array sizes"
 test_case check_invalid long_double_int "Checks for confusion of 'long" \
-    "double' with 'long int'; PR 39639"
+    "double' with 'long int'; PR bin/39639"
 atf_init_test_cases()
+{
 	for name in ${Names}; do
 		atf_add_test_case ${name}
 	done
+}

	@@ -1,7 +1,7 @@		@@ -1,7 +1,7 @@
1	/* PR 39639: writing "long double" gave "long int" */	1	/* PR bin/39639: writing "long double" gave "long int" */
2		2
3	int	3	int
4	fail(long double a, long int b)	4	fail(long double a, long int b)
5	{	5	{
6	return a == b;	6	return a == b;
7	}	7	}