Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Moving more tests out of regress and into atf mainstream
details: https://anonhg.NetBSD.org/src/rev/7f0e7f4630fc
branches: trunk
changeset: 760227:7f0e7f4630fc
user: pgoyette <pgoyette%NetBSD.org@localhost>
date: Fri Dec 31 14:36:10 2010 +0000
description:
Moving more tests out of regress and into atf mainstream
diffstat:
distrib/sets/lists/tests/mi | 14 ++-
tests/lib/libc/Makefile | 8 +-
tests/lib/libc/t_clone.c | 262 ++++++++++++++++++++++++++++++++++++++++++++
tests/lib/libc/t_context.c | 102 +++++++++++++++++
tests/lib/libc/t_hsearch.c | 249 +++++++++++++++++++++++++++++++++++++++++
tests/lib/libc/t_inet.c | 98 ++++++++++++++++
tests/lib/libc/t_ptm.c | 174 +++++++++++++++++++++++++++++
tests/lib/libc/t_strptime.c | 252 ++++++++++++++++++++++++++++++++++++++++++
8 files changed, 1157 insertions(+), 2 deletions(-)
diffs (truncated from 1226 to 300 lines):
diff -r fe8843bff17d -r 7f0e7f4630fc distrib/sets/lists/tests/mi
--- a/distrib/sets/lists/tests/mi Fri Dec 31 14:05:15 2010 +0000
+++ b/distrib/sets/lists/tests/mi Fri Dec 31 14:36:10 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.198 2010/12/31 04:08:32 pgoyette Exp $
+# $NetBSD: mi,v 1.199 2010/12/31 14:36:10 pgoyette Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -367,9 +367,15 @@
./usr/libdata/debug/usr/tests/lib/libc/string/t_string.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libc/string/t_stresep.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libc/string/t_swab.debug tests-lib-debug debug,atf
+./usr/libdata/debug/usr/tests/lib/libc/t_clone.debug tests-lib-debug debug,atf
+./usr/libdata/debug/usr/tests/lib/libc/t_context.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libc/t_convfp.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libc/t_gdtoa.debug tests-lib-debug debug,atf
+./usr/libdata/debug/usr/tests/lib/libc/t_hsearch.debug tests-lib-debug debug,atf
+./usr/libdata/debug/usr/tests/lib/libc/t_inet.debug tests-lib-debug debug,atf
+./usr/libdata/debug/usr/tests/lib/libc/t_ptm.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libc/t_randomid.debug tests-lib-debug debug,atf
+./usr/libdata/debug/usr/tests/lib/libc/t_strptime.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libdes tests-lib-debug
./usr/libdata/debug/usr/tests/lib/libdes/t_des.debug tests-lib-debug debug,atf,crypto
./usr/libdata/debug/usr/tests/lib/semaphore tests-lib-debug
@@ -1629,9 +1635,15 @@
./usr/tests/lib/libc/string/t_string tests-lib-tests atf
./usr/tests/lib/libc/string/t_stresep tests-lib-tests atf
./usr/tests/lib/libc/string/t_swab tests-lib-tests atf
+./usr/tests/lib/libc/t_clone tests-lib-tests atf
+./usr/tests/lib/libc/t_context tests-lib-tests atf
./usr/tests/lib/libc/t_convfp tests-lib-tests atf
./usr/tests/lib/libc/t_gdtoa tests-lib-tests atf
+./usr/tests/lib/libc/t_hsearch tests-lib-tests atf
+./usr/tests/lib/libc/t_inet tests-lib-tests atf
+./usr/tests/lib/libc/t_ptm tests-lib-tests atf
./usr/tests/lib/libc/t_randomid tests-lib-tests atf
+./usr/tests/lib/libc/t_strptime tests-lib-tests atf
./usr/tests/lib/libdes tests-lib-tests
./usr/tests/lib/libdes/Atffile tests-lib-tests atf,crypto
./usr/tests/lib/libdes/t_des tests-lib-tests atf,crypto
diff -r fe8843bff17d -r 7f0e7f4630fc tests/lib/libc/Makefile
--- a/tests/lib/libc/Makefile Fri Dec 31 14:05:15 2010 +0000
+++ b/tests/lib/libc/Makefile Fri Dec 31 14:36:10 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2010/12/31 05:05:43 pgoyette Exp $
+# $NetBSD: Makefile,v 1.15 2010/12/31 14:36:11 pgoyette Exp $
.include <bsd.own.mk>
.include <bsd.sys.mk>
@@ -11,8 +11,14 @@
TESTSDIR= ${TESTSBASE}/lib/libc
+TESTS_C+= t_clone
+TESTS_C+= t_context
TESTS_C+= t_convfp
TESTS_C+= t_gdtoa
+TESTS_C+= t_hsearch
+TESTS_C+= t_inet
+TESTS_C+= t_ptm
TESTS_C+= t_randomid
+TESTS_C+= t_strptime
.include <bsd.test.mk>
diff -r fe8843bff17d -r 7f0e7f4630fc tests/lib/libc/t_clone.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/lib/libc/t_clone.c Fri Dec 31 14:36:10 2010 +0000
@@ -0,0 +1,262 @@
+/* $NetBSD: t_clone.c,v 1.1 2010/12/31 14:36:11 pgoyette Exp $ */
+
+/*-
+ * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jason R. Thorpe.
+ *
+ * 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>
+__COPYRIGHT("@(#) Copyright (c) 2008\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: t_clone.c,v 1.1 2010/12/31 14:36:11 pgoyette Exp $");
+
+#include <sys/mman.h>
+#include <sys/resource.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+
+#include <errno.h>
+#include <sched.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <atf-c.h>
+
+#define STACKSIZE (8 * 1024)
+#define FROBVAL 41973
+#define CHILDEXIT 0xa5
+
+/*
+ * return 1 if the stack grows down, 0 if it grows up.
+ */
+static int
+stackdir(void *p)
+{
+ int val;
+ void *q = &val;
+
+ return p < q ? 0 : 1;
+}
+
+static int
+dummy(void *arg)
+{
+
+ return 0;
+}
+
+ATF_TC(clone);
+
+ATF_TC_HEAD(clone, tc)
+{
+
+ atf_tc_set_md_var(tc, "descr", "Checks clone(2)");
+}
+
+static int
+clone_func(void *arg)
+{
+ long *frobp = arg, diff;
+
+ printf("child: stack ~= %p, frobme = %p\n", &frobp, frobp);
+ fflush(stdout);
+
+ if (frobp[0] != getppid())
+ return 1;
+
+ if (frobp[0] == getpid())
+ return 2;
+
+ diff = labs(frobp[1] - (long) &frobp);
+
+ if (diff > 1024)
+ return 3;
+
+ frobp[1] = FROBVAL;
+
+ return (CHILDEXIT);
+}
+
+ATF_TC_BODY(clone, tc)
+{
+ sigset_t mask;
+ void *allocstack, *stack;
+ pid_t pid;
+ volatile long frobme[2];
+ int stat;
+
+ allocstack = mmap(NULL, STACKSIZE, PROT_READ|PROT_WRITE|PROT_EXEC,
+ MAP_PRIVATE|MAP_ANON, -1, (off_t) 0);
+
+ ATF_REQUIRE_ERRNO(errno, allocstack != MAP_FAILED);
+
+ stack = (caddr_t) allocstack + STACKSIZE * stackdir(&stat);
+
+ printf("parent: stack = %p, frobme = %p\n", stack, frobme);
+ fflush(stdout);
+
+ frobme[0] = (long)getpid();
+ frobme[1] = (long)stack;
+
+ sigemptyset(&mask);
+ sigaddset(&mask, SIGUSR1);
+
+ ATF_REQUIRE_ERRNO(errno, sigprocmask(SIG_BLOCK, &mask, NULL) != -1);
+
+ switch (pid = __clone(clone_func, stack,
+ CLONE_VM|CLONE_FS|CLONE_FILES|CLONE_SIGHAND|SIGUSR1,
+ __UNVOLATILE(frobme))) {
+ case 0:
+ atf_tc_fail("clone() returned 0");
+ /*NOTREACHED*/
+ case -1:
+ atf_tc_fail("clone() failed: %s", strerror(errno));
+ /*NOTREACHED*/
+ default:
+ while (waitpid(pid, &stat, __WCLONE) != pid)
+ continue;
+ }
+
+ ATF_REQUIRE_MSG(WIFEXITED(stat) != 0, "child didn't exit");
+
+ printf("parent: childexit = 0x%x, frobme = %ld\n",
+ WEXITSTATUS(stat), frobme[1]);
+
+ switch (WEXITSTATUS(stat)) {
+ case CHILDEXIT:
+ ATF_REQUIRE_EQ(frobme[1], FROBVAL);
+ break;
+ case 1:
+ atf_tc_fail("child: argument does not contain parent's pid");
+ /*NOTREACHED*/
+ case 2:
+ atf_tc_fail("child: called in parent's pid");
+ /*NOTREACHED*/
+ case 3:
+ atf_tc_fail("child: called with bad stack");
+ /*NOTREACHED*/
+ default:
+ atf_tc_fail("child returned unknown code: %d",
+ WEXITSTATUS(stat));
+ /*NOTREACHED*/
+ }
+
+ ATF_REQUIRE_ERRNO(errno, munmap(allocstack, STACKSIZE) != -1);
+}
+
+ATF_TC(null_stack);
+
+ATF_TC_HEAD(null_stack, tc)
+{
+
+ atf_tc_set_md_var(tc, "descr",
+ "Checks that clone(2) fails when stack pointer is NULL");
+}
+
+ATF_TC_BODY(null_stack, tc)
+{
+ int rv;
+
+ rv = __clone(dummy, NULL,
+ CLONE_VM|CLONE_FS|CLONE_FILES|CLONE_SIGHAND|SIGCHLD, NULL);
+
+ ATF_REQUIRE_EQ(rv, -1);
+ ATF_REQUIRE_EQ(errno, EINVAL);
+}
+
+ATF_TC(null_func);
+
+ATF_TC_HEAD(null_func, tc)
+{
+
+ atf_tc_set_md_var(tc, "descr",
+ "Checks that clone(2) fails when function pointer is NULL");
+}
+
+ATF_TC_BODY(null_func, tc)
+{
+ void *allocstack, *stack;
+ int rv, stat;
+
+ allocstack = mmap(NULL, STACKSIZE, PROT_READ|PROT_WRITE|PROT_EXEC,
+ MAP_PRIVATE|MAP_ANON, -1, (off_t) 0);
+ ATF_REQUIRE_ERRNO(errno, allocstack != MAP_FAILED);
+ stack = (caddr_t) allocstack + STACKSIZE * stackdir(&stat);
+
+ errno = 0;
+ rv = __clone(0, stack,
+ CLONE_VM|CLONE_FS|CLONE_FILES|CLONE_SIGHAND|SIGCHLD, NULL);
+
+ ATF_REQUIRE_EQ(rv, -1);
+ ATF_REQUIRE_EQ(errno, EINVAL);
+
+ ATF_REQUIRE_ERRNO(errno, munmap(allocstack, STACKSIZE) != -1);
+}
+
+ATF_TC(out_of_proc);
+
+ATF_TC_HEAD(out_of_proc, tc)
+{
+
+ atf_tc_set_md_var(tc, "descr",
+ "Checks that clone(2) fails when running out of processes");
+ atf_tc_set_md_var(tc, "require.user", "unprivileged");
+}
Home |
Main Index |
Thread Index |
Old Index