Module Name:    src
Committed By:   jruoho
Date:           Mon Apr  4 08:19:08 UTC 2011

Modified Files:
        src/distrib/sets/lists/tests: mi
        src/tests/syscall: Makefile
Added Files:
        src/tests/syscall: t_getsid.c

Log Message:
Add some basic tests also for getsid(2).


To generate a diff of this commit:
cvs rdiff -u -r1.286 -r1.287 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.15 -r1.16 src/tests/syscall/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/syscall/t_getsid.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.286 src/distrib/sets/lists/tests/mi:1.287
--- src/distrib/sets/lists/tests/mi:1.286	Mon Apr  4 06:48:04 2011
+++ src/distrib/sets/lists/tests/mi	Mon Apr  4 08:19:08 2011
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.286 2011/04/04 06:48:04 jruoho Exp $
+# $NetBSD: mi,v 1.287 2011/04/04 08:19:08 jruoho Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -569,6 +569,7 @@
 ./usr/libdata/debug/usr/tests/syscall/t_dup.debug			tests-syscall-debug	debug,atf
 ./usr/libdata/debug/usr/tests/syscall/t_fsync.debug			tests-syscall-debug	debug,atf
 ./usr/libdata/debug/usr/tests/syscall/t_getpid.debug			tests-syscall-debug	debug,atf
+./usr/libdata/debug/usr/tests/syscall/t_getsid.debug			tests-syscall-debug	debug,atf
 ./usr/libdata/debug/usr/tests/syscall/t_mmap.debug			tests-syscall-debug	debug,atf
 ./usr/libdata/debug/usr/tests/syscall/t_mprotect.debug			tests-syscall-debug	debug,atf
 ./usr/libdata/debug/usr/tests/syscall/t_timer.debug			tests-syscall-debug	debug,atf
@@ -2112,6 +2113,7 @@
 ./usr/tests/syscall/t_dup			tests-syscall-tests	atf
 ./usr/tests/syscall/t_fsync			tests-syscall-tests	atf
 ./usr/tests/syscall/t_getpid			tests-syscall-tests	atf
+./usr/tests/syscall/t_getsid			tests-syscall-tests	atf
 ./usr/tests/syscall/t_mmap			tests-syscall-tests	atf
 ./usr/tests/syscall/t_mprotect			tests-syscall-tests	atf
 ./usr/tests/syscall/t_timer			tests-syscall-tests	atf

Index: src/tests/syscall/Makefile
diff -u src/tests/syscall/Makefile:1.15 src/tests/syscall/Makefile:1.16
--- src/tests/syscall/Makefile:1.15	Mon Apr  4 08:05:37 2011
+++ src/tests/syscall/Makefile	Mon Apr  4 08:19:08 2011
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.15 2011/04/04 08:05:37 jruoho Exp $
+# $NetBSD: Makefile,v 1.16 2011/04/04 08:19:08 jruoho Exp $
 
 .include <bsd.own.mk>
 
 TESTSDIR=	${TESTSBASE}/syscall
 
-TESTS_C+=	t_access t_cmsg t_dup t_fsync t_getpid
+TESTS_C+=	t_access t_cmsg t_dup t_fsync t_getpid t_getsid
 TESTS_C+=	t_mmap t_mprotect t_timer
 
 LDADD.t_getpid+=-lpthread

Added files:

Index: src/tests/syscall/t_getsid.c
diff -u /dev/null src/tests/syscall/t_getsid.c:1.1
--- /dev/null	Mon Apr  4 08:19:08 2011
+++ src/tests/syscall/t_getsid.c	Mon Apr  4 08:19:08 2011
@@ -0,0 +1,119 @@
+/* $NetBSD: t_getsid.c,v 1.1 2011/04/04 08:19:08 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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_getsid.c,v 1.1 2011/04/04 08:19:08 jruoho Exp $");
+
+#include <sys/wait.h>
+
+#include <errno.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#include <atf-c.h>
+
+ATF_TC(getsid_current);
+ATF_TC_HEAD(getsid_current, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test getsid(0)");
+}
+
+ATF_TC_BODY(getsid_current, tc)
+{
+	pid_t sid;
+
+	sid = getsid(0);
+	ATF_REQUIRE(sid != -1);
+
+	if (sid != getsid(getpid()))
+		atf_tc_fail("getsid(0) did not match the calling process");
+}
+
+ATF_TC(getsid_err);
+ATF_TC_HEAD(getsid_err, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test error conditions in getsid(2)");
+}
+
+ATF_TC_BODY(getsid_err, tc)
+{
+
+	errno = 0;
+
+	ATF_REQUIRE(getsid(-1) == -1);
+	ATF_REQUIRE(errno == ESRCH);
+}
+
+ATF_TC(getsid_process);
+ATF_TC_HEAD(getsid_process, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test getsid(2) with processes");
+}
+
+ATF_TC_BODY(getsid_process, tc)
+{
+	pid_t csid, pid, ppid, sid;
+	int sta;
+
+	sid = getsid(0);
+	pid = fork();
+
+	ATF_REQUIRE(pid >= 0);
+	ATF_REQUIRE(sid != -1);
+
+	if (pid == 0) {
+
+		csid = getsid(0);
+		ppid = getppid();
+
+		if (sid != csid)
+			exit(EXIT_FAILURE);
+
+		if (getsid(ppid) != csid)
+			exit(EXIT_FAILURE);
+
+		exit(EXIT_SUCCESS);
+	}
+
+	(void)wait(&sta);
+
+	if (WIFEXITED(sta) == 0 || WEXITSTATUS(sta) != EXIT_SUCCESS)
+		atf_tc_fail("invalid session ID");
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, getsid_current);
+	ATF_TP_ADD_TC(tp, getsid_err);
+	ATF_TP_ADD_TC(tp, getsid_process);
+
+	return atf_no_error();
+}

Reply via email to