From: Jan Palus <jan.palus@gmail.com>
To: git@vger.kernel.org
Subject: Re: EOF test fixes (t7030/t7406)
Date: Wed, 22 Mar 2017 19:28:41 +0100 [thread overview]
Message-ID: <20170322182841.wkavsj6hj67jzud7@kalarepa> (raw)
In-Reply-To: <20170322173528.ho43ulndlozq35tu@kalarepa>
[-- Attachment #1: Type: text/plain, Size: 296 bytes --]
It appears more tests are affected:
$ grep -r '^[[:space:]]*EOF &&' .
./t7406-submodule-update.sh: EOF &&
./t7030-verify-tag.sh: EOF &&
./t7030-verify-tag.sh: EOF &&
./t7004-tag.sh: EOF &&
./t7004-tag.sh: EOF &&
attaching patch for t7406 and t7030 which both fail even after fix is
applied.
[-- Attachment #2: git-EOF-t7030-t7406.patch --]
[-- Type: text/plain, Size: 1454 bytes --]
diff -ur git-2.12.1.orig/t/t7030-verify-tag.sh git-2.12.1/t/t7030-verify-tag.sh
--- git-2.12.1.orig/t/t7030-verify-tag.sh 2017-03-22 19:20:49.614759549 +0100
+++ git-2.12.1/t/t7030-verify-tag.sh 2017-03-22 19:26:27.608511234 +0100
@@ -126,17 +126,17 @@
'
test_expect_success 'verifying tag with --format' '
- cat >expect <<-\EOF
+ cat >expect <<-\EOF &&
tagname : fourth-signed
- EOF &&
+ EOF
git verify-tag --format="tagname : %(tag)" "fourth-signed" >actual &&
test_cmp expect actual
'
test_expect_success 'verifying a forged tag with --format fail and format accordingly' '
- cat >expect <<-\EOF
+ cat >expect <<-\EOF &&
tagname : 7th forged-signed
- EOF &&
+ EOF
test_must_fail git verify-tag --format="tagname : %(tag)" $(cat forged1.tag) >actual-forged &&
test_cmp expect actual-forged
'
diff -ur git-2.12.1.orig/t/t7406-submodule-update.sh git-2.12.1/t/t7406-submodule-update.sh
--- git-2.12.1.orig/t/t7406-submodule-update.sh 2017-03-22 19:20:49.614759549 +0100
+++ git-2.12.1/t/t7406-submodule-update.sh 2017-03-22 19:25:34.105528379 +0100
@@ -442,9 +442,9 @@
'
test_expect_success 'submodule update - command run for initial population of submodule' '
- cat <<-\ EOF >expect
+ cat >expect <<-\EOF &&
Execution of '\''false $submodulesha1'\'' failed in submodule path '\''submodule'\''
- EOF &&
+ EOF
rm -rf super/submodule &&
test_must_fail git -C super submodule update >../actual &&
test_cmp expect actual &&
next prev parent reply other threads:[~2017-03-22 18:28 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 ` Jan Palus [this message]
2017-03-22 18:47 ` 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 ` [PATCH] t7406: correct test case for submodule-update initial population Stefan Beller
2017-03-22 21:59 ` 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=20170322182841.wkavsj6hj67jzud7@kalarepa \
--to=jan.palus@gmail.com \
--cc=git@vger.kernel.org \
/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).