summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0def2e1)
raw | patch | inline | side by side (parent: 0def2e1)
author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | |
Mon, 19 Jul 2010 20:28:11 +0000 (20:28 +0000) | ||
committer | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | |
Sat, 30 Oct 2010 07:10:05 +0000 (07:10 +0000) |
Rename t0200-gettext.sh to t0200-gettext-basic.sh. Versions of GNU
gettext before v0.15 (released in 2006) fail to run the test because
of an old bug in gettext.sh.
To conform with the FHS gettext.sh prints a help message when it's
invoked directly. To do this it checks if $0 is "gettext.sh". This
check was broken before v0.15, it was checking for *\gettext.sh (to
support Windows), but now correctly checks for *\\gettext.sh.
t0200-gettext.sh matched the former broken check, so on systems with
an old GNU gettext (like RHEL 5.4) the test simply printed:
./t0200-gettext.sh
GNU gettext shell script function library version 0.14.6
Usage: . gettext.sh
FATAL: Unexpected exit with code 1
Which is just the gettext.sh help output:
$ gettext.sh
GNU gettext shell script function library version 0.17
Usage: . gettext.sh
Change the test name to t0200-gettext-basic.sh to work around that.
Reported-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Tested-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
gettext before v0.15 (released in 2006) fail to run the test because
of an old bug in gettext.sh.
To conform with the FHS gettext.sh prints a help message when it's
invoked directly. To do this it checks if $0 is "gettext.sh". This
check was broken before v0.15, it was checking for *\gettext.sh (to
support Windows), but now correctly checks for *\\gettext.sh.
t0200-gettext.sh matched the former broken check, so on systems with
an old GNU gettext (like RHEL 5.4) the test simply printed:
./t0200-gettext.sh
GNU gettext shell script function library version 0.14.6
Usage: . gettext.sh
FATAL: Unexpected exit with code 1
Which is just the gettext.sh help output:
$ gettext.sh
GNU gettext shell script function library version 0.17
Usage: . gettext.sh
Change the test name to t0200-gettext-basic.sh to work around that.
Reported-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Tested-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t0200-gettext-basic.sh | [new file with mode: 0755] | patch | blob |
t/t0200-gettext.sh | [deleted file] | patch | blob | history |
diff --git a/t/t0200-gettext-basic.sh b/t/t0200-gettext-basic.sh
--- /dev/null
+++ b/t/t0200-gettext-basic.sh
@@ -0,0 +1,108 @@
+#!/bin/sh
+#
+# Copyright (c) 2010 Ævar Arnfjörð Bjarmason
+#
+
+test_description='Gettext support for Git'
+
+. ./lib-gettext.sh
+
+test_expect_success "sanity: \$GIT_INTERNAL_GETTEXT_SH_SCHEME is set (to $GIT_INTERNAL_GETTEXT_SH_SCHEME)" '
+ test -n "$GIT_INTERNAL_GETTEXT_SH_SCHEME"
+'
+
+test_expect_success 'sanity: $TEXTDOMAIN is git' '
+ test $TEXTDOMAIN = "git"
+'
+
+test_expect_success 'xgettext sanity: Perl _() strings are not extracted' '
+ ! grep "A Perl string xgettext will not get" "$GIT_PO_PATH"/is.po
+'
+
+test_expect_success 'xgettext sanity: Comment extraction with --add-comments' '
+ grep "TRANSLATORS: This is a test" "$TEST_DIRECTORY"/t0200/* | wc -l >expect &&
+ grep "TRANSLATORS: This is a test" "$GIT_PO_PATH"/is.po | wc -l >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'xgettext sanity: Comment extraction with --add-comments stops at statements' '
+ ! grep "This is a phony" "$GIT_PO_PATH"/is.po &&
+ ! grep "the above comment" "$GIT_PO_PATH"/is.po
+'
+
+test_expect_success GETTEXT 'sanity: $TEXTDOMAINDIR exists without NO_GETTEXT=YesPlease' '
+ test -d "$TEXTDOMAINDIR" &&
+ test "$TEXTDOMAINDIR" = "$GIT_TEXTDOMAINDIR"
+'
+
+test_expect_success GETTEXT 'sanity: Icelandic locale was compiled' '
+ test -f "$TEXTDOMAINDIR/is/LC_MESSAGES/git.mo"
+'
+
+# TODO: When we have more locales, generalize this to test them
+# all. Maybe we'll need a dir->locale map for that.
+test_expect_success GETTEXT_LOCALE 'sanity: gettext("") metadata is OK' '
+ # Return value may be non-zero
+ LANGUAGE=is LC_ALL="$is_IS_locale" gettext "" >zero-expect &&
+ grep "Project-Id-Version: Git" zero-expect &&
+ grep "Git Mailing List <git@vger.kernel.org>" zero-expect &&
+ grep "Content-Type: text/plain; charset=UTF-8" zero-expect &&
+ grep "Content-Transfer-Encoding: 8bit" zero-expect
+'
+
+test_expect_success GETTEXT_LOCALE 'sanity: gettext(unknown) is passed through' '
+ printf "This is not a translation string" >expect &&
+ gettext "This is not a translation string" >actual &&
+ eval_gettext "This is not a translation string" >actual &&
+ test_cmp expect actual
+'
+
+# xgettext from C
+test_expect_success GETTEXT_LOCALE 'xgettext: C extraction of _() and N_() strings' '
+ printf "TILRAUN: C tilraunastrengur" >expect &&
+ printf "\n" >>expect &&
+ printf "Sjá '\''git help SKIPUN'\'' til að sjá hjálp fyrir tiltekna skipun." >>expect &&
+ LANGUAGE=is LC_ALL="$is_IS_locale" gettext "TEST: A C test string" >actual &&
+ printf "\n" >>actual &&
+ LANGUAGE=is LC_ALL="$is_IS_locale" gettext "See '\''git help COMMAND'\'' for more information on a specific command." >>actual &&
+ test_cmp expect actual
+'
+
+test_expect_success GETTEXT_LOCALE 'xgettext: C extraction with %s' '
+ printf "TILRAUN: C tilraunastrengur %%s" >expect &&
+ LANGUAGE=is LC_ALL="$is_IS_locale" gettext "TEST: A C test string %s" >actual &&
+ test_cmp expect actual
+'
+
+# xgettext from Shell
+test_expect_success GETTEXT_LOCALE 'xgettext: Shell extraction' '
+ printf "TILRAUN: Skeljartilraunastrengur" >expect &&
+ LANGUAGE=is LC_ALL="$is_IS_locale" gettext "TEST: A Shell test string" >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success GETTEXT_LOCALE 'xgettext: Shell extraction with $variable' '
+ printf "TILRAUN: Skeljartilraunastrengur með breytunni a var i able" >x-expect &&
+ LANGUAGE=is LC_ALL="$is_IS_locale" variable="a var i able" eval_gettext "TEST: A Shell test \$variable" >x-actual &&
+ test_cmp x-expect x-actual
+'
+
+# xgettext from Perl
+test_expect_success GETTEXT_LOCALE 'xgettext: Perl extraction' '
+ printf "TILRAUN: Perl tilraunastrengur" >expect &&
+ LANGUAGE=is LC_ALL="$is_IS_locale" gettext "TEST: A Perl test string" >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success GETTEXT_LOCALE 'xgettext: Perl extraction with %s' '
+ printf "TILRAUN: Perl tilraunastrengur með breytunni %%s" >expect &&
+ LANGUAGE=is LC_ALL="$is_IS_locale" gettext "TEST: A Perl test variable %s" >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success GETTEXT_LOCALE 'sanity: Some gettext("") data for real locale' '
+ LANGUAGE=is LC_ALL="$is_IS_locale" gettext "" >real-locale &&
+ test -s real-locale
+'
+
+test_done
diff --git a/t/t0200-gettext.sh b/t/t0200-gettext.sh
--- a/t/t0200-gettext.sh
+++ /dev/null
@@ -1,108 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2010 Ævar Arnfjörð Bjarmason
-#
-
-test_description='Gettext support for Git'
-
-. ./lib-gettext.sh
-
-test_expect_success "sanity: \$GIT_INTERNAL_GETTEXT_SH_SCHEME is set (to $GIT_INTERNAL_GETTEXT_SH_SCHEME)" '
- test -n "$GIT_INTERNAL_GETTEXT_SH_SCHEME"
-'
-
-test_expect_success 'sanity: $TEXTDOMAIN is git' '
- test $TEXTDOMAIN = "git"
-'
-
-test_expect_success 'xgettext sanity: Perl _() strings are not extracted' '
- ! grep "A Perl string xgettext will not get" "$GIT_PO_PATH"/is.po
-'
-
-test_expect_success 'xgettext sanity: Comment extraction with --add-comments' '
- grep "TRANSLATORS: This is a test" "$TEST_DIRECTORY"/t0200/* | wc -l >expect &&
- grep "TRANSLATORS: This is a test" "$GIT_PO_PATH"/is.po | wc -l >actual &&
- test_cmp expect actual
-'
-
-test_expect_success 'xgettext sanity: Comment extraction with --add-comments stops at statements' '
- ! grep "This is a phony" "$GIT_PO_PATH"/is.po &&
- ! grep "the above comment" "$GIT_PO_PATH"/is.po
-'
-
-test_expect_success GETTEXT 'sanity: $TEXTDOMAINDIR exists without NO_GETTEXT=YesPlease' '
- test -d "$TEXTDOMAINDIR" &&
- test "$TEXTDOMAINDIR" = "$GIT_TEXTDOMAINDIR"
-'
-
-test_expect_success GETTEXT 'sanity: Icelandic locale was compiled' '
- test -f "$TEXTDOMAINDIR/is/LC_MESSAGES/git.mo"
-'
-
-# TODO: When we have more locales, generalize this to test them
-# all. Maybe we'll need a dir->locale map for that.
-test_expect_success GETTEXT_LOCALE 'sanity: gettext("") metadata is OK' '
- # Return value may be non-zero
- LANGUAGE=is LC_ALL="$is_IS_locale" gettext "" >zero-expect &&
- grep "Project-Id-Version: Git" zero-expect &&
- grep "Git Mailing List <git@vger.kernel.org>" zero-expect &&
- grep "Content-Type: text/plain; charset=UTF-8" zero-expect &&
- grep "Content-Transfer-Encoding: 8bit" zero-expect
-'
-
-test_expect_success GETTEXT_LOCALE 'sanity: gettext(unknown) is passed through' '
- printf "This is not a translation string" >expect &&
- gettext "This is not a translation string" >actual &&
- eval_gettext "This is not a translation string" >actual &&
- test_cmp expect actual
-'
-
-# xgettext from C
-test_expect_success GETTEXT_LOCALE 'xgettext: C extraction of _() and N_() strings' '
- printf "TILRAUN: C tilraunastrengur" >expect &&
- printf "\n" >>expect &&
- printf "Sjá '\''git help SKIPUN'\'' til að sjá hjálp fyrir tiltekna skipun." >>expect &&
- LANGUAGE=is LC_ALL="$is_IS_locale" gettext "TEST: A C test string" >actual &&
- printf "\n" >>actual &&
- LANGUAGE=is LC_ALL="$is_IS_locale" gettext "See '\''git help COMMAND'\'' for more information on a specific command." >>actual &&
- test_cmp expect actual
-'
-
-test_expect_success GETTEXT_LOCALE 'xgettext: C extraction with %s' '
- printf "TILRAUN: C tilraunastrengur %%s" >expect &&
- LANGUAGE=is LC_ALL="$is_IS_locale" gettext "TEST: A C test string %s" >actual &&
- test_cmp expect actual
-'
-
-# xgettext from Shell
-test_expect_success GETTEXT_LOCALE 'xgettext: Shell extraction' '
- printf "TILRAUN: Skeljartilraunastrengur" >expect &&
- LANGUAGE=is LC_ALL="$is_IS_locale" gettext "TEST: A Shell test string" >actual &&
- test_cmp expect actual
-'
-
-test_expect_success GETTEXT_LOCALE 'xgettext: Shell extraction with $variable' '
- printf "TILRAUN: Skeljartilraunastrengur með breytunni a var i able" >x-expect &&
- LANGUAGE=is LC_ALL="$is_IS_locale" variable="a var i able" eval_gettext "TEST: A Shell test \$variable" >x-actual &&
- test_cmp x-expect x-actual
-'
-
-# xgettext from Perl
-test_expect_success GETTEXT_LOCALE 'xgettext: Perl extraction' '
- printf "TILRAUN: Perl tilraunastrengur" >expect &&
- LANGUAGE=is LC_ALL="$is_IS_locale" gettext "TEST: A Perl test string" >actual &&
- test_cmp expect actual
-'
-
-test_expect_success GETTEXT_LOCALE 'xgettext: Perl extraction with %s' '
- printf "TILRAUN: Perl tilraunastrengur með breytunni %%s" >expect &&
- LANGUAGE=is LC_ALL="$is_IS_locale" gettext "TEST: A Perl test variable %s" >actual &&
- test_cmp expect actual
-'
-
-test_expect_success GETTEXT_LOCALE 'sanity: Some gettext("") data for real locale' '
- LANGUAGE=is LC_ALL="$is_IS_locale" gettext "" >real-locale &&
- test -s real-locale
-'
-
-test_done