From: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>,
"Ævar Arnfjörð" <avarab@gmail.com>,
"SZEDER Gábor" <szeder.dev@gmail.com>,
"Johannes Schindelin" <johannes.schindelin@gmx.de>,
"Johannes Schindelin" <johannes.schindelin@gmx.de>
Subject: [PATCH 10/11] GETTEXT_POISON=rot13: perform actual checks in `test_i18ngrep`
Date: Tue, 12 Jan 2021 08:47:41 +0000 [thread overview]
Message-ID: <0a56ebfcad79a03a6a8701db367cabb7953a5fa4.1610441263.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.836.git.1610441262.gitgitgadget@gmail.com>
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
t/helper/test-i18n.c | 42 ++++++++++++++++++++++++++++++++++++++++-
t/test-lib-functions.sh | 6 ++++++
2 files changed, 47 insertions(+), 1 deletion(-)
diff --git a/t/helper/test-i18n.c b/t/helper/test-i18n.c
index 4b572e6efad..8a16df6b40f 100644
--- a/t/helper/test-i18n.c
+++ b/t/helper/test-i18n.c
@@ -1,8 +1,10 @@
#include "test-tool.h"
#include "cache.h"
+#include "grep.h"
static const char *usage_msg = "\n"
-" test-tool i18n cmp <file1> <file2>\n";
+" test-tool i18n cmp <file1> <file2>\n"
+" test-tool i18n grep <regex> <file>\n";
static inline char do_rot13(char c)
{
@@ -75,6 +77,42 @@ static int i18n_cmp(const char **argv)
return 0;
}
+static int i18n_grep(const char **argv)
+{
+ int dont_match = 0;
+ const char *pattern, *path;
+
+ struct grep_opt opt;
+ struct grep_source source;
+ struct strbuf buf = STRBUF_INIT;
+ int hit;
+
+ if (*argv && !strcmp("!", *argv)) {
+ dont_match = 1;
+ argv++;
+ }
+
+ pattern = *(argv++);
+ path = *(argv++);
+
+ if (!pattern || !path || *argv)
+ usage(usage_msg);
+
+ grep_init(&opt, the_repository, NULL);
+ append_grep_pattern(&opt, pattern, "command line", 0, GREP_PATTERN);
+ compile_grep_patterns(&opt);
+
+ if (strbuf_read_file(&buf, path, 0) < 0)
+ die_errno("could not read %s", path);
+ unrot13_strbuf(&buf);
+ grep_source_init(&source, GREP_SOURCE_BUF, path, path, path);
+ source.buf = buf.buf;
+ source.size = buf.len;
+ hit = grep_source(&opt, &source);
+ strbuf_release(&buf);
+ return dont_match ^ !hit;
+}
+
int cmd__i18n(int argc, const char **argv)
{
argv++;
@@ -82,6 +120,8 @@ int cmd__i18n(int argc, const char **argv)
usage(usage_msg);
if (!strcmp(*argv, "cmp"))
return i18n_cmp(argv+1);
+ else if (!strcmp(*argv, "grep"))
+ return i18n_grep(argv+1);
else
usage(usage_msg);
diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh
index 08731bae854..394fd2ef5be 100644
--- a/t/test-lib-functions.sh
+++ b/t/test-lib-functions.sh
@@ -1021,6 +1021,12 @@ test_i18ngrep () {
if test_have_prereq !C_LOCALE_OUTPUT
then
+ if test rot13 = "$GIT_TEST_GETTEXT_POISON"
+ then
+ test-tool i18n grep "$@"
+ return $?
+ fi
+
# pretend success
return 0
fi
--
gitgitgadget
next prev parent reply other threads:[~2021-01-12 8:49 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-12 8:47 [PATCH 00/11] [RFH] Introduce support for GETTEXT_POISON=rot13 Johannes Schindelin via GitGitGadget
2021-01-12 8:47 ` [PATCH 01/11] tests: remove unnecessary GIT_TEST_GETTEXT_POISON=false constructs Johannes Schindelin via GitGitGadget
2021-01-12 9:07 ` SZEDER Gábor
2021-01-12 8:47 ` [PATCH 02/11] Support GIT_TEST_GETTEXT_POISON=rot13 Johannes Schindelin via GitGitGadget
2021-01-12 19:37 ` Junio C Hamano
2021-01-12 8:47 ` [PATCH 03/11] parse-options: add forgotten translations Johannes Schindelin via GitGitGadget
2021-01-12 8:47 ` [PATCH 04/11] sha1dc: mark forgotten message for translation Johannes Schindelin via GitGitGadget
2021-01-12 11:37 ` Jeff King
2021-01-12 19:40 ` Junio C Hamano
2021-01-15 15:43 ` Johannes Schindelin
2021-01-15 16:29 ` Jeff King
2021-01-18 14:26 ` Johannes Schindelin
2021-01-18 21:06 ` Junio C Hamano
2021-01-19 15:52 ` Johannes Schindelin
2021-01-12 8:47 ` [PATCH 05/11] t0006: use `test_i18ncmp` only for C locales Johannes Schindelin via GitGitGadget
2021-01-12 8:47 ` [PATCH 06/11] t0041: stop using `test_i18ngrep` on untranslated output Johannes Schindelin via GitGitGadget
2021-01-12 8:47 ` [PATCH 07/11] t0027: mark a function as requiring the C locale Johannes Schindelin via GitGitGadget
2021-01-12 8:47 ` [PATCH 08/11] t6301: do not expect the output of `for-each-ref` to be translated Johannes Schindelin via GitGitGadget
2021-01-12 8:47 ` [PATCH 09/11] GETTEXT_POISON=rot13: do compare the output in `test_i18ncmp` Johannes Schindelin via GitGitGadget
2021-01-12 19:47 ` Junio C Hamano
2021-01-15 15:44 ` Johannes Schindelin
2021-01-15 19:58 ` Junio C Hamano
2021-01-18 14:36 ` Johannes Schindelin
2021-01-12 8:47 ` Johannes Schindelin via GitGitGadget [this message]
2021-01-12 8:47 ` [PATCH 11/11] test-tool i18n: do not complain about empty messages Johannes Schindelin via GitGitGadget
2021-01-12 11:34 ` [PATCH 00/11] [RFH] Introduce support for GETTEXT_POISON=rot13 Jeff King
2021-01-12 19:50 ` Junio C Hamano
2021-01-13 7:32 ` Jeff King
2021-01-16 6:38 ` Junio C Hamano
2021-01-12 13:32 ` Ævar Arnfjörð Bjarmason
2021-01-15 16:13 ` Johannes Schindelin
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=0a56ebfcad79a03a6a8701db367cabb7953a5fa4.1610441263.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=johannes.schindelin@gmx.de \
--cc=pclouds@gmail.com \
--cc=szeder.dev@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.