All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>, "Jeff King" <peff@peff.net>,
	"Jeffrey Walton" <noloader@gmail.com>,
	"Michał Kiedrowicz" <michal.kiedrowicz@gmail.com>,
	"J Smith" <dark.panda@gmail.com>,
	"Victor Leschuk" <vleschuk@gmail.com>,
	"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>,
	"Fredrik Kuivinen" <frekui@gmail.com>,
	"Brandon Williams" <bmwill@google.com>,
	"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [PATCH v4 28/31] pack-objects & index-pack: add test for --threads warning
Date: Thu, 25 May 2017 19:45:32 +0000	[thread overview]
Message-ID: <20170525194535.9324-29-avarab@gmail.com> (raw)
In-Reply-To: <20170525194535.9324-1-avarab@gmail.com>

Add a test for the warning that's emitted when --threads or
pack.threads is provided under NO_PTHREADS=YesPlease. This uses the
new PTHREADS prerequisite.

The assertion for C_LOCALE_OUTPUT in the latter test is currently
redundant, since unlike index-pack the pack-objects warnings aren't
i18n'd. However they might be changed to be i18n'd in the future, and
there's no harm in future-proofing the test.

There's an existing bug in the implementation of pack-objects which
this test currently tests for as-is. Details about the bug & the fix
are included in a follow-up change.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
 t/t5300-pack-object.sh | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/t/t5300-pack-object.sh b/t/t5300-pack-object.sh
index 43a672c345..6ed23ee1d2 100755
--- a/t/t5300-pack-object.sh
+++ b/t/t5300-pack-object.sh
@@ -421,6 +421,42 @@ test_expect_success 'index-pack <pack> works in non-repo' '
 	test_path_is_file foo.idx
 '
 
+test_expect_success !PTHREADS,C_LOCALE_OUTPUT 'index-pack --threads=N or pack.threads=N warns when no pthreads' '
+	test_must_fail git index-pack --threads=2 2>err &&
+	grep ^warning: err >warnings &&
+	test_line_count = 1 warnings &&
+	grep -F "no threads support, ignoring --threads=2" err &&
+
+	test_must_fail git -c pack.threads=2 index-pack 2>err &&
+	grep ^warning: err >warnings &&
+	test_line_count = 1 warnings &&
+	grep -F "no threads support, ignoring pack.threads" err &&
+
+	test_must_fail git -c pack.threads=2 index-pack --threads=4 2>err &&
+	grep ^warning: err >warnings &&
+	test_line_count = 2 warnings &&
+	grep -F "no threads support, ignoring --threads=4" err &&
+	grep -F "no threads support, ignoring pack.threads" err
+'
+
+test_expect_success !PTHREADS,C_LOCALE_OUTPUT 'pack-objects --threads=N or pack.threads=N warns when no pthreads' '
+	git pack-objects --threads=2 --stdout --all </dev/null >/dev/null 2>err &&
+	grep ^warning: err >warnings &&
+	test_line_count = 1 warnings &&
+	grep -F "no threads support, ignoring --threads" err &&
+
+	git -c pack.threads=2 pack-objects --stdout --all </dev/null >/dev/null 2>err &&
+	grep ^warning: err >warnings &&
+	test_must_fail test_line_count = 1 warnings &&
+	grep -F "no threads support, ignoring pack.threads" err &&
+
+	git -c pack.threads=2 pack-objects --threads=4 --stdout --all </dev/null >/dev/null 2>err &&
+	grep ^warning: err >warnings &&
+	test_line_count = 2 warnings &&
+	grep -F "no threads support, ignoring --threads" err &&
+	grep -F "no threads support, ignoring pack.threads" err
+'
+
 #
 # WARNING!
 #
