[SCM] GNU libidn branch, master, updated. libidn-1-23-3-gdc84aa0

[Simon Josefsson]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU libidn".

http://git.savannah.gnu.org/cgit/libidn.git/commit/?id=dc84aa0fc81c538d8b3a58142c733a7c4dbb00fb

The branch, master has been updated
       via  dc84aa0fc81c538d8b3a58142c733a7c4dbb00fb (commit)
      from  824409ef982af09f13e1bb6800b882fa0d974cdc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit dc84aa0fc81c538d8b3a58142c733a7c4dbb00fb
Author: Simon Josefsson <address@hidden>
Date:   Wed Nov 30 12:11:42 2011 +0100

    Update gnulib files.

-----------------------------------------------------------------------

Summary of changes:
 gl/Makefile.am                               |    2 +-
 gl/m4/gnulib-cache.m4                        |    4 +-
 gl/m4/gnulib-comp.m4                         |    3 ++
 gl/m4/manywarnings.m4                        |    9 ++---
 gltests/Makefile.am                          |    9 +++++
 gltests/{test-symlink.c => test-binary-io.c} |   48 +++++++++++++++-----------
 gltests/test-binary-io.sh                    |   12 ++++++
 maint.mk                                     |   10 +++++
 8 files changed, 69 insertions(+), 28 deletions(-)
 copy gltests/{test-symlink.c => test-binary-io.c} (56%)
 create mode 100755 gltests/test-binary-io.sh

diff --git a/gl/Makefile.am b/gl/Makefile.am
index ebbe4d0..ef51635 100644
--- a/gl/Makefile.am
+++ b/gl/Makefile.am
@@ -21,7 +21,7 @@
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --dir=. --local-dir=gl/override 
--lib=libgnu --source-base=gl --m4-base=gl/m4 --doc-base=doc 
--tests-base=gltests --aux-dir=build-aux --with-tests --avoid=binary-io-tests 
--avoid=fcntl-h-tests --avoid=stdlib-tests --avoid=string-tests 
--avoid=sys_stat-tests --avoid=time-tests --avoid=unistd-tests 
--avoid=update-copyright-tests --avoid=wchar-tests 
--no-conditional-dependencies --libtool --macro-prefix=gl --no-vc-files 
autobuild csharpcomp-script csharpexec-script error fdl-1.3 gendocs getopt-gnu 
gnupload gpl-3.0 lgpl-2.1 maintainer-makefile manywarnings pmccabe2html 
progname update-copyright useless-if-before-free valgrind-tests vc-list-files 
version-etc warnings
+# Reproduce by: gnulib-tool --import --dir=. --local-dir=gl/override 
--lib=libgnu --source-base=gl --m4-base=gl/m4 --doc-base=doc 
--tests-base=gltests --aux-dir=build-aux --with-tests --avoid=fcntl-h-tests 
--avoid=stdlib-tests --avoid=string-tests --avoid=sys_stat-tests 
--avoid=time-tests --avoid=unistd-tests --avoid=update-copyright-tests 
--avoid=wchar-tests --no-conditional-dependencies --libtool --macro-prefix=gl 
--no-vc-files autobuild csharpcomp-script csharpexec-script error fdl-1.3 
gendocs getopt-gnu gnupload gpl-3.0 lgpl-2.1 maintainer-makefile manywarnings 
pmccabe2html progname update-copyright useless-if-before-free valgrind-tests 
vc-list-files version-etc warnings
 
 AUTOMAKE_OPTIONS = 1.5 gnits
 
diff --git a/gl/m4/gnulib-cache.m4 b/gl/m4/gnulib-cache.m4
index 92865c6..df4f7c4 100644
--- a/gl/m4/gnulib-cache.m4
+++ b/gl/m4/gnulib-cache.m4
@@ -27,7 +27,7 @@
 
 
 # Specification in the form of a command-line invocation:
