Module Name: src
Committed By: jmmv
Date: Sat Jul 3 08:18:30 UTC 2010
Modified Files:
src/tests/fs/lfs: t_pr.c
src/tests/fs/ptyfs: t_nullpts.c
src/tests/fs/union: t_pr.c
src/tests/kernel/tty: t_pr.c
src/tests/lib/semaphore: sem.c
src/tests/util/sh: t_expand.sh
Log Message:
Replace custom xfail settings with the new expected failure support in
atf 0.10.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/fs/lfs/t_pr.c
cvs rdiff -u -r1.3 -r1.4 src/tests/fs/ptyfs/t_nullpts.c
cvs rdiff -u -r1.2 -r1.3 src/tests/fs/union/t_pr.c
cvs rdiff -u -r1.1 -r1.2 src/tests/kernel/tty/t_pr.c
cvs rdiff -u -r1.5 -r1.6 src/tests/lib/semaphore/sem.c
cvs rdiff -u -r1.6 -r1.7 src/tests/util/sh/t_expand.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/fs/lfs/t_pr.c
diff -u src/tests/fs/lfs/t_pr.c:1.1 src/tests/fs/lfs/t_pr.c:1.2
--- src/tests/fs/lfs/t_pr.c:1.1 Mon Jun 28 09:45:06 2010
+++ src/tests/fs/lfs/t_pr.c Sat Jul 3 08:18:30 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: t_pr.c,v 1.1 2010/06/28 09:45:06 pooka Exp $ */
+/* $NetBSD: t_pr.c,v 1.2 2010/07/03 08:18:30 jmmv Exp $ */
#include <sys/types.h>
#include <sys/mount.h>
@@ -26,7 +26,6 @@
atf_tc_set_md_var(tc, "descr", "mknod(2) hangs on LFS (PR kern/43503)");
atf_tc_set_md_var(tc, "timeout", "1");
atf_tc_set_md_var(tc, "use.fs", "true");
- //atf_tc_set_md_var(tc, "xfail", "PR kern/43503");
}
#define IMGNAME "disk.img"
Index: src/tests/fs/ptyfs/t_nullpts.c
diff -u src/tests/fs/ptyfs/t_nullpts.c:1.3 src/tests/fs/ptyfs/t_nullpts.c:1.4
--- src/tests/fs/ptyfs/t_nullpts.c:1.3 Wed Jun 16 15:57:11 2010
+++ src/tests/fs/ptyfs/t_nullpts.c Sat Jul 3 08:18:30 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: t_nullpts.c,v 1.3 2010/06/16 15:57:11 pooka Exp $ */
+/* $NetBSD: t_nullpts.c,v 1.4 2010/07/03 08:18:30 jmmv Exp $ */
#include <sys/types.h>
#include <sys/mount.h>
@@ -60,7 +60,6 @@
ATF_TC_HEAD(nullrevoke, tc)
{
atf_tc_set_md_var(tc, "descr", "null mount ptyfs and revoke");
- atf_tc_set_md_var(tc, "xfail", "PR kern/43456");
}
ATF_TC_BODY(nullrevoke, tc)
@@ -115,6 +114,7 @@
rump_sys_close(ptg.sfd);
/* revoke slave tty. boom */
+ atf_tc_expect_signal(-1, "PR kern/43456");
rump_sys_revoke(path);
/* done? */
Index: src/tests/fs/union/t_pr.c
diff -u src/tests/fs/union/t_pr.c:1.2 src/tests/fs/union/t_pr.c:1.3
--- src/tests/fs/union/t_pr.c:1.2 Wed Jun 30 14:10:14 2010
+++ src/tests/fs/union/t_pr.c Sat Jul 3 08:18:30 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: t_pr.c,v 1.2 2010/06/30 14:10:14 hannken Exp $ */
+/* $NetBSD: t_pr.c,v 1.3 2010/07/03 08:18:30 jmmv Exp $ */
#include <sys/types.h>
#include <sys/mount.h>
@@ -25,7 +25,6 @@
{
atf_tc_set_md_var(tc, "descr", "mount_union -b twice");
atf_tc_set_md_var(tc, "use.fs", "true");
- /* atf_tc_set_md_var(tc, "xfail", "PR kern/23986"); */
}
#define IMG1 "atf1.img"
@@ -68,6 +67,7 @@
unionargs.mntflags = UNMNT_BELOW;
/* BADABOOM */
+ /* atf_tc_expect_signal(-1, "PR kern/23986"); */
rump_sys_mount(MOUNT_UNION, "/Tunion", 0,&unionargs,sizeof(unionargs));
}
Index: src/tests/kernel/tty/t_pr.c
diff -u src/tests/kernel/tty/t_pr.c:1.1 src/tests/kernel/tty/t_pr.c:1.2
--- src/tests/kernel/tty/t_pr.c:1.1 Mon Jun 28 19:04:00 2010
+++ src/tests/kernel/tty/t_pr.c Sat Jul 3 08:18:30 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: t_pr.c,v 1.1 2010/06/28 19:04:00 pooka Exp $ */
+/* $NetBSD: t_pr.c,v 1.2 2010/07/03 08:18:30 jmmv Exp $ */
#include <sys/types.h>
#include <sys/ioctl.h>
@@ -15,7 +15,6 @@
{
atf_tc_set_md_var(tc, "descr", "ioctl on pty");
- atf_tc_set_md_var(tc, "xfail", "PR kern/40688");
}
ATF_TC_BODY(ptyioctl, tc)
@@ -29,6 +28,7 @@
err(1, "open");
/* boom, dies with null deref under ptcwakeup() */
+ atf_tc_expect_signal(-1, "PR kern/40688");
rump_sys_ioctl(fd, TIOCGETA, &tio);
}
Index: src/tests/lib/semaphore/sem.c
diff -u src/tests/lib/semaphore/sem.c:1.5 src/tests/lib/semaphore/sem.c:1.6
--- src/tests/lib/semaphore/sem.c:1.5 Thu Jun 17 09:37:50 2010
+++ src/tests/lib/semaphore/sem.c Sat Jul 3 08:18:30 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sem.c,v 1.5 2010/06/17 09:37:50 pooka Exp $ */
+/* $NetBSD: sem.c,v 1.6 2010/07/03 08:18:30 jmmv Exp $ */
/*
* Common code for semaphore tests. This can be included both into
@@ -265,7 +265,6 @@
/* this is currently broken. i'll append the PR number soon */
atf_tc_set_md_var(tc, "descr", "tests unlinked semaphores can be "
"closed (%s)", LIBNAME);
- atf_tc_set_md_var(tc, "xfail", "PR kern/43452");
}
#define SEM "/thesem"
@@ -279,6 +278,7 @@
if (sem_unlink(SEM) == -1)
atf_tc_fail_errno("unlink");
+ atf_tc_expect_fail("PR kern/43452");
if (sem_close(sem) == -1)
atf_tc_fail_errno("close unlinked semaphore");
}
Index: src/tests/util/sh/t_expand.sh
diff -u src/tests/util/sh/t_expand.sh:1.6 src/tests/util/sh/t_expand.sh:1.7
--- src/tests/util/sh/t_expand.sh:1.6 Wed Jun 16 15:39:41 2010
+++ src/tests/util/sh/t_expand.sh Sat Jul 3 08:18:30 2010
@@ -1,4 +1,4 @@
-# $NetBSD: t_expand.sh,v 1.6 2010/06/16 15:39:41 pooka Exp $
+# $NetBSD: t_expand.sh,v 1.7 2010/07/03 08:18:30 jmmv Exp $
#
# Copyright (c) 2007, 2009 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -87,11 +87,11 @@
atf_set "descr" "Checks that the %% operator works and strips" \
"the contents of a variable from the given point" \
"to the end"
- atf_set "xfail" "PR bin/43469"
}
strip_body() {
line='#define bindir "/usr/bin" /* comment */'
stripped='#define bindir "/usr/bin" '
+ atf_expect_fail "PR bin/43469"
atf_check_equal '$stripped' '${line%%/\**}'
}
