[src/trunk]: src/tests Replace custom xfail settings with the new expected fa...

[jmmv <jmmv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a0ffbd2e0550
branches:  trunk
changeset: 756018:a0ffbd2e0550
user:      jmmv <jmmv%NetBSD.org@localhost>
date:      Sat Jul 03 08:18:30 2010 +0000

description:
Replace custom xfail settings with the new expected failure support in
atf 0.10.

diffstat:

 tests/fs/lfs/t_pr.c        |  3 +--
 tests/fs/ptyfs/t_nullpts.c |  4 ++--
 tests/fs/union/t_pr.c      |  4 ++--
 tests/kernel/tty/t_pr.c    |  4 ++--
 tests/lib/semaphore/sem.c  |  4 ++--
 tests/util/sh/t_expand.sh  |  4 ++--
 6 files changed, 11 insertions(+), 12 deletions(-)

diffs (139 lines):

diff -r 87f56ddff937 -r a0ffbd2e0550 tests/fs/lfs/t_pr.c
--- a/tests/fs/lfs/t_pr.c       Sat Jul 03 08:16:50 2010 +0000
+++ b/tests/fs/lfs/t_pr.c       Sat Jul 03 08:18:30 2010 +0000
@@ -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"
diff -r 87f56ddff937 -r a0ffbd2e0550 tests/fs/ptyfs/t_nullpts.c
--- a/tests/fs/ptyfs/t_nullpts.c        Sat Jul 03 08:16:50 2010 +0000
+++ b/tests/fs/ptyfs/t_nullpts.c        Sat Jul 03 08:18:30 2010 +0000
@@ -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? */
diff -r 87f56ddff937 -r a0ffbd2e0550 tests/fs/union/t_pr.c
--- a/tests/fs/union/t_pr.c     Sat Jul 03 08:16:50 2010 +0000
+++ b/tests/fs/union/t_pr.c     Sat Jul 03 08:18:30 2010 +0000
@@ -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));
 }
 
diff -r 87f56ddff937 -r a0ffbd2e0550 tests/kernel/tty/t_pr.c
--- a/tests/kernel/tty/t_pr.c   Sat Jul 03 08:16:50 2010 +0000
+++ b/tests/kernel/tty/t_pr.c   Sat Jul 03 08:18:30 2010 +0000
@@ -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);
 }
 
diff -r 87f56ddff937 -r a0ffbd2e0550 tests/lib/semaphore/sem.c
--- a/tests/lib/semaphore/sem.c Sat Jul 03 08:16:50 2010 +0000
+++ b/tests/lib/semaphore/sem.c Sat Jul 03 08:18:30 2010 +0000
@@ -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");
 }
diff -r 87f56ddff937 -r a0ffbd2e0550 tests/util/sh/t_expand.sh
--- a/tests/util/sh/t_expand.sh Sat Jul 03 08:16:50 2010 +0000
+++ b/tests/util/sh/t_expand.sh Sat Jul 03 08:18:30 2010 +0000
@@ -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%%/\**}'
 }