Module Name:    src
Committed By:   jruoho
Date:           Fri Jul 15 13:54:31 UTC 2011

Modified Files:
        src/distrib/sets/lists/tests: mi
        src/tests/lib/libc/stdlib: Makefile t_getenv.c
Added Files:
        src/tests/lib/libc/stdlib: t_getenv_thread.c

Log Message:
Split out the -lpthread tests to a separate file.

XXX: The only thing gained from this is seeing whether -lpthread breaks
     the getenv(3) family. Yet, a strict hypothesis about this would require
     that the two test files are identical, which they are not.


To generate a diff of this commit:
cvs rdiff -u -r1.375 -r1.376 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.15 -r1.16 src/tests/lib/libc/stdlib/Makefile
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libc/stdlib/t_getenv.c
cvs rdiff -u -r0 -r1.1 src/tests/lib/libc/stdlib/t_getenv_thread.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.375 src/distrib/sets/lists/tests/mi:1.376
--- src/distrib/sets/lists/tests/mi:1.375	Fri Jul 15 07:35:21 2011
+++ src/distrib/sets/lists/tests/mi	Fri Jul 15 13:54:31 2011
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.375 2011/07/15 07:35:21 jruoho Exp $
+# $NetBSD: mi,v 1.376 2011/07/15 13:54:31 jruoho Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -450,6 +450,7 @@
 ./usr/libdata/debug/usr/tests/lib/libc/stdlib/t_environment_pth.debug	tests-obsolete		obsolete
 ./usr/libdata/debug/usr/tests/lib/libc/stdlib/t_exit.debug		tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/stdlib/t_getenv.debug		tests-lib-debug		debug,atf
+./usr/libdata/debug/usr/tests/lib/libc/stdlib/t_getenv_thread.debug	tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/stdlib/t_hsearch.debug		tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/stdlib/t_mi_vector_hash.debug	tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/stdlib/t_posix_memalign.debug	tests-lib-debug		debug,atf
@@ -2033,6 +2034,7 @@
 ./usr/tests/lib/libc/stdlib/t_environment_pth	tests-obsolete		obsolete
 ./usr/tests/lib/libc/stdlib/t_exit		tests-lib-tests		atf
 ./usr/tests/lib/libc/stdlib/t_getenv		tests-lib-tests		atf
+./usr/tests/lib/libc/stdlib/t_getenv_thread	tests-lib-tests		atf
 ./usr/tests/lib/libc/stdlib/t_getopt		tests-lib-tests		atf
 ./usr/tests/lib/libc/stdlib/t_hsearch		tests-lib-tests		atf
 ./usr/tests/lib/libc/stdlib/t_mi_vector_hash	tests-lib-tests		atf

Index: src/tests/lib/libc/stdlib/Makefile
diff -u src/tests/lib/libc/stdlib/Makefile:1.15 src/tests/lib/libc/stdlib/Makefile:1.16
--- src/tests/lib/libc/stdlib/Makefile:1.15	Thu Jul  7 15:50:23 2011
+++ src/tests/lib/libc/stdlib/Makefile	Fri Jul 15 13:54:31 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2011/07/07 15:50:23 jruoho Exp $
+# $NetBSD: Makefile,v 1.16 2011/07/15 13:54:31 jruoho Exp $
 
 .include <bsd.own.mk>
 
@@ -6,6 +6,7 @@
 
 TESTS_C+=	t_div
 TESTS_C+=	t_getenv
+TESTS_C+=	t_getenv_thread
 TESTS_C+=	t_exit
 TESTS_C+=	t_hsearch
 TESTS_C+=	t_mi_vector_hash
@@ -24,7 +25,7 @@
 PROGS+=		h_getopt h_getopt_long
 
 LDADD.t_strtod=			-lm
-LDADD.t_getenv=			-pthread
+LDADD.t_getenv_thread=		-pthread
 
 COPTS+=				-ffloat-store
 

Index: src/tests/lib/libc/stdlib/t_getenv.c
diff -u src/tests/lib/libc/stdlib/t_getenv.c:1.1 src/tests/lib/libc/stdlib/t_getenv.c:1.2
--- src/tests/lib/libc/stdlib/t_getenv.c:1.1	Thu Jul  7 15:50:23 2011
+++ src/tests/lib/libc/stdlib/t_getenv.c	Fri Jul 15 13:54:31 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_getenv.c,v 1.1 2011/07/07 15:50:23 jruoho Exp $ */
+/*	$NetBSD: t_getenv.c,v 1.2 2011/07/15 13:54:31 jruoho Exp $ */
 
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -32,143 +32,16 @@
  * SUCH DAMAGE.
  */
 
