about summary refs log tree commit diff
diff options
context:
space:
mode:
authorThomas Schwinge <thomas@codesourcery.com>2013-04-05 15:58:27 +0200
committerThomas Schwinge <thomas@codesourcery.com>2013-04-05 22:39:26 +0200
commita8b792d6bb54fda2ff66f8b0c725397d402f367e (patch)
treeba1b193d79b34b06f805565a78d09e2a30cfa96e
parenta1cbf437a53b24f2ff1f6af42028b607f6aa279d (diff)
downloadglibc-a8b792d6bb54fda2ff66f8b0c725397d402f367e.tar.gz
glibc-a8b792d6bb54fda2ff66f8b0c725397d402f367e.tar.xz
glibc-a8b792d6bb54fda2ff66f8b0c725397d402f367e.zip
Properly collect individual tests' results.
Fixup for commit 003c9895a89e71767ad64bafac1ca99622be2eb7.
-rw-r--r--ChangeLog3
-rw-r--r--stdio-common/tstdiomisc.c10
2 files changed, 8 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index a4a3779caa..1bdbdf3cb6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2013-04-05  Thomas Schwinge  <thomas@codesourcery.com>
 
+	* stdio-common/tstdiomisc.c (F): Properly collect individual
+	tests' results.
+
 	[BZ #14686, #15336]
 	* sysdeps/ieee754/dbl-64/urem.h (nNAN, NAN): Remove definitions.
 	* sysdeps/ieee754/dbl-64/e_remainder.c (__ieee754_remainder):
diff --git a/stdio-common/tstdiomisc.c b/stdio-common/tstdiomisc.c
index d24c55f53c..fa07aa5a89 100644
--- a/stdio-common/tstdiomisc.c
+++ b/stdio-common/tstdiomisc.c
@@ -57,20 +57,20 @@ F (void)
 {
   char buf[80];
   wchar_t wbuf[40];
-  int result;
+  int result = 0;
 
   qnanval = NAN;
 
   snprintf (buf, sizeof buf, "%a %A %e %E %f %F %g %G",
 	    qnanval, qnanval, qnanval, qnanval,
 	    qnanval, qnanval, qnanval, qnanval);
-  result = strcmp (buf, "nan NAN nan NAN nan NAN nan NAN") != 0;
+  result |= strcmp (buf, "nan NAN nan NAN nan NAN nan NAN") != 0;
   printf ("expected \"nan NAN nan NAN nan NAN nan NAN\", got \"%s\"\n", buf);
 
   snprintf (buf, sizeof buf, "%a %A %e %E %f %F %g %G",
 	    -qnanval, -qnanval, -qnanval, -qnanval,
 	    -qnanval, -qnanval, -qnanval, -qnanval);
-  result = strcmp (buf, "-nan -NAN -nan -NAN -nan -NAN -nan -NAN") != 0;
+  result |= strcmp (buf, "-nan -NAN -nan -NAN -nan -NAN -nan -NAN") != 0;
   printf ("expected \"-nan -NAN -nan -NAN -nan -NAN -nan -NAN\", got \"%s\"\n",
 	  buf);
 
@@ -118,13 +118,13 @@ F (void)
   snprintf (buf, sizeof buf, "%La %LA %Le %LE %Lf %LF %Lg %LG",
 	    lqnanval, lqnanval, lqnanval, lqnanval,
 	    lqnanval, lqnanval, lqnanval, lqnanval);
-  result = strcmp (buf, "nan NAN nan NAN nan NAN nan NAN") != 0;
+  result |= strcmp (buf, "nan NAN nan NAN nan NAN nan NAN") != 0;
   printf ("expected \"nan NAN nan NAN nan NAN nan NAN\", got \"%s\"\n", buf);
 
   snprintf (buf, sizeof buf, "%La %LA %Le %LE %Lf %LF %Lg %LG",
 	    -lqnanval, -lqnanval, -lqnanval, -lqnanval,
 	    -lqnanval, -lqnanval, -lqnanval, -lqnanval);
-  result = strcmp (buf, "-nan -NAN -nan -NAN -nan -NAN -nan -NAN") != 0;
+  result |= strcmp (buf, "-nan -NAN -nan -NAN -nan -NAN -nan -NAN") != 0;
   printf ("expected \"-nan -NAN -nan -NAN -nan -NAN -nan -NAN\", got \"%s\"\n",
 	  buf);