From: Junio C Hamano <gitster@pobox.com>
To: Ben Peart <benpeart@microsoft.com>
Cc: "peartben\@gmail.com" <peartben@gmail.com>,
Ben Peart <Ben.Peart@microsoft.com>,
"avarab\@gmail.com" <avarab@gmail.com>,
"git\@vger.kernel.org" <git@vger.kernel.org>,
"t.gummerer\@gmail.com" <t.gummerer@gmail.com>
Subject: Re: [PATCH v2 4/5] read-cache: update TEST_GIT_INDEX_VERSION support
Date: Fri, 14 Sep 2018 15:26:51 -0700 [thread overview]
Message-ID: <xmqqpnxfaf6c.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <xmqqtvmrafs5.fsf@gitster-ct.c.googlers.com> (Junio C. Hamano's message of "Fri, 14 Sep 2018 15:13:46 -0700")
Junio C Hamano <gitster@pobox.com> writes:
> Ben Peart <benpeart@microsoft.com> writes:
>
>> diff --git a/t/test-lib.sh b/t/test-lib.sh
>> index 653688c067..397eb71578 100644
>> --- a/t/test-lib.sh
>> +++ b/t/test-lib.sh
>> @@ -134,9 +134,9 @@ export EDITOR
>> GIT_TRACE_BARE=1
>> export GIT_TRACE_BARE
>>
>> -if test -n "${TEST_GIT_INDEX_VERSION:+isset}"
>> +if test -n "${GIT_TEST_INDEX_VERSION:+isset}"
>> then
>> - GIT_INDEX_VERSION="$TEST_GIT_INDEX_VERSION"
>> + GIT_INDEX_VERSION="$GIT_TEST_INDEX_VERSION"
>> export GIT_INDEX_VERSION
>> fi
>
> Is this done a bit before ...
>
>> @@ -159,6 +159,7 @@ check_var_migration () {
>> }
>>
>> check_var_migration GIT_FSMONITOR_TEST GIT_TEST_FSMONITOR
>> +check_var_migration TEST_GIT_INDEX_VERSION GIT_TEST_INDEX_VERSION
>
> ... this has a chance to kick in to say things like "Whoa you have
> TEST_GIT_INDEX_VERSION that is an old spelling of
> GIT_TEST_INDEX_VERSION", isn't it?
So, the obvious fix would look like the patch below.
One problem with warning is that
$ TEST_GIT_INDEX_VERSION=4 sh ./t0000-basic.sh
(or any other depreated variable set without its modern counterpart
set) would fail due to extra output produced to the standard error
stream.
t/test-lib.sh | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 17a56f44ad..8ef86e05a3 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -134,12 +134,6 @@ export EDITOR
GIT_TRACE_BARE=1
export GIT_TRACE_BARE
-if test -n "${GIT_TEST_INDEX_VERSION:+isset}"
-then
- GIT_INDEX_VERSION="$GIT_TEST_INDEX_VERSION"
- export GIT_INDEX_VERSION
-fi
-
check_var_migration () {
old_name=$1 new_name=$2
eval "old_isset=\${${old_name}:+isset}"
@@ -162,6 +156,13 @@ check_var_migration GIT_FSMONITOR_TEST GIT_TEST_FSMONITOR
check_var_migration TEST_GIT_INDEX_VERSION GIT_TEST_INDEX_VERSION
check_var_migration GIT_FORCE_PRELOAD_TEST GIT_TEST_PRELOAD_INDEX
+# Use specific version of the index file format
+if test -n "${GIT_TEST_INDEX_VERSION:+isset}"
+then
+ GIT_INDEX_VERSION="$GIT_TEST_INDEX_VERSION"
+ export GIT_INDEX_VERSION
+fi
+
# Add libc MALLOC and MALLOC_PERTURB test
# only if we are not executing the test with valgrind
if expr " $GIT_TEST_OPTS " : ".* --valgrind " >/dev/null ||
next prev parent reply other threads:[~2018-09-14 22:26 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-14 14:37 [PATCH v1 0/4] Cleanup pass on special test setups Ben Peart
2018-09-14 14:37 ` [PATCH v1 1/4] correct typo/spelling error in t/README Ben Peart
2018-09-14 14:37 ` [PATCH v1 2/4] fsmonitor: update GIT_TEST_FSMONITOR support Ben Peart
2018-09-14 16:59 ` Junio C Hamano
2018-09-14 17:03 ` Junio C Hamano
2018-09-14 17:15 ` Junio C Hamano
2018-09-14 18:05 ` Ben Peart
2018-09-14 18:18 ` Junio C Hamano
2018-09-14 20:13 ` [PATCH v2 0/5] Cleanup pass on special test setups Ben Peart
2018-09-14 20:13 ` [PATCH v2 1/5] correct typo/spelling error in t/README Ben Peart
2018-09-14 20:43 ` Jonathan Nieder
2018-09-14 20:14 ` [PATCH v2 2/5] preload-index: teach GIT_FORCE_PRELOAD_TEST to take a boolean Ben Peart
2018-09-14 20:51 ` Jonathan Nieder
2018-09-14 21:54 ` Junio C Hamano
2018-09-14 20:14 ` [PATCH v2 3/5] fsmonitor: update GIT_TEST_FSMONITOR support Ben Peart
2018-09-14 20:14 ` [PATCH v2 4/5] read-cache: update TEST_GIT_INDEX_VERSION support Ben Peart
2018-09-14 22:13 ` Junio C Hamano
2018-09-14 22:26 ` Junio C Hamano [this message]
2018-09-14 20:14 ` [PATCH v2 5/5] preload-index: update GIT_FORCE_PRELOAD_TEST support Ben Peart
2018-09-14 14:37 ` [PATCH v1 3/4] read-cache: update TEST_GIT_INDEX_VERSION support Ben Peart
2018-09-14 14:37 ` [PATCH v1 4/4] preload-index: update GIT_FORCE_PRELOAD_TEST support Ben Peart
2018-09-18 23:29 ` [PATCH v3 0/5] Cleanup pass on special test setups Ben Peart
2018-09-18 23:29 ` [PATCH v3 2/5] preload-index: use git_env_bool() not getenv() for customization Ben Peart
2018-09-18 23:29 ` [PATCH v3 1/5] t/README: correct spelling of "uncommon" Ben Peart
2018-09-18 23:29 ` [PATCH v3 3/5] fsmonitor: update GIT_TEST_FSMONITOR support Ben Peart
2018-09-28 10:01 ` SZEDER Gábor
2018-09-28 14:21 ` Ben Peart
2018-09-28 14:27 ` Ben Peart
2018-09-28 18:43 ` Junio C Hamano
2018-09-18 23:29 ` [PATCH v3 4/5] read-cache: update TEST_GIT_INDEX_VERSION support Ben Peart
2018-09-18 23:29 ` [PATCH v3 5/5] preload-index: update GIT_FORCE_PRELOAD_TEST support Ben Peart
2018-09-20 18:43 ` Re*: [PATCH v3 0/5] Cleanup pass on special test setups Junio C Hamano
2018-09-25 18:44 ` Ben Peart
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqpnxfaf6c.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=Ben.Peart@microsoft.com \
--cc=avarab@gmail.com \
--cc=benpeart@microsoft.com \
--cc=git@vger.kernel.org \
--cc=peartben@gmail.com \
--cc=t.gummerer@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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).