 @@ -1,14 +1,14 @@
-/*	$NetBSD: t_strtod.c,v 1.28 2012/03/18 07:00:51 jruoho Exp $ */
+/*	$NetBSD: t_strtod.c,v 1.29 2012/04/04 10:52:59 joerg 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.
 @@ -22,27 +22,27 @@
  * 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.
  */
 /* Public domain, Otto Moerbeek <otto@drijf.net>, 2006. */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: t_strtod.c,v 1.28 2012/03/18 07:00:51 jruoho Exp $");
+__RCSID("$NetBSD: t_strtod.c,v 1.29 2012/04/04 10:52:59 joerg Exp $");
 #include <errno.h>
 #include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <atf-c.h>
 #include <atf-c/config.h>
 #if defined(__i386__) || defined(__amd64__) || defined(__sparc__)
 #include <fenv.h>
 #endif
 @@ -82,159 +82,159 @@ ATF_TC_HEAD(strtod_hex, tc)
 	atf_tc_set_md_var(tc, "descr", "A strtod(3) with hexadecimals");
+}
 #ifdef __vax__
 #define SMALL_NUM       1.0e-38
 #else
 #define SMALL_NUM       1.0e-40
 #endif
 ATF_TC_BODY(strtod_hex, tc)
+{
 	const char *str;
 	char *end;
-	double d;
+	volatile double d;
 	str = "-0x0";
 	d = strtod(str, &end);	/* -0.0 */
 	ATF_REQUIRE(end == str + 4);
 	ATF_REQUIRE(signbit(d) != 0);
 	ATF_REQUIRE(fabs(d) < SMALL_NUM);
 	str = "-0x";
 	d = strtod(str, &end);	/* -0.0 */
 	ATF_REQUIRE(end == str + 2);
 	ATF_REQUIRE(signbit(d) != 0);
 	ATF_REQUIRE(fabs(d) < SMALL_NUM);
+}
 ATF_TC(strtod_inf);
 ATF_TC_HEAD(strtod_inf, tc)
+{
 	atf_tc_set_md_var(tc, "descr", "A strtod(3) with INF (PR lib/33262)");
+}
 ATF_TC_BODY(strtod_inf, tc)
+{
 #ifndef __vax__
 	for (size_t i = 0; i < __arraycount(inf_strings); i++) {
-		double d = strtod(inf_strings[i], NULL);
+		volatile double d = strtod(inf_strings[i], NULL);
 		ATF_REQUIRE(isinf(d) != 0);
+	}
 #else
 	atf_tc_skip("vax not supported");
 #endif
+}
 ATF_TC(strtof_inf);
 ATF_TC_HEAD(strtof_inf, tc)
+{
 	atf_tc_set_md_var(tc, "descr", "A strtof(3) with INF (PR lib/33262)");
+}
 ATF_TC_BODY(strtof_inf, tc)
+{
 #ifndef __vax__
 	for (size_t i = 0; i < __arraycount(inf_strings); i++) {
-		float f = strtof(inf_strings[i], NULL);
+		volatile float f = strtof(inf_strings[i], NULL);
 		ATF_REQUIRE(isinf(f) != 0);
+	}
 #else
 	atf_tc_skip("vax not supported");
 #endif
+}
 ATF_TC(strtold_inf);
 ATF_TC_HEAD(strtold_inf, tc)
+{
 	atf_tc_set_md_var(tc, "descr", "A strtold(3) with INF (PR lib/33262)");
+}
 ATF_TC_BODY(strtold_inf, tc)
+{
 #ifndef __vax__
 #   ifdef __HAVE_LONG_DOUBLE
 	if (system("cpuctl identify 0 | grep -q QEMU") == 0)
 		atf_tc_expect_fail("PR misc/44767");
 	for (size_t i = 0; i < __arraycount(inf_strings); i++) {
-		long double ld = strtold(inf_strings[i], NULL);
+		volatile long double ld = strtold(inf_strings[i], NULL);
 		ATF_REQUIRE(isinf(ld) != 0);
+	}
 #   else
 	atf_tc_skip("Requires long double support");
 #   endif
 #else
 	atf_tc_skip("vax not supported");
 #endif
+}
 ATF_TC(strtod_nan);
 ATF_TC_HEAD(strtod_nan, tc)
+{
 	atf_tc_set_md_var(tc, "descr", "A strtod(3) with NaN");
+}
 ATF_TC_BODY(strtod_nan, tc)
+{
 #ifndef __vax__
 	char *end;
-	double d = strtod(nan_string, &end);
+	volatile double d = strtod(nan_string, &end);
 	ATF_REQUIRE(isnan(d) != 0);
 	ATF_REQUIRE(strcmp(end, "y") == 0);
 #else
 	atf_tc_skip("vax not supported");
 #endif
+}
 ATF_TC(strtof_nan);
 ATF_TC_HEAD(strtof_nan, tc)
