From: Stefan Beller <sbeller@google.com>
To: gitster@pobox.com
Cc: git@vger.kernel.org, peff@peff.net, jan.palus@gmail.com,
Stefan Beller <sbeller@google.com>
Subject: [PATCH] t7406: correct test case for submodule-update initial population
Date: Wed, 22 Mar 2017 14:49:48 -0700 [thread overview]
Message-ID: <20170322214948.12015-1-sbeller@google.com> (raw)
In-Reply-To: <20170322213953.oddbgw5nfrvmzjgm@sigill.intra.peff.net>
There are three issues with the test:
* The syntax of the here-doc was wrong, such that the entire test was
sucked into the here-doc, which is why the test succeeded successfully.
* The variable $submodulesha1 was not expanded as it was inside a single
quoted string. Use double quote to expand the variable.
* The redirection from the git command to the output file for comparison
was wrong as the -C operator from git doesn't apply to the redirect path.
Also we're interested in stderr of that command.
Noticed-by: Jan Palus <jan.palus@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Stefan Beller <sbeller@google.com>
---
This is just one patch (for bisectability)
it applies on e7b37caf4fe.
Thanks,
Stefan
t/t7406-submodule-update.sh | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh
index 8c086a4..c327eb6 100755
--- a/t/t7406-submodule-update.sh
+++ b/t/t7406-submodule-update.sh
@@ -425,11 +425,11 @@ test_expect_success 'submodule update - command in .git/config catches failure -
'
test_expect_success 'submodule update - command run for initial population of submodule' '
- cat <<-\ EOF >expect
- Execution of '\''false $submodulesha1'\'' failed in submodule path '\''submodule'\''
- EOF &&
+ cat >expect <<-\EOF &&
+ Execution of '\'"false $submodulesha1"\'' failed in submodule path '\''submodule'\''
+ EOF
rm -rf super/submodule &&
- test_must_fail git -C super submodule update >../actual &&
+ test_must_fail git -C super submodule update 2>actual &&
test_cmp expect actual &&
git -C super submodule update --checkout
'
--
2.10.2.50.g9d09a6e.dirty
next prev parent reply other threads:[~2017-03-22 21:50 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-22 17:35 EOF test fixes (t5615/t7004) Jan Palus
2017-03-22 18:28 ` EOF test fixes (t7030/t7406) Jan Palus
2017-03-22 18:47 ` EOF test fixes (t5615/t7004) Stefan Beller
2017-03-22 19:43 ` Junio C Hamano
2017-03-22 20:08 ` [PATCH 0/3] fix "here-doc" syntax errors Junio C Hamano
2017-03-22 20:08 ` [PATCH 1/3] t5615: fix a here-doc syntax error Junio C Hamano
2017-03-22 21:02 ` Jeff King
2017-03-22 20:08 ` [PATCH 2/3] t7406: fix here-doc syntax errors Junio C Hamano
2017-03-22 21:07 ` Jeff King
2017-03-22 21:32 ` Stefan Beller
2017-03-22 21:39 ` Jeff King
2017-03-22 21:49 ` Stefan Beller [this message]
2017-03-22 21:59 ` [PATCH] t7406: correct test case for submodule-update initial population Jeff King
2017-03-22 22:07 ` Stefan Beller
2017-03-22 22:09 ` Jeff King
2017-03-22 22:14 ` Jonathan Nieder
2017-03-22 22:12 ` Junio C Hamano
2017-03-22 22:24 ` Jeff King
2017-03-22 22:28 ` Stefan Beller
2017-03-22 21:34 ` [PATCH 2/3] t7406: fix here-doc syntax errors Junio C Hamano
2017-03-22 20:08 ` [PATCH 3/3] t7004, t7030: " Junio C Hamano
2017-03-22 21:10 ` Jeff King
2017-03-22 21:43 ` Santiago Torres
2017-03-22 22:04 ` Jeff King
2017-03-22 22:04 ` Junio C Hamano
2017-03-22 22:15 ` Santiago Torres
2017-03-22 22:22 ` Jeff King
2017-03-22 22:34 ` Santiago Torres
2017-03-22 22:41 ` Jeff King
2017-03-22 22:47 ` Junio C Hamano
2017-03-22 22:51 ` Santiago Torres
2017-03-23 22:00 ` Junio C Hamano
2017-03-23 22:28 ` Santiago Torres
2017-03-23 23:49 ` Jeff King
2017-03-24 16:45 ` Junio C Hamano
2017-03-24 16:49 ` Jeff King
2017-03-24 18:00 ` Jeff King
2017-03-24 18:04 ` Junio C Hamano
2017-03-24 18:16 ` Jeff King
2017-03-22 22:38 ` Junio C Hamano
2017-03-22 22:40 ` [PATCH 0/3] fix "here-doc" " Jan Palus
2017-03-23 2:12 ` [PATCH] tests: lint for run-away here-doc Junio C Hamano
2017-03-23 5:43 ` [PATCH v2] " Junio C Hamano
2017-03-24 1:29 ` Jonathan Nieder
2017-03-24 2:45 ` Junio C Hamano
2017-03-24 3:59 ` 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
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=20170322214948.12015-1-sbeller@google.com \
--to=sbeller@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jan.palus@gmail.com \
--cc=peff@peff.net \
/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).