Module Name: src
Committed By: jruoho
Date: Thu Jul 7 08:27:36 UTC 2011
Modified Files:
src/tests/lib/libc/string: t_memcpy.c t_memmem.c t_popcount.c
t_stresep.c t_swab.c
Log Message:
Rename some test case names for consistency.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libc/string/t_memcpy.c
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libc/string/t_memmem.c \
src/tests/lib/libc/string/t_stresep.c src/tests/lib/libc/string/t_swab.c
cvs rdiff -u -r1.3 -r1.4 src/tests/lib/libc/string/t_popcount.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_memcpy.c
diff -u src/tests/lib/libc/string/t_memcpy.c:1.2 src/tests/lib/libc/string/t_memcpy.c:1.3
--- src/tests/lib/libc/string/t_memcpy.c:1.2 Thu Apr 7 18:14:09 2011
+++ src/tests/lib/libc/string/t_memcpy.c Thu Jul 7 08:27:36 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: t_memcpy.c,v 1.2 2011/04/07 18:14:09 jruoho Exp $ */
+/* $NetBSD: t_memcpy.c,v 1.3 2011/07/07 08:27:36 jruoho Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -75,15 +75,13 @@
}
}
-ATF_TC(check_memcpy);
-
-ATF_TC_HEAD(check_memcpy, tc)
+ATF_TC(memcpy_basic);
+ATF_TC_HEAD(memcpy_basic, tc)
{
-
atf_tc_set_md_var(tc, "descr", "Test memcpy results");
}
-
-ATF_TC_BODY(check_memcpy, tc)
+
+ATF_TC_BODY(memcpy_basic, tc)
{
int i, j;
testBlock_t auto1, auto2;
@@ -104,7 +102,7 @@
ATF_TP_ADD_TCS(tp)
{
- ATF_TP_ADD_TC(tp, check_memcpy);
+ ATF_TP_ADD_TC(tp, memcpy_basic);
return atf_no_error();
}
Index: src/tests/lib/libc/string/t_memmem.c
diff -u src/tests/lib/libc/string/t_memmem.c:1.1 src/tests/lib/libc/string/t_memmem.c:1.2
--- src/tests/lib/libc/string/t_memmem.c:1.1 Sun Dec 26 13:35:54 2010
+++ src/tests/lib/libc/string/t_memmem.c Thu Jul 7 08:27:36 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: t_memmem.c,v 1.1 2010/12/26 13:35:54 pgoyette Exp $ */
+/* $NetBSD: t_memmem.c,v 1.2 2011/07/07 08:27:36 jruoho Exp $ */
/*-
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -65,15 +65,14 @@
atf_tc_fail("Check stderr for test id/line"); \
}
-ATF_TC(check_memmem);
-
-ATF_TC_HEAD(check_memmem, tc)
+ATF_TC(memmem_basic);
+ATF_TC_HEAD(memmem_basic, tc)
{
atf_tc_set_md_var(tc, "descr", "Test memmem results");
}
-ATF_TC_BODY(check_memmem, tc)
+ATF_TC_BODY(memmem_basic, tc)
{
expect(memmem(b2, lb2, p0, lp0) == b2);
@@ -95,7 +94,7 @@
ATF_TP_ADD_TCS(tp)
{
- ATF_TP_ADD_TC(tp, check_memmem);
+ ATF_TP_ADD_TC(tp, memmem_basic);
return atf_no_error();
}
Index: src/tests/lib/libc/string/t_stresep.c
diff -u src/tests/lib/libc/string/t_stresep.c:1.1 src/tests/lib/libc/string/t_stresep.c:1.2
--- src/tests/lib/libc/string/t_stresep.c:1.1 Sun Dec 26 13:35:54 2010
+++ src/tests/lib/libc/string/t_stresep.c Thu Jul 7 08:27:36 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: t_stresep.c,v 1.1 2010/12/26 13:35:54 pgoyette Exp $ */
+/* $NetBSD: t_stresep.c,v 1.2 2011/07/07 08:27:36 jruoho Exp $ */
/*-
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -42,15 +42,14 @@
atf_tc_fail("Check stderr for test id/line"); \
}
-ATF_TC(check_stresep);
-
-ATF_TC_HEAD(check_stresep, tc)
+ATF_TC(stresep_basic);
+ATF_TC_HEAD(stresep_basic, tc)
{
atf_tc_set_md_var(tc, "descr", "Test stresep results");
}
-ATF_TC_BODY(check_stresep, tc)
+ATF_TC_BODY(stresep_basic, tc)
{
char brk[] = "foo\\ \\ bar baz bar\\ foo\\ bar\\ \\ foo \\ \\ \\ "
"baz bar\\ \\ ";
@@ -67,7 +66,7 @@
ATF_TP_ADD_TCS(tp)
{
- ATF_TP_ADD_TC(tp, check_stresep);
+ ATF_TP_ADD_TC(tp, stresep_basic);
return atf_no_error();
}
Index: src/tests/lib/libc/string/t_swab.c
diff -u src/tests/lib/libc/string/t_swab.c:1.1 src/tests/lib/libc/string/t_swab.c:1.2
--- src/tests/lib/libc/string/t_swab.c:1.1 Sun Dec 26 13:35:54 2010
+++ src/tests/lib/libc/string/t_swab.c Thu Jul 7 08:27:36 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: t_swab.c,v 1.1 2010/12/26 13:35:54 pgoyette Exp $ */
+/* $NetBSD: t_swab.c,v 1.2 2011/07/07 08:27:36 jruoho Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -61,15 +61,14 @@
printf("\n");
}
-ATF_TC(check_swab);
-
-ATF_TC_HEAD(check_swab, tc)
+ATF_TC(swab_basic);
+ATF_TC_HEAD(swab_basic, tc)
{
atf_tc_set_md_var(tc, "descr", "Test swab results");
}
-ATF_TC_BODY(check_swab, tc)
+ATF_TC_BODY(swab_basic, tc)
{
char a[MAXCHK], b[MAXCHK], r[MAXCHK];
size_t i;
@@ -90,7 +89,7 @@
ATF_TP_ADD_TCS(tp)
{
- ATF_TP_ADD_TC(tp, check_swab);
+ ATF_TP_ADD_TC(tp, swab_basic);
return atf_no_error();
}
Index: src/tests/lib/libc/string/t_popcount.c
diff -u src/tests/lib/libc/string/t_popcount.c:1.3 src/tests/lib/libc/string/t_popcount.c:1.4
--- src/tests/lib/libc/string/t_popcount.c:1.3 Sun Dec 26 13:29:47 2010
+++ src/tests/lib/libc/string/t_popcount.c Thu Jul 7 08:27:36 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: t_popcount.c,v 1.3 2010/12/26 13:29:47 pgoyette Exp $ */
+/* $NetBSD: t_popcount.c,v 1.4 2011/07/07 08:27:36 jruoho Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_popcount.c,v 1.3 2010/12/26 13:29:47 pgoyette Exp $");
+__RCSID("$NetBSD: t_popcount.c,v 1.4 2011/07/07 08:27:36 jruoho Exp $");
#include <atf-c.h>
#include <strings.h>
@@ -63,82 +63,81 @@
}
unsigned int test_parts[256] = {
- 0x318e53e6U, 0x11710316U, 0x62608ffaU, 0x67e0f562U,
- 0xe432e82cU, 0x9862e8b2U, 0x7d96a627U, 0x3f74ad31U,
- 0x3cecf906U, 0xcdc0dcb4U, 0x241dab64U, 0x31e6133eU,
- 0x23086ad4U, 0x721d5a91U, 0xc483da53U, 0x6a62af52U,
- 0xf3f5c386U, 0xe0de3f77U, 0x65afe528U, 0xf4816485U,
- 0x40ccbf08U, 0x25df49c1U, 0xae5a6ee0U, 0xab36ccadU,
- 0x87e1ec29U, 0x60ca2407U, 0x49d62e47U, 0xa09f2df5U,
- 0xaf4c1c68U, 0x8ef08d50U, 0x624cfd2fU, 0xa6a36f20U,
- 0x68aaf879U, 0x0fe9deabU, 0x5c9a4060U, 0x215d8f08U,
- 0x55e84712U, 0xea1f1681U, 0x3a10b8a1U, 0x08e06632U,
- 0xcbc875e2U, 0x31e53258U, 0xcd3807a4U, 0xb9d17516U,
- 0x8fbfd9abU, 0x6651b555U, 0x550fb381U, 0x05061b9dU,
- 0x35aef3f2U, 0x9175078cU, 0xae0f14daU, 0x92a2d5f8U,
- 0x70d968feU, 0xe86f41c5U, 0x5cfaf39fU, 0x8499b18dU,
- 0xb33f879aU, 0x0a68ad3dU, 0x9323ecc1U, 0x060037ddU,
- 0xb91a5051U, 0xa0dbebf6U, 0x3e6aa6f1U, 0x7b422b5bU,
- 0x599e811eU, 0x199f7594U, 0xca453365U, 0x1cda6f48U,
- 0xe9c75d2cU, 0x6a873217U, 0x79c45d72U, 0x143b8e37U,
- 0xa11df26eU, 0xaf31f80aU, 0x311bf759U, 0x2378563cU,
- 0x9ab95fa5U, 0xfcf4d47cU, 0x1f7db268U, 0xd64b09e1U,
- 0xad7936daU, 0x7a59005cU, 0x45b173d3U, 0xc1a71b32U,
- 0x7d9f0de2U, 0xa9ac3792U, 0x9e7f9966U, 0x7f0b8080U,
- 0xece6c06fU, 0x78d92a3cU, 0x6d5f8f6cU, 0xc50ca544U,
- 0x5d8ded27U, 0xd27a8462U, 0x4bcd13ccU, 0xd49075f2U,
- 0xa8d52acfU, 0x41915d97U, 0x564f7062U, 0xefb046e2U,
- 0xe296277aU, 0x605b0ea3U, 0x10b2c3a1U, 0x4e8e5c66U,
- 0x4bd8ec04U, 0x29935be9U, 0x381839f3U, 0x555d8824U,
- 0xd6befddbU, 0x5d8d6d6eU, 0xb2fdb7b4U, 0xb471c8fcU,
- 0xc2fd325bU, 0x932d2487U, 0xbdbbadefU, 0x66c8895dU,
- 0x5d77857aU, 0x259f1cc0U, 0x302037faU, 0xda9aa7a8U,
- 0xb112c6aaU, 0x78f74192U, 0xfd4da741U, 0xfa5765c1U,
- 0x6ea1bc5cU, 0xd283f39cU, 0x268ae67dU, 0xdedcd134U,
- 0xbbf92410U, 0x6b45fb55U, 0x2f75ac71U, 0x64bf2ca5U,
- 0x8b99675aU, 0x3f4923b6U, 0x7e610550U, 0x04b1c06dU,
- 0x8f92e7c6U, 0x45cb608bU, 0x2d06d1f2U, 0x79cf387aU,
- 0xfd3ed225U, 0x243eee20U, 0x2cbefc6fU, 0x8286cbaaU,
- 0x70d4c182U, 0x054e3cc6U, 0xb66c5362U, 0x0c73fa5dU,
- 0x539948feU, 0xec638563U, 0x0cf04ab6U, 0xec7b52f4U,
- 0x58eeffceU, 0x6fe8049aU, 0xb3b33332U, 0x2e33bfdbU,
- 0xcc817567U, 0x71ac57c8U, 0x4bab3ac7U, 0x327c558bU,
- 0x82a6d279U, 0x5adf71daU, 0x1074a656U, 0x3c533c1fU,
- 0x82fdbe69U, 0x21b4f6afU, 0xd59580e8U, 0x0de824ebU,
- 0xa510941bU, 0x7cd91144U, 0xa8c10631U, 0x4c839267U,
- 0x5d503c2fU, 0xe1567d55U, 0x23910cc7U, 0xdb1bdc34U,
- 0x2a866704U, 0x33e21f0cU, 0x5c7681b4U, 0x818651caU,
- 0xb1d18162U, 0x225ad014U, 0xadf7d6baU, 0xac548d9bU,
- 0xe94736e5U, 0x2279c5f1U, 0x33215d2cU, 0xdc8ab90eU,
- 0xf5e3d7f2U, 0xedcb15cfU, 0xc9a43c4cU, 0xfc678fc6U,
- 0x43796b95U, 0x3f8b700cU, 0x867bbc72U, 0x81f71fecU,
- 0xd00cad7dU, 0x302c458fU, 0x8ae21accU, 0x05850ce8U,
- 0x7764d8e8U, 0x8a36cd68U, 0x40b44bd7U, 0x1cffaeb7U,
- 0x2b248f34U, 0x1eefdbafU, 0x574d7437U, 0xe86cd935U,
- 0xf53dd1c8U, 0x1b022513U, 0xef2d249bU, 0x94fb2b08U,
- 0x15d3eff8U, 0x14245e1bU, 0x82aa8425U, 0x53959028U,
- 0x9c5f9b80U, 0x325e0c82U, 0x3e236c24U, 0x74e1dd36U,
- 0x9890df3fU, 0xaf9701a2U, 0x023b3413U, 0x7634c67eU,
- 0x55cf5e45U, 0x56d2a95bU, 0xb6db869bU, 0xac19e260U,
- 0xdd310740U, 0x26d68f84U, 0x45bebf17U, 0xe4a7728fU,
- 0xf082e66eU, 0xb2fe3c10U, 0x2db1fa2cU, 0x4b3dfcfaU,
- 0xc7b3a672U, 0xaeadc67bU, 0x6cce6f2bU, 0x8263dbbfU,
- 0xd9724d5bU, 0xbcc767b5U, 0x8d563798U, 0x2db764b4U,
- 0x76e0cee7U, 0xd34f9a67U, 0x035c810aU, 0x3f56bdc1U,
- 0x5b3f2c84U, 0x0baca8c0U, 0xfe979a77U, 0x484ca775U,
- 0xbdc7f104U, 0xc06c3efbU, 0xdbc5f32cU, 0x44b017e7U,
+ 0x318e53e6U, 0x11710316U, 0x62608ffaU, 0x67e0f562U,
+ 0xe432e82cU, 0x9862e8b2U, 0x7d96a627U, 0x3f74ad31U,
+ 0x3cecf906U, 0xcdc0dcb4U, 0x241dab64U, 0x31e6133eU,
+ 0x23086ad4U, 0x721d5a91U, 0xc483da53U, 0x6a62af52U,
+ 0xf3f5c386U, 0xe0de3f77U, 0x65afe528U, 0xf4816485U,
+ 0x40ccbf08U, 0x25df49c1U, 0xae5a6ee0U, 0xab36ccadU,
+ 0x87e1ec29U, 0x60ca2407U, 0x49d62e47U, 0xa09f2df5U,
+ 0xaf4c1c68U, 0x8ef08d50U, 0x624cfd2fU, 0xa6a36f20U,
+ 0x68aaf879U, 0x0fe9deabU, 0x5c9a4060U, 0x215d8f08U,
+ 0x55e84712U, 0xea1f1681U, 0x3a10b8a1U, 0x08e06632U,
+ 0xcbc875e2U, 0x31e53258U, 0xcd3807a4U, 0xb9d17516U,
+ 0x8fbfd9abU, 0x6651b555U, 0x550fb381U, 0x05061b9dU,
+ 0x35aef3f2U, 0x9175078cU, 0xae0f14daU, 0x92a2d5f8U,
+ 0x70d968feU, 0xe86f41c5U, 0x5cfaf39fU, 0x8499b18dU,
+ 0xb33f879aU, 0x0a68ad3dU, 0x9323ecc1U, 0x060037ddU,
+ 0xb91a5051U, 0xa0dbebf6U, 0x3e6aa6f1U, 0x7b422b5bU,
+ 0x599e811eU, 0x199f7594U, 0xca453365U, 0x1cda6f48U,
+ 0xe9c75d2cU, 0x6a873217U, 0x79c45d72U, 0x143b8e37U,
+ 0xa11df26eU, 0xaf31f80aU, 0x311bf759U, 0x2378563cU,
+ 0x9ab95fa5U, 0xfcf4d47cU, 0x1f7db268U, 0xd64b09e1U,
+ 0xad7936daU, 0x7a59005cU, 0x45b173d3U, 0xc1a71b32U,
+ 0x7d9f0de2U, 0xa9ac3792U, 0x9e7f9966U, 0x7f0b8080U,
+ 0xece6c06fU, 0x78d92a3cU, 0x6d5f8f6cU, 0xc50ca544U,
+ 0x5d8ded27U, 0xd27a8462U, 0x4bcd13ccU, 0xd49075f2U,
+ 0xa8d52acfU, 0x41915d97U, 0x564f7062U, 0xefb046e2U,
+ 0xe296277aU, 0x605b0ea3U, 0x10b2c3a1U, 0x4e8e5c66U,
+ 0x4bd8ec04U, 0x29935be9U, 0x381839f3U, 0x555d8824U,
+ 0xd6befddbU, 0x5d8d6d6eU, 0xb2fdb7b4U, 0xb471c8fcU,
+ 0xc2fd325bU, 0x932d2487U, 0xbdbbadefU, 0x66c8895dU,
+ 0x5d77857aU, 0x259f1cc0U, 0x302037faU, 0xda9aa7a8U,
+ 0xb112c6aaU, 0x78f74192U, 0xfd4da741U, 0xfa5765c1U,
+ 0x6ea1bc5cU, 0xd283f39cU, 0x268ae67dU, 0xdedcd134U,
+ 0xbbf92410U, 0x6b45fb55U, 0x2f75ac71U, 0x64bf2ca5U,
+ 0x8b99675aU, 0x3f4923b6U, 0x7e610550U, 0x04b1c06dU,
+ 0x8f92e7c6U, 0x45cb608bU, 0x2d06d1f2U, 0x79cf387aU,
+ 0xfd3ed225U, 0x243eee20U, 0x2cbefc6fU, 0x8286cbaaU,
+ 0x70d4c182U, 0x054e3cc6U, 0xb66c5362U, 0x0c73fa5dU,
+ 0x539948feU, 0xec638563U, 0x0cf04ab6U, 0xec7b52f4U,
+ 0x58eeffceU, 0x6fe8049aU, 0xb3b33332U, 0x2e33bfdbU,
+ 0xcc817567U, 0x71ac57c8U, 0x4bab3ac7U, 0x327c558bU,
+ 0x82a6d279U, 0x5adf71daU, 0x1074a656U, 0x3c533c1fU,
+ 0x82fdbe69U, 0x21b4f6afU, 0xd59580e8U, 0x0de824ebU,
+ 0xa510941bU, 0x7cd91144U, 0xa8c10631U, 0x4c839267U,
+ 0x5d503c2fU, 0xe1567d55U, 0x23910cc7U, 0xdb1bdc34U,
+ 0x2a866704U, 0x33e21f0cU, 0x5c7681b4U, 0x818651caU,
+ 0xb1d18162U, 0x225ad014U, 0xadf7d6baU, 0xac548d9bU,
+ 0xe94736e5U, 0x2279c5f1U, 0x33215d2cU, 0xdc8ab90eU,
+ 0xf5e3d7f2U, 0xedcb15cfU, 0xc9a43c4cU, 0xfc678fc6U,
+ 0x43796b95U, 0x3f8b700cU, 0x867bbc72U, 0x81f71fecU,
+ 0xd00cad7dU, 0x302c458fU, 0x8ae21accU, 0x05850ce8U,
+ 0x7764d8e8U, 0x8a36cd68U, 0x40b44bd7U, 0x1cffaeb7U,
+ 0x2b248f34U, 0x1eefdbafU, 0x574d7437U, 0xe86cd935U,
+ 0xf53dd1c8U, 0x1b022513U, 0xef2d249bU, 0x94fb2b08U,
+ 0x15d3eff8U, 0x14245e1bU, 0x82aa8425U, 0x53959028U,
+ 0x9c5f9b80U, 0x325e0c82U, 0x3e236c24U, 0x74e1dd36U,
+ 0x9890df3fU, 0xaf9701a2U, 0x023b3413U, 0x7634c67eU,
+ 0x55cf5e45U, 0x56d2a95bU, 0xb6db869bU, 0xac19e260U,
+ 0xdd310740U, 0x26d68f84U, 0x45bebf17U, 0xe4a7728fU,
+ 0xf082e66eU, 0xb2fe3c10U, 0x2db1fa2cU, 0x4b3dfcfaU,
+ 0xc7b3a672U, 0xaeadc67bU, 0x6cce6f2bU, 0x8263dbbfU,
+ 0xd9724d5bU, 0xbcc767b5U, 0x8d563798U, 0x2db764b4U,
+ 0x76e0cee7U, 0xd34f9a67U, 0x035c810aU, 0x3f56bdc1U,
+ 0x5b3f2c84U, 0x0baca8c0U, 0xfe979a77U, 0x484ca775U,
+ 0xbdc7f104U, 0xc06c3efbU, 0xdbc5f32cU, 0x44b017e7U,
};
-ATF_TC(t_popcount);
-
-ATF_TC_HEAD(t_popcount, tc)
+ATF_TC(popcount_basic);
+ATF_TC_HEAD(popcount_basic, tc)
{
atf_tc_set_md_var(tc, "descr", "Test popcount results");
atf_tc_set_md_var(tc, "timeout", "0");
}
-ATF_TC_BODY(t_popcount, tc)
+ATF_TC_BODY(popcount_basic, tc)
{
unsigned int i, r;
@@ -154,15 +153,15 @@
ATF_CHECK_EQ(popcount(0xffffffff), 32);
}
-ATF_TC(t_popcountll);
-ATF_TC_HEAD(t_popcountll, tc)
+ATF_TC(popcountll_basic);
+ATF_TC_HEAD(popcountll_basic, tc)
{
atf_tc_set_md_var(tc, "descr", "Test popcountll results");
atf_tc_set_md_var(tc, "timeout", "0");
}
-ATF_TC_BODY(t_popcountll, tc)
+ATF_TC_BODY(popcountll_basic, tc)
{
unsigned int i, j, r, r2, p;
unsigned long long v;
@@ -192,8 +191,8 @@
ATF_TP_ADD_TCS(tp)
{
- ATF_TP_ADD_TC(tp, t_popcount);
- ATF_TP_ADD_TC(tp, t_popcountll);
+ ATF_TP_ADD_TC(tp, popcount_basic);
+ ATF_TP_ADD_TC(tp, popcountll_basic);
return atf_no_error();
}
