All of lore.kernel.org
 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 5/7] Fix tests under GETTEXT_POISON on pack-object
Date: Tue, 21 Aug 2012 11:31:02 +0700	[thread overview]
Message-ID: <1345523464-14586-6-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 pack-object.
This issue was was introduced in v1.7.10.2-556-g46140:

    46140 index-pack: use streaming interface for collision test on large blobs
    cf2ba pack-objects: use streaming interface for reading large loose blobs

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/t5300-pack-object.sh       | 4 ++--
 t/t5530-upload-pack-error.sh | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/t/t5300-pack-object.sh b/t/t5300-pack-object.sh
index 2e52f8b..a07c871 100755
--- a/t/t5300-pack-object.sh
+++ b/t/t5300-pack-object.sh
@@ -416,11 +416,11 @@ test_expect_success \
 test_expect_success \
     'make sure index-pack detects the SHA1 collision' \
     'test_must_fail git index-pack -o bad.idx test-3.pack 2>msg &&
-     grep "SHA1 COLLISION FOUND" msg'
+     test_i18ngrep "SHA1 COLLISION FOUND" msg'
 
 test_expect_success \
     'make sure index-pack detects the SHA1 collision (large blobs)' \
     'test_must_fail git -c core.bigfilethreshold=1 index-pack -o bad.idx test-3.pack 2>msg &&
-     grep "SHA1 COLLISION FOUND" msg'
+     test_i18ngrep "SHA1 COLLISION FOUND" msg'
 
 test_done
diff --git a/t/t5530-upload-pack-error.sh b/t/t5530-upload-pack-error.sh
index 6b2a5f4..99f8dbc 100755
--- a/t/t5530-upload-pack-error.sh
+++ b/t/t5530-upload-pack-error.sh
@@ -35,7 +35,7 @@ test_expect_success 'upload-pack fails due to error in pack-objects packing' '
 	printf "0032want %s\n00000009done\n0000" \
 		$(git rev-parse HEAD) >input &&
 	test_must_fail git upload-pack . <input >/dev/null 2>output.err &&
-	grep "unable to read" output.err &&
+	test_i18ngrep "unable to read" output.err &&
 	grep "pack-objects died" output.err
 '
 
-- 
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 ` [PATCH 3/7] Fix tests under GETTEXT_POISON on diffstat Nguyễn Thái Ngọc Duy
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 ` Nguyễn Thái Ngọc Duy [this message]
2012-08-21  5:17   ` [PATCH 5/7] Fix tests under GETTEXT_POISON on pack-object 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-6-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.