-#   gnulib-tool --import --dir=. --local-dir=gl/override --lib=libgnu 
--source-base=gl --m4-base=gl/m4 --doc-base=doc --tests-base=gltests 
--aux-dir=build-aux --with-tests --avoid=binary-io-tests --avoid=fcntl-h-tests 
--avoid=stdlib-tests --avoid=string-tests --avoid=sys_stat-tests 
--avoid=time-tests --avoid=unistd-tests --avoid=update-copyright-tests 
--avoid=wchar-tests --no-conditional-dependencies --libtool --macro-prefix=gl 
--no-vc-files autobuild csharpcomp-script csharpexec-script error fdl-1.3 
gendocs getopt-gnu gnupload gpl-3.0 lgpl-2.1 maintainer-makefile manywarnings 
pmccabe2html progname update-copyright useless-if-before-free valgrind-tests 
vc-list-files version-etc warnings
+#   gnulib-tool --import --dir=. --local-dir=gl/override --lib=libgnu 
--source-base=gl --m4-base=gl/m4 --doc-base=doc --tests-base=gltests 
--aux-dir=build-aux --with-tests --avoid=fcntl-h-tests --avoid=stdlib-tests 
--avoid=string-tests --avoid=sys_stat-tests --avoid=time-tests 
--avoid=unistd-tests --avoid=update-copyright-tests --avoid=wchar-tests 
--no-conditional-dependencies --libtool --macro-prefix=gl --no-vc-files 
autobuild csharpcomp-script csharpexec-script error fdl-1.3 gendocs getopt-gnu 
gnupload gpl-3.0 lgpl-2.1 maintainer-makefile manywarnings pmccabe2html 
progname update-copyright useless-if-before-free valgrind-tests vc-list-files 
version-etc warnings
 
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
 gl_LOCAL_DIR([gl/override])
@@ -53,7 +53,7 @@ gl_MODULES([
   version-etc
   warnings
 ])
-gl_AVOID([binary-io-tests fcntl-h-tests stdlib-tests string-tests 
sys_stat-tests time-tests unistd-tests update-copyright-tests wchar-tests])
+gl_AVOID([fcntl-h-tests stdlib-tests string-tests sys_stat-tests time-tests 
unistd-tests update-copyright-tests wchar-tests])
 gl_SOURCE_BASE([gl])
 gl_M4_BASE([gl/m4])
 gl_PO_BASE([])
