Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Merge 't_environment' and 't_environment_pth'.
details: https://anonhg.NetBSD.org/src/rev/49effb76b03e
branches: trunk
changeset: 767057:49effb76b03e
user: jruoho <jruoho%NetBSD.org@localhost>
date: Thu Jul 07 15:50:23 2011 +0000
description:
Merge 't_environment' and 't_environment_pth'.
diffstat:
distrib/sets/lists/tests/mi | 12 +-
tests/lib/libc/stdlib/Makefile | 7 +-
tests/lib/libc/stdlib/t_environment.c | 197 -------------
tests/lib/libc/stdlib/t_environment_pth.c | 177 -----------
tests/lib/libc/stdlib/t_getenv.c | 450 ++++++++++++++++++++++++++++++
5 files changed, 460 insertions(+), 383 deletions(-)
diffs (truncated from 898 to 300 lines):
diff -r 7aaf3c10c0d3 -r 49effb76b03e distrib/sets/lists/tests/mi
--- a/distrib/sets/lists/tests/mi Thu Jul 07 15:07:53 2011 +0000
+++ b/distrib/sets/lists/tests/mi Thu Jul 07 15:50:23 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.370 2011/07/07 14:29:59 pgoyette Exp $
+# $NetBSD: mi,v 1.371 2011/07/07 15:50:23 jruoho Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -440,9 +440,10 @@
./usr/libdata/debug/usr/tests/lib/libc/stdlib/h_getopt.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libc/stdlib/h_getopt_long.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libc/stdlib/t_div.debug tests-lib-debug debug,atf
-./usr/libdata/debug/usr/tests/lib/libc/stdlib/t_environment.debug tests-lib-debug debug,atf
-./usr/libdata/debug/usr/tests/lib/libc/stdlib/t_environment_pth.debug tests-lib-debug debug,atf
+./usr/libdata/debug/usr/tests/lib/libc/stdlib/t_environment.debug tests-obsolete obsolete
+./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_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
@@ -2016,9 +2017,10 @@
./usr/tests/lib/libc/stdlib/h_getopt_long tests-lib-tests atf
./usr/tests/lib/libc/stdlib/t_atexit tests-lib-tests atf
./usr/tests/lib/libc/stdlib/t_div tests-lib-tests atf
-./usr/tests/lib/libc/stdlib/t_environment tests-lib-tests atf
-./usr/tests/lib/libc/stdlib/t_environment_pth tests-lib-tests atf
+./usr/tests/lib/libc/stdlib/t_environment tests-obsolete obsolete
+./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_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
diff -r 7aaf3c10c0d3 -r 49effb76b03e tests/lib/libc/stdlib/Makefile
--- a/tests/lib/libc/stdlib/Makefile Thu Jul 07 15:07:53 2011 +0000
+++ b/tests/lib/libc/stdlib/Makefile Thu Jul 07 15:50:23 2011 +0000
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.14 2011/06/04 14:56:58 jruoho Exp $
+# $NetBSD: Makefile,v 1.15 2011/07/07 15:50:23 jruoho Exp $
.include <bsd.own.mk>
TESTSDIR= ${TESTSBASE}/lib/libc/stdlib
TESTS_C+= t_div
-TESTS_C+= t_environment
-TESTS_C+= t_environment_pth
+TESTS_C+= t_getenv
TESTS_C+= t_exit
TESTS_C+= t_hsearch
TESTS_C+= t_mi_vector_hash
@@ -25,7 +24,7 @@
PROGS+= h_getopt h_getopt_long
LDADD.t_strtod= -lm
-LDADD.t_environment_pth= -pthread
+LDADD.t_getenv= -pthread
COPTS+= -ffloat-store
diff -r 7aaf3c10c0d3 -r 49effb76b03e tests/lib/libc/stdlib/t_environment.c
--- a/tests/lib/libc/stdlib/t_environment.c Thu Jul 07 15:07:53 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,197 +0,0 @@
-/* $NetBSD: t_environment.c,v 1.12 2010/11/16 14:03:47 tron Exp $ */
-/*-
- * Copyright (c) 2010 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas
- *
- * 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 COPYRIGHT HOLDERS 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
- * COPYRIGHT HOLDERS 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_environment.c,v 1.12 2010/11/16 14:03:47 tron Exp $");
-
-#include <atf-c.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-ATF_TC(t_setenv);
-ATF_TC(t_putenv);
-ATF_TC(t_clearenv);
-ATF_TC(t_mixed);
-ATF_TC(t_getenv);
-
-ATF_TC_HEAD(t_setenv, tc)
-{
- atf_tc_set_md_var(tc, "descr",
- "Test setenv(3), getenv(3), unsetenv(3)");
- atf_tc_set_md_var(tc, "timeout", "300");
-}
-
-ATF_TC_HEAD(t_putenv, tc)
-{
- atf_tc_set_md_var(tc, "descr",
- "Test putenv(3), getenv(3), unsetenv(3)");
-}
-
-ATF_TC_HEAD(t_clearenv, tc)
-{
- atf_tc_set_md_var(tc, "descr",
- "Test user clearing environment directly");
-}
-
-ATF_TC_HEAD(t_mixed, tc)
-{
- atf_tc_set_md_var(tc, "descr",
- "Test mixing setenv(3), unsetenv(3) and putenv(3)");
-}
-
-ATF_TC_HEAD(t_getenv, tc)
-{
- atf_tc_set_md_var(tc, "descr",
- "Test setenv(3), getenv(3)");
-}
-
-ATF_TC_BODY(t_setenv, tc)
-{
- const size_t numvars = 8192;
- size_t i, offset;
- char name[1024];
- char value[1024];
-
- offset = lrand48();
- for (i = 0; i < numvars; i++) {
- (void)snprintf(name, sizeof(name), "var%zu",
- (i * 7 + offset) % numvars);
- (void)snprintf(value, sizeof(value), "value%ld", lrand48());
- ATF_CHECK(setenv(name, value, 1) != -1);
- ATF_CHECK(setenv(name, "foo", 0) != -1);
- ATF_CHECK_STREQ(getenv(name), value);
- }
-
- offset = lrand48();
- for (i = 0; i < numvars; i++) {
- (void)snprintf(name, sizeof(name), "var%zu",
- (i * 11 + offset) % numvars);
- ATF_CHECK(unsetenv(name) != -1);
- ATF_CHECK(getenv(name) == NULL);
- ATF_CHECK(unsetenv(name) != -1);
- }
-
- ATF_CHECK_ERRNO(EINVAL, setenv(NULL, "val", 1) == -1);
- ATF_CHECK_ERRNO(EINVAL, setenv("", "val", 1) == -1);
- ATF_CHECK_ERRNO(EINVAL, setenv("v=r", "val", 1) == -1);
- ATF_CHECK_ERRNO(EINVAL, setenv("var", NULL, 1) == -1);
-
- ATF_CHECK(setenv("var", "=val", 1) == 0);
- ATF_CHECK_STREQ(getenv("var"), "=val");
-}
-
-ATF_TC_BODY(t_putenv, tc)
-{
- char string[1024];
-
- snprintf(string, sizeof(string), "crap=true");
- ATF_CHECK(putenv(string) != -1);
- ATF_CHECK_STREQ(getenv("crap"), "true");
- string[1] = 'l';
- ATF_CHECK_STREQ(getenv("clap"), "true");
- ATF_CHECK(getenv("crap") == NULL);
- string[1] = 'r';
- ATF_CHECK(unsetenv("crap") != -1);
- ATF_CHECK(getenv("crap") == NULL);
-
- ATF_CHECK_ERRNO(EINVAL, putenv(NULL) == -1);
- ATF_CHECK_ERRNO(EINVAL, putenv(__UNCONST("val")) == -1);
- ATF_CHECK_ERRNO(EINVAL, putenv(__UNCONST("=val")) == -1);
-}
-
-extern char **environ;
-
-ATF_TC_BODY(t_clearenv, tc)
-{
- char name[1024], value[1024];
-
- for (size_t i = 0; i < 1024; i++) {
- snprintf(name, sizeof(name), "crap%zu", i);
- snprintf(value, sizeof(value), "%zu", i);
- ATF_CHECK(setenv(name, value, 1) != -1);
- }
-
- *environ = NULL;
-
- for (size_t i = 0; i < 1; i++) {
- snprintf(name, sizeof(name), "crap%zu", i);
- snprintf(value, sizeof(value), "%zu", i);
- ATF_CHECK(setenv(name, value, 1) != -1);
- }
-
- ATF_CHECK_STREQ(getenv("crap0"), "0");
- ATF_CHECK(getenv("crap1") == NULL);
- ATF_CHECK(getenv("crap2") == NULL);
-}
-
-ATF_TC_BODY(t_mixed, tc)
-{
- char string[32];
-
- (void)strcpy(string, "mixedcrap=putenv");
-
- ATF_CHECK(setenv("mixedcrap", "setenv", 1) != -1);
- ATF_CHECK_STREQ(getenv("mixedcrap"), "setenv");
- ATF_CHECK(putenv(string) != -1);
- ATF_CHECK_STREQ(getenv("mixedcrap"), "putenv");
- ATF_CHECK(unsetenv("mixedcrap") != -1);
- ATF_CHECK(getenv("mixedcrap") == NULL);
-
- ATF_CHECK(putenv(string) != -1);
- ATF_CHECK_STREQ(getenv("mixedcrap"), "putenv");
- ATF_CHECK(setenv("mixedcrap", "setenv", 1) != -1);
- ATF_CHECK_STREQ(getenv("mixedcrap"), "setenv");
- ATF_CHECK(unsetenv("mixedcrap") != -1);
- ATF_CHECK(getenv("mixedcrap") == NULL);
-}
-
-ATF_TC_BODY(t_getenv, tc)
-{
- ATF_CHECK(setenv("EVIL", "very=bad", 1) != -1);
- ATF_CHECK_STREQ(getenv("EVIL"), "very=bad");
- ATF_CHECK(getenv("EVIL=very") == NULL);
- ATF_CHECK(unsetenv("EVIL") != -1);
-}
-
-ATF_TP_ADD_TCS(tp)
-{
- ATF_TP_ADD_TC(tp, t_setenv);
- ATF_TP_ADD_TC(tp, t_putenv);
- ATF_TP_ADD_TC(tp, t_clearenv);
- ATF_TP_ADD_TC(tp, t_mixed);
- ATF_TP_ADD_TC(tp, t_getenv);
-
- return atf_no_error();
-}
diff -r 7aaf3c10c0d3 -r 49effb76b03e tests/lib/libc/stdlib/t_environment_pth.c
--- a/tests/lib/libc/stdlib/t_environment_pth.c Thu Jul 07 15:07:53 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,177 +0,0 @@
-/* $NetBSD: t_environment_pth.c,v 1.2 2010/11/17 08:55:27 tron 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_environment_pth.c,v 1.2 2010/11/17 08:55:27 tron Exp $");
Home |
Main Index |
Thread Index |
Old Index