Module Name: src
Committed By: jruoho
Date: Sun Mar 18 09:46:50 UTC 2012
Modified Files:
src/tests/kernel: t_filedesc.c t_rnd.c
src/tests/net/icmp: t_forward.c
src/tests/net/if_loop: t_pr.c
src/tests/sbin/ifconfig: t_nonexistent.sh
src/tests/sbin/sysctl: t_perm.sh
src/tests/usr.bin/unifdef: t_basic.sh
Log Message:
Move more PR references from comments to ATF's "descr".
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tests/kernel/t_filedesc.c \
src/tests/kernel/t_rnd.c
cvs rdiff -u -r1.7 -r1.8 src/tests/net/icmp/t_forward.c
cvs rdiff -u -r1.6 -r1.7 src/tests/net/if_loop/t_pr.c
cvs rdiff -u -r1.3 -r1.4 src/tests/sbin/ifconfig/t_nonexistent.sh
cvs rdiff -u -r1.5 -r1.6 src/tests/sbin/sysctl/t_perm.sh
cvs rdiff -u -r1.4 -r1.5 src/tests/usr.bin/unifdef/t_basic.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/kernel/t_filedesc.c
diff -u src/tests/kernel/t_filedesc.c:1.4 src/tests/kernel/t_filedesc.c:1.5
--- src/tests/kernel/t_filedesc.c:1.4 Wed Nov 3 16:10:20 2010
+++ src/tests/kernel/t_filedesc.c Sun Mar 18 09:46:50 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: t_filedesc.c,v 1.4 2010/11/03 16:10:20 christos Exp $ */
+/* $NetBSD: t_filedesc.c,v 1.5 2012/03/18 09:46:50 jruoho Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_filedesc.c,v 1.4 2010/11/03 16:10:20 christos Exp $");
+__RCSID("$NetBSD: t_filedesc.c,v 1.5 2012/03/18 09:46:50 jruoho Exp $");
#include <sys/types.h>
@@ -47,8 +47,7 @@ ATF_TC_HEAD(getfilerace, tc)
{
atf_tc_set_md_var(tc, "descr", "race between multithreaded proc. "
- "fd_getfile() and fd_close()");
- /* PR kern/43694 */
+ "fd_getfile() and fd_close() (PR kern/43694)");
}
static int fd;
Index: src/tests/kernel/t_rnd.c
diff -u src/tests/kernel/t_rnd.c:1.4 src/tests/kernel/t_rnd.c:1.5
--- src/tests/kernel/t_rnd.c:1.4 Mon Dec 6 16:37:25 2010
+++ src/tests/kernel/t_rnd.c Sun Mar 18 09:46:50 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: t_rnd.c,v 1.4 2010/12/06 16:37:25 christos Exp $ */
+/* $NetBSD: t_rnd.c,v 1.5 2012/03/18 09:46:50 jruoho Exp $ */
/*
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_rnd.c,v 1.4 2010/12/06 16:37:25 christos Exp $");
+__RCSID("$NetBSD: t_rnd.c,v 1.5 2012/03/18 09:46:50 jruoho Exp $");
#include <sys/types.h>
#include <sys/fcntl.h>
@@ -44,10 +44,11 @@ __RCSID("$NetBSD: t_rnd.c,v 1.4 2010/12/
ATF_TC(RNDADDDATA);
ATF_TC_HEAD(RNDADDDATA, tc)
{
- atf_tc_set_md_var(tc, "descr", "checks ioctl(RNDADDDATA)");
+ atf_tc_set_md_var(tc, "descr",
+ "Checks ioctl(RNDADDDATA) (PR kern/42020)");
}
-/* Adapted from example provided by Juho Salminen in PR kern/42020 */
+/* Adapted from example provided by Juho Salminen in the noted PR. */
ATF_TC_BODY(RNDADDDATA, tc)
{
rnddata_t rd;
@@ -57,7 +58,7 @@ ATF_TC_BODY(RNDADDDATA, tc)
fd = rump_sys_open("/dev/random", O_RDWR, 0);
if (fd == -1)
atf_tc_fail_errno("cannot open /dev/random");
-
+
rd.entropy = 1;
rd.len = 1;
if (rump_sys_ioctl(fd, RNDADDDATA, &rd) == -1)
Index: src/tests/net/icmp/t_forward.c
diff -u src/tests/net/icmp/t_forward.c:1.7 src/tests/net/icmp/t_forward.c:1.8
--- src/tests/net/icmp/t_forward.c:1.7 Sun Nov 7 17:51:21 2010
+++ src/tests/net/icmp/t_forward.c Sun Mar 18 09:46:50 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: t_forward.c,v 1.7 2010/11/07 17:51:21 jmmv Exp $ */
+/* $NetBSD: t_forward.c,v 1.8 2012/03/18 09:46:50 jruoho Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: t_forward.c,v 1.7 2010/11/07 17:51:21 jmmv Exp $");
+__RCSID("$NetBSD: t_forward.c,v 1.8 2012/03/18 09:46:50 jruoho Exp $");
#endif /* not lint */
#include <sys/types.h>
@@ -128,9 +128,8 @@ ATF_TC_HEAD(returndatabytes, tc)
{
atf_tc_set_md_var(tc, "descr", "icmp.returndatabytes with certain "
- "packets can cause kernel panic");
+ "packets can cause kernel panic (PR kern/43548)");
atf_tc_set_md_var(tc, "timeout", "4"); /* just in case */
- /* PR kern/43548 */
}
ATF_TC_BODY(returndatabytes, tc)
Index: src/tests/net/if_loop/t_pr.c
diff -u src/tests/net/if_loop/t_pr.c:1.6 src/tests/net/if_loop/t_pr.c:1.7
--- src/tests/net/if_loop/t_pr.c:1.6 Tue Apr 26 18:42:08 2011
+++ src/tests/net/if_loop/t_pr.c Sun Mar 18 09:46:50 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: t_pr.c,v 1.6 2011/04/26 18:42:08 martin Exp $ */
+/* $NetBSD: t_pr.c,v 1.7 2012/03/18 09:46:50 jruoho Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: t_pr.c,v 1.6 2011/04/26 18:42:08 martin Exp $");
+__RCSID("$NetBSD: t_pr.c,v 1.7 2012/03/18 09:46:50 jruoho Exp $");
#endif /* not lint */
#include <sys/types.h>
@@ -154,8 +154,8 @@ ATF_TC(loopmtu);
ATF_TC_HEAD(loopmtu, tc)
{
- atf_tc_set_md_var(tc, "descr", "test lo0 fragmentation");
- /* PR kern/43664 */
+ atf_tc_set_md_var(tc, "descr",
+ "test lo0 fragmentation (PR kern/43664)");
}
ATF_TC_BODY(loopmtu, tc)
@@ -178,11 +178,6 @@ ATF_TC_BODY(loopmtu, tc)
sin.sin_port = htons(12345);
sin.sin_addr.s_addr = inet_addr("127.0.0.1");
- /*
- * Should not fail anymore, PR has been fixed...
- *
- * atf_tc_expect_signal(SIGABRT, "PR kern/43664");
- */
if (rump_sys_sendto(s, data, sizeof(data), 0,
(struct sockaddr *)&sin, sizeof(sin)) == -1)
atf_tc_fail_errno("sendto failed");
@@ -192,8 +187,8 @@ ATF_TC(loopmtu_csum);
ATF_TC_HEAD(loopmtu_csum, tc)
{
- atf_tc_set_md_var(tc, "descr", "test lo0 fragmentation with checksums");
- /* PR kern/43664 */
+ atf_tc_set_md_var(tc, "descr",
+ "test lo0 fragmentation with checksums (PR kern/43664)");
}
ATF_TC_BODY(loopmtu_csum, tc)
@@ -218,11 +213,6 @@ ATF_TC_BODY(loopmtu_csum, tc)
sin.sin_port = htons(12345);
sin.sin_addr.s_addr = inet_addr("127.0.0.1");
- /*
- * Should not fail anymore, PR has been fixed...
- *
- * atf_tc_expect_signal(SIGABRT, "PR kern/43664");
- */
if (rump_sys_sendto(s, data, sizeof(data), 0,
(struct sockaddr *)&sin, sizeof(sin)) == -1)
atf_tc_fail_errno("sendto failed");
Index: src/tests/sbin/ifconfig/t_nonexistent.sh
diff -u src/tests/sbin/ifconfig/t_nonexistent.sh:1.3 src/tests/sbin/ifconfig/t_nonexistent.sh:1.4
--- src/tests/sbin/ifconfig/t_nonexistent.sh:1.3 Sat Mar 17 17:39:44 2012
+++ src/tests/sbin/ifconfig/t_nonexistent.sh Sun Mar 18 09:46:50 2012
@@ -1,4 +1,4 @@
-# $NetBSD: t_nonexistent.sh,v 1.3 2012/03/17 17:39:44 jruoho Exp $
+# $NetBSD: t_nonexistent.sh,v 1.4 2012/03/18 09:46:50 jruoho Exp $
#
# Copyright (c) 2011 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -30,13 +30,12 @@
atf_test_case nonexistent
nonexistent_head() {
- atf_set "descr" "Check ifconfig(8) with nonexistent interface"
+ atf_set "descr" "Check ifconfig(8) with " \
+ "a nonexistent interface (PR bin/43141)"
}
nonexistent_body() {
- # Cf. PR bin/43141.
- #
atf_check -s not-exit:0 -e ignore \
ifconfig nonexistent0 1.2.3.4/24
}
Index: src/tests/sbin/sysctl/t_perm.sh
diff -u src/tests/sbin/sysctl/t_perm.sh:1.5 src/tests/sbin/sysctl/t_perm.sh:1.6
--- src/tests/sbin/sysctl/t_perm.sh:1.5 Mon Mar 12 08:14:02 2012
+++ src/tests/sbin/sysctl/t_perm.sh Sun Mar 18 09:46:50 2012
@@ -1,4 +1,4 @@
-# $NetBSD: t_perm.sh,v 1.5 2012/03/12 08:14:02 jruoho Exp $
+# $NetBSD: t_perm.sh,v 1.6 2012/03/18 09:46:50 jruoho Exp $
#
# Copyright (c) 2011 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -100,12 +100,13 @@ sysctl_hw_cleanup() {
clean
}
-# kern (cf. closed PR kern/44946).
+# kern.
#
atf_test_case sysctl_kern cleanup
sysctl_kern_head() {
atf_set "require.user" "unprivileged"
- atf_set "descr" "Test writing to 'kern' sysctl node as an user"
+ atf_set "descr" "Test writing to 'kern' " \
+ "sysctl node as an user (PR kern/44946)"
}
sysctl_kern_body() {
Index: src/tests/usr.bin/unifdef/t_basic.sh
diff -u src/tests/usr.bin/unifdef/t_basic.sh:1.4 src/tests/usr.bin/unifdef/t_basic.sh:1.5
--- src/tests/usr.bin/unifdef/t_basic.sh:1.4 Wed May 11 22:08:12 2011
+++ src/tests/usr.bin/unifdef/t_basic.sh Sun Mar 18 09:46:50 2012
@@ -1,4 +1,4 @@
-# $NetBSD: t_basic.sh,v 1.4 2011/05/11 22:08:12 njoly Exp $
+# $NetBSD: t_basic.sh,v 1.5 2012/03/18 09:46:50 jruoho Exp $
#
# Copyright (c) 2011 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -30,14 +30,12 @@
atf_test_case basic
basic_head() {
- atf_set "descr" "A basic test of unifdef(1)"
+ atf_set "descr" "A basic test of unifdef(1) (PR bin/42628)"
atf_set "require.progs" "unifdef"
}
basic_body() {
- # See PR bin/42628.
- #
atf_check -s ignore -o file:$(atf_get_srcdir)/d_basic.out \
-x "unifdef -U__FreeBSD__ $(atf_get_srcdir)/d_basic.in"
}
