Fix side effects from tests-related modules.

diff --git a/ChangeLog b/ChangeLog
index 6ff91cb..8c80d6a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,34 @@
+2010-04-08  Bruno Haible  <bruno@clisp.org>
+
+       Fix side effects from tests-related modules.
+       * modules/dprintf-posix (Comment): New section.
+       * modules/fprintf-posix (Comment): Likewise.
+       * modules/obstack-printf-posix (Comment): Likewise.
+       * modules/printf-posix (Comment): Likewise.
+       * modules/snprintf-posix (Comment): Likewise.
+       * modules/sprintf-posix (Comment): Likewise.
+       * modules/vasnprintf-posix (Comment): Likewise.
+       * modules/vasprintf-posix (Comment): Likewise.
+       * modules/vdprintf-posix (Comment): Likewise.
+       * modules/vfprintf-posix (Comment): Likewise.
+       * modules/vprintf-posix (Comment): Likewise.
+       * modules/vsnprintf-posix (Comment): Likewise.
+       * modules/vsprintf-posix (Comment): Likewise.
+       * modules/xprintf-posix (Comment): Likewise.
+       * modules/xvasprintf-posix (Comment): Likewise.
+       * modules/ceilf-tests (Depends-on): Remove fprintf-posix.
+       * modules/floorf-tests (Depends-on): Likewise.
+       * modules/round-tests (Depends-on): Likewise.
+       * modules/roundf-tests (Depends-on): Likewise.
+       * modules/trunc-tests (Depends-on): Likewise.
+       * modules/truncf-tests (Depends-on): Likewise.
+       * tests/test-ceilf2.c (check): Don't invoke fprintf if the
+       'fprintf-posix' module is not present.
+       * tests/test-floorf2.c (check): Likewise.
+       * tests/test-trunc2.c (check): Likewise.
+       * tests/test-truncf2.c (check): Likewise.
+       * tests/test-round2.c (equal): Likewise.
+
 2010-04-07  Karl Berry  <karl@gnu.org>
 
        * config/srclist.txt,

diff --git a/modules/ceilf-tests b/modules/ceilf-tests
index 9462b06..09c9c78 100644 (file)
--- a/modules/ceilf-tests
+++ b/modules/ceilf-tests
@@ -10,7 +10,6 @@ float
 isnanf-nolibm
 stdbool
 stdint
-fprintf-posix
 
 configure.ac:
 

diff --git a/modules/dprintf-posix b/modules/dprintf-posix
index 1f4b85c..19a4718 100644 (file)
--- a/modules/dprintf-posix
+++ b/modules/dprintf-posix
@@ -2,6 +2,12 @@ Description:
 POSIX compatible dprintf() function: print formatted output to a file
 descriptor
 
+Comment:
+This module should not be used as a dependency from a test module,
+otherwise when this module occurs as a tests-related module, it will
+have side effects on the compilation of the 'vasnprintf' module, if
+that module occurs among the main modules in lib/.
+
 Files:
 m4/dprintf-posix.m4
 m4/printf.m4

diff --git a/modules/floorf-tests b/modules/floorf-tests
index ffe6a99..64b4e3c 100644 (file)
--- a/modules/floorf-tests
+++ b/modules/floorf-tests
@@ -10,7 +10,6 @@ float
 isnanf-nolibm
 stdbool
 stdint
-fprintf-posix
 
 configure.ac:
 

diff --git a/modules/fprintf-posix b/modules/fprintf-posix
index 2f22ebd..be2b010 100644 (file)
--- a/modules/fprintf-posix
+++ b/modules/fprintf-posix
@@ -1,6 +1,12 @@
 Description:
 POSIX compatible fprintf() function: print formatted output to a stream
 
+Comment:
+This module should not be used as a dependency from a test module,
+otherwise when this module occurs as a tests-related module, it will
+have side effects on the compilation of the 'vasnprintf' module, if
+that module occurs among the main modules in lib/.
+
 Files:
 lib/fprintf.c
 m4/fprintf-posix.m4

diff --git a/modules/obstack-printf-posix b/modules/obstack-printf-posix
index eb7bef5..306a3df 100644 (file)
--- a/modules/obstack-printf-posix
+++ b/modules/obstack-printf-posix
@@ -1,6 +1,12 @@
 Description:
 POSIX formatted printing into an obstack.
 
