Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Move the sigaction(2) test to the right place.
details: https://anonhg.NetBSD.org/src/rev/53f5bbbcbbd7
branches: trunk
changeset: 770382:53f5bbbcbbd7
user: jruoho <jruoho%NetBSD.org@localhost>
date: Sat Oct 15 07:00:48 2011 +0000
description:
Move the sigaction(2) test to the right place.
diffstat:
distrib/sets/lists/tests/mi | 8 +-
tests/kernel/Makefile | 3 +-
tests/kernel/t_sigaction.c | 125 --------------------------------------
tests/lib/libc/sys/Makefile | 3 +-
tests/lib/libc/sys/t_sigaction.c | 128 +++++++++++++++++++++++++++++++++++++++
5 files changed, 136 insertions(+), 131 deletions(-)
diffs (truncated from 338 to 300 lines):
diff -r 7567e93d2760 -r 53f5bbbcbbd7 distrib/sets/lists/tests/mi
--- a/distrib/sets/lists/tests/mi Sat Oct 15 06:54:52 2011 +0000
+++ b/distrib/sets/lists/tests/mi Sat Oct 15 07:00:48 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.408 2011/10/15 06:54:53 jruoho Exp $
+# $NetBSD: mi,v 1.409 2011/10/15 07:00:49 jruoho Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -331,7 +331,7 @@
./usr/libdata/debug/usr/tests/kernel/t_posix_fadvise.debug tests-obsolete obsolete
./usr/libdata/debug/usr/tests/kernel/t_pty.debug tests-kernel-tests debug,atf
./usr/libdata/debug/usr/tests/kernel/t_rnd.debug tests-kernel-tests debug,atf
-./usr/libdata/debug/usr/tests/kernel/t_sigaction.debug tests-kernel-tests debug,atf
+./usr/libdata/debug/usr/tests/kernel/t_sigaction.debug tests-obsolete obsolete
./usr/libdata/debug/usr/tests/kernel/t_time.debug tests-obsolete obsolete
./usr/libdata/debug/usr/tests/kernel/t_ucontext.debug tests-obsolete obsolete
./usr/libdata/debug/usr/tests/kernel/t_writev.debug tests-obsolete obsolete
@@ -519,6 +519,7 @@
./usr/libdata/debug/usr/tests/lib/libc/sys/t_select.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libc/sys/t_setrlimit.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libc/sys/t_setuid.debug tests-lib-debug debug,atf
+./usr/libdata/debug/usr/tests/lib/libc/sys/t_sigaction.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libc/sys/t_sigqueue.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libc/sys/t_stat.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libc/sys/t_timer_create.debug tests-lib-debug debug,atf
@@ -1861,7 +1862,7 @@
./usr/tests/kernel/t_ps_strings tests-kernel-tests atf
./usr/tests/kernel/t_pty tests-kernel-tests atf
./usr/tests/kernel/t_rnd tests-kernel-tests atf
-./usr/tests/kernel/t_sigaction tests-kernel-tests atf
+./usr/tests/kernel/t_sigaction tests-obsolete obsolete
./usr/tests/kernel/t_time tests-obsolete obsolete
./usr/tests/kernel/t_ucontext tests-obsolete obsolete
./usr/tests/kernel/t_umount tests-kernel-tests atf
@@ -2137,6 +2138,7 @@
./usr/tests/lib/libc/sys/t_select tests-lib-tests atf
./usr/tests/lib/libc/sys/t_setrlimit tests-lib-tests atf
./usr/tests/lib/libc/sys/t_setuid tests-lib-tests atf
+./usr/tests/lib/libc/sys/t_sigaction tests-lib-tests atf
./usr/tests/lib/libc/sys/t_sigqueue tests-lib-tests atf
./usr/tests/lib/libc/sys/t_stat tests-lib-tests atf
./usr/tests/lib/libc/sys/t_timer_create tests-lib-tests atf
diff -r 7567e93d2760 -r 53f5bbbcbbd7 tests/kernel/Makefile
--- a/tests/kernel/Makefile Sat Oct 15 06:54:52 2011 +0000
+++ b/tests/kernel/Makefile Sat Oct 15 07:00:48 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2011/10/15 06:54:53 jruoho Exp $
+# $NetBSD: Makefile,v 1.21 2011/10/15 07:00:49 jruoho Exp $
NOMAN= # defined
@@ -13,7 +13,6 @@
TESTS_C+= t_pty
TESTS_C+= t_rnd
TESTS_C+= t_extattrctl
-TESTS_C+= t_sigaction
TESTS_C+= t_filedesc
TESTS_SH= t_umount
diff -r 7567e93d2760 -r 53f5bbbcbbd7 tests/kernel/t_sigaction.c
--- a/tests/kernel/t_sigaction.c Sat Oct 15 06:54:52 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,125 +0,0 @@
-/* $NetBSD: t_sigaction.c,v 1.2 2011/02/07 09:40:52 matt Exp $ */
-
-/*-
- * Copyright (c) 2010 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>
-__COPYRIGHT("@(#) Copyright (c) 2010\
- The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_sigaction.c,v 1.2 2011/02/07 09:40:52 matt Exp $");
-
-#include <sys/wait.h>
-
-#include <signal.h>
-#include <stdbool.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <atf-c.h>
-#include <atf-c/config.h>
-
-#include "../h_macros.h"
-
-static bool handler_called = false;
-
-static void
-handler(int signo)
-{
- handler_called = true;
-}
-
-static void
-sa_resethand_child(const int flags)
-{
- struct sigaction sa;
-
- sa.sa_flags = flags;
- sa.sa_handler = &handler;
- sigemptyset(&sa.sa_mask);
-
- sigaction(SIGUSR1, &sa, NULL);
- kill(getpid(), SIGUSR1);
- exit(handler_called ? EXIT_SUCCESS : EXIT_FAILURE);
-}
-
-static void
-wait_and_check_child(const pid_t pid, const char *fail_message)
-{
- int status;
-
- (void)waitpid(pid, &status, 0);
-
- if (WIFEXITED(status))
- ATF_CHECK_EQ(EXIT_SUCCESS, WEXITSTATUS(status));
- else
- atf_tc_fail("%s; raw exit status was %d", fail_message, status);
-}
-
-ATF_TC(sa_noflags);
-ATF_TC_HEAD(sa_noflags, tc)
-{
- atf_tc_set_md_var(tc, "descr", "Checks programming a signal with "
- "sigaction(2) but without any flags");
-}
-ATF_TC_BODY(sa_noflags, tc)
-{
- const pid_t pid = fork();
- if (pid == -1)
- atf_tc_fail_errno("fork(2) failed");
- else if (pid == 0)
- sa_resethand_child(0);
- else
- wait_and_check_child(pid, "Child process did not exit cleanly; "
- "it failed to process the signal");
-}
-
-ATF_TC(sa_resethand);
-ATF_TC_HEAD(sa_resethand, tc)
-{
- atf_tc_set_md_var(tc, "descr", "Checks that SA_RESETHAND works");
-}
-ATF_TC_BODY(sa_resethand, tc)
-{
- const pid_t pid = fork();
- if (pid == -1)
- atf_tc_fail_errno("fork(2) failed");
- else if (pid == 0)
- sa_resethand_child(SA_RESETHAND);
- else {
- wait_and_check_child(pid, "Child process did not exit cleanly; "
- "it either failed to process the signal or SA_RESETHAND is "
- "broken");
- }
-}
-
-ATF_TP_ADD_TCS(tp)
-{
- ATF_TP_ADD_TC(tp, sa_noflags);
- ATF_TP_ADD_TC(tp, sa_resethand);
-
- return atf_no_error();
-}
diff -r 7567e93d2760 -r 53f5bbbcbbd7 tests/lib/libc/sys/Makefile
--- a/tests/lib/libc/sys/Makefile Sat Oct 15 06:54:52 2011 +0000
+++ b/tests/lib/libc/sys/Makefile Sat Oct 15 07:00:48 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2011/10/15 06:54:52 jruoho Exp $
+# $NetBSD: Makefile,v 1.16 2011/10/15 07:00:48 jruoho Exp $
MKMAN= no
@@ -40,6 +40,7 @@
TESTS_C+= t_select
TESTS_C+= t_setrlimit
TESTS_C+= t_setuid
+TESTS_C+= t_sigaction
TESTS_C+= t_sigqueue
TESTS_C+= t_stat
TESTS_C+= t_timer_create
diff -r 7567e93d2760 -r 53f5bbbcbbd7 tests/lib/libc/sys/t_sigaction.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/lib/libc/sys/t_sigaction.c Sat Oct 15 07:00:48 2011 +0000
@@ -0,0 +1,128 @@
+/* $NetBSD: t_sigaction.c,v 1.1 2011/10/15 07:00:48 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2010 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>
+__COPYRIGHT("@(#) Copyright (c) 2010\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: t_sigaction.c,v 1.1 2011/10/15 07:00:48 jruoho Exp $");
+
+#include <sys/wait.h>
+
+#include <signal.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <atf-c.h>
+#include <atf-c/config.h>
+
+#include "../../../h_macros.h"
+
+static bool handler_called = false;
+
+static void
+handler(int signo)
+{
+ handler_called = true;
+}
+
+static void
+sa_resethand_child(const int flags)
+{
+ struct sigaction sa;
+
+ sa.sa_flags = flags;
+ sa.sa_handler = &handler;
+ sigemptyset(&sa.sa_mask);
+
+ sigaction(SIGUSR1, &sa, NULL);
+ kill(getpid(), SIGUSR1);
+ exit(handler_called ? EXIT_SUCCESS : EXIT_FAILURE);
+}
+
+static void
+wait_and_check_child(const pid_t pid, const char *fail_message)
+{
+ int status;
+
+ (void)waitpid(pid, &status, 0);
+
+ if (WIFEXITED(status))
+ ATF_CHECK_EQ(EXIT_SUCCESS, WEXITSTATUS(status));
+ else
+ atf_tc_fail("%s; raw exit status was %d", fail_message, status);
+}
+
+ATF_TC(sigaction_noflags);
+ATF_TC_HEAD(sigaction_noflags, tc)
+{
+ atf_tc_set_md_var(tc, "descr", "Checks programming a signal with "
+ "sigaction(2) but without any flags");
+}
+
+ATF_TC_BODY(sigaction_noflags, tc)
+{
Home |
Main Index |
Thread Index |
Old Index