Module Name: src
Committed By: pooka
Date: Mon Aug 16 10:46:20 UTC 2010
Modified Files:
src/tests: h_macros.h
src/tests/fs/puffs: t_fuzz.c
Log Message:
Make random garbage more widely available.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tests/h_macros.h
cvs rdiff -u -r1.2 -r1.3 src/tests/fs/puffs/t_fuzz.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/h_macros.h
diff -u src/tests/h_macros.h:1.3 src/tests/h_macros.h:1.4
--- src/tests/h_macros.h:1.3 Sun Jul 25 22:29:15 2010
+++ src/tests/h_macros.h Mon Aug 16 10:46:19 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: h_macros.h,v 1.3 2010/07/25 22:29:15 pooka Exp $ */
+/* $NetBSD: h_macros.h,v 1.4 2010/08/16 10:46:19 pooka Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -61,4 +61,18 @@
atf_tc_fail(buf);
}
+static __inline void
+tests_makegarbage(void *space, size_t len)
+{
+ uint16_t *sb = space;
+ uint16_t randval;
+
+ while (len >= sizeof(randval)) {
+ *sb++ = (random() & 0xffff);
+ len -= sizeof(*sb);
+ }
+ randval = (uint16_t)random();
+ memcpy(sb, &randval, len);
+}
+
#endif
Index: src/tests/fs/puffs/t_fuzz.c
diff -u src/tests/fs/puffs/t_fuzz.c:1.2 src/tests/fs/puffs/t_fuzz.c:1.3
--- src/tests/fs/puffs/t_fuzz.c:1.2 Mon Aug 2 09:44:23 2010
+++ src/tests/fs/puffs/t_fuzz.c Mon Aug 16 10:46:20 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: t_fuzz.c,v 1.2 2010/08/02 09:44:23 pooka Exp $ */
+/* $NetBSD: t_fuzz.c,v 1.3 2010/08/16 10:46:20 pooka Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -60,20 +60,6 @@
#define ITERATIONS 100
static void
-makegarbage(void *space, size_t len)
-{
- long *sb = space;
- long randval;
-
- while (len >= sizeof(long)) {
- *sb++ = random();
- len -= sizeof(long);
- }
- randval = random();
- memcpy(sb, &randval, len);
-}
-
-static void
fixversion(struct puffs_kargs *kargs)
{
@@ -226,7 +212,7 @@
ATF_REQUIRE(rump_sys_mkdir("/mnt", 0777) == 0);
for (i = 0; i < ITERATIONS; i++) {
- makegarbage(&kargs, sizeof(kargs));
+ tests_makegarbage(&kargs, sizeof(kargs));
fixup(nfix, &kargs);
if (rump_sys_mount(MOUNT_PUFFS, "/mnt", 0,
&kargs, sizeof(kargs)) == 0) {
@@ -251,7 +237,7 @@
#define MAKETEST(_n_) \
ATF_TC(mountfuzz##_n_); \
ATF_TC_HEAD(mountfuzz##_n_, tc) \
-{atf_tc_set_md_var(tc, "descr", "garbage kargs, " # _n_ " fix");} \
+{atf_tc_set_md_var(tc, "descr", "garbage kargs, " # _n_ " fix(es)");} \
ATF_TC_BODY(mountfuzz##_n_, tc) {testbody(_n_);}
MAKETEST(0);