+Comment:
+This module should not be used as a dependency from a test module,
+otherwise when this module occurs as a tests-related module, it will
+have side effects on the compilation of the 'vasnprintf' module, if
+that module occurs among the main modules in lib/.
+
 Files:
 m4/obstack-printf.m4
 m4/obstack-printf-posix.m4

diff --git a/modules/printf-posix b/modules/printf-posix
index b690c72..b9884f4 100644 (file)
--- a/modules/printf-posix
+++ b/modules/printf-posix
@@ -1,6 +1,12 @@
 Description:
 POSIX compatible printf() function: print formatted output to standard output
 
+Comment:
+This module should not be used as a dependency from a test module,
+otherwise when this module occurs as a tests-related module, it will
+have side effects on the compilation of the 'vasnprintf' module, if
+that module occurs among the main modules in lib/.
+
 Files:
 lib/printf.c
 m4/printf-posix-rpl.m4

diff --git a/modules/round-tests b/modules/round-tests
index 28b0def..b52890c 100644 (file)
--- a/modules/round-tests
+++ b/modules/round-tests
@@ -9,7 +9,6 @@ Depends-on:
 isnand-nolibm
 stdbool
 stdint
-fprintf-posix
 verify
 
 configure.ac:

diff --git a/modules/roundf-tests b/modules/roundf-tests
index 82ff3b7..8d99ab9 100644 (file)
--- a/modules/roundf-tests
+++ b/modules/roundf-tests
@@ -12,7 +12,6 @@ floorf
 isnanf-nolibm
 stdbool
 stdint
-fprintf-posix
 verify
 
 configure.ac:

diff --git a/modules/snprintf-posix b/modules/snprintf-posix
index 28c8fe3..16b38b7 100644 (file)
--- a/modules/snprintf-posix
+++ b/modules/snprintf-posix
@@ -2,6 +2,12 @@ Description:
 POSIX compatible snprintf() function: print formatted output to a fixed length
 string
 
+Comment:
+This module should not be used as a dependency from a test module,
+otherwise when this module occurs as a tests-related module, it will
+have side effects on the compilation of the 'vasnprintf' module, if
+that module occurs among the main modules in lib/.
+
 Files:
 m4/snprintf-posix.m4
 m4/printf.m4

diff --git a/modules/sprintf-posix b/modules/sprintf-posix
index e432bd8..b5f02f6 100644 (file)
--- a/modules/sprintf-posix
+++ b/modules/sprintf-posix
@@ -1,6 +1,12 @@
 Description:
 POSIX compatible sprintf() function: print formatted output to a string
 
+Comment:
+This module should not be used as a dependency from a test module,
+otherwise when this module occurs as a tests-related module, it will
+have side effects on the compilation of the 'vasnprintf' module, if
+that module occurs among the main modules in lib/.
+
 Files:
 lib/sprintf.c
 m4/sprintf-posix.m4

diff --git a/modules/trunc-tests b/modules/trunc-tests
index 3f84aff..ce1e979 100644 (file)
--- a/modules/trunc-tests
+++ b/modules/trunc-tests
@@ -10,7 +10,6 @@ float
 isnand-nolibm
 stdbool
 stdint
-fprintf-posix
 
 configure.ac:
 

diff --git a/modules/truncf-tests b/modules/truncf-tests
index a2b9320..746950d 100644 (file)
--- a/modules/truncf-tests
+++ b/modules/truncf-tests
@@ -10,7 +10,6 @@ float
 isnanf-nolibm
 stdbool
 stdint
-fprintf-posix
 
 configure.ac:
 

diff --git a/modules/vasnprintf-posix b/modules/vasnprintf-posix
index 2e47814..6a6177a 100644 (file)
--- a/modules/vasnprintf-posix
+++ b/modules/vasnprintf-posix
@@ -2,6 +2,12 @@ Description:
 POSIX compatible vsprintf with automatic memory allocation and bounded output
 size.
 
+Comment:
+This module should not be used as a dependency from a test module,
+otherwise when this module occurs as a tests-related module, it will
+have side effects on the compilation of the 'vasnprintf' module, if
+that module occurs among the main modules in lib/.
+
 Files:
 m4/vasnprintf-posix.m4
 m4/printf.m4

diff --git a/modules/vasprintf-posix b/modules/vasprintf-posix
index 1fc3385..5e90506 100644 (file)
--- a/modules/vasprintf-posix
+++ b/modules/vasprintf-posix
@@ -1,6 +1,12 @@
 Description:
 POSIX compatible vsprintf with automatic memory allocation.
 
