Module Name: src
Committed By: jmmv
Date: Sun Mar 17 04:46:07 UTC 2013
Modified Files:
src/tests/lib/libc/c063: t_faccessat.c t_fchmodat.c t_fchownat.c
t_fstatat.c t_linkat.c t_mkdirat.c t_mkfifoat.c t_mknodat.c
t_o_search.c t_openat.c t_readlinkat.c t_renameat.c t_symlinkat.c
t_unlinkat.c t_utimensat.c
Log Message:
Remove unnecessary cleanup routines.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libc/c063/t_faccessat.c \
src/tests/lib/libc/c063/t_fchmodat.c src/tests/lib/libc/c063/t_fstatat.c \
src/tests/lib/libc/c063/t_linkat.c src/tests/lib/libc/c063/t_mkdirat.c \
src/tests/lib/libc/c063/t_mkfifoat.c src/tests/lib/libc/c063/t_openat.c \
src/tests/lib/libc/c063/t_renameat.c \
src/tests/lib/libc/c063/t_symlinkat.c \
src/tests/lib/libc/c063/t_unlinkat.c
cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libc/c063/t_fchownat.c \
src/tests/lib/libc/c063/t_mknodat.c \
src/tests/lib/libc/c063/t_readlinkat.c
cvs rdiff -u -r1.3 -r1.4 src/tests/lib/libc/c063/t_o_search.c
cvs rdiff -u -r1.4 -r1.5 src/tests/lib/libc/c063/t_utimensat.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libc/c063/t_faccessat.c
diff -u src/tests/lib/libc/c063/t_faccessat.c:1.1 src/tests/lib/libc/c063/t_faccessat.c:1.2
--- src/tests/lib/libc/c063/t_faccessat.c:1.1 Sun Nov 18 17:41:54 2012
+++ src/tests/lib/libc/c063/t_faccessat.c Sun Mar 17 04:46:06 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: t_faccessat.c,v 1.1 2012/11/18 17:41:54 manu Exp $ */
+/* $NetBSD: t_faccessat.c,v 1.2 2013/03/17 04:46:06 jmmv Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_faccessat.c,v 1.1 2012/11/18 17:41:54 manu Exp $");
+__RCSID("$NetBSD: t_faccessat.c,v 1.2 2013/03/17 04:46:06 jmmv Exp $");
#include <atf-c.h>
#include <errno.h>
@@ -48,12 +48,11 @@ __RCSID("$NetBSD: t_faccessat.c,v 1.1 20
#define BASELINK "symlink"
#define FILEERR "dir/faccessaterr"
-ATF_TC_WITH_CLEANUP(faccessat_fd);
+ATF_TC(faccessat_fd);
ATF_TC_HEAD(faccessat_fd, tc)
{
atf_tc_set_md_var(tc, "descr", "See that faccessat works with fd");
}
-
ATF_TC_BODY(faccessat_fd, tc)
{
int dfd;
@@ -68,20 +67,12 @@ ATF_TC_BODY(faccessat_fd, tc)
ATF_REQUIRE(close(dfd) == 0);
}
-ATF_TC_CLEANUP(faccessat_fd, tc)
-{
- (void)unlink(FILE);
- (void)unlink(FILEERR);
- (void)rmdir(DIR);
-}
-
-ATF_TC_WITH_CLEANUP(faccessat_fdcwd);
+ATF_TC(faccessat_fdcwd);
ATF_TC_HEAD(faccessat_fdcwd, tc)
{
atf_tc_set_md_var(tc, "descr",
"See that faccessat works with fd as AT_FDCWD");
}
-
ATF_TC_BODY(faccessat_fdcwd, tc)
{
int fd;
@@ -94,39 +85,23 @@ ATF_TC_BODY(faccessat_fdcwd, tc)
ATF_REQUIRE(faccessat(AT_FDCWD, BASEFILE, F_OK, 0) == 0);
}
-ATF_TC_CLEANUP(faccessat_fdcwd, tc)
-{
- (void)unlink(FILE);
- (void)unlink(FILEERR);
- (void)rmdir(DIR);
-}
-
-ATF_TC_WITH_CLEANUP(faccessat_fdcwderr);
+ATF_TC(faccessat_fdcwderr);
ATF_TC_HEAD(faccessat_fdcwderr, tc)
{
atf_tc_set_md_var(tc, "descr",
"See that faccessat fails with fd as AT_FDCWD and bad path");
}
-
ATF_TC_BODY(faccessat_fdcwderr, tc)
{
ATF_REQUIRE(mkdir(DIR, 0755) == 0);
ATF_REQUIRE(faccessat(AT_FDCWD, FILEERR, F_OK, 0) == -1);
}
-ATF_TC_CLEANUP(faccessat_fdcwderr, tc)
-{
- (void)unlink(FILE);
- (void)unlink(FILEERR);
- (void)rmdir(DIR);
-}
-
-ATF_TC_WITH_CLEANUP(faccessat_fderr1);
+ATF_TC(faccessat_fderr1);
ATF_TC_HEAD(faccessat_fderr1, tc)
{
atf_tc_set_md_var(tc, "descr", "See that faccessat fail with bad path");
}
-
ATF_TC_BODY(faccessat_fderr1, tc)
{
int dfd;
@@ -135,22 +110,13 @@ ATF_TC_BODY(faccessat_fderr1, tc)
ATF_REQUIRE((dfd = open(DIR, O_RDONLY, 0)) != -1);
ATF_REQUIRE(faccessat(dfd, FILEERR, F_OK, 0) == -1);
ATF_REQUIRE(close(dfd) == 0);
-
-}
-
-ATF_TC_CLEANUP(faccessat_fderr1, tc)
-{
- (void)unlink(FILE);
- (void)unlink(FILEERR);
- (void)rmdir(DIR);
}
-ATF_TC_WITH_CLEANUP(faccessat_fderr2);
+ATF_TC(faccessat_fderr2);
ATF_TC_HEAD(faccessat_fderr2, tc)
{
atf_tc_set_md_var(tc, "descr", "See that faccessat fails with bad fdat");
}
-
ATF_TC_BODY(faccessat_fderr2, tc)
{
int dfd;
@@ -166,19 +132,11 @@ ATF_TC_BODY(faccessat_fderr2, tc)
ATF_REQUIRE(close(dfd) == 0);
}
-ATF_TC_CLEANUP(faccessat_fderr2, tc)
-{
- (void)unlink(FILE);
- (void)unlink(FILEERR);
- (void)rmdir(DIR);
-}
-
-ATF_TC_WITH_CLEANUP(faccessat_fderr3);
+ATF_TC(faccessat_fderr3);
ATF_TC_HEAD(faccessat_fderr3, tc)
{
atf_tc_set_md_var(tc, "descr", "See that faccessat fails with fd as -1");
}
-
ATF_TC_BODY(faccessat_fderr3, tc)
{
int fd;
@@ -190,19 +148,11 @@ ATF_TC_BODY(faccessat_fderr3, tc)
ATF_REQUIRE(faccessat(-1, FILE, F_OK, 0) == -1);
}
-ATF_TC_CLEANUP(faccessat_fderr3, tc)
-{
- (void)unlink(FILE);
- (void)unlink(FILEERR);
- (void)rmdir(DIR);
-}
-
-ATF_TC_WITH_CLEANUP(faccessat_fdlink);
+ATF_TC(faccessat_fdlink);
ATF_TC_HEAD(faccessat_fdlink, tc)
{
atf_tc_set_md_var(tc, "descr", "See that faccessat works on symlink");
}
-
ATF_TC_BODY(faccessat_fdlink, tc)
{
int dfd;
@@ -220,12 +170,6 @@ ATF_TC_BODY(faccessat_fdlink, tc)
ATF_REQUIRE(close(dfd) == 0);
}
-ATF_TC_CLEANUP(faccessat_fdlink, tc)
-{
- (void)unlink(LINK);
- (void)rmdir(DIR);
-}
-
ATF_TP_ADD_TCS(tp)
{
Index: src/tests/lib/libc/c063/t_fchmodat.c
diff -u src/tests/lib/libc/c063/t_fchmodat.c:1.1 src/tests/lib/libc/c063/t_fchmodat.c:1.2
--- src/tests/lib/libc/c063/t_fchmodat.c:1.1 Sun Nov 18 17:41:54 2012
+++ src/tests/lib/libc/c063/t_fchmodat.c Sun Mar 17 04:46:06 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: t_fchmodat.c,v 1.1 2012/11/18 17:41:54 manu Exp $ */
+/* $NetBSD: t_fchmodat.c,v 1.2 2013/03/17 04:46:06 jmmv Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_fchmodat.c,v 1.1 2012/11/18 17:41:54 manu Exp $");
+__RCSID("$NetBSD: t_fchmodat.c,v 1.2 2013/03/17 04:46:06 jmmv Exp $");
#include <atf-c.h>
#include <errno.h>
@@ -48,12 +48,11 @@ __RCSID("$NetBSD: t_fchmodat.c,v 1.1 201
#define BASELINK "symlink"
#define FILEERR "dir/fchmodaterr"
-ATF_TC_WITH_CLEANUP(fchmodat_fd);
+ATF_TC(fchmodat_fd);
ATF_TC_HEAD(fchmodat_fd, tc)
{
atf_tc_set_md_var(tc, "descr", "See that fchmodat works with fd");
}
-
ATF_TC_BODY(fchmodat_fd, tc)
{
int dfd;
@@ -72,20 +71,12 @@ ATF_TC_BODY(fchmodat_fd, tc)
ATF_REQUIRE(st.st_mode = 0600);
}
-ATF_TC_CLEANUP(fchmodat_fd, tc)
-{
- (void)unlink(FILE);
- (void)unlink(FILEERR);
- (void)rmdir(DIR);
-}
-
-ATF_TC_WITH_CLEANUP(fchmodat_fdcwd);
+ATF_TC(fchmodat_fdcwd);
ATF_TC_HEAD(fchmodat_fdcwd, tc)
{
atf_tc_set_md_var(tc, "descr",
"See that fchmodat works with fd as AT_FDCWD");
}
-
ATF_TC_BODY(fchmodat_fdcwd, tc)
{
int fd;
@@ -102,39 +93,23 @@ ATF_TC_BODY(fchmodat_fdcwd, tc)
ATF_REQUIRE(st.st_mode = 0600);
}
-ATF_TC_CLEANUP(fchmodat_fdcwd, tc)
-{
- (void)unlink(FILE);
- (void)unlink(FILEERR);
- (void)rmdir(DIR);
-}
-
-ATF_TC_WITH_CLEANUP(fchmodat_fdcwderr);
+ATF_TC(fchmodat_fdcwderr);
ATF_TC_HEAD(fchmodat_fdcwderr, tc)
{
atf_tc_set_md_var(tc, "descr",
"See that fchmodat fails with fd as AT_FDCWD and bad path");
}
-
ATF_TC_BODY(fchmodat_fdcwderr, tc)
{
ATF_REQUIRE(mkdir(DIR, 0755) == 0);
ATF_REQUIRE(fchmodat(AT_FDCWD, FILEERR, 0600, 0) == -1);
}
-ATF_TC_CLEANUP(fchmodat_fdcwderr, tc)
-{
- (void)unlink(FILE);
- (void)unlink(FILEERR);
- (void)rmdir(DIR);
-}
-
-ATF_TC_WITH_CLEANUP(fchmodat_fderr1);
+ATF_TC(fchmodat_fderr1);
ATF_TC_HEAD(fchmodat_fderr1, tc)
{
atf_tc_set_md_var(tc, "descr", "See that fchmodat fail with bad path");
}
-
ATF_TC_BODY(fchmodat_fderr1, tc)
{
int dfd;
@@ -145,19 +120,11 @@ ATF_TC_BODY(fchmodat_fderr1, tc)
ATF_REQUIRE(close(dfd) == 0);
}
-ATF_TC_CLEANUP(fchmodat_fderr1, tc)
-{
- (void)unlink(FILE);
- (void)unlink(FILEERR);
- (void)rmdir(DIR);
-}
-
-ATF_TC_WITH_CLEANUP(fchmodat_fderr2);
+ATF_TC(fchmodat_fderr2);
ATF_TC_HEAD(fchmodat_fderr2, tc)
{
atf_tc_set_md_var(tc, "descr", "See that fchmodat fails with bad fdat");
}
-
ATF_TC_BODY(fchmodat_fderr2, tc)
{
int dfd;
@@ -173,19 +140,11 @@ ATF_TC_BODY(fchmodat_fderr2, tc)
ATF_REQUIRE(close(dfd) == 0);
}
-ATF_TC_CLEANUP(fchmodat_fderr2, tc)
-{
- (void)unlink(FILE);
- (void)unlink(FILEERR);
- (void)rmdir(DIR);
-}
-
-ATF_TC_WITH_CLEANUP(fchmodat_fderr3);
+ATF_TC(fchmodat_fderr3);
ATF_TC_HEAD(fchmodat_fderr3, tc)
{
atf_tc_set_md_var(tc, "descr", "See that fchmodat fails with fd as -1");
}
-
ATF_TC_BODY(fchmodat_fderr3, tc)
{
int fd;
@@ -197,20 +156,11 @@ ATF_TC_BODY(fchmodat_fderr3, tc)
ATF_REQUIRE(fchmodat(-1, FILE, 0600, 0) == -1);
}
-ATF_TC_CLEANUP(fchmodat_fderr3, tc)
-{
- (void)unlink(FILE);
- (void)unlink(FILEERR);
- (void)rmdir(DIR);
-}
-
-
-ATF_TC_WITH_CLEANUP(fchmodat_fdlink);
+ATF_TC(fchmodat_fdlink);
ATF_TC_HEAD(fchmodat_fdlink, tc)
{
atf_tc_set_md_var(tc, "descr", "See that fchmodat works on symlink");
}
-
ATF_TC_BODY(fchmodat_fdlink, tc)
{
int dfdlink;
@@ -232,12 +182,6 @@ ATF_TC_BODY(fchmodat_fdlink, tc)
ATF_REQUIRE(st.st_mode = 0600);
}
-ATF_TC_CLEANUP(fchmodat_fdlink, tc)
-{
- (void)unlink(LINK);
- (void)rmdir(DIR);
-}
-
ATF_TP_ADD_TCS(tp)
{
Index: src/tests/lib/libc/c063/t_fstatat.c
diff -u src/tests/lib/libc/c063/t_fstatat.c:1.1 src/tests/lib/libc/c063/t_fstatat.c:1.2
--- src/tests/lib/libc/c063/t_fstatat.c:1.1 Sun Nov 18 17:41:54 2012
+++ src/tests/lib/libc/c063/t_fstatat.c Sun Mar 17 04:46:06 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: t_fstatat.c,v 1.1 2012/11/18 17:41:54 manu Exp $ */
+/* $NetBSD: t_fstatat.c,v 1.2 2013/03/17 04:46:06 jmmv Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_fstatat.c,v 1.1 2012/11/18 17:41:54 manu Exp $");
+__RCSID("$NetBSD: t_fstatat.c,v 1.2 2013/03/17 04:46:06 jmmv Exp $");
#include <atf-c.h>
#include <errno.h>
@@ -48,12 +48,11 @@ __RCSID("$NetBSD: t_fstatat.c,v 1.1 2012
#define BASELINK "symlink"
#define FILEERR "dir/symlink"
-ATF_TC_WITH_CLEANUP(fstatat_fd);
+ATF_TC(fstatat_fd);
ATF_TC_HEAD(fstatat_fd, tc)
{
atf_tc_set_md_var(tc, "descr", "See that fstatat works with fd");
}
-
ATF_TC_BODY(fstatat_fd, tc)
{
int dfd;
@@ -72,20 +71,12 @@ ATF_TC_BODY(fstatat_fd, tc)
ATF_REQUIRE(memcmp(&st1, &st2, sizeof(st1)) == 0);
}
-ATF_TC_CLEANUP(fstatat_fd, tc)
-{
- (void)unlink(FILE);
- (void)unlink(FILEERR);
- (void)rmdir(DIR);
-}
-
-ATF_TC_WITH_CLEANUP(fstatat_fdcwd);
+ATF_TC(fstatat_fdcwd);
ATF_TC_HEAD(fstatat_fdcwd, tc)
{
atf_tc_set_md_var(tc, "descr",
"See that fstatat works with fd as AT_FDCWD");
}
-
ATF_TC_BODY(fstatat_fdcwd, tc)
{
int fd;
@@ -99,20 +90,12 @@ ATF_TC_BODY(fstatat_fdcwd, tc)
ATF_REQUIRE(fstatat(AT_FDCWD, BASEFILE, &st, 0) == 0);
}
-ATF_TC_CLEANUP(fstatat_fdcwd, tc)
-{
- (void)unlink(FILE);
- (void)unlink(FILEERR);
- (void)rmdir(DIR);
-}
-
-ATF_TC_WITH_CLEANUP(fstatat_fdcwderr);
+ATF_TC(fstatat_fdcwderr);
ATF_TC_HEAD(fstatat_fdcwderr, tc)
{
atf_tc_set_md_var(tc, "descr",
"See that fstatat fails with fd as AT_FDCWD and bad path");
}
-
ATF_TC_BODY(fstatat_fdcwderr, tc)
{
struct stat st;
@@ -121,19 +104,11 @@ ATF_TC_BODY(fstatat_fdcwderr, tc)
ATF_REQUIRE(fstatat(AT_FDCWD, FILEERR, &st, 0) == -1);
}
-ATF_TC_CLEANUP(fstatat_fdcwderr, tc)
-{
- (void)unlink(FILE);
- (void)unlink(FILEERR);
- (void)rmdir(DIR);
-}
-
-ATF_TC_WITH_CLEANUP(fstatat_fderr1);
+ATF_TC(fstatat_fderr1);
ATF_TC_HEAD(fstatat_fderr1, tc)
{
atf_tc_set_md_var(tc, "descr", "See that fstatat fail with bad path");
}
-
ATF_TC_BODY(fstatat_fderr1, tc)
{
int dfd;
@@ -143,22 +118,13 @@ ATF_TC_BODY(fstatat_fderr1, tc)
ATF_REQUIRE((dfd = open(DIR, O_RDONLY, 0)) != -1);
ATF_REQUIRE(fstatat(dfd, FILEERR, &st, 0) == -1);
ATF_REQUIRE(close(dfd) == 0);
-
}
-ATF_TC_CLEANUP(fstatat_fderr1, tc)
-{
- (void)unlink(FILE);
- (void)unlink(FILEERR);
- (void)rmdir(DIR);
-}
-
-ATF_TC_WITH_CLEANUP(fstatat_fderr2);
+ATF_TC(fstatat_fderr2);
ATF_TC_HEAD(fstatat_fderr2, tc)
{
atf_tc_set_md_var(tc, "descr", "See that fstatat fails with bad fdat");
}
-
ATF_TC_BODY(fstatat_fderr2, tc)
{
int dfd;
@@ -175,19 +141,11 @@ ATF_TC_BODY(fstatat_fderr2, tc)
ATF_REQUIRE(close(dfd) == 0);
}
-ATF_TC_CLEANUP(fstatat_fderr2, tc)
-{
- (void)unlink(FILE);
- (void)unlink(FILEERR);
- (void)rmdir(DIR);
-}
-
-ATF_TC_WITH_CLEANUP(fstatat_fderr3);
+ATF_TC(fstatat_fderr3);
ATF_TC_HEAD(fstatat_fderr3, tc)
{
atf_tc_set_md_var(tc, "descr", "See that fstatat fails with fd as -1");
}
-
ATF_TC_BODY(fstatat_fderr3, tc)
{
int fd;
@@ -200,20 +158,11 @@ ATF_TC_BODY(fstatat_fderr3, tc)
ATF_REQUIRE(fstatat(-1, FILE, &st, 0) == -1);
}
-ATF_TC_CLEANUP(fstatat_fderr3, tc)
-{
- (void)unlink(FILE);
- (void)unlink(FILEERR);
- (void)rmdir(DIR);
-}
-
-
-ATF_TC_WITH_CLEANUP(fstatat_fdlink);
+ATF_TC(fstatat_fdlink);
ATF_TC_HEAD(fstatat_fdlink, tc)
{
atf_tc_set_md_var(tc, "descr", "See that fstatat works on symlink");
}
-
ATF_TC_BODY(fstatat_fdlink, tc)
{
int dfd;
@@ -232,12 +181,6 @@ ATF_TC_BODY(fstatat_fdlink, tc)
ATF_REQUIRE(close(dfd) == 0);
}
-ATF_TC_CLEANUP(fstatat_fdlink, tc)
-{
- (void)unlink(LINK);
- (void)rmdir(DIR);
-}
-
ATF_TP_ADD_TCS(tp)
{
Index: src/tests/lib/libc/c063/t_linkat.c
diff -u src/tests/lib/libc/c063/t_linkat.c:1.1 src/tests/lib/libc/c063/t_linkat.c:1.2
--- src/tests/lib/libc/c063/t_linkat.c:1.1 Sun Nov 18 17:41:54 2012
+++ src/tests/lib/libc/c063/t_linkat.c Sun Mar 17 04:46:06 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: t_linkat.c,v 1.1 2012/11/18 17:41:54 manu Exp $ */
+/* $NetBSD: t_linkat.c,v 1.2 2013/03/17 04:46:06 jmmv Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_linkat.c,v 1.1 2012/11/18 17:41:54 manu Exp $");
+__RCSID("$NetBSD: t_linkat.c,v 1.2 2013/03/17 04:46:06 jmmv Exp $");
#include <atf-c.h>
#include <errno.h>
@@ -53,12 +53,11 @@ __RCSID("$NetBSD: t_linkat.c,v 1.1 2012/
#define BASELINK "symlink"
#define FILEERR "olddir/olderr"
-ATF_TC_WITH_CLEANUP(linkat_fd);
+ATF_TC(linkat_fd);
ATF_TC_HEAD(linkat_fd, tc)
{
atf_tc_set_md_var(tc, "descr", "See that linkat works with fd");
}
-
ATF_TC_BODY(linkat_fd, tc)
{
int ofd, nfd, fd;
@@ -80,22 +79,12 @@ ATF_TC_BODY(linkat_fd, tc)
ATF_REQUIRE(ost.st_ino == nst.st_ino);
}
-ATF_TC_CLEANUP(linkat_fd, tc)
-{
- (void)unlink(FILE);
- (void)unlink(TARGET);
- (void)rmdir(NDIR);
- (void)rmdir(ODIR);
-}
-
-
-ATF_TC_WITH_CLEANUP(linkat_fdcwd);
+ATF_TC(linkat_fdcwd);
ATF_TC_HEAD(linkat_fdcwd, tc)
{
atf_tc_set_md_var(tc, "descr",
"See that linkat works with fd as AT_FDCWD");
}
-
ATF_TC_BODY(linkat_fdcwd, tc)
{
int fd;
@@ -113,21 +102,12 @@ ATF_TC_BODY(linkat_fdcwd, tc)
ATF_REQUIRE(ost.st_ino == nst.st_ino);
}
-ATF_TC_CLEANUP(linkat_fdcwd, tc)
-{
- (void)unlink(FILE);
- (void)unlink(TARGET);
- (void)rmdir(NDIR);
- (void)rmdir(ODIR);
-}
-
-ATF_TC_WITH_CLEANUP(linkat_fdcwderr);
+ATF_TC(linkat_fdcwderr);
ATF_TC_HEAD(linkat_fdcwderr, tc)
{
atf_tc_set_md_var(tc, "descr",
"See that linkat fails with fd as AT_FDCWD and bad path");
}
-
ATF_TC_BODY(linkat_fdcwderr, tc)
{
int fd;
@@ -140,21 +120,11 @@ ATF_TC_BODY(linkat_fdcwderr, tc)
ATF_REQUIRE(linkat(AT_FDCWD, FILEERR, AT_FDCWD, TARGET, 0) == -1);
}
-ATF_TC_CLEANUP(linkat_fdcwderr, tc)
-{
- (void)unlink(FILE);
- (void)unlink(FILEERR);
- (void)unlink(TARGET);
- (void)rmdir(NDIR);
- (void)rmdir(ODIR);
-}
-
-ATF_TC_WITH_CLEANUP(linkat_fderr);
+ATF_TC(linkat_fderr);
ATF_TC_HEAD(linkat_fderr, tc)
{
atf_tc_set_md_var(tc, "descr", "See that linkat fails with fd as -1");
}
-
ATF_TC_BODY(linkat_fderr, tc)
{
int fd;
@@ -169,20 +139,11 @@ ATF_TC_BODY(linkat_fderr, tc)
ATF_REQUIRE(linkat(-1, FILE, -1, TARGET, 0) == -1);
}
-ATF_TC_CLEANUP(linkat_fderr, tc)
-{
- (void)unlink(FILE);
- (void)unlink(TARGET);
- (void)rmdir(NDIR);
- (void)rmdir(ODIR);
-}
-
-ATF_TC_WITH_CLEANUP(linkat_fdlink1);
+ATF_TC(linkat_fdlink1);
ATF_TC_HEAD(linkat_fdlink1, tc)
{
atf_tc_set_md_var(tc, "descr", "See that linkat works on symlink target");
}
-
ATF_TC_BODY(linkat_fdlink1, tc)
{
int ofd, nfd, fd;
@@ -210,22 +171,12 @@ ATF_TC_BODY(linkat_fdlink1, tc)
ATF_REQUIRE(ost.st_ino == nst.st_ino);
}
-ATF_TC_CLEANUP(linkat_fdlink1, tc)
-{
- (void)unlink(FILE);
- (void)unlink(LINK);
- (void)unlink(TARGET);
- (void)rmdir(NDIR);
- (void)rmdir(ODIR);
-}
-
-ATF_TC_WITH_CLEANUP(linkat_fdlink2);
+ATF_TC(linkat_fdlink2);
ATF_TC_HEAD(linkat_fdlink2, tc)
{
atf_tc_set_md_var(tc, "descr", "See that linkat works on symlink source");
}
-
ATF_TC_BODY(linkat_fdlink2, tc)
{
int ofd, nfd, fd;
@@ -252,15 +203,6 @@ ATF_TC_BODY(linkat_fdlink2, tc)
ATF_REQUIRE(ost.st_ino != nst.st_ino);
}
-ATF_TC_CLEANUP(linkat_fdlink2, tc)
-{
- (void)unlink(FILE);
- (void)unlink(LINK);
- (void)unlink(TARGET);
- (void)rmdir(NDIR);
- (void)rmdir(ODIR);
-}
-
ATF_TP_ADD_TCS(tp)
{
Index: src/tests/lib/libc/c063/t_mkdirat.c
diff -u src/tests/lib/libc/c063/t_mkdirat.c:1.1 src/tests/lib/libc/c063/t_mkdirat.c:1.2
--- src/tests/lib/libc/c063/t_mkdirat.c:1.1 Sun Nov 18 17:41:54 2012
+++ src/tests/lib/libc/c063/t_mkdirat.c Sun Mar 17 04:46:06 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: t_mkdirat.c,v 1.1 2012/11/18 17:41:54 manu Exp $ */
+/* $NetBSD: t_mkdirat.c,v 1.2 2013/03/17 04:46:06 jmmv Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_mkdirat.c,v 1.1 2012/11/18 17:41:54 manu Exp $");
+__RCSID("$NetBSD: t_mkdirat.c,v 1.2 2013/03/17 04:46:06 jmmv Exp $");
#include <atf-c.h>
#include <errno.h>
@@ -47,12 +47,11 @@ __RCSID("$NetBSD: t_mkdirat.c,v 1.1 2012
#define BASESDIR "openat"
#define SDIRERR "dir/openaterr"
-ATF_TC_WITH_CLEANUP(mkdirat_fd);
+ATF_TC(mkdirat_fd);
ATF_TC_HEAD(mkdirat_fd, tc)
{
atf_tc_set_md_var(tc, "descr", "See that mkdirat works with fd");
}
-
ATF_TC_BODY(mkdirat_fd, tc)
{
int dfd;
@@ -65,21 +64,12 @@ ATF_TC_BODY(mkdirat_fd, tc)
ATF_REQUIRE(access(SDIR, F_OK) == 0);
}
-ATF_TC_CLEANUP(mkdirat_fd, tc)
-{
- (void)unlink(SDIR);
- (void)unlink(SDIRERR);
- (void)rmdir(DIR);
-}
-
-
-ATF_TC_WITH_CLEANUP(mkdirat_fdcwd);
+ATF_TC(mkdirat_fdcwd);
ATF_TC_HEAD(mkdirat_fdcwd, tc)
{
atf_tc_set_md_var(tc, "descr",
"See that mkdirat works with fd as AT_FDCWD");
}
-
ATF_TC_BODY(mkdirat_fdcwd, tc)
{
mode_t mode = 0755;
@@ -89,20 +79,12 @@ ATF_TC_BODY(mkdirat_fdcwd, tc)
ATF_REQUIRE(access(SDIR, F_OK) == 0);
}
-ATF_TC_CLEANUP(mkdirat_fdcwd, tc)
-{
- (void)unlink(SDIR);
- (void)unlink(SDIRERR);
- (void)rmdir(DIR);
-}
-
-ATF_TC_WITH_CLEANUP(mkdirat_fdcwderr);
+ATF_TC(mkdirat_fdcwderr);
ATF_TC_HEAD(mkdirat_fdcwderr, tc)
{
atf_tc_set_md_var(tc, "descr",
"See that mkdirat fails with fd as AT_FDCWD and bad path");
}
-
ATF_TC_BODY(mkdirat_fdcwderr, tc)
{
mode_t mode = 0755;
@@ -110,19 +92,11 @@ ATF_TC_BODY(mkdirat_fdcwderr, tc)
ATF_REQUIRE(mkdirat(AT_FDCWD, SDIRERR, mode) == -1);
}
-ATF_TC_CLEANUP(mkdirat_fdcwderr, tc)
-{
- (void)unlink(SDIR);
- (void)unlink(SDIRERR);
- (void)rmdir(DIR);
-}
-
-ATF_TC_WITH_CLEANUP(mkdirat_fderr);
+ATF_TC(mkdirat_fderr);
ATF_TC_HEAD(mkdirat_fderr, tc)
{
atf_tc_set_md_var(tc, "descr", "See that mkdirat fails with fd as -1");
}
-
ATF_TC_BODY(mkdirat_fderr, tc)
{
int fd;
@@ -134,14 +108,6 @@ ATF_TC_BODY(mkdirat_fderr, tc)
ATF_REQUIRE(mkdirat(-1, SDIR, mode) == -1);
}
-ATF_TC_CLEANUP(mkdirat_fderr, tc)
-{
- (void)unlink(SDIR);
- (void)unlink(SDIRERR);
- (void)rmdir(DIR);
-}
-
-
ATF_TP_ADD_TCS(tp)
{
Index: src/tests/lib/libc/c063/t_mkfifoat.c
diff -u src/tests/lib/libc/c063/t_mkfifoat.c:1.1 src/tests/lib/libc/c063/t_mkfifoat.c:1.2
--- src/tests/lib/libc/c063/t_mkfifoat.c:1.1 Sun Nov 18 17:41:54 2012
+++ src/tests/lib/libc/c063/t_mkfifoat.c Sun Mar 17 04:46:06 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: t_mkfifoat.c,v 1.1 2012/11/18 17:41:54 manu Exp $ */
+/* $NetBSD: t_mkfifoat.c,v 1.2 2013/03/17 04:46:06 jmmv Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_mkfifoat.c,v 1.1 2012/11/18 17:41:54 manu Exp $");
+__RCSID("$NetBSD: t_mkfifoat.c,v 1.2 2013/03/17 04:46:06 jmmv Exp $");
#include <atf-c.h>
#include <errno.h>
@@ -47,12 +47,11 @@ __RCSID("$NetBSD: t_mkfifoat.c,v 1.1 201
#define BASEFIFO "openat"
#define FIFOERR "dir/openaterr"
-ATF_TC_WITH_CLEANUP(mkfifoat_fd);
+ATF_TC(mkfifoat_fd);
ATF_TC_HEAD(mkfifoat_fd, tc)
{
atf_tc_set_md_var(tc, "descr", "See that mkfifoat works with fd");
}
-
ATF_TC_BODY(mkfifoat_fd, tc)
{
int dfd;
@@ -66,21 +65,12 @@ ATF_TC_BODY(mkfifoat_fd, tc)
ATF_REQUIRE(access(FIFO, F_OK) == 0);
}
-ATF_TC_CLEANUP(mkfifoat_fd, tc)
-{
- (void)unlink(FIFO);
- (void)unlink(FIFOERR);
- (void)rmdir(DIR);
-}
-
-
-ATF_TC_WITH_CLEANUP(mkfifoat_fdcwd);
+ATF_TC(mkfifoat_fdcwd);
ATF_TC_HEAD(mkfifoat_fdcwd, tc)
{
atf_tc_set_md_var(tc, "descr",
"See that mkfifoat works with fd as AT_FDCWD");
}
-
ATF_TC_BODY(mkfifoat_fdcwd, tc)
{
int fd;
@@ -92,20 +82,12 @@ ATF_TC_BODY(mkfifoat_fdcwd, tc)
ATF_REQUIRE(access(FIFO, F_OK) == 0);
}
-ATF_TC_CLEANUP(mkfifoat_fdcwd, tc)
-{
- (void)unlink(FIFO);
- (void)unlink(FIFOERR);
- (void)rmdir(DIR);
-}
-
-ATF_TC_WITH_CLEANUP(mkfifoat_fdcwderr);
+ATF_TC(mkfifoat_fdcwderr);
ATF_TC_HEAD(mkfifoat_fdcwderr, tc)
{
atf_tc_set_md_var(tc, "descr",
"See that mkfifoat fails with fd as AT_FDCWD and bad path");
}
-
ATF_TC_BODY(mkfifoat_fdcwderr, tc)
{
int fd;
@@ -114,19 +96,11 @@ ATF_TC_BODY(mkfifoat_fdcwderr, tc)
ATF_REQUIRE((fd = mkfifoat(AT_FDCWD, FIFOERR, mode)) == -1);
}
-ATF_TC_CLEANUP(mkfifoat_fdcwderr, tc)
-{
- (void)unlink(FIFO);
- (void)unlink(FIFOERR);
- (void)rmdir(DIR);
-}
-
-ATF_TC_WITH_CLEANUP(mkfifoat_fderr);
+ATF_TC(mkfifoat_fderr);
ATF_TC_HEAD(mkfifoat_fderr, tc)
{
atf_tc_set_md_var(tc, "descr", "See that mkfifoat fails with fd as -1");
}
-
ATF_TC_BODY(mkfifoat_fderr, tc)
{
int fd;
@@ -138,14 +112,6 @@ ATF_TC_BODY(mkfifoat_fderr, tc)
ATF_REQUIRE((fd = mkfifoat(-1, FIFO, mode)) == -1);
}
-ATF_TC_CLEANUP(mkfifoat_fderr, tc)
-{
- (void)unlink(FIFO);
- (void)unlink(FIFOERR);
- (void)rmdir(DIR);
-}
-
-
ATF_TP_ADD_TCS(tp)
{
Index: src/tests/lib/libc/c063/t_openat.c
diff -u src/tests/lib/libc/c063/t_openat.c:1.1 src/tests/lib/libc/c063/t_openat.c:1.2
--- src/tests/lib/libc/c063/t_openat.c:1.1 Sun Nov 18 17:41:54 2012
+++ src/tests/lib/libc/c063/t_openat.c Sun Mar 17 04:46:06 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: t_openat.c,v 1.1 2012/11/18 17:41:54 manu Exp $ */
+/* $NetBSD: t_openat.c,v 1.2 2013/03/17 04:46:06 jmmv Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_openat.c,v 1.1 2012/11/18 17:41:54 manu Exp $");
+__RCSID("$NetBSD: t_openat.c,v 1.2 2013/03/17 04:46:06 jmmv Exp $");
#include <atf-c.h>
#include <errno.h>
@@ -46,12 +46,11 @@ __RCSID("$NetBSD: t_openat.c,v 1.1 2012/
#define BASEFILE "openat"
#define FILEERR "dir/openaterr"
-ATF_TC_WITH_CLEANUP(openat_fd);
+ATF_TC(openat_fd);
ATF_TC_HEAD(openat_fd, tc)
{
atf_tc_set_md_var(tc, "descr", "See that openat works with fd");
}
-
ATF_TC_BODY(openat_fd, tc)
{
int dfd;
@@ -67,20 +66,12 @@ ATF_TC_BODY(openat_fd, tc)
ATF_REQUIRE(close(fd) == 0);
}
-ATF_TC_CLEANUP(openat_fd, tc)
-{
- (void)unlink(FILE);
- (void)unlink(FILEERR);
- (void)rmdir(DIR);
-}
-
-ATF_TC_WITH_CLEANUP(openat_fdcwd);
+ATF_TC(openat_fdcwd);
ATF_TC_HEAD(openat_fdcwd, tc)
{
atf_tc_set_md_var(tc, "descr",
"See that openat works with fd as AT_FDCWD");
}
-
ATF_TC_BODY(openat_fdcwd, tc)
{
int fd;
@@ -94,20 +85,12 @@ ATF_TC_BODY(openat_fdcwd, tc)
ATF_REQUIRE(close(fd) == 0);
}
-ATF_TC_CLEANUP(openat_fdcwd, tc)
-{
- (void)unlink(FILE);
- (void)unlink(FILEERR);
- (void)rmdir(DIR);
-}
-
-ATF_TC_WITH_CLEANUP(openat_fdcwderr);
+ATF_TC(openat_fdcwderr);
ATF_TC_HEAD(openat_fdcwderr, tc)
{
atf_tc_set_md_var(tc, "descr",
"See that openat fails with fd as AT_FDCWD and bad path");
}
-
ATF_TC_BODY(openat_fdcwderr, tc)
{
int fd;
@@ -116,19 +99,11 @@ ATF_TC_BODY(openat_fdcwderr, tc)
ATF_REQUIRE((fd = openat(AT_FDCWD, FILEERR, O_RDONLY, 0)) == -1);
}
-ATF_TC_CLEANUP(openat_fdcwderr, tc)
-{
- (void)unlink(FILE);
- (void)unlink(FILEERR);
- (void)rmdir(DIR);
-}
-
-ATF_TC_WITH_CLEANUP(openat_fderr1);
+ATF_TC(openat_fderr1);
ATF_TC_HEAD(openat_fderr1, tc)
{
atf_tc_set_md_var(tc, "descr", "See that openat fail with bad path");
}
-
ATF_TC_BODY(openat_fderr1, tc)
{
int dfd;
@@ -140,19 +115,11 @@ ATF_TC_BODY(openat_fderr1, tc)
ATF_REQUIRE(close(dfd) == 0);
}
-ATF_TC_CLEANUP(openat_fderr1, tc)
-{
- (void)unlink(FILE);
- (void)unlink(FILEERR);
- (void)rmdir(DIR);
-}
-
-ATF_TC_WITH_CLEANUP(openat_fderr2);
+ATF_TC(openat_fderr2);
ATF_TC_HEAD(openat_fderr2, tc)
{
atf_tc_set_md_var(tc, "descr", "See that openat fails with bad fdat");
}
-
ATF_TC_BODY(openat_fderr2, tc)
{
int dfd;
@@ -168,19 +135,11 @@ ATF_TC_BODY(openat_fderr2, tc)
ATF_REQUIRE(close(dfd) == 0);
}
-ATF_TC_CLEANUP(openat_fderr2, tc)
-{
- (void)unlink(FILE);
- (void)unlink(FILEERR);
- (void)rmdir(DIR);
-}
-
-ATF_TC_WITH_CLEANUP(openat_fderr3);
+ATF_TC(openat_fderr3);
ATF_TC_HEAD(openat_fderr3, tc)
{
atf_tc_set_md_var(tc, "descr", "See that openat fails with fd as -1");
}
-
ATF_TC_BODY(openat_fderr3, tc)
{
int fd;
@@ -192,14 +151,6 @@ ATF_TC_BODY(openat_fderr3, tc)
ATF_REQUIRE((fd = openat(-1, FILE, O_RDONLY, 0)) == -1);
}
-ATF_TC_CLEANUP(openat_fderr3, tc)
-{
- (void)unlink(FILE);
- (void)unlink(FILEERR);
- (void)rmdir(DIR);
-}
-
-
ATF_TP_ADD_TCS(tp)
{
Index: src/tests/lib/libc/c063/t_renameat.c
diff -u src/tests/lib/libc/c063/t_renameat.c:1.1 src/tests/lib/libc/c063/t_renameat.c:1.2
--- src/tests/lib/libc/c063/t_renameat.c:1.1 Sun Nov 18 17:41:54 2012
+++ src/tests/lib/libc/c063/t_renameat.c Sun Mar 17 04:46:06 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: t_renameat.c,v 1.1 2012/11/18 17:41:54 manu Exp $ */
+/* $NetBSD: t_renameat.c,v 1.2 2013/03/17 04:46:06 jmmv Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_renameat.c,v 1.1 2012/11/18 17:41:54 manu Exp $");
+__RCSID("$NetBSD: t_renameat.c,v 1.2 2013/03/17 04:46:06 jmmv Exp $");
#include <atf-c.h>
#include <errno.h>
@@ -51,12 +51,11 @@ __RCSID("$NetBSD: t_renameat.c,v 1.1 201
#define BASETARGET "new"
#define FILEERR "olddir/olderr"
-ATF_TC_WITH_CLEANUP(renameat_fd);
+ATF_TC(renameat_fd);
ATF_TC_HEAD(renameat_fd, tc)
{
atf_tc_set_md_var(tc, "descr", "See that renameat works with fd");
}
-
ATF_TC_BODY(renameat_fd, tc)
{
int ofd, nfd, fd;
@@ -79,16 +78,7 @@ ATF_TC_BODY(renameat_fd, tc)
ATF_REQUIRE(ost.st_ino == nst.st_ino);
}
-ATF_TC_CLEANUP(renameat_fd, tc)
-{
- (void)unlink(FILE);
- (void)unlink(TARGET);
- (void)rmdir(NDIR);
- (void)rmdir(ODIR);
-}
-
-
-ATF_TC_WITH_CLEANUP(renameat_fdcwd);
+ATF_TC(renameat_fdcwd);
ATF_TC_HEAD(renameat_fdcwd, tc)
{
atf_tc_set_md_var(tc, "descr",
@@ -113,21 +103,12 @@ ATF_TC_BODY(renameat_fdcwd, tc)
ATF_REQUIRE(ost.st_ino == nst.st_ino);
}
-ATF_TC_CLEANUP(renameat_fdcwd, tc)
-{
- (void)unlink(FILE);
- (void)unlink(TARGET);
- (void)rmdir(NDIR);
- (void)rmdir(ODIR);
-}
-
-ATF_TC_WITH_CLEANUP(renameat_fdcwderr);
+ATF_TC(renameat_fdcwderr);
ATF_TC_HEAD(renameat_fdcwderr, tc)
{
atf_tc_set_md_var(tc, "descr",
"See that renameat fails with fd as AT_FDCWD and bad path");
}
-
ATF_TC_BODY(renameat_fdcwderr, tc)
{
int fd;
@@ -140,21 +121,11 @@ ATF_TC_BODY(renameat_fdcwderr, tc)
ATF_REQUIRE(renameat(AT_FDCWD, FILEERR, AT_FDCWD, TARGET) == -1);
}
-ATF_TC_CLEANUP(renameat_fdcwderr, tc)
-{
- (void)unlink(FILE);
- (void)unlink(FILEERR);
- (void)unlink(TARGET);
- (void)rmdir(NDIR);
- (void)rmdir(ODIR);
-}
-
-ATF_TC_WITH_CLEANUP(renameat_fderr);
+ATF_TC(renameat_fderr);
ATF_TC_HEAD(renameat_fderr, tc)
{
atf_tc_set_md_var(tc, "descr", "See that renameat fails with fd as -1");
}
-
ATF_TC_BODY(renameat_fderr, tc)
{
int fd;
@@ -169,14 +140,6 @@ ATF_TC_BODY(renameat_fderr, tc)
ATF_REQUIRE(renameat(-1, FILE, -1, TARGET) == -1);
}
-ATF_TC_CLEANUP(renameat_fderr, tc)
-{
- (void)unlink(FILE);
- (void)unlink(TARGET);
- (void)rmdir(NDIR);
- (void)rmdir(ODIR);
-}
-
ATF_TP_ADD_TCS(tp)
{
Index: src/tests/lib/libc/c063/t_symlinkat.c
diff -u src/tests/lib/libc/c063/t_symlinkat.c:1.1 src/tests/lib/libc/c063/t_symlinkat.c:1.2
--- src/tests/lib/libc/c063/t_symlinkat.c:1.1 Sun Nov 18 17:41:54 2012
+++ src/tests/lib/libc/c063/t_symlinkat.c Sun Mar 17 04:46:06 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: t_symlinkat.c,v 1.1 2012/11/18 17:41:54 manu Exp $ */
+/* $NetBSD: t_symlinkat.c,v 1.2 2013/03/17 04:46:06 jmmv Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_symlinkat.c,v 1.1 2012/11/18 17:41:54 manu Exp $");
+__RCSID("$NetBSD: t_symlinkat.c,v 1.2 2013/03/17 04:46:06 jmmv Exp $");
#include <atf-c.h>
#include <errno.h>
@@ -51,12 +51,11 @@ __RCSID("$NetBSD: t_symlinkat.c,v 1.1 20
#define BASELINK "symlink"
#define FILEERR "olddir/olderr"
-ATF_TC_WITH_CLEANUP(symlinkat_fd);
+ATF_TC(symlinkat_fd);
ATF_TC_HEAD(symlinkat_fd, tc)
{
atf_tc_set_md_var(tc, "descr", "See that symlinkat works with fd");
}
-
ATF_TC_BODY(symlinkat_fd, tc)
{
int dfd, fd;
@@ -76,22 +75,12 @@ ATF_TC_BODY(symlinkat_fd, tc)
ATF_REQUIRE(ost.st_ino == nst.st_ino);
}
-ATF_TC_CLEANUP(symlinkat_fd, tc)
-{
- (void)unlink(FILE);
- (void)unlink(LINK);
- (void)rmdir(NDIR);
- (void)rmdir(ODIR);
-}
-
-
-ATF_TC_WITH_CLEANUP(symlinkat_fdcwd);
+ATF_TC(symlinkat_fdcwd);
ATF_TC_HEAD(symlinkat_fdcwd, tc)
{
atf_tc_set_md_var(tc, "descr",
"See that symlinkat works with fd as AT_FDCWD");
}
-
ATF_TC_BODY(symlinkat_fdcwd, tc)
{
int fd;
@@ -109,21 +98,12 @@ ATF_TC_BODY(symlinkat_fdcwd, tc)
ATF_REQUIRE(ost.st_ino == nst.st_ino);
}
-ATF_TC_CLEANUP(symlinkat_fdcwd, tc)
-{
- (void)unlink(FILE);
- (void)unlink(LINK);
- (void)rmdir(NDIR);
- (void)rmdir(ODIR);
-}
-
-ATF_TC_WITH_CLEANUP(symlinkat_fdcwderr);
+ATF_TC(symlinkat_fdcwderr);
ATF_TC_HEAD(symlinkat_fdcwderr, tc)
{
atf_tc_set_md_var(tc, "descr",
"See that symlinkat works with fd as AT_FDCWD and bad path");
}
-
ATF_TC_BODY(symlinkat_fdcwderr, tc)
{
int fd;
@@ -141,21 +121,11 @@ ATF_TC_BODY(symlinkat_fdcwderr, tc)
}
-ATF_TC_CLEANUP(symlinkat_fdcwderr, tc)
-{
- (void)unlink(FILE);
- (void)unlink(FILEERR);
- (void)unlink(LINK);
- (void)rmdir(NDIR);
- (void)rmdir(ODIR);
-}
-
-ATF_TC_WITH_CLEANUP(symlinkat_fderr);
+ATF_TC(symlinkat_fderr);
ATF_TC_HEAD(symlinkat_fderr, tc)
{
atf_tc_set_md_var(tc, "descr", "See that symlinkat fails with fd as -1");
}
-
ATF_TC_BODY(symlinkat_fderr, tc)
{
int fd;
@@ -168,14 +138,6 @@ ATF_TC_BODY(symlinkat_fderr, tc)
ATF_REQUIRE(symlinkat(RELFILE, -1, LINK) == -1);
}
-ATF_TC_CLEANUP(symlinkat_fderr, tc)
-{
- (void)unlink(FILE);
- (void)unlink(LINK);
- (void)rmdir(NDIR);
- (void)rmdir(ODIR);
-}
-
ATF_TP_ADD_TCS(tp)
{
Index: src/tests/lib/libc/c063/t_unlinkat.c
diff -u src/tests/lib/libc/c063/t_unlinkat.c:1.1 src/tests/lib/libc/c063/t_unlinkat.c:1.2
--- src/tests/lib/libc/c063/t_unlinkat.c:1.1 Sun Nov 18 17:41:54 2012
+++ src/tests/lib/libc/c063/t_unlinkat.c Sun Mar 17 04:46:06 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: t_unlinkat.c,v 1.1 2012/11/18 17:41:54 manu Exp $ */
+/* $NetBSD: t_unlinkat.c,v 1.2 2013/03/17 04:46:06 jmmv Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_unlinkat.c,v 1.1 2012/11/18 17:41:54 manu Exp $");
+__RCSID("$NetBSD: t_unlinkat.c,v 1.2 2013/03/17 04:46:06 jmmv Exp $");
#include <atf-c.h>
#include <errno.h>
@@ -46,12 +46,11 @@ __RCSID("$NetBSD: t_unlinkat.c,v 1.1 201
#define BASEFILE "unlinkat"
#define FILEERR "dir/unlinkaterr"
-ATF_TC_WITH_CLEANUP(unlinkat_fd);
+ATF_TC(unlinkat_fd);
ATF_TC_HEAD(unlinkat_fd, tc)
{
atf_tc_set_md_var(tc, "descr", "See that unlinkat works with fd");
}
-
ATF_TC_BODY(unlinkat_fd, tc)
{
int dfd;
@@ -66,20 +65,12 @@ ATF_TC_BODY(unlinkat_fd, tc)
ATF_REQUIRE(close(dfd) == 0);
}
-ATF_TC_CLEANUP(unlinkat_fd, tc)
-{
- (void)unlink(FILE);
- (void)unlink(FILEERR);
- (void)rmdir(DIR);
-}
-
-ATF_TC_WITH_CLEANUP(unlinkat_fdcwd);
+ATF_TC(unlinkat_fdcwd);
ATF_TC_HEAD(unlinkat_fdcwd, tc)
{
atf_tc_set_md_var(tc, "descr",
"See that unlinkat works with fd as AT_FDCWD");
}
-
ATF_TC_BODY(unlinkat_fdcwd, tc)
{
int fd;
@@ -92,39 +83,23 @@ ATF_TC_BODY(unlinkat_fdcwd, tc)
ATF_REQUIRE(unlinkat(AT_FDCWD, BASEFILE, 0) == 0);
}
-ATF_TC_CLEANUP(unlinkat_fdcwd, tc)
-{
- (void)unlink(FILE);
- (void)unlink(FILEERR);
- (void)rmdir(DIR);
-}
-
-ATF_TC_WITH_CLEANUP(unlinkat_fdcwderr);
+ATF_TC(unlinkat_fdcwderr);
ATF_TC_HEAD(unlinkat_fdcwderr, tc)
{
atf_tc_set_md_var(tc, "descr",
"See that unlinkat fails with fd as AT_FDCWD and bad path");
}
-
ATF_TC_BODY(unlinkat_fdcwderr, tc)
{
ATF_REQUIRE(mkdir(DIR, 0755) == 0);
ATF_REQUIRE(unlinkat(AT_FDCWD, FILEERR, 0) == -1);
}
-ATF_TC_CLEANUP(unlinkat_fdcwderr, tc)
-{
- (void)unlink(FILE);
- (void)unlink(FILEERR);
- (void)rmdir(DIR);
-}
-
-ATF_TC_WITH_CLEANUP(unlinkat_fderr1);
+ATF_TC(unlinkat_fderr1);
ATF_TC_HEAD(unlinkat_fderr1, tc)
{
atf_tc_set_md_var(tc, "descr", "See that unlinkat fail with bad path");
}
-
ATF_TC_BODY(unlinkat_fderr1, tc)
{
int dfd;
@@ -133,22 +108,13 @@ ATF_TC_BODY(unlinkat_fderr1, tc)
ATF_REQUIRE((dfd = open(DIR, O_RDONLY, 0)) != -1);
ATF_REQUIRE(unlinkat(dfd, FILEERR, 0) == -1);
ATF_REQUIRE(close(dfd) == 0);
-
-}
-
-ATF_TC_CLEANUP(unlinkat_fderr1, tc)
-{
- (void)unlink(FILE);
- (void)unlink(FILEERR);
- (void)rmdir(DIR);
}
-ATF_TC_WITH_CLEANUP(unlinkat_fderr2);
+ATF_TC(unlinkat_fderr2);
ATF_TC_HEAD(unlinkat_fderr2, tc)
{
atf_tc_set_md_var(tc, "descr", "See that unlinkat fails with bad fdat");
}
-
ATF_TC_BODY(unlinkat_fderr2, tc)
{
int dfd;
@@ -164,19 +130,11 @@ ATF_TC_BODY(unlinkat_fderr2, tc)
ATF_REQUIRE(close(dfd) == 0);
}
-ATF_TC_CLEANUP(unlinkat_fderr2, tc)
-{
- (void)unlink(FILE);
- (void)unlink(FILEERR);
- (void)rmdir(DIR);
-}
-
-ATF_TC_WITH_CLEANUP(unlinkat_fderr3);
+ATF_TC(unlinkat_fderr3);
ATF_TC_HEAD(unlinkat_fderr3, tc)
{
atf_tc_set_md_var(tc, "descr", "See that unlinkat fails with fd as -1");
}
-
ATF_TC_BODY(unlinkat_fderr3, tc)
{
int fd;
@@ -188,20 +146,12 @@ ATF_TC_BODY(unlinkat_fderr3, tc)
ATF_REQUIRE(unlinkat(-1, FILE, 0) == -1);
}
-ATF_TC_CLEANUP(unlinkat_fderr3, tc)
-{
- (void)unlink(FILE);
- (void)unlink(FILEERR);
- (void)rmdir(DIR);
-}
-
-ATF_TC_WITH_CLEANUP(unlinkat_dir);
+ATF_TC(unlinkat_dir);
ATF_TC_HEAD(unlinkat_dir, tc)
{
atf_tc_set_md_var(tc, "descr",
"See that unlinkat can remove directories");
}
-
ATF_TC_BODY(unlinkat_dir, tc)
{
ATF_REQUIRE(mkdir(DIR, 0755) == 0);
@@ -211,11 +161,6 @@ ATF_TC_BODY(unlinkat_dir, tc)
ATF_REQUIRE(unlinkat(AT_FDCWD, DIR, AT_REMOVEDIR) == 0);
}
-ATF_TC_CLEANUP(unlinkat_dir, tc)
-{
- (void)rmdir(DIR);
-}
-
ATF_TP_ADD_TCS(tp)
{
Index: src/tests/lib/libc/c063/t_fchownat.c
diff -u src/tests/lib/libc/c063/t_fchownat.c:1.2 src/tests/lib/libc/c063/t_fchownat.c:1.3
--- src/tests/lib/libc/c063/t_fchownat.c:1.2 Tue Nov 20 20:01:14 2012
+++ src/tests/lib/libc/c063/t_fchownat.c Sun Mar 17 04:46:06 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: t_fchownat.c,v 1.2 2012/11/20 20:01:14 martin Exp $ */
+/* $NetBSD: t_fchownat.c,v 1.3 2013/03/17 04:46:06 jmmv Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_fchownat.c,v 1.2 2012/11/20 20:01:14 martin Exp $");
+__RCSID("$NetBSD: t_fchownat.c,v 1.3 2013/03/17 04:46:06 jmmv Exp $");
#include <atf-c.h>
#include <errno.h>
@@ -65,13 +65,12 @@ static int getuser(uid_t *uid, gid_t *gi
return 0;
}
-ATF_TC_WITH_CLEANUP(fchownat_fd);
+ATF_TC(fchownat_fd);
ATF_TC_HEAD(fchownat_fd, tc)
{
atf_tc_set_md_var(tc, "descr", "See that fchownat works with fd");
atf_tc_set_md_var(tc, "require.user", "root");
}
-
ATF_TC_BODY(fchownat_fd, tc)
{
int dfd;
@@ -94,21 +93,13 @@ ATF_TC_BODY(fchownat_fd, tc)
ATF_REQUIRE(st.st_gid == gid);
}
-ATF_TC_CLEANUP(fchownat_fd, tc)
-{
- (void)unlink(FILE);
- (void)unlink(FILEERR);
- (void)rmdir(DIR);
-}
-
-ATF_TC_WITH_CLEANUP(fchownat_fdcwd);
+ATF_TC(fchownat_fdcwd);
ATF_TC_HEAD(fchownat_fdcwd, tc)
{
atf_tc_set_md_var(tc, "descr",
"See that fchownat works with fd as AT_FDCWD");
atf_tc_set_md_var(tc, "require.user", "root");
}
-
ATF_TC_BODY(fchownat_fdcwd, tc)
{
int fd;
@@ -129,21 +120,13 @@ ATF_TC_BODY(fchownat_fdcwd, tc)
ATF_REQUIRE(st.st_gid == gid);
}
-ATF_TC_CLEANUP(fchownat_fdcwd, tc)
-{
- (void)unlink(FILE);
- (void)unlink(FILEERR);
- (void)rmdir(DIR);
-}
-
-ATF_TC_WITH_CLEANUP(fchownat_fdcwderr);
+ATF_TC(fchownat_fdcwderr);
ATF_TC_HEAD(fchownat_fdcwderr, tc)
{
atf_tc_set_md_var(tc, "descr",
"See that fchownat fails with fd as AT_FDCWD and bad path");
atf_tc_set_md_var(tc, "require.user", "root");
}
-
ATF_TC_BODY(fchownat_fdcwderr, tc)
{
uid_t uid;
@@ -154,20 +137,12 @@ ATF_TC_BODY(fchownat_fdcwderr, tc)
ATF_REQUIRE(fchownat(AT_FDCWD, FILEERR, uid, gid, 0) == -1);
}
-ATF_TC_CLEANUP(fchownat_fdcwderr, tc)
-{
- (void)unlink(FILE);
- (void)unlink(FILEERR);
- (void)rmdir(DIR);
-}
-
-ATF_TC_WITH_CLEANUP(fchownat_fderr1);
+ATF_TC(fchownat_fderr1);
ATF_TC_HEAD(fchownat_fderr1, tc)
{
atf_tc_set_md_var(tc, "descr", "See that fchownat fail with bad path");
atf_tc_set_md_var(tc, "require.user", "root");
}
-
ATF_TC_BODY(fchownat_fderr1, tc)
{
int dfd;
@@ -181,20 +156,12 @@ ATF_TC_BODY(fchownat_fderr1, tc)
ATF_REQUIRE(close(dfd) == 0);
}
-ATF_TC_CLEANUP(fchownat_fderr1, tc)
-{
- (void)unlink(FILE);
- (void)unlink(FILEERR);
- (void)rmdir(DIR);
-}
-
-ATF_TC_WITH_CLEANUP(fchownat_fderr2);
+ATF_TC(fchownat_fderr2);
ATF_TC_HEAD(fchownat_fderr2, tc)
{
atf_tc_set_md_var(tc, "descr", "See that fchownat fails with bad fdat");
atf_tc_set_md_var(tc, "require.user", "root");
}
-
ATF_TC_BODY(fchownat_fderr2, tc)
{
int dfd;
@@ -213,20 +180,12 @@ ATF_TC_BODY(fchownat_fderr2, tc)
ATF_REQUIRE(close(dfd) == 0);
}
-ATF_TC_CLEANUP(fchownat_fderr2, tc)
-{
- (void)unlink(FILE);
- (void)unlink(FILEERR);
- (void)rmdir(DIR);
-}
-
-ATF_TC_WITH_CLEANUP(fchownat_fderr3);
+ATF_TC(fchownat_fderr3);
ATF_TC_HEAD(fchownat_fderr3, tc)
{
atf_tc_set_md_var(tc, "descr", "See that fchownat fails with fd as -1");
atf_tc_set_md_var(tc, "require.user", "root");
}
-
ATF_TC_BODY(fchownat_fderr3, tc)
{
int fd;
@@ -241,20 +200,12 @@ ATF_TC_BODY(fchownat_fderr3, tc)
ATF_REQUIRE(fchownat(-1, FILE, uid, gid, 0) == -1);
}
-ATF_TC_CLEANUP(fchownat_fderr3, tc)
-{
- (void)unlink(FILE);
- (void)unlink(FILEERR);
- (void)rmdir(DIR);
-}
-
-ATF_TC_WITH_CLEANUP(fchownat_fdlink);
+ATF_TC(fchownat_fdlink);
ATF_TC_HEAD(fchownat_fdlink, tc)
{
atf_tc_set_md_var(tc, "descr", "See that fchownat works on symlink");
atf_tc_set_md_var(tc, "require.user", "root");
}
-
ATF_TC_BODY(fchownat_fdlink, tc)
{
int dfd;
@@ -281,12 +232,6 @@ ATF_TC_BODY(fchownat_fdlink, tc)
ATF_REQUIRE(st.st_gid == gid);
}
-ATF_TC_CLEANUP(fchownat_fdlink, tc)
-{
- (void)unlink(LINK);
- (void)rmdir(DIR);
-}
-
ATF_TP_ADD_TCS(tp)
{
Index: src/tests/lib/libc/c063/t_mknodat.c
diff -u src/tests/lib/libc/c063/t_mknodat.c:1.2 src/tests/lib/libc/c063/t_mknodat.c:1.3
--- src/tests/lib/libc/c063/t_mknodat.c:1.2 Tue Nov 20 20:01:14 2012
+++ src/tests/lib/libc/c063/t_mknodat.c Sun Mar 17 04:46:06 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: t_mknodat.c,v 1.2 2012/11/20 20:01:14 martin Exp $ */
+/* $NetBSD: t_mknodat.c,v 1.3 2013/03/17 04:46:06 jmmv Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_mknodat.c,v 1.2 2012/11/20 20:01:14 martin Exp $");
+__RCSID("$NetBSD: t_mknodat.c,v 1.3 2013/03/17 04:46:06 jmmv Exp $");
#include <atf-c.h>
#include <errno.h>
@@ -61,13 +61,12 @@ get_devnull(void)
}
-ATF_TC_WITH_CLEANUP(mknodat_fd);
+ATF_TC(mknodat_fd);
ATF_TC_HEAD(mknodat_fd, tc)
{
atf_tc_set_md_var(tc, "descr", "See that mknodat works with fd");
atf_tc_set_md_var(tc, "require.user", "root");
}
-
ATF_TC_BODY(mknodat_fd, tc)
{
int dfd;
@@ -83,22 +82,13 @@ ATF_TC_BODY(mknodat_fd, tc)
ATF_REQUIRE(access(FILE, F_OK) == 0);
}
-ATF_TC_CLEANUP(mknodat_fd, tc)
-{
- (void)unlink(FILE);
- (void)unlink(FILEERR);
- (void)rmdir(DIR);
-}
-
-
-ATF_TC_WITH_CLEANUP(mknodat_fdcwd);
+ATF_TC(mknodat_fdcwd);
ATF_TC_HEAD(mknodat_fdcwd, tc)
{
atf_tc_set_md_var(tc, "descr",
"See that mknodat works with fd as AT_FDCWD");
atf_tc_set_md_var(tc, "require.user", "root");
}
-
ATF_TC_BODY(mknodat_fdcwd, tc)
{
int fd;
@@ -112,21 +102,13 @@ ATF_TC_BODY(mknodat_fdcwd, tc)
ATF_REQUIRE(access(FILE, F_OK) == 0);
}
-ATF_TC_CLEANUP(mknodat_fdcwd, tc)
-{
- (void)unlink(FILE);
- (void)unlink(FILEERR);
- (void)rmdir(DIR);
-}
-
-ATF_TC_WITH_CLEANUP(mknodat_fdcwderr);
+ATF_TC(mknodat_fdcwderr);
ATF_TC_HEAD(mknodat_fdcwderr, tc)
{
atf_tc_set_md_var(tc, "descr",
"See that mknodat fails with fd as AT_FDCWD and bad path");
atf_tc_set_md_var(tc, "require.user", "root");
}
-
ATF_TC_BODY(mknodat_fdcwderr, tc)
{
int fd;
@@ -137,20 +119,12 @@ ATF_TC_BODY(mknodat_fdcwderr, tc)
ATF_REQUIRE((fd = mknodat(AT_FDCWD, FILEERR, mode, dev)) == -1);
}
-ATF_TC_CLEANUP(mknodat_fdcwderr, tc)
-{
- (void)unlink(FILE);
- (void)unlink(FILEERR);
- (void)rmdir(DIR);
-}
-
-ATF_TC_WITH_CLEANUP(mknodat_fderr);
+ATF_TC(mknodat_fderr);
ATF_TC_HEAD(mknodat_fderr, tc)
{
atf_tc_set_md_var(tc, "descr", "See that mknodat fails with fd as -1");
atf_tc_set_md_var(tc, "require.user", "root");
}
-
ATF_TC_BODY(mknodat_fderr, tc)
{
int fd;
@@ -164,14 +138,6 @@ ATF_TC_BODY(mknodat_fderr, tc)
ATF_REQUIRE((fd = mknodat(-1, FILE, mode, dev)) == -1);
}
-ATF_TC_CLEANUP(mknodat_fderr, tc)
-{
- (void)unlink(FILE);
- (void)unlink(FILEERR);
- (void)rmdir(DIR);
-}
-
-
ATF_TP_ADD_TCS(tp)
{
Index: src/tests/lib/libc/c063/t_readlinkat.c
diff -u src/tests/lib/libc/c063/t_readlinkat.c:1.2 src/tests/lib/libc/c063/t_readlinkat.c:1.3
--- src/tests/lib/libc/c063/t_readlinkat.c:1.2 Thu Nov 22 20:17:48 2012
+++ src/tests/lib/libc/c063/t_readlinkat.c Sun Mar 17 04:46:06 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: t_readlinkat.c,v 1.2 2012/11/22 20:17:48 martin Exp $ */
+/* $NetBSD: t_readlinkat.c,v 1.3 2013/03/17 04:46:06 jmmv Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_readlinkat.c,v 1.2 2012/11/22 20:17:48 martin Exp $");
+__RCSID("$NetBSD: t_readlinkat.c,v 1.3 2013/03/17 04:46:06 jmmv Exp $");
#include <atf-c.h>
#include <errno.h>
@@ -48,12 +48,11 @@ __RCSID("$NetBSD: t_readlinkat.c,v 1.2 2
#define BASELINK "symlink"
#define FILEERR "dir/readlinkaterr"
-ATF_TC_WITH_CLEANUP(readlinkat_fd);
+ATF_TC(readlinkat_fd);
ATF_TC_HEAD(readlinkat_fd, tc)
{
atf_tc_set_md_var(tc, "descr", "See that readlinkat works with fd");
}
-
ATF_TC_BODY(readlinkat_fd, tc)
{
int dfd;
@@ -75,21 +74,12 @@ ATF_TC_BODY(readlinkat_fd, tc)
ATF_REQUIRE(strcmp(buf, FILE) == 0);
}
-ATF_TC_CLEANUP(readlinkat_fd, tc)
-{
- (void)unlink(FILE);
- (void)unlink(LINK);
- (void)unlink(FILEERR);
- (void)rmdir(DIR);
-}
-
-ATF_TC_WITH_CLEANUP(readlinkat_fdcwd);
+ATF_TC(readlinkat_fdcwd);
ATF_TC_HEAD(readlinkat_fdcwd, tc)
{
atf_tc_set_md_var(tc, "descr",
"See that readlinkat works with fd as AT_FDCWD");
}
-
ATF_TC_BODY(readlinkat_fdcwd, tc)
{
int fd;
@@ -108,21 +98,12 @@ ATF_TC_BODY(readlinkat_fdcwd, tc)
ATF_REQUIRE(strcmp(buf, FILE) == 0);
}
-ATF_TC_CLEANUP(readlinkat_fdcwd, tc)
-{
- (void)unlink(FILE);
- (void)unlink(LINK);
- (void)unlink(FILEERR);
- (void)rmdir(DIR);
-}
-
-ATF_TC_WITH_CLEANUP(readlinkat_fdcwderr);
+ATF_TC(readlinkat_fdcwderr);
ATF_TC_HEAD(readlinkat_fdcwderr, tc)
{
atf_tc_set_md_var(tc, "descr",
"See that readlinkat fails with fd as AT_FDCWD and bad path");
}
-
ATF_TC_BODY(readlinkat_fdcwderr, tc)
{
char buf[MAXPATHLEN];
@@ -130,20 +111,11 @@ ATF_TC_BODY(readlinkat_fdcwderr, tc)
ATF_REQUIRE(readlinkat(AT_FDCWD, LINK, buf, sizeof(buf)) == -1);
}
-ATF_TC_CLEANUP(readlinkat_fdcwderr, tc)
-{
- (void)unlink(FILE);
- (void)unlink(LINK);
- (void)unlink(FILEERR);
- (void)rmdir(DIR);
-}
-
-ATF_TC_WITH_CLEANUP(readlinkat_fderr1);
+ATF_TC(readlinkat_fderr1);
ATF_TC_HEAD(readlinkat_fderr1, tc)
{
atf_tc_set_md_var(tc, "descr", "See that readlinkat fail with bad path");
}
-
ATF_TC_BODY(readlinkat_fderr1, tc)
{
int dfd;
@@ -152,22 +124,13 @@ ATF_TC_BODY(readlinkat_fderr1, tc)
ATF_REQUIRE((dfd = open(DIR, O_RDONLY, 0)) != -1);
ATF_REQUIRE(readlinkat(dfd, FILEERR, F_OK, 0) == -1);
ATF_REQUIRE(close(dfd) == 0);
-
-}
-
-ATF_TC_CLEANUP(readlinkat_fderr1, tc)
-{
- (void)unlink(FILE);
- (void)unlink(FILEERR);
- (void)rmdir(DIR);
}
-ATF_TC_WITH_CLEANUP(readlinkat_fderr2);
+ATF_TC(readlinkat_fderr2);
ATF_TC_HEAD(readlinkat_fderr2, tc)
{
atf_tc_set_md_var(tc, "descr", "See that readlinkat fails with fd as -1");
}
-
ATF_TC_BODY(readlinkat_fderr2, tc)
{
int fd;
@@ -181,15 +144,6 @@ ATF_TC_BODY(readlinkat_fderr2, tc)
ATF_REQUIRE(readlinkat(-1, LINK, buf, sizeof(buf)) == -1);
}
-ATF_TC_CLEANUP(readlinkat_fderr2, tc)
-{
- (void)unlink(FILE);
- (void)unlink(LINK);
- (void)unlink(FILEERR);
- (void)rmdir(DIR);
-}
-
-
ATF_TP_ADD_TCS(tp)
{
Index: src/tests/lib/libc/c063/t_o_search.c
diff -u src/tests/lib/libc/c063/t_o_search.c:1.3 src/tests/lib/libc/c063/t_o_search.c:1.4
--- src/tests/lib/libc/c063/t_o_search.c:1.3 Sun Jan 13 08:15:03 2013
+++ src/tests/lib/libc/c063/t_o_search.c Sun Mar 17 04:46:06 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: t_o_search.c,v 1.3 2013/01/13 08:15:03 dholland Exp $ */
+/* $NetBSD: t_o_search.c,v 1.4 2013/03/17 04:46:06 jmmv Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_o_search.c,v 1.3 2013/01/13 08:15:03 dholland Exp $");
+__RCSID("$NetBSD: t_o_search.c,v 1.4 2013/03/17 04:46:06 jmmv Exp $");
#include <atf-c.h>
#include <errno.h>
@@ -56,13 +56,12 @@ __RCSID("$NetBSD: t_o_search.c,v 1.3 201
#define BASEFILE "o_search"
-ATF_TC_WITH_CLEANUP(o_search_perm1);
+ATF_TC(o_search_perm1);
ATF_TC_HEAD(o_search_perm1, tc)
{
atf_tc_set_md_var(tc, "descr", "See that openat enforces search permission");
atf_tc_set_md_var(tc, "require.user", "unprivileged");
}
-
ATF_TC_BODY(o_search_perm1, tc)
{
int dfd;
@@ -85,22 +84,14 @@ ATF_TC_BODY(o_search_perm1, tc)
ATF_REQUIRE(close(dfd) == 0);
}
-ATF_TC_CLEANUP(o_search_perm1, tc)
-{
- (void)unlink(FILE);
- (void)rmdir(DIR);
-}
-
-
#ifdef USE_O_SEARCH
-ATF_TC_WITH_CLEANUP(o_search_root_flag1);
+ATF_TC(o_search_root_flag1);
ATF_TC_HEAD(o_search_root_flag1, tc)
{
atf_tc_set_md_var(tc, "descr", "See that root openat honours O_SEARCH");
atf_tc_set_md_var(tc, "require.user", "root");
}
-
ATF_TC_BODY(o_search_root_flag1, tc)
{
int dfd;
@@ -127,20 +118,12 @@ ATF_TC_BODY(o_search_root_flag1, tc)
ATF_REQUIRE(close(dfd) == 0);
}
-ATF_TC_CLEANUP(o_search_root_flag1, tc)
-{
- (void)unlink(FILE);
- (void)rmdir(DIR);
-}
-
-
-ATF_TC_WITH_CLEANUP(o_search_unpriv_flag1);
+ATF_TC(o_search_unpriv_flag1);
ATF_TC_HEAD(o_search_unpriv_flag1, tc)
{
atf_tc_set_md_var(tc, "descr", "See that openat honours O_SEARCH");
atf_tc_set_md_var(tc, "require.user", "unprivileged");
}
-
ATF_TC_BODY(o_search_unpriv_flag1, tc)
{
int dfd;
@@ -167,22 +150,14 @@ ATF_TC_BODY(o_search_unpriv_flag1, tc)
ATF_REQUIRE(close(dfd) == 0);
}
-ATF_TC_CLEANUP(o_search_unpriv_flag1, tc)
-{
- (void)unlink(FILE);
- (void)rmdir(DIR);
-}
-
#endif /* USE_O_SEARCH */
-
-ATF_TC_WITH_CLEANUP(o_search_perm2);
+ATF_TC(o_search_perm2);
ATF_TC_HEAD(o_search_perm2, tc)
{
atf_tc_set_md_var(tc, "descr", "See that faccessat enforces search permission");
atf_tc_set_md_var(tc, "require.user", "unprivileged");
}
-
ATF_TC_BODY(o_search_perm2, tc)
{
int dfd;
@@ -203,22 +178,14 @@ ATF_TC_BODY(o_search_perm2, tc)
ATF_REQUIRE(close(dfd) == 0);
}
-ATF_TC_CLEANUP(o_search_perm2, tc)
-{
- (void)unlink(FILE);
- (void)rmdir(DIR);
-}
-
-
#ifdef USE_O_SEARCH
-ATF_TC_WITH_CLEANUP(o_search_root_flag2);
+ATF_TC(o_search_root_flag2);
ATF_TC_HEAD(o_search_root_flag2, tc)
{
atf_tc_set_md_var(tc, "descr", "See that root fstatat honours O_SEARCH");
atf_tc_set_md_var(tc, "require.user", "root");
}
-
ATF_TC_BODY(o_search_root_flag2, tc)
{
int dfd;
@@ -243,20 +210,12 @@ ATF_TC_BODY(o_search_root_flag2, tc)
ATF_REQUIRE(close(dfd) == 0);
}
-ATF_TC_CLEANUP(o_search_root_flag2, tc)
-{
- (void)unlink(FILE);
- (void)rmdir(DIR);
-}
-
-
-ATF_TC_WITH_CLEANUP(o_search_unpriv_flag2);
+ATF_TC(o_search_unpriv_flag2);
ATF_TC_HEAD(o_search_unpriv_flag2, tc)
{
atf_tc_set_md_var(tc, "descr", "See that fstatat honours O_SEARCH");
atf_tc_set_md_var(tc, "require.user", "unprivileged");
}
-
ATF_TC_BODY(o_search_unpriv_flag2, tc)
{
int dfd;
@@ -281,21 +240,14 @@ ATF_TC_BODY(o_search_unpriv_flag2, tc)
ATF_REQUIRE(close(dfd) == 0);
}
-ATF_TC_CLEANUP(o_search_unpriv_flag2, tc)
-{
- (void)unlink(FILE);
- (void)rmdir(DIR);
-}
-
#endif /* USE_O_SEARCH */
-ATF_TC_WITH_CLEANUP(o_search_notdir);
+ATF_TC(o_search_notdir);
ATF_TC_HEAD(o_search_notdir, tc)
{
atf_tc_set_md_var(tc, "descr", "See that openat fails with non dir fd");
}
-
ATF_TC_BODY(o_search_notdir, tc)
{
int dfd;
@@ -307,14 +259,6 @@ ATF_TC_BODY(o_search_notdir, tc)
ATF_REQUIRE(errno == ENOTDIR);
}
-ATF_TC_CLEANUP(o_search_notdir, tc)
-{
- (void)unlink(FILE);
- (void)rmdir(DIR);
-}
-
-
-
ATF_TP_ADD_TCS(tp)
{
Index: src/tests/lib/libc/c063/t_utimensat.c
diff -u src/tests/lib/libc/c063/t_utimensat.c:1.4 src/tests/lib/libc/c063/t_utimensat.c:1.5
--- src/tests/lib/libc/c063/t_utimensat.c:1.4 Thu Nov 22 14:59:59 2012
+++ src/tests/lib/libc/c063/t_utimensat.c Sun Mar 17 04:46:06 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: t_utimensat.c,v 1.4 2012/11/22 14:59:59 martin Exp $ */
+/* $NetBSD: t_utimensat.c,v 1.5 2013/03/17 04:46:06 jmmv Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_utimensat.c,v 1.4 2012/11/22 14:59:59 martin Exp $");
+__RCSID("$NetBSD: t_utimensat.c,v 1.5 2013/03/17 04:46:06 jmmv Exp $");
#include <atf-c.h>
#include <errno.h>
@@ -54,12 +54,11 @@ const struct timespec tptr[] = {
{ 0x15263748, 123456789 },
};
-ATF_TC_WITH_CLEANUP(utimensat_fd);
+ATF_TC(utimensat_fd);
ATF_TC_HEAD(utimensat_fd, tc)
{
atf_tc_set_md_var(tc, "descr", "See that utimensat works with fd");
}
-
ATF_TC_BODY(utimensat_fd, tc)
{
int dfd;
@@ -81,20 +80,12 @@ ATF_TC_BODY(utimensat_fd, tc)
ATF_REQUIRE(st.st_mtimespec.tv_nsec == tptr[1].tv_nsec);
}
-ATF_TC_CLEANUP(utimensat_fd, tc)
-{
- (void)unlink(FILE);
- (void)unlink(FILEERR);
- (void)rmdir(DIR);
-}
-
-ATF_TC_WITH_CLEANUP(utimensat_fdcwd);
+ATF_TC(utimensat_fdcwd);
ATF_TC_HEAD(utimensat_fdcwd, tc)
{
atf_tc_set_md_var(tc, "descr",
"See that utimensat works with fd as AT_FDCWD");
}
-
ATF_TC_BODY(utimensat_fdcwd, tc)
{
int fd;
@@ -114,39 +105,23 @@ ATF_TC_BODY(utimensat_fdcwd, tc)
ATF_REQUIRE(st.st_mtimespec.tv_nsec == tptr[1].tv_nsec);
}
-ATF_TC_CLEANUP(utimensat_fdcwd, tc)
-{
- (void)unlink(FILE);
- (void)unlink(FILEERR);
- (void)rmdir(DIR);
-}
-
-ATF_TC_WITH_CLEANUP(utimensat_fdcwderr);
+ATF_TC(utimensat_fdcwderr);
ATF_TC_HEAD(utimensat_fdcwderr, tc)
{
atf_tc_set_md_var(tc, "descr",
"See that utimensat fails with fd as AT_FDCWD and bad path");
}
-
ATF_TC_BODY(utimensat_fdcwderr, tc)
{
ATF_REQUIRE(mkdir(DIR, 0755) == 0);
ATF_REQUIRE(utimensat(AT_FDCWD, FILEERR, tptr, 0) == -1);
}
-ATF_TC_CLEANUP(utimensat_fdcwderr, tc)
-{
- (void)unlink(FILE);
- (void)unlink(FILEERR);
- (void)rmdir(DIR);
-}
-
-ATF_TC_WITH_CLEANUP(utimensat_fderr1);
+ATF_TC(utimensat_fderr1);
ATF_TC_HEAD(utimensat_fderr1, tc)
{
atf_tc_set_md_var(tc, "descr", "See that utimensat fail with bad path");
}
-
ATF_TC_BODY(utimensat_fderr1, tc)
{
int dfd;
@@ -157,19 +132,11 @@ ATF_TC_BODY(utimensat_fderr1, tc)
ATF_REQUIRE(close(dfd) == 0);
}
-ATF_TC_CLEANUP(utimensat_fderr1, tc)
-{
- (void)unlink(FILE);
- (void)unlink(FILEERR);
- (void)rmdir(DIR);
-}
-
-ATF_TC_WITH_CLEANUP(utimensat_fderr2);
+ATF_TC(utimensat_fderr2);
ATF_TC_HEAD(utimensat_fderr2, tc)
{
atf_tc_set_md_var(tc, "descr", "See that utimensat fails with bad fdat");
}
-
ATF_TC_BODY(utimensat_fderr2, tc)
{
int dfd;
@@ -185,19 +152,11 @@ ATF_TC_BODY(utimensat_fderr2, tc)
ATF_REQUIRE(close(dfd) == 0);
}
-ATF_TC_CLEANUP(utimensat_fderr2, tc)
-{
- (void)unlink(FILE);
- (void)unlink(FILEERR);
- (void)rmdir(DIR);
-}
-
-ATF_TC_WITH_CLEANUP(utimensat_fderr3);
+ATF_TC(utimensat_fderr3);
ATF_TC_HEAD(utimensat_fderr3, tc)
{
atf_tc_set_md_var(tc, "descr", "See that utimensat fails with fd as -1");
}
-
ATF_TC_BODY(utimensat_fderr3, tc)
{
int fd;
@@ -209,19 +168,11 @@ ATF_TC_BODY(utimensat_fderr3, tc)
ATF_REQUIRE(utimensat(-1, FILE, tptr, 0) == -1);
}
-ATF_TC_CLEANUP(utimensat_fderr3, tc)
-{
- (void)unlink(FILE);
- (void)unlink(FILEERR);
- (void)rmdir(DIR);
-}
-
-ATF_TC_WITH_CLEANUP(utimensat_fdlink);
+ATF_TC(utimensat_fdlink);
ATF_TC_HEAD(utimensat_fdlink, tc)
{
atf_tc_set_md_var(tc, "descr", "See that utimensat works on symlink");
}
-
ATF_TC_BODY(utimensat_fdlink, tc)
{
int dfd;
@@ -246,12 +197,6 @@ ATF_TC_BODY(utimensat_fdlink, tc)
ATF_REQUIRE(st.st_mtimespec.tv_nsec == tptr[1].tv_nsec);
}
-ATF_TC_CLEANUP(utimensat_fdlink, tc)
-{
- (void)unlink(LINK);
- (void)rmdir(DIR);
-}
-
ATF_TP_ADD_TCS(tp)
{