-/*-
- * Copyright (c) 2010 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matthias Scheler.
- *
- * 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_getenv.c,v 1.1 2011/07/07 15:50:23 jruoho Exp $");
+__RCSID("$NetBSD: t_getenv.c,v 1.2 2011/07/15 13:54:31 jruoho Exp $");
 
 #include <atf-c.h>
 #include <errno.h>
-#include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <time.h>
-
-#define	THREADED_NUM_THREADS	8
-#define	THREADED_NUM_VARS	16
-#define	THREADED_VAR_NAME	"THREADED%zu"
-#define	THREADED_RUN_TIME	10
 
 extern char	**environ;
-static void	 *thread_getenv_r(void *);
-static void	 *thread_putenv(void *);
-static void	 *thread_setenv(void *);
-static void	 *thread_unsetenv(void *);
-
-static void *
-thread_getenv_r(void *arg)
-{
-	time_t endtime;
-
-	endtime = *(time_t *)arg;
-	do {
-		size_t i;
-		char name[32], value[128];
-
-		i = lrand48() % THREADED_NUM_VARS;
-		(void)snprintf(name, sizeof(name), THREADED_VAR_NAME, i);
-
-		if (getenv_r(name, value, sizeof(value)) == -1) {
-			ATF_CHECK(errno == ENOENT);
-		}
-	} while (time(NULL) < endtime);
-
-	return NULL;
-}
-
-
-static void *
-thread_putenv(void *arg)
-{
-	time_t endtime;
-	size_t i;
-	static char vars[THREADED_NUM_VARS][128];
-
-	for (i = 0; i < THREADED_NUM_VARS; i++) {
-		(void)snprintf(vars[i], sizeof(vars[i]),
-		    THREADED_VAR_NAME "=putenv %ld", i, lrand48());
-	}
-
-	endtime = *(time_t *)arg;
-	do {
-		char name[128];
-
-		i = lrand48() % THREADED_NUM_VARS;
-		(void)strlcpy(name, vars[i], sizeof(name));
-		*strchr(name, '=') = '\0';
-
-		ATF_CHECK(unsetenv(name) != -1);
-		ATF_CHECK(putenv(vars[i]) != -1);
-	} while (time(NULL) < endtime);
-
-	return NULL;
-}
-
-static void *
-thread_setenv(void *arg)
-{
-	time_t endtime;
-
-	endtime = *(time_t *)arg;
-	do {
-		size_t i;
-		char name[32], value[64];
-
-		i = lrand48() % THREADED_NUM_VARS;
-		(void)snprintf(name, sizeof(name), THREADED_VAR_NAME, i);
-		(void)snprintf(value, sizeof(value), "setenv %ld", lrand48());
-
-		ATF_CHECK(setenv(name, value, 1) != -1);
-	} while (time(NULL) < endtime);
-
-	return NULL;
-}
-
-static void *
-thread_unsetenv(void *arg)
-{
-	time_t endtime;
-
-	endtime = *(time_t *)arg;
-	do {
-		size_t i;
-		char name[32];
-
-		i = lrand48() % THREADED_NUM_VARS;
-		(void)snprintf(name, sizeof(name), THREADED_VAR_NAME, i);
-
-		ATF_CHECK(unsetenv(name) != -1);
-	} while (time(NULL) < endtime);
-
-	return NULL;
-}
 
 ATF_TC(clearenv_basic);
 ATF_TC_HEAD(clearenv_basic, tc)
@@ -215,36 +88,6 @@
 	ATF_CHECK(unsetenv("EVIL") != -1);
 }
 
-ATF_TC(getenv_r_thread);
-ATF_TC_HEAD(getenv_r_thread, tc)
-{
-	char timeout[32];
-
-	atf_tc_set_md_var(tc, "descr", "Test getenv_r(3) with threads");
-
-	(void)snprintf(timeout, sizeof(timeout), "%d", THREADED_RUN_TIME + 5);
-
-	atf_tc_set_md_var(tc, "timeout", timeout);
-}
-
-ATF_TC_BODY(getenv_r_thread, tc)
-{
-	pthread_t threads[THREADED_NUM_THREADS];
-	time_t endtime;
-	size_t i, j;
-
-	endtime = time(NULL) + THREADED_RUN_TIME;
-
-	for (i = j = 0; j < 2; j++) {
-
-		ATF_CHECK(pthread_create(&threads[i++], NULL, thread_getenv_r,
-		    &endtime) == 0);
-	}
-
-	for (j = 0; j < i; j++)
-		ATF_CHECK(pthread_join(threads[j], NULL) == 0);
-}
-
 ATF_TC(putenv_basic);
 ATF_TC_HEAD(putenv_basic, tc)
 {
@@ -272,36 +115,6 @@
 	ATF_CHECK_ERRNO(EINVAL, putenv(__UNCONST("=val")) == -1);
 }
 
-ATF_TC(putenv_thread);
-ATF_TC_HEAD(putenv_thread, tc)
-{
-	char timeout[32];
-
-	atf_tc_set_md_var(tc, "descr", "Test concurrent access by putenv(3)");
-
-	(void)snprintf(timeout, sizeof(timeout), "%d", THREADED_RUN_TIME + 5);
-
-	atf_tc_set_md_var(tc, "timeout", timeout);
-}
-
-ATF_TC_BODY(putenv_thread, tc)
-{
-	pthread_t threads[THREADED_NUM_THREADS];
-	time_t endtime;
-	size_t i, j;
-
-	endtime = time(NULL) + THREADED_RUN_TIME;
-
-	for (i = j = 0; j < 2; j++) {
-
-		ATF_CHECK(pthread_create(&threads[i++], NULL, thread_putenv,
-		    &endtime) == 0);
-	}
-
-	for (j = 0; j < i; j++)
-		ATF_CHECK(pthread_join(threads[j], NULL) == 0);
-}
-
 ATF_TC(setenv_basic);
 ATF_TC_HEAD(setenv_basic, tc)
 {
@@ -352,7 +165,6 @@
 	    "Test mixing setenv(3), unsetenv(3) and putenv(3)");
 }
 
-
 ATF_TC_BODY(setenv_mixed, tc)
 {
 	char string[32];
@@ -374,77 +186,14 @@
 	ATF_CHECK(getenv("mixedcrap") == NULL);
 }
 
-ATF_TC(setenv_thread);
-ATF_TC_HEAD(setenv_thread, tc)
-{
-	char timeout[32];
-
-	atf_tc_set_md_var(tc, "descr", "Test concurrent access by setenv(3)");
-
-	(void)snprintf(timeout, sizeof(timeout), "%d", THREADED_RUN_TIME + 5);
-
-	atf_tc_set_md_var(tc, "timeout", timeout);
-}
-
-ATF_TC_BODY(setenv_thread, tc)
-{
-	pthread_t threads[THREADED_NUM_THREADS];
-	time_t endtime;
-	size_t i, j;
-
-	endtime = time(NULL) + THREADED_RUN_TIME;
-
-	for (i = j = 0; j < 2; j++) {
-
-		ATF_CHECK(pthread_create(&threads[i++], NULL, thread_setenv,
-		    &endtime) == 0);
-	}
-
-	for (j = 0; j < i; j++)
-		ATF_CHECK(pthread_join(threads[j], NULL) == 0);
-}
-
-ATF_TC(unsetenv_thread);
-ATF_TC_HEAD(unsetenv_thread, tc)
-{
-	char timeout[32];
-
-	atf_tc_set_md_var(tc, "descr", "Test unsetenv(3) with threads");
-
-	(void)snprintf(timeout, sizeof(timeout), "%d", THREADED_RUN_TIME + 5);
-
-	atf_tc_set_md_var(tc, "timeout", timeout);
-}
-
-ATF_TC_BODY(unsetenv_thread, tc)
-{
-	pthread_t threads[THREADED_NUM_THREADS];
-	time_t endtime;
-	size_t i, j;
-
-	endtime = time(NULL) + THREADED_RUN_TIME;
-
-	for (i = j = 0; j < 2; j++) {
-
-		ATF_CHECK(pthread_create(&threads[i++], NULL, thread_unsetenv,
-		    &endtime) == 0);
-	}
-
-	for (j = 0; j < i; j++)
-		ATF_CHECK(pthread_join(threads[j], NULL) == 0);
-}
-
 ATF_TP_ADD_TCS(tp)
 {
+
 	ATF_TP_ADD_TC(tp, clearenv_basic);
 	ATF_TP_ADD_TC(tp, getenv_basic);
-	ATF_TP_ADD_TC(tp, getenv_r_thread);
 	ATF_TP_ADD_TC(tp, putenv_basic);
-	ATF_TP_ADD_TC(tp, putenv_thread);
 	ATF_TP_ADD_TC(tp, setenv_basic);
 	ATF_TP_ADD_TC(tp, setenv_mixed);
-	ATF_TP_ADD_TC(tp, setenv_thread);
-	ATF_TP_ADD_TC(tp, unsetenv_thread);
 
 	return atf_no_error();
 }

Added files:

Index: src/tests/lib/libc/stdlib/t_getenv_thread.c
diff -u /dev/null src/tests/lib/libc/stdlib/t_getenv_thread.c:1.1
--- /dev/null	Fri Jul 15 13:54:31 2011
+++ src/tests/lib/libc/stdlib/t_getenv_thread.c	Fri Jul 15 13:54:31 2011
@@ -0,0 +1,269 @@
+/*	$NetBSD: t_getenv_thread.c,v 1.1 2011/07/15 13:54:31 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Matthias Scheler.
+ *
+ * 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_getenv_thread.c,v 1.1 2011/07/15 13:54:31 jruoho Exp $");
+
+#include <atf-c.h>
+#include <errno.h>
+#include <pthread.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+
+#define	THREADED_NUM_THREADS	8
+#define	THREADED_NUM_VARS	16
+#define	THREADED_VAR_NAME	"THREADED%zu"
+#define	THREADED_RUN_TIME	10
+
+static void	 *thread_getenv_r(void *);
+static void	 *thread_putenv(void *);
+static void	 *thread_setenv(void *);
+static void	 *thread_unsetenv(void *);
+
+static void *
+thread_getenv_r(void *arg)
+{
+	time_t endtime;
+
+	endtime = *(time_t *)arg;
+	do {
+		size_t i;
+		char name[32], value[128];
+
+		i = lrand48() % THREADED_NUM_VARS;
+		(void)snprintf(name, sizeof(name), THREADED_VAR_NAME, i);
+
+		if (getenv_r(name, value, sizeof(value)) == -1) {
+			ATF_CHECK(errno == ENOENT);
+		}
+	} while (time(NULL) < endtime);
+
+	return NULL;
+}
+
+
+static void *
+thread_putenv(void *arg)
+{
+	time_t endtime;
+	size_t i;
+	static char vars[THREADED_NUM_VARS][128];
+
+	for (i = 0; i < THREADED_NUM_VARS; i++) {
+		(void)snprintf(vars[i], sizeof(vars[i]),
+		    THREADED_VAR_NAME "=putenv %ld", i, lrand48());
+	}
+
+	endtime = *(time_t *)arg;
+	do {
+		char name[128];
+
+		i = lrand48() % THREADED_NUM_VARS;
+		(void)strlcpy(name, vars[i], sizeof(name));
+		*strchr(name, '=') = '\0';
+
+		ATF_CHECK(unsetenv(name) != -1);
+		ATF_CHECK(putenv(vars[i]) != -1);
+	} while (time(NULL) < endtime);
+
+	return NULL;
+}
+
+static void *
+thread_setenv(void *arg)
+{
+	time_t endtime;
+
+	endtime = *(time_t *)arg;
+	do {
+		size_t i;
+		char name[32], value[64];
+
+		i = lrand48() % THREADED_NUM_VARS;
+		(void)snprintf(name, sizeof(name), THREADED_VAR_NAME, i);
+		(void)snprintf(value, sizeof(value), "setenv %ld", lrand48());
+
+		ATF_CHECK(setenv(name, value, 1) != -1);
+	} while (time(NULL) < endtime);
+
+	return NULL;
+}
+
+static void *
+thread_unsetenv(void *arg)
+{
+	time_t endtime;
+
+	endtime = *(time_t *)arg;
+	do {
+		size_t i;
+		char name[32];
+
+		i = lrand48() % THREADED_NUM_VARS;
+		(void)snprintf(name, sizeof(name), THREADED_VAR_NAME, i);
+
+		ATF_CHECK(unsetenv(name) != -1);
+	} while (time(NULL) < endtime);
+
+	return NULL;
+}
+
+ATF_TC(getenv_r_thread);
+ATF_TC_HEAD(getenv_r_thread, tc)
+{
+	char timeout[32];
+
+	atf_tc_set_md_var(tc, "descr", "Test getenv_r(3) with threads");
+
+	(void)snprintf(timeout, sizeof(timeout), "%d", THREADED_RUN_TIME + 5);
+
+	atf_tc_set_md_var(tc, "timeout", timeout);
+}
+
+ATF_TC_BODY(getenv_r_thread, tc)
+{
+	pthread_t threads[THREADED_NUM_THREADS];
+	time_t endtime;
+	size_t i, j;
+
+	endtime = time(NULL) + THREADED_RUN_TIME;
+
+	for (i = j = 0; j < 2; j++) {
+
+		ATF_CHECK(pthread_create(&threads[i++], NULL, thread_getenv_r,
+		    &endtime) == 0);
+	}
+
+	for (j = 0; j < i; j++)
+		ATF_CHECK(pthread_join(threads[j], NULL) == 0);
+}
+
+ATF_TC(putenv_thread);
+ATF_TC_HEAD(putenv_thread, tc)
+{
+	char timeout[32];
+
+	atf_tc_set_md_var(tc, "descr", "Test concurrent access by putenv(3)");
+
+	(void)snprintf(timeout, sizeof(timeout), "%d", THREADED_RUN_TIME + 5);
+
+	atf_tc_set_md_var(tc, "timeout", timeout);
+}
+
+ATF_TC_BODY(putenv_thread, tc)
+{
+	pthread_t threads[THREADED_NUM_THREADS];
+	time_t endtime;
+	size_t i, j;
+
+	endtime = time(NULL) + THREADED_RUN_TIME;
+
+	for (i = j = 0; j < 2; j++) {
+
+		ATF_CHECK(pthread_create(&threads[i++], NULL, thread_putenv,
+		    &endtime) == 0);
+	}
+
+	for (j = 0; j < i; j++)
+		ATF_CHECK(pthread_join(threads[j], NULL) == 0);
+}
+
+ATF_TC(setenv_thread);
+ATF_TC_HEAD(setenv_thread, tc)
+{
+	char timeout[32];
+
+	atf_tc_set_md_var(tc, "descr", "Test concurrent access by setenv(3)");
+
+	(void)snprintf(timeout, sizeof(timeout), "%d", THREADED_RUN_TIME + 5);
+
+	atf_tc_set_md_var(tc, "timeout", timeout);
+}
+
+ATF_TC_BODY(setenv_thread, tc)
+{
+	pthread_t threads[THREADED_NUM_THREADS];
+	time_t endtime;
+	size_t i, j;
+
+	endtime = time(NULL) + THREADED_RUN_TIME;
+
+	for (i = j = 0; j < 2; j++) {
+
+		ATF_CHECK(pthread_create(&threads[i++], NULL, thread_setenv,
+		    &endtime) == 0);
+	}
+
+	for (j = 0; j < i; j++)
+		ATF_CHECK(pthread_join(threads[j], NULL) == 0);
+}
+
+ATF_TC(unsetenv_thread);
+ATF_TC_HEAD(unsetenv_thread, tc)
+{
+	char timeout[32];
+
+	atf_tc_set_md_var(tc, "descr", "Test unsetenv(3) with threads");
+
+	(void)snprintf(timeout, sizeof(timeout), "%d", THREADED_RUN_TIME + 5);
+
+	atf_tc_set_md_var(tc, "timeout", timeout);
+}
+
+ATF_TC_BODY(unsetenv_thread, tc)
+{
+	pthread_t threads[THREADED_NUM_THREADS];
+	time_t endtime;
+	size_t i, j;
+
+	endtime = time(NULL) + THREADED_RUN_TIME;
+
+	for (i = j = 0; j < 2; j++) {
+
+		ATF_CHECK(pthread_create(&threads[i++], NULL, thread_unsetenv,
+		    &endtime) == 0);
+	}
+
+	for (j = 0; j < i; j++)
+		ATF_CHECK(pthread_join(threads[j], NULL) == 0);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, getenv_r_thread);
+	ATF_TP_ADD_TC(tp, putenv_thread);
+	ATF_TP_ADD_TC(tp, setenv_thread);
+	ATF_TP_ADD_TC(tp, unsetenv_thread);
+
+	return atf_no_error();
+}

Reply via email to