changeset 16123:25b04be44d9e

binary-io tests: Avoid test failure on mingw when libtool is used. * tests/test-binary-io.c (main): Don't remove t-bin-out2.tmp here. Don't verify the size of t-bin-out1.tmp here. * tests/test-binary-io.sh: Verify it here. Reported by Simon Josefsson.
author Bruno Haible <bruno@clisp.org>
date Sun, 27 Nov 2011 15:54:08 +0100
parents e3e8e2fc21a9
children c56792ef17f5
files ChangeLog tests/test-binary-io.c tests/test-binary-io.sh
diffstat 3 files changed, 9 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-11-27  Bruno Haible  <bruno@clisp.org>
+
+	binary-io tests: Avoid test failure on mingw when libtool is used.
+	* tests/test-binary-io.c (main): Don't remove t-bin-out2.tmp here.
+	Don't verify the size of t-bin-out1.tmp here.
+	* tests/test-binary-io.sh: Verify it here.
+	Reported by Simon Josefsson.
+
 2011-11-26  Bruno Haible  <bruno@clisp.org>
 
 	Fix conflict between two instantiations of module 'unistd'.
--- a/tests/test-binary-io.c
+++ b/tests/test-binary-io.c
@@ -46,19 +46,10 @@
       exit (1);
     ASSERT (statbuf.st_size == 6);
   }
-  unlink ("t-bin-out2.tmp");
 
   /* Test the SET_BINARY macro.  */
   SET_BINARY (1);
   fputs ("Hello\n", stdout);
-  fclose (stdout);
-  fclose (stderr);
-  {
-    struct stat statbuf;
-    if (stat ("t-bin-out1.tmp", &statbuf) < 0)
-      exit (1);
-    ASSERT (statbuf.st_size == 6);
-  }
 
   return 0;
 }
--- a/tests/test-binary-io.sh
+++ b/tests/test-binary-io.sh
@@ -5,6 +5,7 @@
 
 tmpfiles="$tmpfiles t-bin-out1.tmp t-bin-out2.tmp"
 ./test-binary-io${EXEEXT} > t-bin-out1.tmp || exit 1
+cmp t-bin-out1.tmp t-bin-out2.tmp > /dev/null || exit 1
 
 rm -fr $tmpfiles