Module Name: src
Committed By: jruoho
Date: Sat Oct 15 07:00:49 UTC 2011
Modified Files:
src/distrib/sets/lists/tests: mi
src/tests/kernel: Makefile
src/tests/lib/libc/sys: Makefile
Added Files:
src/tests/lib/libc/sys: t_sigaction.c
Removed Files:
src/tests/kernel: t_sigaction.c
Log Message:
Move the sigaction(2) test to the right place.
To generate a diff of this commit:
cvs rdiff -u -r1.408 -r1.409 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.20 -r1.21 src/tests/kernel/Makefile
cvs rdiff -u -r1.2 -r0 src/tests/kernel/t_sigaction.c
cvs rdiff -u -r1.15 -r1.16 src/tests/lib/libc/sys/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/lib/libc/sys/t_sigaction.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.408 src/distrib/sets/lists/tests/mi:1.409
--- src/distrib/sets/lists/tests/mi:1.408 Sat Oct 15 06:54:53 2011
+++ src/distrib/sets/lists/tests/mi Sat Oct 15 07:00:49 2011
@@ -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
Index: src/tests/kernel/Makefile
diff -u src/tests/kernel/Makefile:1.20 src/tests/kernel/Makefile:1.21
--- src/tests/kernel/Makefile:1.20 Sat Oct 15 06:54:53 2011
+++ src/tests/kernel/Makefile Sat Oct 15 07:00:49 2011
@@ -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_lwpctl
TESTS_C+= t_pty
TESTS_C+= t_rnd
TESTS_C+= t_extattrctl
-TESTS_C+= t_sigaction
TESTS_C+= t_filedesc
TESTS_SH= t_umount
Index: src/tests/lib/libc/sys/Makefile
diff -u src/tests/lib/libc/sys/Makefile:1.15 src/tests/lib/libc/sys/Makefile:1.16
--- src/tests/lib/libc/sys/Makefile:1.15 Sat Oct 15 06:54:52 2011
+++ src/tests/lib/libc/sys/Makefile Sat Oct 15 07:00:48 2011
@@ -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_revoke
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
Added files:
Index: src/tests/lib/libc/sys/t_sigaction.c
diff -u /dev/null src/tests/lib/libc/sys/t_sigaction.c:1.1
--- /dev/null Sat Oct 15 07:00:49 2011
+++ src/tests/lib/libc/sys/t_sigaction.c Sat Oct 15 07:00:48 2011
@@ -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)
+{
+ 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(sigaction_resethand);
+ATF_TC_HEAD(sigaction_resethand, tc)
+{
+ atf_tc_set_md_var(tc, "descr", "Checks that SA_RESETHAND works");
+}
+
+ATF_TC_BODY(sigaction_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, sigaction_noflags);
+ ATF_TP_ADD_TC(tp, sigaction_resethand);
+
+ return atf_no_error();
+}
