Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/tests/lib/libc Put the atexit test where it belongs - in lib...
details: https://anonhg.NetBSD.org/src/rev/5849be78c4eb
branches: trunk
changeset: 760757:5849be78c4eb
user: pgoyette <pgoyette%NetBSD.org@localhost>
date: Wed Jan 12 19:44:07 2011 +0000
description:
Put the atexit test where it belongs - in libc/stdlib/
diffstat:
tests/lib/libc/Makefile | 4 +-
tests/lib/libc/h_atexit.c | 178 --------------------------------------
tests/lib/libc/stdlib/Makefile | 4 +-
tests/lib/libc/stdlib/h_atexit.c | 178 ++++++++++++++++++++++++++++++++++++++
tests/lib/libc/stdlib/t_atexit.sh | 54 +++++++++++
tests/lib/libc/t_atexit.sh | 54 -----------
6 files changed, 236 insertions(+), 236 deletions(-)
diffs (truncated from 527 to 300 lines):
diff -r a0581a88cd98 -r 5849be78c4eb tests/lib/libc/Makefile
--- a/tests/lib/libc/Makefile Wed Jan 12 19:31:39 2011 +0000
+++ b/tests/lib/libc/Makefile Wed Jan 12 19:44:07 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2011/01/12 17:32:27 pgoyette Exp $
+# $NetBSD: Makefile,v 1.31 2011/01/12 19:44:07 pgoyette Exp $
.include <bsd.own.mk>
.include <bsd.sys.mk>
@@ -24,13 +24,11 @@
TESTS_C+= t_randomid
TESTS_C+= t_strptime
-TESTS_SH+= t_atexit
TESTS_SH+= t_nsdispatch
BINDIR= ${TESTSDIR}
MKMAN= no
-PROGS+= h_atexit
PROGS+= h_nsd_recurse
LDADD.h_nsd_recurse+= -lpthread
diff -r a0581a88cd98 -r 5849be78c4eb tests/lib/libc/h_atexit.c
--- a/tests/lib/libc/h_atexit.c Wed Jan 12 19:31:39 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,178 +0,0 @@
-/* $NetBSD: h_atexit.c,v 1.1 2011/01/03 19:01:47 pgoyette Exp $ */
-
-/*-
- * Copyright (c) 2011 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code was 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) 2011\
- The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: h_atexit.c,v 1.1 2011/01/03 19:01:47 pgoyette Exp $");
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <signal.h>
-#include <string.h>
-#include <unistd.h>
-
-extern int __cxa_atexit(void (*func)(void *), void *, void *);
-extern void __cxa_finalize(void *);
-
-static int dso_handle_1;
-static int dso_handle_2;
-static int dso_handle_3;
-
-static int arg_1;
-static int arg_2;
-static int arg_3;
-
-static int exiting_state;
-
-#define ASSERT(expr) \
-do { \
- if ((expr) == 0) { \
- write(STDERR_FILENO, __func__, strlen(__func__)); \
- write(STDERR_FILENO, ": ", 2); \
- write(STDERR_FILENO, __STRING(expr), \
- strlen(__STRING(expr))); \
- write(STDERR_FILENO, "\n", 1); \
- my_abort(); \
- } \
-} while (/*CONSTCOND*/0)
-
-#define SUCCESS() \
-do { \
- write(STDOUT_FILENO, __func__, strlen(__func__)); \
- write(STDOUT_FILENO, "\n", 1); \
-} while (/*CONSTCOND*/0)
-
-static void
-my_abort(void)
-{
-
- kill(getpid(), SIGABRT);
- /* NOTREACHED */
-}
-
-static void
-cxa_handler_5(void *arg)
-{
- static int cxa_handler_5_called;
-
- ASSERT(arg == (void *)&arg_1);
- ASSERT(cxa_handler_5_called == 0);
- ASSERT(exiting_state == 5);
-
- exiting_state--;
- cxa_handler_5_called = 1;
- SUCCESS();
-}
-
-static void
-cxa_handler_4(void *arg)
-{
- static int cxa_handler_4_called;
-
- ASSERT(arg == (void *)&arg_1);
- ASSERT(cxa_handler_4_called == 0);
- ASSERT(exiting_state == 4);
-
- exiting_state--;
- cxa_handler_4_called = 1;
- SUCCESS();
-}
-
-static void
-cxa_handler_3(void *arg)
-{
- static int cxa_handler_3_called;
-
- ASSERT(arg == (void *)&arg_2);
- ASSERT(cxa_handler_3_called == 0);
- ASSERT(exiting_state == 3);
-
- exiting_state--;
- cxa_handler_3_called = 1;
- SUCCESS();
-}
-
-static void
-cxa_handler_2(void *arg)
-{
- static int cxa_handler_2_called;
-
- ASSERT(arg == (void *)&arg_3);
- ASSERT(cxa_handler_2_called == 0);
- ASSERT(exiting_state == 2);
-
- exiting_state--;
- cxa_handler_2_called = 1;
- SUCCESS();
-}
-
-static void
-normal_handler_1(void)
-{
- static int normal_handler_1_called;
-
- ASSERT(normal_handler_1_called == 0);
- ASSERT(exiting_state == 1);
-
- exiting_state--;
- normal_handler_1_called = 1;
- SUCCESS();
-}
-
-static void
-normal_handler_0(void)
-{
- static int normal_handler_0_called;
-
- ASSERT(normal_handler_0_called == 0);
- ASSERT(exiting_state == 0);
-
- normal_handler_0_called = 1;
- SUCCESS();
-}
-
-int
-main(int argc, char *argv[])
-{
-
- exiting_state = 5;
-
- ASSERT(0 == atexit(normal_handler_0));
- ASSERT(0 == atexit(normal_handler_1));
- ASSERT(0 == __cxa_atexit(cxa_handler_4, &arg_1, &dso_handle_1));
- ASSERT(0 == __cxa_atexit(cxa_handler_5, &arg_1, &dso_handle_1));
- ASSERT(0 == __cxa_atexit(cxa_handler_3, &arg_2, &dso_handle_2));
- ASSERT(0 == __cxa_atexit(cxa_handler_2, &arg_3, &dso_handle_3));
-
- __cxa_finalize(&dso_handle_1);
- __cxa_finalize(&dso_handle_2);
- exit(0);
-}
diff -r a0581a88cd98 -r 5849be78c4eb tests/lib/libc/stdlib/Makefile
--- a/tests/lib/libc/stdlib/Makefile Wed Jan 12 19:31:39 2011 +0000
+++ b/tests/lib/libc/stdlib/Makefile Wed Jan 12 19:44:07 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2011/01/01 23:56:49 pgoyette Exp $
+# $NetBSD: Makefile,v 1.8 2011/01/12 19:44:08 pgoyette Exp $
.include <bsd.own.mk>
@@ -11,12 +11,14 @@
TESTS_C+= t_posix_memalign
TESTS_C+= t_strtox
+TESTS_SH+= t_atexit
TESTS_SH+= t_getopt
MKMAN=no
BINDIR= ${TESTSDIR}
+PROGS+= h_atexit
PROGS+= h_getopt h_getopt_long
LDADD.t_environment_pth= -pthread
diff -r a0581a88cd98 -r 5849be78c4eb tests/lib/libc/stdlib/h_atexit.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/lib/libc/stdlib/h_atexit.c Wed Jan 12 19:44:07 2011 +0000
@@ -0,0 +1,178 @@
+/* $NetBSD: h_atexit.c,v 1.1 2011/01/12 19:44:08 pgoyette Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code was 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) 2011\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: h_atexit.c,v 1.1 2011/01/12 19:44:08 pgoyette Exp $");
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <signal.h>
+#include <string.h>
+#include <unistd.h>
+
+extern int __cxa_atexit(void (*func)(void *), void *, void *);
+extern void __cxa_finalize(void *);
+
+static int dso_handle_1;
+static int dso_handle_2;
+static int dso_handle_3;
+
+static int arg_1;
+static int arg_2;
+static int arg_3;
+
+static int exiting_state;
+
+#define ASSERT(expr) \
+do { \
+ if ((expr) == 0) { \
+ write(STDERR_FILENO, __func__, strlen(__func__)); \
+ write(STDERR_FILENO, ": ", 2); \
+ write(STDERR_FILENO, __STRING(expr), \
+ strlen(__STRING(expr))); \
+ write(STDERR_FILENO, "\n", 1); \
+ my_abort(); \
+ } \
+} while (/*CONSTCOND*/0)
+
+#define SUCCESS() \
Home |
Main Index |
Thread Index |
Old Index