Module Name:    src
Committed By:   kre
Date:           Tue Nov 28 23:26:01 UTC 2017

Modified Files:
        src/tests/lib/libc/locale: t_sprintf.c

Log Message:
Revert 1.4 (perhaps temporarily) and add even more diagnostics to those
added in 1.3 to see if it is possible to determine why the strict equality
test fails on i386, yet succeeds elsewhere.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/tests/lib/libc/locale/t_sprintf.c

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/locale/t_sprintf.c
diff -u src/tests/lib/libc/locale/t_sprintf.c:1.5 src/tests/lib/libc/locale/t_sprintf.c:1.6
--- src/tests/lib/libc/locale/t_sprintf.c:1.5	Fri Nov 24 21:30:43 2017
+++ src/tests/lib/libc/locale/t_sprintf.c	Tue Nov 28 23:26:01 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: t_sprintf.c,v 1.5 2017/11/24 21:30:43 kre Exp $ */
+/* $NetBSD: t_sprintf.c,v 1.6 2017/11/28 23:26:01 kre Exp $ */
 
 /*-
  * Copyright (c) 2017 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
 #include <sys/cdefs.h>
 __COPYRIGHT("@(#) Copyright (c) 2017\
  The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_sprintf.c,v 1.5 2017/11/24 21:30:43 kre Exp $");
+__RCSID("$NetBSD: t_sprintf.c,v 1.6 2017/11/28 23:26:01 kre Exp $");
 
 #include <locale.h>
 #include <math.h>
@@ -134,11 +134,15 @@ h_strto(const struct test *t)
 
 	ATF_REQUIRE_EQ((int)strtol(t->int_input, NULL, 10), t->int_value);
 	d = strtod(t->double_input, NULL);
-	if ((diff = fabs(d - t->double_value)) > 1e-7)
-		ATF_REQUIRE_EQ_MSG(d, t->double_value, "In %s: d=strtod("
-		    "t->double_input[%s], NULL)[%.9g] != t->double_value[%.9g]"
-		    ": diff=%g", t->locale, t->double_input, d,
-		    t->double_value, diff);
+	diff = fabs(d - t->double_value);
+#if 0
+	if (diff >= 1e-7)
+#endif
+		ATF_REQUIRE_EQ_MSG(d, t->double_value, "In %s:"
+		    " d=strtod(t->double_input[%s], NULL)[%.12g = %a] !="
+		    " t->double_value[%.12g = %a]: diff=%g",
+		    t->locale, t->double_input, d, d,
+		    t->double_value, t->double_value, diff);
 }
 
 static void

Reply via email to