From: Junio C Hamano <gitster@pobox•com>
To: Jeff King <peff@peff•net>, Tanay Abhra <tanayabh@gmail•com>
Cc: git@vger•kernel.org, Michael Haggerty <mhagger@alum•mit.edu>
Subject: Re: [PATCH v2 3/3] test-lib.sh: support -x option for shell-tracing
Date: Mon, 13 Oct 2014 15:31:49 -0700 [thread overview]
Message-ID: <xmqqd29v1u0a.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <xmqqh9z71uf9.fsf@gitster.dls.corp.google.com> (Junio C. Hamano's message of "Mon, 13 Oct 2014 15:22:50 -0700")
Junio C Hamano <gitster@pobox•com> writes:
> Does 1308 pass with this patch for you (running it without "-x")?
>
> The original that expects a hardcoded line number (not relative to
> the original or something) is a bad taste, and also the test setup
> procedure is broken (see below for a fix of that breakage, which
> does not fix the breakage this patch seems to bring in anyway).
>
> But still it is disturbing to see that there is a blank line
> difference with and without this change in the file created by the
> test (i.e. the client of the code this patch touches).
This is even more disturbing. With this fix (which is correct as
far as I can tell) queued on top of ta/config-set, the shell-tracing
patch does not fail any more.
I suspect that the broken test in the original ended the .git/config
file with an incomplete line or something, and with the attached fix
we no longer do so and that is why shell-tracing patch no longer
breaks it, it seems. So if there is a test that does want to create
a file that ends with an incomplete line, we may see the real
breakage again with the shell-tracing patch in.
-- >8 --
Subject: [PATCH] t1308: fix broken here document in test script
Signed-off-by: Junio C Hamano <gitster@pobox•com>
---
t/t1308-config-set.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t1308-config-set.sh b/t/t1308-config-set.sh
index 7fdf840..243d612 100755
--- a/t/t1308-config-set.sh
+++ b/t/t1308-config-set.sh
@@ -23,7 +23,7 @@ check_config () {
}
test_expect_success 'setup default config' '
- cat >.git/config <<\EOF
+ cat >.git/config <<-\EOF
[case]
penguin = very blue
Movie = BadPhysics
@@ -185,7 +185,7 @@ test_expect_success 'proper error on error in default config files' '
cp .git/config .git/config.old &&
test_when_finished "mv .git/config.old .git/config" &&
echo "[" >>.git/config &&
- echo "fatal: bad config file line 35 in .git/config" >expect &&
+ echo "fatal: bad config file line 34 in .git/config" >expect &&
test_expect_code 128 test-config get_value foo.bar 2>actual &&
test_cmp expect actual
'
--
2.1.2-468-g1a77c5b
next prev parent reply other threads:[~2014-10-13 22:32 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-10 6:06 [PATCH 0/3] "-x" tracing option for tests Jeff King
2014-10-10 6:07 ` [PATCH 1/3] t5304: use test_path_is_* instead of "test -f" Jeff King
2014-10-10 6:11 ` [PATCH 2/3] t5304: use helper to report failure of "test foo = bar" Jeff King
2014-10-13 16:10 ` Jonathan Nieder
2014-10-13 21:15 ` Jeff King
2014-10-13 21:31 ` Jonathan Nieder
2014-10-13 21:33 ` Junio C Hamano
2014-10-13 21:38 ` Jonathan Nieder
2014-10-13 21:56 ` Junio C Hamano
2014-10-13 21:36 ` Jeff King
2014-10-10 6:13 ` [PATCH 3/3] test-lib.sh: support -x option for shell-tracing Jeff King
2014-10-10 6:21 ` Jeff King
2014-10-10 6:47 ` [PATCH v2 " Jeff King
2014-10-13 18:43 ` Junio C Hamano
2014-10-13 22:22 ` Junio C Hamano
2014-10-13 22:31 ` Junio C Hamano [this message]
2014-10-13 22:33 ` Jeff King
2014-10-13 22:38 ` Junio C Hamano
2014-10-13 22:43 ` Jeff King
2014-10-13 23:14 ` Junio C Hamano
2014-10-14 0:46 ` Jeff King
2014-10-10 6:27 ` [PATCH " Jeff King
2014-10-13 18:24 ` [PATCH 0/3] "-x" tracing option for tests Junio C Hamano
2014-10-13 21:07 ` Jeff King
2014-10-14 8:52 ` Michael Haggerty
2014-10-14 13:44 ` Jeff King
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=xmqqd29v1u0a.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=mhagger@alum$(echo .)mit.edu \
--cc=peff@peff$(echo .)net \
--cc=tanayabh@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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