+Comment:
+This module should not be used as a dependency from a test module,
+otherwise when this module occurs as a tests-related module, it will
+have side effects on the compilation of the 'vasnprintf' module, if
+that module occurs among the main modules in lib/.
+
 Files:
 m4/vasprintf-posix.m4
 m4/printf.m4

diff --git a/modules/vdprintf-posix b/modules/vdprintf-posix
index bc1cb88..649eacf 100644 (file)
--- a/modules/vdprintf-posix
+++ b/modules/vdprintf-posix
@@ -2,6 +2,12 @@ Description:
 POSIX compatible vdprintf() function: print formatted output to a file
 descriptor
 
+Comment:
+This module should not be used as a dependency from a test module,
+otherwise when this module occurs as a tests-related module, it will
+have side effects on the compilation of the 'vasnprintf' module, if
+that module occurs among the main modules in lib/.
+
 Files:
 m4/vdprintf-posix.m4
 m4/printf.m4

diff --git a/modules/vfprintf-posix b/modules/vfprintf-posix
index b622564..45af363 100644 (file)
--- a/modules/vfprintf-posix
+++ b/modules/vfprintf-posix
@@ -1,6 +1,12 @@
 Description:
 POSIX compatible vfprintf() function: print formatted output to a stream
 
+Comment:
+This module should not be used as a dependency from a test module,
+otherwise when this module occurs as a tests-related module, it will
+have side effects on the compilation of the 'vasnprintf' module, if
+that module occurs among the main modules in lib/.
+
 Files:
 lib/vfprintf.c
 m4/vfprintf-posix.m4

diff --git a/modules/vprintf-posix b/modules/vprintf-posix
index 2007000..319d83d 100644 (file)
--- a/modules/vprintf-posix
+++ b/modules/vprintf-posix
@@ -1,6 +1,12 @@
 Description:
 POSIX compatible vprintf() function: print formatted output to standard output
 
+Comment:
+This module should not be used as a dependency from a test module,
+otherwise when this module occurs as a tests-related module, it will
+have side effects on the compilation of the 'vasnprintf' module, if
+that module occurs among the main modules in lib/.
+
 Files:
 lib/vprintf.c
 m4/vprintf-posix.m4

diff --git a/modules/vsnprintf-posix b/modules/vsnprintf-posix
index dda0c32..0f36cd9 100644 (file)
--- a/modules/vsnprintf-posix
+++ b/modules/vsnprintf-posix
@@ -2,6 +2,12 @@ Description:
 POSIX compatible vsnprintf() function: print formatted output to a fixed length
 string
 
+Comment:
+This module should not be used as a dependency from a test module,
+otherwise when this module occurs as a tests-related module, it will
+have side effects on the compilation of the 'vasnprintf' module, if
+that module occurs among the main modules in lib/.
+
 Files:
 m4/vsnprintf-posix.m4
 m4/printf.m4

diff --git a/modules/vsprintf-posix b/modules/vsprintf-posix
index 96730b3..44d89f5 100644 (file)
--- a/modules/vsprintf-posix
+++ b/modules/vsprintf-posix
@@ -1,6 +1,12 @@
 Description:
 POSIX compatible vsprintf() function: print formatted output to a string
 
+Comment:
+This module should not be used as a dependency from a test module,
+otherwise when this module occurs as a tests-related module, it will
+have side effects on the compilation of the 'vasnprintf' module, if
+that module occurs among the main modules in lib/.
+
 Files:
 lib/vsprintf.c
 m4/vsprintf-posix.m4

diff --git a/modules/xprintf-posix b/modules/xprintf-posix
index 495f799..d25741e 100644 (file)
--- a/modules/xprintf-posix
+++ b/modules/xprintf-posix
@@ -2,6 +2,12 @@ Description:
 A wrapper around printf with POSIX compatible format string interpretation,
 that calls error upon ENOMEM or EILSEQ errors.
 
+Comment:
+This module should not be used as a dependency from a test module,
+otherwise when this module occurs as a tests-related module, it will
+have side effects on the compilation of the 'vasnprintf' module, if
+that module occurs among the main modules in lib/.
+
 Files:
 
 Depends-on:

diff --git a/modules/xvasprintf-posix b/modules/xvasprintf-posix
index b95ebb8..8811f9c 100644 (file)
--- a/modules/xvasprintf-posix
+++ b/modules/xvasprintf-posix
@@ -2,6 +2,12 @@ Description:
 vasprintf and asprintf with POSIX compatible format string interpretation and
 with out-of-memory checking.  Also see xalloc-die.
 
