Update.

	* stdio-common/tst-printf.c (main): Comment out one test which
	checked the compiler's ability to fold floating-point constants
	but not really printf.
	(rfg3): Make s const.
	* stdio-common/tst-printf.sh: Adjust for removed test.

diff --git a/ChangeLog b/ChangeLog
index 12a5011..b809c48 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2002-03-15  Ulrich Drepper  <drepper@redhat.com>
 
+       * stdio-common/tst-printf.c (main): Comment out one test which
+       checked the compiler's ability to fold floating-point constants
+       but not really printf.
+       (rfg3): Make s const.
+       * stdio-common/tst-printf.sh: Adjust for removed test.
+
        * sysdeps/i386/i386-mcount.S: Just call __mcount_internal, it is an
        internal function.  Adjust for internal_function calling convention.
        * sysdeps/i386/machine-gmon.h: Declare and define __mcount_internal

diff --git a/stdio-common/tst-printf.c b/stdio-common/tst-printf.c
index df73fe2..a9db7ad 100644 (file)
--- a/stdio-common/tst-printf.c
+++ b/stdio-common/tst-printf.c
@@ -236,10 +236,15 @@ I am ready for my first lesson today.";
   printf ("%g should be 10\n", 10.0);
   printf ("%g should be 0.02\n", 0.02);
 
+#if 0
+  /* This test rather checks the way the compiler handles constant
+     folding.  gcc behavior wrt to this changed in 3.2 so it is not a
+     portable test.  */
   {
     double x=1.0;
     printf("%.17f\n",(1.0/x/10.0+1.0)*x-x);
   }
+#endif
 
   {
     char buf[200];
@@ -364,7 +369,7 @@ rfg3 (void)
   double g = 5.0000001;
   unsigned long l = 1234567890;
   double d = 321.7654321;
-  char *s = "test-string";
+  const char s[] = "test-string";
   int i = 12345;
   int h = 1234;
 

diff --git a/stdio-common/tst-printf.sh b/stdio-common/tst-printf.sh
index a3626a7..3655558 100644 (file)
--- a/stdio-common/tst-printf.sh
+++ b/stdio-common/tst-printf.sh
@@ -132,7 +132,6 @@ prefix  6d      6o      6x      6X      6u
 1e+06 should be 1e+06
 10 should be 10
 0.02 should be 0.02
-0.10000000000000009
 Test ok.
 sprintf (buf, "%07Lo", 040000000000ll) = 40000000000
 printf ("%hhu", 257) = 1
@@ -243,7 +242,6 @@ prefix  6d      6o      6x      6X      6u
 1e+06 should be 1e+06
 10 should be 10
 0.02 should be 0.02
-0.10000000000000009
 Test ok.
 sprintf (buf, "%07Lo", 040000000000ll) = 40000000000
 printf ("%hhu", 257) = 1