+{
 	atf_tc_set_md_var(tc, "descr", "A strtof(3) with NaN");
+}
 ATF_TC_BODY(strtof_nan, tc)
+{
 #ifndef __vax__
 	char *end;
-	float f = strtof(nan_string, &end);
+	volatile float f = strtof(nan_string, &end);
 	ATF_REQUIRE(isnanf(f) != 0);
 	ATF_REQUIRE(strcmp(end, "y") == 0);
 #else
 	atf_tc_skip("vax not supported");
 #endif
+}
 ATF_TC(strtold_nan);
 ATF_TC_HEAD(strtold_nan, tc)
+{
 	atf_tc_set_md_var(tc, "descr", "A strtold(3) with NaN (PR lib/45020)");
+}
 ATF_TC_BODY(strtold_nan, tc)
+{
 #ifndef __vax__
 #   ifdef __HAVE_LONG_DOUBLE
 	char *end;
 	if (system("cpuctl identify 0 | grep -q QEMU") == 0)
 		atf_tc_expect_fail("PR misc/44767");
-	long double ld = strtold(nan_string, &end);
+	volatile long double ld = strtold(nan_string, &end);
 	ATF_REQUIRE(isnan(ld) != 0);
 	ATF_REQUIRE(__isnanl(ld) != 0);
 	ATF_REQUIRE(strcmp(end, "y") == 0);
 #   else
 	atf_tc_skip("Requires long double support");
 #   endif
 #else
 	atf_tc_skip("vax not supported");
 #endif
+}
 ATF_TC(strtod_round);
 ATF_TC_HEAD(strtod_round, tc)
 @@ -245,31 +245,31 @@ ATF_TC_HEAD(strtod_round, tc)
 ATF_TC_BODY(strtod_round, tc)
+{
 #if defined(__i386__) || defined(__amd64__) || defined(__sparc__)
 	/*
 	 * Test that strtod(3) honors the current rounding mode.
 	 * The used value is somewhere near 1 + DBL_EPSILON + FLT_EPSILON.
 	 */
 	const char *val =
 	    "1.00000011920928977282585492503130808472633361816406";
 	(void)fesetround(FE_UPWARD);
-	double d1 = strtod(val, NULL);
+	volatile double d1 = strtod(val, NULL);
 	(void)fesetround(FE_DOWNWARD);
-	double d2 = strtod(val, NULL);
+	volatile double d2 = strtod(val, NULL);
 	if (fabs(d1 - d2) > 0.0)
 		return;
 	else {
 		atf_tc_expect_fail("PR misc/44767");
 		atf_tc_fail("strtod(3) did not honor fesetround(3)");
+	}
 #else
 	atf_tc_skip("Requires one of i386, amd64 or sparc");
 #endif
+}
 ATF_TC(strtod_underflow);
 @@ -282,27 +282,27 @@ ATF_TC_BODY(strtod_underflow, tc)
+{
 	const char *tmp =
 	    "0.0000000000000000000000000000000000000000000000000000"
 	    "000000000000000000000000000000000000000000000000000000"
 	    "000000000000000000000000000000000000000000000000000000"
 	    "000000000000000000000000000000000000000000000000000000"
 	    "000000000000000000000000000000000000000000000000000000"
 	    "000000000000000000000000000000000000000000000000000000"
 	    "000000000000000000000000000000000000000000000000000000"
 	    "000000000000000002";
 	errno = 0;
-	double d = strtod(tmp, NULL);
+	volatile double d = strtod(tmp, NULL);
 	if (d != 0 || errno != ERANGE)
 		atf_tc_fail("strtod(3) did not detect underflow");
+}
 ATF_TP_ADD_TCS(tp)
+{
 	ATF_TP_ADD_TC(tp, strtod_basic);
 	ATF_TP_ADD_TC(tp, strtod_hex);
 	ATF_TP_ADD_TC(tp, strtod_inf);
 	ATF_TP_ADD_TC(tp, strtof_inf);
 	ATF_TP_ADD_TC(tp, strtold_inf);

 @@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.22 2012/03/29 06:16:56 jruoho Exp $
+# $NetBSD: Makefile,v 1.23 2012/04/04 10:52:59 joerg Exp $
 .include <bsd.own.mk>
 TESTSDIR=	${TESTSBASE}/lib/libc/stdlib
 TESTS_C+=	t_abs
 TESTS_C+=	t_atoi
 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
 @@ -18,19 +18,18 @@ TESTS_C+=	t_strtod
 TESTS_C+=	t_strtol
 TESTS_C+=	t_system
 TESTS_SH+=	t_atexit
 TESTS_SH+=	t_getopt
 MKMAN=no
 BINDIR=		${TESTSDIR}
 PROGS+=		h_atexit
 PROGS+=		h_getopt h_getopt_long
 COPTS.t_strtod.c+=		-ffloat-store
 LDADD.t_strtod=			-lm
 LDADD.t_getenv_thread=		-lpthread
 .include <bsd.test.mk>