+Comment:
+This module should not be used as a dependency from a test module,
+otherwise when this module occurs as a tests-related module, it will
+have side effects on the compilation of the 'vasnprintf' module, if
+that module occurs among the main modules in lib/.
+
 Files:
 
 Depends-on:

diff --git a/tests/test-ceilf2.c b/tests/test-ceilf2.c
index 5c92393..705c19a 100644 (file)
--- a/tests/test-ceilf2.c
+++ b/tests/test-ceilf2.c
@@ -16,6 +16,9 @@
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
 
+/* When this test fails on some platform, build it together with the gnulib
+   module 'fprintf-posix' for optimal debugging output.  */
+
 #include <config.h>
 
 #include <math.h>
@@ -119,8 +122,10 @@ check (float x)
       return 0;
     else
       {
+#if GNULIB_TEST_FPRINTF_POSIX
         fprintf (stderr, "ceilf %g(%a) = %g(%a) or %g(%a)?\n",
                  x, x, reference, reference, result, result);
+#endif
         return 1;
       }
   }

diff --git a/tests/test-floorf2.c b/tests/test-floorf2.c
index 573a648..b26a508 100644 (file)
--- a/tests/test-floorf2.c
+++ b/tests/test-floorf2.c
@@ -16,6 +16,9 @@
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
 
+/* When this test fails on some platform, build it together with the gnulib
+   module 'fprintf-posix' for optimal debugging output.  */
+
 #include <config.h>
 
 #include <math.h>
@@ -119,8 +122,10 @@ check (float x)
       return 0;
     else
       {
+#if GNULIB_TEST_FPRINTF_POSIX
         fprintf (stderr, "floorf %g(%a) = %g(%a) or %g(%a)?\n",
                  x, x, reference, reference, result, result);
+#endif
         return 1;
       }
   }

diff --git a/tests/test-round2.c b/tests/test-round2.c
index cad256d..8c3eda0 100644 (file)
--- a/tests/test-round2.c
+++ b/tests/test-round2.c
@@ -17,6 +17,9 @@
 /* Written by Ben Pfaff <blp@gnu.org>, 2007.
    Heavily based on code by Bruno Haible. */
 
+/* When this test fails on some platform, build it together with the gnulib
+   module 'fprintf-posix' for optimal debugging output.  */
+
 /* Get the two reference implementations of round under the names
    round_reference1 and round_reference2.
 
@@ -62,8 +65,10 @@ equal (const char *message, DOUBLE x, DOUBLE y0, DOUBLE y1)
     return true;
   else
     {
+#if GNULIB_TEST_FPRINTF_POSIX
       fprintf (stderr, "%s: "FUNCTION"(%g(%a)) = %g(%a) or %g(%a)?\n",
                message, x, x, y0, y0, y1, y1);
+#endif
       return false;
     }
 }

diff --git a/tests/test-trunc2.c b/tests/test-trunc2.c
index 397e1ad..c9f0d8f 100644 (file)
--- a/tests/test-trunc2.c
+++ b/tests/test-trunc2.c
@@ -16,6 +16,9 @@
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
 
+/* When this test fails on some platform, build it together with the gnulib
+   module 'fprintf-posix' for optimal debugging output.  */
+
 #include <config.h>
 
 #include <math.h>
@@ -123,8 +126,10 @@ check (double x)
       return 0;
     else
       {
+#if GNULIB_TEST_FPRINTF_POSIX
         fprintf (stderr, "trunc %g(%a) = %g(%a) or %g(%a)?\n",
                  x, x, reference, reference, result, result);
+#endif
         return 1;
       }
   }

diff --git a/tests/test-truncf2.c b/tests/test-truncf2.c
index 2d78808..f19ed83 100644 (file)
--- a/tests/test-truncf2.c
+++ b/tests/test-truncf2.c
@@ -16,6 +16,9 @@
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
 
+/* When this test fails on some platform, build it together with the gnulib
+   module 'fprintf-posix' for optimal debugging output.  */
+
 #include <config.h>
 
 #include <math.h>
@@ -123,8 +126,10 @@ check (float x)
       return 0;
     else
       {
+#if GNULIB_TEST_FPRINTF_POSIX
         fprintf (stderr, "truncf %g(%a) = %g(%a) or %g(%a)?\n",
                  x, x, reference, reference, result, result);
+#endif
         return 1;
       }
   }