git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
	"Ævar Arnfjörð" <avarab@gmail.com>,
	"Jiang Xin" <worldhello.net@gmail.com>,
	"Jonathan Nieder" <jrnieder@gmail.com>,
	"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH 3/7] Fix tests under GETTEXT_POISON on diffstat
Date: Tue, 21 Aug 2012 11:31:00 +0700	[thread overview]
Message-ID: <1345523464-14586-4-git-send-email-pclouds@gmail.com> (raw)
In-Reply-To: <1345523464-14586-1-git-send-email-pclouds@gmail.com>

From: Jiang Xin <worldhello.net@gmail.com>

Use i18n-specific test functions in test scripts for diffstat.
This issue was was introduced in v1.7.9-1-g7f814:

    7f814 Use correct grammar in diffstat summary line

and been broken under GETTEXT_POISON=YesPlease since.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
 t/t4006-diff-mode.sh          | 8 ++++----
 t/t4202-log.sh                | 2 +-
 t/t4205-log-pretty-formats.sh | 4 ++--
 t/t7508-status.sh             | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/t/t4006-diff-mode.sh b/t/t4006-diff-mode.sh
index 7a3e1f9..3d4b1ba 100755
--- a/t/t4006-diff-mode.sh
+++ b/t/t4006-diff-mode.sh
@@ -36,24 +36,24 @@ test_expect_success '--stat output after text chmod' '
 	test_chmod -x rezrov &&
 	echo " 0 files changed" >expect &&
 	git diff HEAD --stat >actual &&
-	test_cmp expect actual
+	test_i18ncmp expect actual
 '
 
 test_expect_success '--shortstat output after text chmod' '
 	git diff HEAD --shortstat >actual &&
-	test_cmp expect actual
+	test_i18ncmp expect actual
 '
 
 test_expect_success '--stat output after binary chmod' '
 	test_chmod +x binbin &&
 	echo " 0 files changed" >expect &&
 	git diff HEAD --stat >actual &&
-	test_cmp expect actual
+	test_i18ncmp expect actual
 '
 
 test_expect_success '--shortstat output after binary chmod' '
 	git diff HEAD --shortstat >actual &&
-	test_cmp expect actual
+	test_i18ncmp expect actual
 '
 
 test_done
diff --git a/t/t4202-log.sh b/t/t4202-log.sh
index 71be59d..31869dc 100755
--- a/t/t4202-log.sh
+++ b/t/t4202-log.sh
@@ -803,7 +803,7 @@ sanitize_output () {
 test_expect_success 'log --graph with diff and stats' '
 	git log --graph --pretty=short --stat -p >actual &&
 	sanitize_output >actual.sanitized <actual &&
-	test_cmp expect actual.sanitized
+	test_i18ncmp expect actual.sanitized
 '
 
 test_done
diff --git a/t/t4205-log-pretty-formats.sh b/t/t4205-log-pretty-formats.sh
index 4afd778..2c45de7 100755
--- a/t/t4205-log-pretty-formats.sh
+++ b/t/t4205-log-pretty-formats.sh
@@ -88,7 +88,7 @@ test_expect_success 'NUL separation with --stat' '
 	stat1_part=$(git diff --stat --root HEAD^) &&
 	printf "add bar\n$stat0_part\n\0initial\n$stat1_part\n" >expected &&
 	git log -z --stat --pretty="format:%s" >actual &&
-	test_cmp expected actual
+	test_i18ncmp expected actual
 '
 
 test_expect_failure 'NUL termination with --stat' '
@@ -96,7 +96,7 @@ test_expect_failure 'NUL termination with --stat' '
 	stat1_part=$(git diff --stat --root HEAD^) &&
 	printf "add bar\n$stat0_part\n\0initial\n$stat1_part\n\0" >expected &&
 	git log -z --stat --pretty="tformat:%s" >actual &&
-	test_cmp expected actual
+	test_i18ncmp expected actual
 '
 
 test_done
diff --git a/t/t7508-status.sh b/t/t7508-status.sh
index c206f47..e313ef1 100755
--- a/t/t7508-status.sh
+++ b/t/t7508-status.sh
@@ -80,7 +80,7 @@ test_expect_success 'status --column' '
 #	dir1/untracked dir2/untracked untracked
 #	dir2/modified  output
 EOF
-	test_cmp expect output
+	test_i18ncmp expect output
 '
 
 cat >expect <<\EOF
-- 
1.7.12.rc2

  parent reply	other threads:[~2012-08-21  4:32 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-08-21  4:30 [PATCH 0/7] Gettext poison fixes Nguyễn Thái Ngọc Duy
2012-08-21  4:30 ` [PATCH 1/7] Fix tests under GETTEXT_POISON on relative dates Nguyễn Thái Ngọc Duy
2012-08-21  4:30 ` [PATCH 2/7] Fix tests under GETTEXT_POISON on git-stash Nguyễn Thái Ngọc Duy
2012-08-21  4:31 ` Nguyễn Thái Ngọc Duy [this message]
2012-08-21  4:31 ` [PATCH 4/7] Fix tests under GETTEXT_POISON on git-apply Nguyễn Thái Ngọc Duy
2012-08-21  4:31 ` [PATCH 5/7] Fix tests under GETTEXT_POISON on pack-object Nguyễn Thái Ngọc Duy
2012-08-21  5:17   ` Jonathan Nieder
2012-08-21 10:39     ` Nguyen Thai Ngoc Duy
2012-08-21 14:24       ` Jonathan Nieder
2012-08-21 17:53         ` Junio C Hamano
2012-08-21  4:31 ` [PATCH 6/7] Fix tests under GETTEXT_POISON on git-remote Nguyễn Thái Ngọc Duy
2012-08-21 22:05   ` Junio C Hamano
2012-08-22 14:56     ` Jiang Xin
2012-08-22 19:39       ` Junio C Hamano
2012-08-21  4:31 ` [PATCH 7/7] Fix tests under GETTEXT_POISON on parseopt Nguyễn Thái Ngọc Duy
2012-08-27  5:36 ` [PATCH v2 0/7] Gettext poison fixes Jiang Xin
2012-08-27  5:36 ` [PATCH v2 1/7] Fix tests under GETTEXT_POISON on relative dates Jiang Xin
2012-08-27 16:18   ` Junio C Hamano
2012-08-27  5:36 ` [PATCH v2 2/7] Fix tests under GETTEXT_POISON on git-stash Jiang Xin
2012-08-27  5:36 ` [PATCH v2 3/7] Fix tests under GETTEXT_POISON on diffstat Jiang Xin
2012-08-27  5:36 ` [PATCH v2 4/7] Fix tests under GETTEXT_POISON on git-apply Jiang Xin
2012-08-27  5:36 ` [PATCH v2 5/7] Fix tests under GETTEXT_POISON on pack-object Jiang Xin
2012-08-27  5:36 ` [PATCH v2 6/7] Fix tests under GETTEXT_POISON on git-remote Jiang Xin
2012-08-27 16:28   ` Junio C Hamano
2012-08-27 21:25     ` Jiang Xin
2012-08-28  1:27       ` Junio C Hamano
2012-08-27  5:36 ` [PATCH v2 7/7] Fix tests under GETTEXT_POISON on parseopt Jiang Xin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1345523464-14586-4-git-send-email-pclouds@gmail.com \
    --to=pclouds@gmail.com \
    --cc=avarab@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jrnieder@gmail.com \
    --cc=worldhello.net@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).