Module Name: src
Committed By: jruoho
Date: Thu Jul 14 07:33:20 UTC 2011
Modified Files:
src/tests/lib/libc/string: t_memset.c t_strcmp.c t_strlen.c
Log Message:
Use ATF_CHECK() when appropriate.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libc/string/t_memset.c
cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libc/string/t_strcmp.c
cvs rdiff -u -r1.4 -r1.5 src/tests/lib/libc/string/t_strlen.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/string/t_memset.c
diff -u src/tests/lib/libc/string/t_memset.c:1.1 src/tests/lib/libc/string/t_memset.c:1.2
--- src/tests/lib/libc/string/t_memset.c:1.1 Fri Jun 3 06:39:52 2011
+++ src/tests/lib/libc/string/t_memset.c Thu Jul 14 07:33:20 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: t_memset.c,v 1.1 2011/06/03 06:39:52 jruoho Exp $ */
+/* $NetBSD: t_memset.c,v 1.2 2011/07/14 07:33:20 jruoho Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_memset.c,v 1.1 2011/06/03 06:39:52 jruoho Exp $");
+__RCSID("$NetBSD: t_memset.c,v 1.2 2011/07/14 07:33:20 jruoho Exp $");
#include <sys/stat.h>
@@ -142,16 +142,16 @@
(void)memset(&st, 0, sizeof(struct stat));
- ATF_REQUIRE(st.st_dev == 0);
- ATF_REQUIRE(st.st_ino == 0);
- ATF_REQUIRE(st.st_mode == 0);
- ATF_REQUIRE(st.st_nlink == 0);
- ATF_REQUIRE(st.st_uid == 0);
- ATF_REQUIRE(st.st_gid == 0);
- ATF_REQUIRE(st.st_rdev == 0);
- ATF_REQUIRE(st.st_size == 0);
- ATF_REQUIRE(st.st_atime == 0);
- ATF_REQUIRE(st.st_mtime == 0);
+ ATF_CHECK(st.st_dev == 0);
+ ATF_CHECK(st.st_ino == 0);
+ ATF_CHECK(st.st_mode == 0);
+ ATF_CHECK(st.st_nlink == 0);
+ ATF_CHECK(st.st_uid == 0);
+ ATF_CHECK(st.st_gid == 0);
+ ATF_CHECK(st.st_rdev == 0);
+ ATF_CHECK(st.st_size == 0);
+ ATF_CHECK(st.st_atime == 0);
+ ATF_CHECK(st.st_mtime == 0);
}
static void
Index: src/tests/lib/libc/string/t_strcmp.c
diff -u src/tests/lib/libc/string/t_strcmp.c:1.2 src/tests/lib/libc/string/t_strcmp.c:1.3
--- src/tests/lib/libc/string/t_strcmp.c:1.2 Thu Jul 7 09:31:27 2011
+++ src/tests/lib/libc/string/t_strcmp.c Thu Jul 14 07:33:20 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: t_strcmp.c,v 1.2 2011/07/07 09:31:27 jruoho Exp $ */
+/* $NetBSD: t_strcmp.c,v 1.3 2011/07/14 07:33:20 jruoho Exp $ */
/*
* Written by J.T. Conklin <[email protected]>
@@ -108,22 +108,22 @@
char buf1[10] = "xxx";
char buf2[10] = "xxy";
- ATF_REQUIRE(strcmp(buf1, buf1) == 0);
- ATF_REQUIRE(strcmp(buf2, buf2) == 0);
+ ATF_CHECK(strcmp(buf1, buf1) == 0);
+ ATF_CHECK(strcmp(buf2, buf2) == 0);
- ATF_REQUIRE(strcmp("x�x", "xox") > 0);
- ATF_REQUIRE(strcmp("xxx", "xxxyyy") < 0);
- ATF_REQUIRE(strcmp("xxxyyy", "xxx") > 0);
-
- ATF_REQUIRE(strcmp(buf1 + 0, buf2 + 0) < 0);
- ATF_REQUIRE(strcmp(buf1 + 1, buf2 + 1) < 0);
- ATF_REQUIRE(strcmp(buf1 + 2, buf2 + 2) < 0);
- ATF_REQUIRE(strcmp(buf1 + 3, buf2 + 3) == 0);
-
- ATF_REQUIRE(strcmp(buf2 + 0, buf1 + 0) > 0);
- ATF_REQUIRE(strcmp(buf2 + 1, buf1 + 1) > 0);
- ATF_REQUIRE(strcmp(buf2 + 2, buf1 + 2) > 0);
- ATF_REQUIRE(strcmp(buf2 + 3, buf1 + 3) == 0);
+ ATF_CHECK(strcmp("x�x", "xox") > 0);
+ ATF_CHECK(strcmp("xxx", "xxxyyy") < 0);
+ ATF_CHECK(strcmp("xxxyyy", "xxx") > 0);
+
+ ATF_CHECK(strcmp(buf1 + 0, buf2 + 0) < 0);
+ ATF_CHECK(strcmp(buf1 + 1, buf2 + 1) < 0);
+ ATF_CHECK(strcmp(buf1 + 2, buf2 + 2) < 0);
+ ATF_CHECK(strcmp(buf1 + 3, buf2 + 3) == 0);
+
+ ATF_CHECK(strcmp(buf2 + 0, buf1 + 0) > 0);
+ ATF_CHECK(strcmp(buf2 + 1, buf1 + 1) > 0);
+ ATF_CHECK(strcmp(buf2 + 2, buf1 + 2) > 0);
+ ATF_CHECK(strcmp(buf2 + 3, buf1 + 3) == 0);
}
ATF_TP_ADD_TCS(tp)
Index: src/tests/lib/libc/string/t_strlen.c
diff -u src/tests/lib/libc/string/t_strlen.c:1.4 src/tests/lib/libc/string/t_strlen.c:1.5
--- src/tests/lib/libc/string/t_strlen.c:1.4 Tue Jul 12 12:08:07 2011
+++ src/tests/lib/libc/string/t_strlen.c Thu Jul 14 07:33:20 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: t_strlen.c,v 1.4 2011/07/12 12:08:07 njoly Exp $ */
+/* $NetBSD: t_strlen.c,v 1.5 2011/07/14 07:33:20 jruoho Exp $ */
/*
* Written by J.T. Conklin <[email protected]>
@@ -178,14 +178,14 @@
buf[0] = '\0';
- ATF_REQUIRE(strnlen(buf, 000) == 0);
- ATF_REQUIRE(strnlen(buf, 111) == 0);
+ ATF_CHECK(strnlen(buf, 000) == 0);
+ ATF_CHECK(strnlen(buf, 111) == 0);
- ATF_REQUIRE(strnlen("xxx", 0) == 0);
- ATF_REQUIRE(strnlen("xxx", 1) == 1);
- ATF_REQUIRE(strnlen("xxx", 2) == 2);
- ATF_REQUIRE(strnlen("xxx", 3) == 3);
- ATF_REQUIRE(strnlen("xxx", 9) == 3);
+ ATF_CHECK(strnlen("xxx", 0) == 0);
+ ATF_CHECK(strnlen("xxx", 1) == 1);
+ ATF_CHECK(strnlen("xxx", 2) == 2);
+ ATF_CHECK(strnlen("xxx", 3) == 3);
+ ATF_CHECK(strnlen("xxx", 9) == 3);
}
ATF_TP_ADD_TCS(tp)
