Module Name: src
Committed By: jruoho
Date: Thu Jul 7 09:49:59 UTC 2011
Modified Files:
src/tests/lib/libc/gen: t_basedirname.c t_dir.c t_fmtcheck.c
t_glob_star.c t_humanize_number.c t_randomid.c t_syslog_pthread.c
Log Message:
Rename some test case names for consistency. No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libc/gen/t_basedirname.c \
src/tests/lib/libc/gen/t_fmtcheck.c
cvs rdiff -u -r1.3 -r1.4 src/tests/lib/libc/gen/t_dir.c
cvs rdiff -u -r1.6 -r1.7 src/tests/lib/libc/gen/t_glob_star.c
cvs rdiff -u -r1.4 -r1.5 src/tests/lib/libc/gen/t_humanize_number.c
cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libc/gen/t_randomid.c \
src/tests/lib/libc/gen/t_syslog_pthread.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/gen/t_basedirname.c
diff -u src/tests/lib/libc/gen/t_basedirname.c:1.1 src/tests/lib/libc/gen/t_basedirname.c:1.2
--- src/tests/lib/libc/gen/t_basedirname.c:1.1 Wed Dec 22 23:45:44 2010
+++ src/tests/lib/libc/gen/t_basedirname.c Thu Jul 7 09:49:59 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: t_basedirname.c,v 1.1 2010/12/22 23:45:44 pgoyette Exp $ */
+/* $NetBSD: t_basedirname.c,v 1.2 2011/07/07 09:49:59 jruoho Exp $ */
/*
* Regression test for basename(3).
@@ -90,14 +90,13 @@
{ NULL, NULL }
};
-ATF_TC(t_basename);
-
-ATF_TC_HEAD(t_basename, tc)
+ATF_TC(basename_posix);
+ATF_TC_HEAD(basename_posix, tc)
{
atf_tc_set_md_var(tc, "descr", "Test basename(3) with POSIX examples");
}
-ATF_TC_BODY(t_basename, tc)
+ATF_TC_BODY(basename_posix, tc)
{
char testbuf[32], *base;
int i;
@@ -142,14 +141,13 @@
}
-ATF_TC(t_dirname);
-
-ATF_TC_HEAD(t_dirname, tc)
+ATF_TC(dirname_posix);
+ATF_TC_HEAD(dirname_posix, tc)
{
atf_tc_set_md_var(tc, "descr", "Test dirname(3) with POSIX examples");
}
-ATF_TC_BODY(t_dirname, tc)
+ATF_TC_BODY(dirname_posix, tc)
{
char testbuf[32], *base;
int i;
@@ -195,8 +193,8 @@
ATF_TP_ADD_TCS(tp)
{
- ATF_TP_ADD_TC(tp, t_basename);
- ATF_TP_ADD_TC(tp, t_dirname);
+ ATF_TP_ADD_TC(tp, basename_posix);
+ ATF_TP_ADD_TC(tp, dirname_posix);
return atf_no_error();
}
Index: src/tests/lib/libc/gen/t_fmtcheck.c
diff -u src/tests/lib/libc/gen/t_fmtcheck.c:1.1 src/tests/lib/libc/gen/t_fmtcheck.c:1.2
--- src/tests/lib/libc/gen/t_fmtcheck.c:1.1 Tue Dec 28 12:46:15 2010
+++ src/tests/lib/libc/gen/t_fmtcheck.c Thu Jul 7 09:49:59 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: t_fmtcheck.c,v 1.1 2010/12/28 12:46:15 pgoyette Exp $ */
+/* $NetBSD: t_fmtcheck.c,v 1.2 2011/07/07 09:49:59 jruoho Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -75,15 +75,14 @@
{ "%p %30s %#llx %-10.*e", "This number %lu%% and string %s has %qd numbers and %.*g floats", 1 },
};
-ATF_TC(tc_fmtcheck);
-
-ATF_TC_HEAD(tc_fmtcheck, tc)
+ATF_TC(fmtcheck_basic);
+ATF_TC_HEAD(fmtcheck_basic, tc)
{
atf_tc_set_md_var(tc, "descr", "Test fmtcheck(3)");
}
-ATF_TC_BODY(tc_fmtcheck, tc)
+ATF_TC_BODY(fmtcheck_basic, tc)
{
unsigned int i, r;
const char *f, *cf, *f1, *f2;
@@ -110,7 +109,7 @@
ATF_TP_ADD_TCS(tp)
{
- ATF_TP_ADD_TC(tp, tc_fmtcheck);
+ ATF_TP_ADD_TC(tp, fmtcheck_basic);
return atf_no_error();
}
Index: src/tests/lib/libc/gen/t_dir.c
diff -u src/tests/lib/libc/gen/t_dir.c:1.3 src/tests/lib/libc/gen/t_dir.c:1.4
--- src/tests/lib/libc/gen/t_dir.c:1.3 Sat Jun 11 18:03:18 2011
+++ src/tests/lib/libc/gen/t_dir.c Thu Jul 7 09:49:59 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: t_dir.c,v 1.3 2011/06/11 18:03:18 christos Exp $ */
+/* $NetBSD: t_dir.c,v 1.4 2011/07/07 09:49:59 jruoho Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -39,16 +39,15 @@
#include <sys/stat.h>
-ATF_TC(seekdir);
-
-ATF_TC_HEAD(seekdir, tc)
+ATF_TC(seekdir_basic);
+ATF_TC_HEAD(seekdir_basic, tc)
{
atf_tc_set_md_var(tc, "descr",
"Check telldir(3) and seekdir(3) for correct behavior (PR/24324)");
}
-ATF_TC_BODY(seekdir, tc)
+ATF_TC_BODY(seekdir_basic, tc)
{
DIR *dp;
char *wasname;
@@ -113,7 +112,6 @@
}
ATF_TC(telldir_leak);
-
ATF_TC_HEAD(telldir_leak, tc)
{
@@ -161,7 +159,7 @@
ATF_TP_ADD_TCS(tp)
{
- ATF_TP_ADD_TC(tp, seekdir);
+ ATF_TP_ADD_TC(tp, seekdir_basic);
ATF_TP_ADD_TC(tp, telldir_leak);
return atf_no_error();
Index: src/tests/lib/libc/gen/t_glob_star.c
diff -u src/tests/lib/libc/gen/t_glob_star.c:1.6 src/tests/lib/libc/gen/t_glob_star.c:1.7
--- src/tests/lib/libc/gen/t_glob_star.c:1.6 Wed Nov 3 16:10:21 2010
+++ src/tests/lib/libc/gen/t_glob_star.c Thu Jul 7 09:49:59 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: t_glob_star.c,v 1.6 2010/11/03 16:10:21 christos Exp $ */
+/* $NetBSD: t_glob_star.c,v 1.7 2011/07/07 09:49:59 jruoho Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_glob_star.c,v 1.6 2010/11/03 16:10:21 christos Exp $");
+__RCSID("$NetBSD: t_glob_star.c,v 1.7 2011/07/07 09:49:59 jruoho Exp $");
#include <atf-c.h>
@@ -55,9 +55,6 @@
#define DPRINTF(a)
#endif
-ATF_TC(t_glob_star);
-ATF_TC(t_glob_star_not);
-
struct gl_file {
const char *name;
int dir;
@@ -88,7 +85,7 @@
{ "a/b", b, __arraycount(b), 0 },
};
-static const char *glob_star[] = {
+static const char *glob_star[] = {
"a/1", "a/3", "a/4", "a/b", "a/b/w", "a/b/x", "a/b/y", "a/b/z",
};
@@ -193,33 +190,35 @@
}
-ATF_TC_HEAD(t_glob_star, tc)
+ATF_TC(glob_star);
+ATF_TC_HEAD(glob_star, tc)
{
atf_tc_set_md_var(tc, "descr",
"Test glob(3) ** with GLOB_STAR");
}
-ATF_TC_BODY(t_glob_star, tc)
+ATF_TC_BODY(glob_star, tc)
{
run("a/**", GLOB_STAR, glob_star, __arraycount(glob_star));
}
-ATF_TC_HEAD(t_glob_star_not, tc)
+ATF_TC(glob_star_not);
+ATF_TC_HEAD(glob_star_not, tc)
{
atf_tc_set_md_var(tc, "descr",
"Test glob(3) ** without GLOB_STAR");
}
-ATF_TC_BODY(t_glob_star_not, tc)
+ATF_TC_BODY(glob_star_not, tc)
{
run("a/**", 0, glob_star_not, __arraycount(glob_star_not));
}
ATF_TP_ADD_TCS(tp)
{
- ATF_TP_ADD_TC(tp, t_glob_star);
- ATF_TP_ADD_TC(tp, t_glob_star_not);
+ ATF_TP_ADD_TC(tp, glob_star);
+ ATF_TP_ADD_TC(tp, glob_star_not);
return atf_no_error();
}
Index: src/tests/lib/libc/gen/t_humanize_number.c
diff -u src/tests/lib/libc/gen/t_humanize_number.c:1.4 src/tests/lib/libc/gen/t_humanize_number.c:1.5
--- src/tests/lib/libc/gen/t_humanize_number.c:1.4 Sat Jun 11 18:03:18 2011
+++ src/tests/lib/libc/gen/t_humanize_number.c Thu Jul 7 09:49:59 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: t_humanize_number.c,v 1.4 2011/06/11 18:03:18 christos Exp $ */
+/* $NetBSD: t_humanize_number.c,v 1.5 2011/07/07 09:49:59 jruoho Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
@@ -194,15 +194,14 @@
va_end(ap);
}
-ATF_TC(humanize_basic);
-
-ATF_TC_HEAD(humanize_basic, tc)
+ATF_TC(humanize_number_basic);
+ATF_TC_HEAD(humanize_number_basic, tc)
{
atf_tc_set_md_var(tc, "descr", "Test humanize_number(3)");
}
-ATF_TC_BODY(humanize_basic, tc)
+ATF_TC_BODY(humanize_number_basic, tc)
{
char fbuf[128];
const struct hnopts *ho;
@@ -244,15 +243,14 @@
}
}
-ATF_TC(humanize_big);
-
-ATF_TC_HEAD(humanize_big, tc)
+ATF_TC(humanize_number_big);
+ATF_TC_HEAD(humanize_number_big, tc)
{
atf_tc_set_md_var(tc, "descr", "Test humanize big numbers");
}
-ATF_TC_BODY(humanize_big, tc)
+ATF_TC_BODY(humanize_number_big, tc)
{
char buf[1024];
int rv;
@@ -308,8 +306,8 @@
ATF_TP_ADD_TCS(tp)
{
- ATF_TP_ADD_TC(tp, humanize_basic);
- ATF_TP_ADD_TC(tp, humanize_big);
+ ATF_TP_ADD_TC(tp, humanize_number_basic);
+ ATF_TP_ADD_TC(tp, humanize_number_big);
return atf_no_error();
}
Index: src/tests/lib/libc/gen/t_randomid.c
diff -u src/tests/lib/libc/gen/t_randomid.c:1.2 src/tests/lib/libc/gen/t_randomid.c:1.3
--- src/tests/lib/libc/gen/t_randomid.c:1.2 Thu Jan 13 03:00:41 2011
+++ src/tests/lib/libc/gen/t_randomid.c Thu Jul 7 09:49:59 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: t_randomid.c,v 1.2 2011/01/13 03:00:41 pgoyette Exp $ */
+/* $NetBSD: t_randomid.c,v 1.3 2011/07/07 09:49:59 jruoho Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -40,15 +40,14 @@
uint64_t last[65536];
-ATF_TC(randomid);
-
-ATF_TC_HEAD(randomid, tc)
+ATF_TC(randomid_basic);
+ATF_TC_HEAD(randomid_basic, tc)
{
atf_tc_set_md_var(tc, "descr", "Check randomid(3)");
}
-ATF_TC_BODY(randomid, tc)
+ATF_TC_BODY(randomid_basic, tc)
{
static randomid_t ctx = NULL;
uint64_t lowest, n, diff;
@@ -88,7 +87,7 @@
ATF_TP_ADD_TCS(tp)
{
- ATF_TP_ADD_TC(tp, randomid);
+ ATF_TP_ADD_TC(tp, randomid_basic);
return atf_no_error();
}
Index: src/tests/lib/libc/gen/t_syslog_pthread.c
diff -u src/tests/lib/libc/gen/t_syslog_pthread.c:1.2 src/tests/lib/libc/gen/t_syslog_pthread.c:1.3
--- src/tests/lib/libc/gen/t_syslog_pthread.c:1.2 Thu Dec 30 22:21:53 2010
+++ src/tests/lib/libc/gen/t_syslog_pthread.c Thu Jul 7 09:49:59 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: t_syslog_pthread.c,v 1.2 2010/12/30 22:21:53 pooka Exp $ */
+/* $NetBSD: t_syslog_pthread.c,v 1.3 2011/07/07 09:49:59 jruoho Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -33,15 +33,15 @@
#include <atf-c.h>
#include <syslog.h>
-ATF_TC(basic);
-ATF_TC_HEAD(basic, tc)
+ATF_TC(syslog_pthread);
+ATF_TC_HEAD(syslog_pthread, tc)
{
atf_tc_set_md_var(tc, "descr", "Test that syslog works at all");
atf_tc_set_md_var(tc, "timeout", "2");
}
-ATF_TC_BODY(basic, tc)
+ATF_TC_BODY(syslog_pthread, tc)
{
//atf_tc_expect_timeout("PR lib/44248");
@@ -50,7 +50,8 @@
ATF_TP_ADD_TCS(tp)
{
- ATF_TP_ADD_TC(tp, basic);
+
+ ATF_TP_ADD_TC(tp, syslog_pthread);
return atf_no_error();
}