-- 
2.13.0.303.g4ebf302169


  parent reply	other threads:[~2017-05-25 19:47 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-05-25 19:45 [PATCH v4 00/31] Easy to review grep & pre-PCRE changes Ævar Arnfjörð Bjarmason
2017-05-25 19:45 ` [PATCH v4 01/31] Makefile & configure: reword inaccurate comment about PCRE Ævar Arnfjörð Bjarmason
2017-05-25 19:45 ` [PATCH v4 02/31] grep & rev-list doc: stop promising libpcre for --perl-regexp Ævar Arnfjörð Bjarmason
2017-05-25 19:45 ` [PATCH v4 03/31] test-lib: rename the LIBPCRE prerequisite to PCRE Ævar Arnfjörð Bjarmason
2017-05-25 19:45 ` [PATCH v4 04/31] log: add exhaustive tests for pattern style options & config Ævar Arnfjörð Bjarmason
2017-05-25 19:45 ` [PATCH v4 05/31] log: make --regexp-ignore-case work with --perl-regexp Ævar Arnfjörð Bjarmason
2017-05-25 19:45 ` [PATCH v4 06/31] grep: add a test asserting that --perl-regexp dies when !PCRE Ævar Arnfjörð Bjarmason
2017-05-25 19:45 ` [PATCH v4 07/31] grep: add a test for backreferences in PCRE patterns Ævar Arnfjörð Bjarmason
2017-05-25 19:45 ` [PATCH v4 08/31] grep: change non-ASCII -i test to stop using --debug Ævar Arnfjörð Bjarmason
2017-05-25 19:45 ` [PATCH v4 09/31] grep: add tests for --threads=N and grep.threads Ævar Arnfjörð Bjarmason
2017-05-25 19:45 ` [PATCH v4 10/31] grep: amend submodule recursion test for regex engine testing Ævar Arnfjörð Bjarmason
2017-05-25 19:45 ` [PATCH v4 11/31] grep: add tests for grep pattern types being passed to submodules Ævar Arnfjörð Bjarmason
2017-05-25 19:45 ` [PATCH v4 12/31] grep: add a test helper function for less verbose -f \0 tests Ævar Arnfjörð Bjarmason
2017-05-25 19:45 ` [PATCH v4 13/31] grep: prepare for testing binary regexes containing rx metacharacters Ævar Arnfjörð Bjarmason
2017-05-25 19:45 ` [PATCH v4 14/31] grep: add tests to fix blind spots with \0 patterns Ævar Arnfjörð Bjarmason
2017-05-25 19:45 ` [PATCH v4 15/31] perf: add a GIT_PERF_MAKE_COMMAND for when *_MAKE_OPTS won't do Ævar Arnfjörð Bjarmason
2017-05-25 19:45 ` [PATCH v4 16/31] perf: emit progress output when unpacking & building Ævar Arnfjörð Bjarmason
2017-05-25 19:45 ` [PATCH v4 17/31] perf: add a comparison test of grep regex engines Ævar Arnfjörð Bjarmason
2017-05-25 19:45 ` [PATCH v4 18/31] perf: add a comparison test of grep regex engines with -F Ævar Arnfjörð Bjarmason
2017-05-25 19:45 ` [PATCH v4 19/31] perf: add a comparison test of log --grep regex engines Ævar Arnfjörð Bjarmason
2017-05-25 19:45 ` [PATCH v4 20/31] perf: add a comparison test of log --grep regex engines with -F Ævar Arnfjörð Bjarmason
2017-05-25 19:45 ` [PATCH v4 21/31] grep: catch a missing enum in switch statement Ævar Arnfjörð Bjarmason
2017-05-25 19:45 ` [PATCH v4 22/31] grep: remove redundant regflags assignments Ævar Arnfjörð Bjarmason
2017-05-25 19:45 ` [PATCH v4 23/31] grep: factor test for \0 in grep patterns into a function Ævar Arnfjörð Bjarmason
2017-05-25 19:45 ` [PATCH v4 24/31] grep: change the internal PCRE macro names to be PCRE1 Ævar Arnfjörð Bjarmason
2017-05-25 19:45 ` [PATCH v4 25/31] grep: change internal *pcre* variable & function names to be *pcre1* Ævar Arnfjörð Bjarmason
2017-05-25 19:45 ` [PATCH v4 26/31] grep: move is_fixed() earlier to avoid forward declaration Ævar Arnfjörð Bjarmason
2017-05-25 19:45 ` [PATCH v4 27/31] test-lib: add a PTHREADS prerequisite Ævar Arnfjörð Bjarmason
2017-05-25 19:45 ` Ævar Arnfjörð Bjarmason [this message]
2017-05-25 19:45 ` [PATCH v4 29/31] pack-objects: fix buggy warning about threads Ævar Arnfjörð Bjarmason
2017-05-25 19:45 ` [PATCH v4 30/31] grep: given --threads with NO_PTHREADS=YesPlease, warn Ævar Arnfjörð Bjarmason
2017-05-25 19:45 ` [PATCH v4 31/31] grep: assert that threading is enabled when calling grep_{lock,unlock} Ævar Arnfjörð Bjarmason

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=20170525194535.9324-29-avarab@gmail.com \
    --to=avarab@gmail.com \
    --cc=bmwill@google.com \
    --cc=dark.panda@gmail.com \
    --cc=frekui@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=michal.kiedrowicz@gmail.com \
    --cc=noloader@gmail.com \
    --cc=pclouds@gmail.com \
    --cc=peff@peff.net \
    --cc=vleschuk@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.