diff --git a/gl/m4/gnulib-comp.m4 b/gl/m4/gnulib-comp.m4
index 902b74a..48269c9 100644
--- a/gl/m4/gnulib-comp.m4
+++ b/gl/m4/gnulib-comp.m4
@@ -43,6 +43,7 @@ AC_DEFUN([gl_EARLY],
   # Code from module autobuild:
   AB_INIT
   # Code from module binary-io:
+  # Code from module binary-io-tests:
   # Code from module close:
   # Code from module close-tests:
   # Code from module csharpcomp-script:
@@ -587,6 +588,8 @@ AC_DEFUN([gl_FILE_LIST], [
   tests/macros.h
   tests/signature.h
   tests/test-alloca-opt.c
+  tests/test-binary-io.c
+  tests/test-binary-io.sh
   tests/test-close.c
   tests/test-dup2.c
   tests/test-environ.c
diff --git a/gl/m4/manywarnings.m4 b/gl/m4/manywarnings.m4
index 6e78c07..be68659 100644
--- a/gl/m4/manywarnings.m4
+++ b/gl/m4/manywarnings.m4
@@ -1,4 +1,4 @@
-# manywarnings.m4 serial 1
+# manywarnings.m4 serial 3
 dnl Copyright (C) 2008-2011 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -30,9 +30,9 @@ AC_DEFUN([gl_MANYWARN_COMPLEMENT],
 
 # gl_MANYWARN_ALL_GCC(VARIABLE)
 # -----------------------------
-# Add all documented GCC (currently as per version 4.4) warning
-# parameters to variable VARIABLE.  Note that you need to test them
-# using gl_WARN_ADD if you want to make sure your gcc understands it.
+# Add all documented GCC warning parameters to variable VARIABLE.
+# Note that you need to test them using gl_WARN_ADD if you want to
+# make sure your gcc understands it.
 AC_DEFUN([gl_MANYWARN_ALL_GCC],
 [
   dnl First, check if -Wno-missing-field-initializers is needed.
@@ -171,7 +171,6 @@ AC_DEFUN([gl_MANYWARN_ALL_GCC],
     -Wsuggest-attribute=noreturn \
     -Wsuggest-attribute=pure \
     -Wtrampolines \
-    -Wunsuffixed-float-constants \
     ; do
     gl_manywarn_set="$gl_manywarn_set $gl_manywarn_item"
   done
diff --git a/gltests/Makefile.am b/gltests/Makefile.am
index 7c7c59f..e65e9e9 100644
--- a/gltests/Makefile.am
+++ b/gltests/Makefile.am
@@ -96,6 +96,15 @@ libtests_a_SOURCES += binary-io.h
 
 ## end   gnulib module binary-io
 
+## begin gnulib module binary-io-tests
+
+TESTS += test-binary-io.sh
+check_PROGRAMS += test-binary-io
+
+EXTRA_DIST += test-binary-io.sh test-binary-io.c macros.h
+
+## end   gnulib module binary-io-tests
+
 ## begin gnulib module close
 
 
diff --git a/gltests/test-symlink.c b/gltests/test-binary-io.c
similarity index 56%
copy from gltests/test-symlink.c
copy to gltests/test-binary-io.c
index 367e045..468485d 100644
--- a/gltests/test-symlink.c
+++ b/gltests/test-binary-io.c
@@ -1,5 +1,5 @@
-/* Tests of symlink.
-   Copyright (C) 2009-2011 Free Software Foundation, Inc.
+/* Test of binary mode I/O.
+   Copyright (C) 2005, 2007-2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -14,34 +14,42 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-/* Written by Eric Blake <address@hidden>, 2009.  */
+/* Written by Bruno Haible <address@hidden>, 2005.  */
 
 #include <config.h>
 
-#include <unistd.h>
-
-#include "signature.h"
-SIGNATURE_CHECK (symlink, int, (char const *, char const *));
+#include "binary-io.h"
 
+#include <sys/types.h>
+#include <sys/stat.h>
 #include <fcntl.h>
-#include <errno.h>
-#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <sys/stat.h>
+#include <unistd.h>
 
-#include "ignore-value.h"
 #include "macros.h"
 
-#define BASE "test-symlink.t"
-
-#include "test-symlink.h"
-
 int
-main (void)
+main ()
 {
-  /* Remove any leftovers from a previous partial run.  */
-  ignore_value (system ("rm -rf " BASE "*"));
-
-  return test_symlink (symlink, true);
+  /* Test the O_BINARY macro.  */
+  {
+    int fd =
+      open ("t-bin-out2.tmp", O_CREAT | O_TRUNC | O_RDWR | O_BINARY, 0600);
+    if (write (fd, "Hello\n", 6) < 0)
+      exit (1);
+    close (fd);
+  }
+  {
+    struct stat statbuf;
+    if (stat ("t-bin-out2.tmp", &statbuf) < 0)
+      exit (1);
+    ASSERT (statbuf.st_size == 6);
+  }
+
+  /* Test the SET_BINARY macro.  */
+  SET_BINARY (1);
+  fputs ("Hello\n", stdout);
+
+  return 0;
 }
diff --git a/gltests/test-binary-io.sh b/gltests/test-binary-io.sh
new file mode 100755
index 0000000..272edef
--- /dev/null
+++ b/gltests/test-binary-io.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+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
+
+exit 0
diff --git a/maint.mk b/maint.mk
index 76844a0..e4efb5f 100644
--- a/maint.mk
+++ b/maint.mk
@@ -1157,6 +1157,16 @@ sc_cross_check_PATH_usage_in_tests:
                1>&2; exit 1; } || :;                                   \
        fi
 
+# BRE regex of file contents to identify a test script.
+_test_script_regex ?= \<init\.sh\>
+
+# In tests, use "compare expected actual", not the reverse.
+sc_prohibit_reversed_compare_failure:
+       @prohibit='\<compare [^ ]+ ([^ ]*exp|/dev/null)'                \
+       containing='$(_test_script_regex)'                              \
+       halt='reversed compare arguments'                               \
+         $(_sc_search_regexp)
+
 # #if HAVE_... will evaluate to false for any non numeric string.
 # That would be flagged by using -Wundef, however gnulib currently
 # tests many undefined macros, and so we can't enable that option.


hooks/post-receive
-- 
GNU libidn