Module Name: src
Committed By: jruoho
Date: Thu May 5 13:36:05 UTC 2011
Modified Files:
src/distrib/sets/lists/tests: mi
src/tests/include/sys: Makefile
src/tests/lib/libc/gen: Makefile
Added Files:
src/tests/include/sys: t_tree.c
Removed Files:
src/tests/lib/libc/gen: t_rbstress.c
Log Message:
Try to mirror the real source with the test directory structure (otherwise
the latter carries a risk of becoming a difficult mess to manage.)
To generate a diff of this commit:
cvs rdiff -u -r1.330 -r1.331 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.3 -r1.4 src/tests/include/sys/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/include/sys/t_tree.c
cvs rdiff -u -r1.20 -r1.21 src/tests/lib/libc/gen/Makefile
cvs rdiff -u -r1.2 -r0 src/tests/lib/libc/gen/t_rbstress.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.330 src/distrib/sets/lists/tests/mi:1.331
--- src/distrib/sets/lists/tests/mi:1.330 Thu May 5 13:22:56 2011
+++ src/distrib/sets/lists/tests/mi Thu May 5 13:36:05 2011
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.330 2011/05/05 13:22:56 jruoho Exp $
+# $NetBSD: mi,v 1.331 2011/05/05 13:36:05 jruoho Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -285,6 +285,7 @@
./usr/libdata/debug/usr/tests/include/sys tests-include-tests
./usr/libdata/debug/usr/tests/include/sys/t_bitops.debug tests-include-tests debug,atf
./usr/libdata/debug/usr/tests/include/sys/t_bootblock.debug tests-include-tests debug,atf
+./usr/libdata/debug/usr/tests/include/sys/t_tree.debug tests-include-tests debug,atf
./usr/libdata/debug/usr/tests/include/sys/t_types.debug tests-include-tests debug,atf
./usr/libdata/debug/usr/tests/include/t_bitstring.debug tests-include-tests debug,atf
./usr/libdata/debug/usr/tests/include/t_bswap.debug tests-obsolete obsolete
@@ -360,7 +361,7 @@
./usr/libdata/debug/usr/tests/lib/libc/gen/t_nice.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libc/gen/t_raise.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libc/gen/t_randomid.debug tests-lib-debug debug,atf
-./usr/libdata/debug/usr/tests/lib/libc/gen/t_rbstress.debug tests-lib-debug debug,atf
+./usr/libdata/debug/usr/tests/lib/libc/gen/t_rbstress.debug tests-obsolete obsolete
./usr/libdata/debug/usr/tests/lib/libc/gen/t_syslog_pthread.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libc/gen/t_siginfo.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libc/gen/t_ttyname.debug tests-lib-debug debug,atf
@@ -1391,6 +1392,7 @@
./usr/tests/include/sys/Atffile tests-include-tests atf
./usr/tests/include/sys/t_bitops tests-include-tests atf
./usr/tests/include/sys/t_bootblock tests-include-tests atf
+./usr/tests/include/sys/t_tree tests-include-tests atf
./usr/tests/include/sys/t_types tests-include-tests atf
./usr/tests/include/t_bitstring tests-include-tests atf
./usr/tests/include/t_bswap tests-obsolete obsolete
@@ -1785,7 +1787,7 @@
./usr/tests/lib/libc/gen/t_nice tests-lib-tests atf
./usr/tests/lib/libc/gen/t_raise tests-lib-tests atf
./usr/tests/lib/libc/gen/t_randomid tests-lib-tests atf
-./usr/tests/lib/libc/gen/t_rbstress tests-lib-tests atf
+./usr/tests/lib/libc/gen/t_rbstress tests-obsolete obsolete
./usr/tests/lib/libc/gen/t_syslog_pthread tests-lib-tests atf
./usr/tests/lib/libc/gen/t_siginfo tests-lib-tests atf
./usr/tests/lib/libc/gen/t_ttyname tests-lib-tests atf
Index: src/tests/include/sys/Makefile
diff -u src/tests/include/sys/Makefile:1.3 src/tests/include/sys/Makefile:1.4
--- src/tests/include/sys/Makefile:1.3 Thu May 5 05:24:45 2011
+++ src/tests/include/sys/Makefile Thu May 5 13:36:05 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/05/05 05:24:45 jruoho Exp $
+# $NetBSD: Makefile,v 1.4 2011/05/05 13:36:05 jruoho Exp $
NOMAN= # defined
@@ -7,6 +7,6 @@
TESTSDIR= ${TESTSBASE}/include/sys
LDADD.t_bitops+= -lm
-TESTS_C= t_bitops t_bootblock t_types
+TESTS_C= t_bitops t_bootblock t_tree t_types
.include <bsd.test.mk>
Index: src/tests/lib/libc/gen/Makefile
diff -u src/tests/lib/libc/gen/Makefile:1.20 src/tests/lib/libc/gen/Makefile:1.21
--- src/tests/lib/libc/gen/Makefile:1.20 Thu May 5 13:22:56 2011
+++ src/tests/lib/libc/gen/Makefile Thu May 5 13:36:05 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2011/05/05 13:22:56 jruoho Exp $
+# $NetBSD: Makefile,v 1.21 2011/05/05 13:36:05 jruoho Exp $
.include <bsd.own.mk>
@@ -16,7 +16,6 @@
TESTS_C+= t_nice
TESTS_C+= t_raise
TESTS_C+= t_randomid
-TESTS_C+= t_rbstress
TESTS_C+= t_siginfo
TESTS_C+= t_syslog_pthread
TESTS_C+= t_ttyname
Added files:
Index: src/tests/include/sys/t_tree.c
diff -u /dev/null src/tests/include/sys/t_tree.c:1.1
--- /dev/null Thu May 5 13:36:06 2011
+++ src/tests/include/sys/t_tree.c Thu May 5 13:36:05 2011
@@ -0,0 +1,124 @@
+/* $NetBSD: t_tree.c,v 1.1 2011/05/05 13:36:05 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+#include <sys/tree.h>
+
+#include <atf-c.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+struct mist {
+ RB_ENTRY(mist) rbentry;
+ int key;
+};
+RB_HEAD(head, mist) tt;
+
+static int
+mistcmp(struct mist *a, struct mist *b)
+{
+#if 0
+ return (b->key - a->key); /* wrong, can overflow */
+#else
+ if (b->key > a->key)
+ return 1;
+ else if (b->key < a->key)
+ return (-1);
+ else
+ return 0;
+#endif
+}
+
+RB_PROTOTYPE(head, mist, rbentry, mistcmp)
+RB_GENERATE(head, mist, rbentry, mistcmp)
+
+static struct mist *
+addmist(int key)
+{
+ struct mist *m;
+
+ m = malloc(sizeof(struct mist));
+ m->key = key;
+ RB_INSERT(head, &tt, m);
+ return m;
+}
+
+static int
+findmist(struct mist *m)
+{
+
+ return (!!RB_FIND(head, &tt, m));
+}
+
+#define N 1000
+static int
+test(void)
+{
+ struct mist *m[N];
+ int fail, i, j;
+
+ RB_INIT(&tt);
+ fail = 0;
+ for (i = 0; i < N; i++) {
+ m[i] = addmist(random() << 1); /* use all 32 bits */
+ for (j = 0; j <= i; j++)
+ if (!findmist(m[j]))
+ fail++;
+ }
+ return fail;
+}
+
+ATF_TC(tree_rbstress);
+ATF_TC_HEAD(tree_rbstress, tc)
+{
+
+ atf_tc_set_md_var(tc, "descr", "rb-tree stress test");
+}
+
+ATF_TC_BODY(tree_rbstress, tc)
+{
+ int i, fail, f;
+
+ srandom(4711);
+ fail = 0;
+ for (i = 0; i < 10; i++) {
+ f = test();
+ if (f) {
+ atf_tc_fail_nonfatal("loop %d: %d errors\n", i, f);
+ fail += f;
+ }
+ }
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+ ATF_TP_ADD_TC(tp, tree_rbstress);
+
+ return atf_no_error();
+}
