Re: EOF test fixes (t7030/t7406)
- From
- Jan Palus <jan.palus@gmail.com>
- Date
- Mar 22, 2017, 18:28 UTC
- Message-ID
- <20170322182841.wkavsj6hj67jzud7@kalarepa>
- In-Reply-To
- <20170322173528.ho43ulndlozq35tu@kalarepa>
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.
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 &&