]> git.ipfire.org Git - thirdparty/coreutils.git/commitdiff
tests: correct the "make check"-run check-AUTHORS test
authorJim Meyering <meyering@redhat.com>
Sat, 2 May 2009 19:56:25 +0000 (21:56 +0200)
committerJim Meyering <meyering@redhat.com>
Sun, 3 May 2009 13:51:27 +0000 (15:51 +0200)
* src/Makefile.am (check-AUTHORS): Revert back to using
en_US.UTF-8, to ease parsing (English-only) text around the
list of names, even when .po files are not installed.
Reported by Andreas Schwab.
Along the way, use $(AM_V_GEN), not "@".
(sc_tight_scope): Use $(AM_V_GEN) here, too.
* gnulib: Update submodule to latest, for the proper_name_utf8 fix
that makes --version output print the UTF-8 rendering of author names
in more cases.

gnulib
src/Makefile.am

diff --git a/gnulib b/gnulib
index 8d08fa04b902a9fdd504c6ceae2efb8ca650c2a6..9ccd438ce337e6fb8c95d9261f1e06a3952261c2 160000 (submodule)
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 8d08fa04b902a9fdd504c6ceae2efb8ca650c2a6
+Subproject commit 9ccd438ce337e6fb8c95d9261f1e06a3952261c2
index 5c09906c378f576b98176b6365d9d7c0b70188b7..136cadac957dbbb126288061c0e1332a20bc7337 100644 (file)
@@ -382,15 +382,15 @@ check-duplicate-no-install: tr
        test -z "`echo '$(EXTRA_PROGRAMS)'| ./tr ' ' '\n' | uniq -d`"
 
 # Ensure that the list of programs and author names is accurate.
-# We need a UTF8 locale, and any one should do, but since configure
-# already tries to find a French one, use it.  It's fine to skip this test.
+# We need a UTF8 locale.  If a lack of locale support or a missing
+# translation inhibits printing of UTF-8 names, just skip this test.
 au_dotdot = authors-dotdot
 au_actual = authors-actual
 .PHONY: check-AUTHORS
 check-AUTHORS: $(all_programs)
-       @locale='$(LOCALE_FR_UTF8)';                    \
-       case "$$locale" in                              \
-         ''|none) echo "$@: skipping this check"; exit 0;; esac; \
+       $(AM_V_GEN)LC_ALL="$$locale" ./cat --version    \
+           | grep ' Torbjorn '                         \
+         && { echo "$@: skipping this check"; exit 0; }; \
        rm -f $(au_actual) $(au_dotdot);                \
        for i in `ls $(all_programs) | sed -e 's,$(EXEEXT)$$,,' \
            | $(ASSORT) -u`; do                         \
@@ -420,7 +420,7 @@ check-AUTHORS: $(all_programs)
 # The second nm|grep checks for file-scope variables with `extern' scope.
 .PHONY: sc_tight_scope
 sc_tight_scope: $(bin_PROGRAMS)
-       @t=exceptions-$$$$;                                             \
+       $(AM_V_GEN)t=exceptions-$$$$;                                   \
        trap "s=$$?; rm -f $$t; exit $$s" 0 1 2 13 15;                  \
        src=`for f in $(SOURCES); do                                    \
               test -f $$f && d= || d=$(srcdir)/; echo $$d$$f; done`;   \