Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/tests/kernel Add new test t_open_pr_57260



details:   https://anonhg.NetBSD.org/src/rev/ab2151776636
branches:  trunk
changeset: 374398:ab2151776636
user:      gutteridge <gutteridge%NetBSD.org@localhost>
date:      Fri Apr 21 21:50:04 2023 +0000

description:
Add new test t_open_pr_57260

New test case that reflects the fix in PR kern/57260. The majority of
work for this case itself was by riastradh@, who'd supplied the basis
for it in the ticket, and provided further guidance.

diffstat:

 distrib/sets/lists/debug/mi    |   3 +-
 distrib/sets/lists/tests/mi    |   3 +-
 tests/kernel/Makefile          |   3 +-
 tests/kernel/t_open_pr_57260.c |  98 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 104 insertions(+), 3 deletions(-)

diffs (153 lines):

diff -r b83e7289c18d -r ab2151776636 distrib/sets/lists/debug/mi
--- a/distrib/sets/lists/debug/mi       Fri Apr 21 19:29:31 2023 +0000
+++ b/distrib/sets/lists/debug/mi       Fri Apr 21 21:50:04 2023 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.396 2023/01/30 19:51:33 christos Exp $
+# $NetBSD: mi,v 1.397 2023/04/21 21:50:04 gutteridge Exp $
 ./etc/mtree/set.debug                           comp-sys-root
 ./usr/lib                                      comp-sys-usr            compatdir
 ./usr/lib/i18n/libBIG5_g.a                     comp-c-debuglib         debuglib,compatfile
@@ -1798,6 +1798,7 @@
 ./usr/libdata/debug/usr/tests/kernel/t_lwpctl.debug                    tests-obsolete          obsolete,compattestfile
 ./usr/libdata/debug/usr/tests/kernel/t_mkdir.debug                     tests-obsolete          obsolete,compattestfile
 ./usr/libdata/debug/usr/tests/kernel/t_mqueue.debug                    tests-kernel-tests      debug,atf,compattestfile
+./usr/libdata/debug/usr/tests/kernel/t_open_pr_57260.debug             tests-kernel-tests      debug,atf,compattestfile
 ./usr/libdata/debug/usr/tests/kernel/t_pipe.debug                      tests-obsolete          obsolete,compattestfile
 ./usr/libdata/debug/usr/tests/kernel/t_poll3w.debug                    tests-obsolete          obsolete,compattestfile
 ./usr/libdata/debug/usr/tests/kernel/t_pollts.debug                    tests-obsolete          obsolete,compattestfile
diff -r b83e7289c18d -r ab2151776636 distrib/sets/lists/tests/mi
--- a/distrib/sets/lists/tests/mi       Fri Apr 21 19:29:31 2023 +0000
+++ b/distrib/sets/lists/tests/mi       Fri Apr 21 21:50:04 2023 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1256 2023/03/28 20:04:51 rillig Exp $
+# $NetBSD: mi,v 1.1257 2023/04/21 21:50:05 gutteridge Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -2232,6 +2232,7 @@
 ./usr/tests/kernel/t_mkdir                             tests-obsolete          obsolete
 ./usr/tests/kernel/t_mqueue                            tests-kernel-tests      compattestfile,atf
 ./usr/tests/kernel/t_nointerpreter                     tests-kernel-tests      atf
+./usr/tests/kernel/t_open_pr_57260                     tests-kernel-tests      compattestfile,atf
 ./usr/tests/kernel/t_origin                            tests-kernel-tests      compattestfile,atf
 ./usr/tests/kernel/t_pipe                              tests-obsolete          obsolete
 ./usr/tests/kernel/t_poll3w                            tests-obsolete          obsolete
diff -r b83e7289c18d -r ab2151776636 tests/kernel/Makefile
--- a/tests/kernel/Makefile     Fri Apr 21 19:29:31 2023 +0000
+++ b/tests/kernel/Makefile     Fri Apr 21 21:50:04 2023 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.70 2021/10/01 18:18:32 martin Exp $
+# $NetBSD: Makefile,v 1.71 2023/04/21 21:50:05 gutteridge Exp $
 
 NOMAN=         # defined
 
@@ -20,6 +20,7 @@ TESTS_C+=     t_ksem
 TESTS_C+=      t_sysctl
 TESTS_C+=      t_timeleft
 TESTS_C+=      t_zombie
+TESTS_C+=      t_open_pr_57260
 
 TESTS_SH=      t_umount
 TESTS_SH+=     t_umountstress
diff -r b83e7289c18d -r ab2151776636 tests/kernel/t_open_pr_57260.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/kernel/t_open_pr_57260.c    Fri Apr 21 21:50:04 2023 +0000
@@ -0,0 +1,98 @@
+/*     $NetBSD: t_open_pr_57260.c,v 1.1 2023/04/21 21:50:05 gutteridge Exp $   */
+
+/*-
+ * Copyright (c) 2023 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ * 
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Taylor R. Campbell and David H. Gutteridge.
+ *
+ * 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>
+__RCSID("$NetBSD: t_open_pr_57260.c,v 1.1 2023/04/21 21:50:05 gutteridge Exp $");
+
+#include <sys/stat.h>
+
+#include <fcntl.h>
+#include <setjmp.h>
+#include <signal.h>
+#include <unistd.h>
+
+#include <atf-c.h>
+#include "h_macros.h"
+
+static jmp_buf env;
+static sig_atomic_t alarmed = 0;
+
+static void
+on_alarm(int sig)
+{
+
+    if (!alarmed) {
+        alarmed = 1;
+        alarm(1);
+    } else {
+        longjmp(env, 1);
+    }
+}
+
+ATF_TC(openrestartsignal);
+ATF_TC_HEAD(openrestartsignal, tc)
+{
+
+       atf_tc_set_md_var(tc, "descr", "open(2) should restart on signal "
+           "(PR kern/57260)");
+}
+
+ATF_TC_BODY(openrestartsignal, tc)
+{
+       struct sigaction sa;
+       int fd;
+
+       memset(&sa, 0, sizeof(sa));
+       sa.sa_handler = on_alarm;
+       (void)sigfillset(&sa.sa_mask);
+       sa.sa_flags = SA_RESTART;
+       if (sigaction(SIGALRM, &sa, NULL) == -1)
+               atf_tc_fail_errno("sigaction");
+
+       if (mkfifo("fifo", 0600) == -1)
+               atf_tc_fail_errno("mkfifo");
+       alarm(1);
+       if (setjmp(env))
+               /* second signal handler longjmped out */
+               return;
+       fd = open("fifo", O_RDONLY);
+       if (fd == -1)
+               atf_tc_fail_errno("open");
+       atf_tc_fail("open returned %d", fd);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+       ATF_TP_ADD_TC(tp, openrestartsignal);
+
+       return atf_no_error();
+}



Home | Main Index | Thread Index | Old Index