Module Name: src
Committed By: pgoyette
Date: Thu Jan 13 01:56:44 UTC 2011
Modified Files:
src/tests/lib/libc: Makefile
src/tests/lib/libc/net: Makefile
Added Files:
src/tests/lib/libc/net: h_nsd_recurse.c t_nsdispatch.sh
Removed Files:
src/tests/lib/libc: h_nsd_recurse.c t_nsdispatch.sh
Log Message:
The nsdispatch test belongs in libc/net and not in libc
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/tests/lib/libc/Makefile
cvs rdiff -u -r1.1 -r0 src/tests/lib/libc/h_nsd_recurse.c \
src/tests/lib/libc/t_nsdispatch.sh
cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libc/net/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/lib/libc/net/h_nsd_recurse.c \
src/tests/lib/libc/net/t_nsdispatch.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libc/Makefile
diff -u src/tests/lib/libc/Makefile:1.32 src/tests/lib/libc/Makefile:1.33
--- src/tests/lib/libc/Makefile:1.32 Thu Jan 13 00:14:10 2011
+++ src/tests/lib/libc/Makefile Thu Jan 13 01:56:44 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2011/01/13 00:14:10 pgoyette Exp $
+# $NetBSD: Makefile,v 1.33 2011/01/13 01:56:44 pgoyette Exp $
.include <bsd.own.mk>
.include <bsd.sys.mk>
@@ -22,14 +22,4 @@
TESTS_C+= t_ptm
TESTS_C+= t_randomid
-TESTS_SH+= t_nsdispatch
-
-BINDIR= ${TESTSDIR}
-MKMAN= no
-
-PROGS+= h_nsd_recurse
-
-LDADD.h_nsd_recurse+= -lpthread
-LDADD.t_mktime+= -lpthread
-
.include <bsd.test.mk>
Index: src/tests/lib/libc/net/Makefile
diff -u src/tests/lib/libc/net/Makefile:1.2 src/tests/lib/libc/net/Makefile:1.3
--- src/tests/lib/libc/net/Makefile:1.2 Wed Jan 12 17:32:27 2011
+++ src/tests/lib/libc/net/Makefile Thu Jan 13 01:56:44 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/01/12 17:32:27 pgoyette Exp $
+# $NetBSD: Makefile,v 1.3 2011/01/13 01:56:44 pgoyette Exp $
.include <bsd.own.mk>
@@ -8,12 +8,16 @@
TESTSDIR= ${TESTSBASE}/lib/libc/net
+TESTS_SH+= t_nsdispatch
TESTS_SH+= t_protoent
TESTS_SH+= t_servent
BINDIR= ${TESTSDIR}
+PROGS+= h_nsd_recurse
PROGS+= h_protoent
PROGS+= h_servent
+LDADD.h_nsd_dispatch+= -lpthread
+
.include <bsd.test.mk>
Added files:
Index: src/tests/lib/libc/net/h_nsd_recurse.c
diff -u /dev/null src/tests/lib/libc/net/h_nsd_recurse.c:1.1
--- /dev/null Thu Jan 13 01:56:44 2011
+++ src/tests/lib/libc/net/h_nsd_recurse.c Thu Jan 13 01:56:44 2011
@@ -0,0 +1,107 @@
+/* $NetBSD: h_nsd_recurse.c,v 1.1 2011/01/13 01:56:44 pgoyette Exp $ */
+
+/*-
+ * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jason R. Thorpe.
+ *
+ * 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) 2008\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: h_nsd_recurse.c,v 1.1 2011/01/13 01:56:44 pgoyette Exp $");
+
+#define _REENTRANT
+
+#include <assert.h>
+#include <nsswitch.h>
+#include <pthread.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+static const ns_src testsrc[] = {
+ { "test", NS_SUCCESS },
+ { 0 }
+};
+
+static int
+func3(void *rv, void *cb_data, va_list ap)
+{
+ (void)printf("func3: enter\n");
+ (void)printf("func3: exit\n");
+
+ return NS_SUCCESS;
+}
+
+static int
+func2(void *rv, void *cb_data, va_list ap)
+{
+ static const ns_dtab dtab[] = {
+ { "test", func3, NULL },
+ { 0 }
+ };
+ int r;
+
+ (void)printf("func2: enter\n");
+ r = nsdispatch(NULL, dtab, "test", "test", testsrc);
+ (void)printf("func2: exit\n");
+
+ return r;
+}
+
+static int
+func1(void)
+{
+ static const ns_dtab dtab[] = {
+ { "test", func2, NULL },
+ { 0 }
+ };
+ int r;
+
+ (void)printf("func1: enter\n");
+ r = nsdispatch(NULL, dtab, "test", "test", testsrc);
+ (void)printf("func1: exit\n");
+
+ return r;
+}
+
+static void *
+thrfunc(void *arg)
+{
+ pthread_exit(NULL);
+}
+
+int
+main(int argc, char *argv[])
+{
+ pthread_t thr;
+ void *threval;
+
+ assert(pthread_create(&thr, NULL, thrfunc, NULL) == 0);
+ assert(func1() == NS_SUCCESS);
+ assert(pthread_join(thr, &threval) == 0);
+}
Index: src/tests/lib/libc/net/t_nsdispatch.sh
diff -u /dev/null src/tests/lib/libc/net/t_nsdispatch.sh:1.1
--- /dev/null Thu Jan 13 01:56:44 2011
+++ src/tests/lib/libc/net/t_nsdispatch.sh Thu Jan 13 01:56:44 2011
@@ -0,0 +1,51 @@
+# $NetBSD: t_nsdispatch.sh,v 1.1 2011/01/13 01:56:44 pgoyette Exp $
+#
+# Copyright (c) 2008 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.
+#
+
+atf_test_case recurse
+recurse_head()
+{
+ atf_set "descr" "Checks recursive calls to nsdispatch()" \
+ "within threaded program"
+}
+recurse_body()
+{
+ cat >exp <<EOF
+func1: enter
+func2: enter
+func3: enter
+func3: exit
+func2: exit
+func1: exit
+EOF
+
+ atf_check -o file:exp "$(atf_get_srcdir)/h_nsd_recurse"
+}
+
+atf_init_test_cases()
+{
+ atf_add_test_case recurse
+}
