From 6f82d0e8f9756938f04071892206a5af85e676f0 Mon Sep 17 00:00:00 2001 From: cvs2svn Date: Fri, 13 Jul 2012 17:49:56 +0000 Subject: This commit was manufactured by cvs2git to create tag 'eric_g2k12'. --- src/regress/lib/libc/atexit/Makefile | 16 ---- src/regress/lib/libc/atexit/atexit_test.c | 140 ------------------------------ src/regress/lib/libc/atexit/invalid.ok | 4 - src/regress/lib/libc/atexit/valid.ok | 5 -- 4 files changed, 165 deletions(-) delete mode 100644 src/regress/lib/libc/atexit/Makefile delete mode 100644 src/regress/lib/libc/atexit/atexit_test.c delete mode 100644 src/regress/lib/libc/atexit/invalid.ok delete mode 100644 src/regress/lib/libc/atexit/valid.ok (limited to 'src/regress/lib/libc/atexit') diff --git a/src/regress/lib/libc/atexit/Makefile b/src/regress/lib/libc/atexit/Makefile deleted file mode 100644 index c14b3c7ac4..0000000000 --- a/src/regress/lib/libc/atexit/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# $OpenBSD: Makefile,v 1.5 2003/07/31 22:46:59 david Exp $ - -NOMAN= -PROG=atexit_test -CPPFLAGS+=-I${.CURDIR}/../../../../lib/libc -CLEANFILES+= invalid.out valid.out - -run-regress-atexit_test: ${PROG} - ./${PROG} -valid 2>${.OBJDIR}/valid.out - cmp -s ${.OBJDIR}/valid.out ${.CURDIR}/valid.ok - ./${PROG} -invalid-atexit 2>${.OBJDIR}/invalid.out - cmp -s ${.OBJDIR}/invalid.out ${.CURDIR}/invalid.ok - ./${PROG} -invalid-cleanup 2>${.OBJDIR}/invalid.out - cmp -s ${.OBJDIR}/invalid.out ${.CURDIR}/invalid.ok - -.include diff --git a/src/regress/lib/libc/atexit/atexit_test.c b/src/regress/lib/libc/atexit/atexit_test.c deleted file mode 100644 index 3dd0b62c3e..0000000000 --- a/src/regress/lib/libc/atexit/atexit_test.c +++ /dev/null @@ -1,140 +0,0 @@ -/* $OpenBSD: atexit_test.c,v 1.6 2007/09/03 14:42:44 millert Exp $ */ - -/* - * Copyright (c) 2002 Daniel Hartmeier - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - 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 COPYRIGHT HOLDERS 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 - * COPYRIGHT HOLDERS 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. - * - * Effort sponsored in part by the Defense Advanced Research Projects - * Agency (DARPA) and Air Force Research Laboratory, Air Force - * Materiel Command, USAF, under agreement number F30602-01-2-0537. - * - */ - -#include -#include -#include -#include -#include "stdlib/atexit.h" - -void handle_first(void); -void handle_middle(void); -void handle_last(void); -void handle_invalid(void); -void handle_cleanup(void); -void handle_signal(int); - -static int counter; - -int -main(int argc, char *argv[]) -{ - int i; - - if (argc != 2 || (strcmp(argv[1], "-valid") && - strcmp(argv[1], "-invalid-atexit") && - strcmp(argv[1], "-invalid-cleanup"))) { - fprintf(stderr, "%s -valid/-invalid-atexit/-invalid-cleanup\n", - argv[0]); - return (1); - } - fprintf(stderr, "main()\n"); - if (atexit(handle_last)) { - perror("atexit(handle_last) failed"); - return (1); - } - for (i = 0; i < 65535; ++i) { - if (atexit(handle_middle)) { - perror("atexit(handle_middle) failed"); - return (1); - } - } - if (atexit(handle_first)) { - perror("atexit(handle_first) failed"); - return (1); - } - /* this is supposed to segfault */ - if (!strcmp(argv[1], "-invalid-atexit")) { - signal(SIGSEGV, handle_signal); - __atexit->fns[0].fn_ptr.std_func = handle_invalid; - } else if (!strcmp(argv[1], "-invalid-cleanup")) { - struct atexit *p = __atexit; - - signal(SIGSEGV, handle_signal); - while (p != NULL && p->next != NULL) - p = p->next; - if (p == NULL) - fprintf(stderr, "p == NULL, no page found\n"); - p->fns[0].fn_ptr.std_func = handle_invalid; - } - __atexit_register_cleanup(handle_cleanup); - counter = 0; - fprintf(stderr, "main() returns\n"); - return (0); -} - -void -handle_first(void) -{ - fprintf(stderr, "handle_first() counter == %i\n", counter); -} - -void -handle_middle(void) -{ - counter++; -} - -void -handle_last(void) -{ - fprintf(stderr, "handle_last() counter == %i\n", counter); -} - -void -handle_cleanup(void) -{ - fprintf(stderr, "handle_cleanup()\n"); -} - -void -handle_invalid(void) -{ - fprintf(stderr, "handle_invalid() THIS SHOULD HAVE SEGFAULTED INSTEAD!\n"); -} - -void -handle_signal(int sigraised) -{ - switch (sigraised) { - case SIGSEGV: - fprintf(stderr, "SIGSEGV\n"); - exit(0); - default: - fprintf(stderr, "unexpected signal caught\n"); - exit(1); - } -} diff --git a/src/regress/lib/libc/atexit/invalid.ok b/src/regress/lib/libc/atexit/invalid.ok deleted file mode 100644 index 98cbf8c1de..0000000000 --- a/src/regress/lib/libc/atexit/invalid.ok +++ /dev/null @@ -1,4 +0,0 @@ -main() -SIGSEGV -handle_first() counter == 0 -handle_last() counter == 65535 diff --git a/src/regress/lib/libc/atexit/valid.ok b/src/regress/lib/libc/atexit/valid.ok deleted file mode 100644 index 6509e827a7..0000000000 --- a/src/regress/lib/libc/atexit/valid.ok +++ /dev/null @@ -1,5 +0,0 @@ -main() -main() returns -handle_first() counter == 0 -handle_last() counter == 65535 -handle_cleanup() -- cgit v1.2.3-55-g6feb