[v2,10/27] blame tests: don't rely on t/t4018/ directory

Message ID	20210215154427.32693-11-avarab@gmail.com (mailing list archive)
State	Superseded
Headers	show Return-Path: <git-owner@kernel.org> From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= <avarab@gmail.com> To: git@vger.kernel.org Cc: Junio C Hamano <gitster@pobox.com>, Johannes Sixt <j6t@kdbg.org>, Jeff King <peff@peff.net>, Jonathan Nieder <jrnieder@gmail.com>, Philippe Blain <levraiphilippeblain@gmail.com>, Adam Spiers <git@adamspiers.org>, Eric Sunshine <sunshine@sunshineco.com>, Chris Torek <chris.torek@gmail.com>, =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFy?= =?utf-8?b?bWFzb24=?= <avarab@gmail.com> Subject: [PATCH v2 10/27] blame tests: don't rely on t/t4018/ directory Date: Mon, 15 Feb 2021 16:44:10 +0100 Message-Id: <20210215154427.32693-11-avarab@gmail.com> In-Reply-To: <20210215005236.11313-1-avarab@gmail.com> References: <20210215005236.11313-1-avarab@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	userdiff: refactor + test + doc + misc improvements \| expand [00/20] userdiff: refactor + test + doc + misc improvements [v2,01/27] userdiff: refactor away the parse_bool() function [v2,02/27] userdiff style: re-order drivers in alphabetical order [v2,03/27] userdiff style: declare patterns with consistent style [v2,04/27] userdiff style: normalize pascal regex declaration [v2,05/27] userdiff: add and use for_each_userdiff_driver() [v2,06/27] userdiff tests: explicitly test "default" pattern [v2,07/27] userdiff tests: list builtin drivers via test-tool [v2,08/27] userdiff: remove support for "broken" tests [v2,09/27] userdiff tests: match full hunk headers [v2,10/27] blame tests: don't rely on t/t4018/ directory [v2,11/27] blame tests: simplify userdiff driver test [v2,12/27] userdiff tests: rewrite hunk header test infrastructure [v2,13/27] userdiff tests: do config teardown in test_diff_funcname() [v2,14/27] userdiff tests: move custom patterns into one test file [v2,15/27] userdiff tests: remove hack for "RIGHT" token [v2,16/27] userdiff tests: do not do compile tests on "custom" pattern [v2,17/27] userdiff tests + docs: document & test "diff.<driver>.x?funcname" [v2,18/27] gitattributes doc: reword discussion of built-in userdiff patterns [v2,19/27] gitattributes doc: document multi-line userdiff patterns [v2,20/27] userdiff tests: remove "funcname" from custom3 test [v2,21/27] userdiff tests: factor out test_diff_funcname() logic [v2,22/27] userdiff tests: test hunk headers on accumulated files [v2,23/27] userdiff tests: test hunk header selection with -U0 [v2,24/27] userdiff tests: assert empty hunk header context on -U<large> [v2,25/27] userdiff: match "package" in diff=golang [v2,26/27] userdiff tests: add basic test for ada [v2,27/27] userdiff tests: add basic test for ruby

Message ID

20210215154427.32693-11-avarab@gmail.com (mailing list archive)

State

Superseded

Headers

From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?=  <avarab@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>, Johannes Sixt <j6t@kdbg.org>,
 Jeff King <peff@peff.net>, Jonathan Nieder <jrnieder@gmail.com>,
 Philippe Blain <levraiphilippeblain@gmail.com>,
 Adam Spiers <git@adamspiers.org>, Eric Sunshine <sunshine@sunshineco.com>,
 Chris Torek <chris.torek@gmail.com>, =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFy?=
	=?utf-8?b?bWFzb24=?=  <avarab@gmail.com>
Subject: [PATCH v2 10/27] blame tests: don't rely on t/t4018/ directory
Date: Mon, 15 Feb 2021 16:44:10 +0100
Message-Id: <20210215154427.32693-11-avarab@gmail.com>
In-Reply-To: <20210215005236.11313-1-avarab@gmail.com>
References: <20210215005236.11313-1-avarab@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

userdiff: refactor + test + doc + misc improvements | expand

Commit Message

Ævar Arnfjörð Bjarmason Feb. 15, 2021, 3:44 p.m. UTC

Refactor a test added in 9466e3809d (blame: enable funcname blaming
with userdiff driver, 2020-11-01) so that the blame tests don't rely
on stealing the contents of "t/t4018/fortran-external-function".

I'm about to refactor that directory to delete that file, just moving
the relevant test file here inline is the easiest solution, and I
think also the most readable.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
 t/annotate-tests.sh | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

Comments

Junio C Hamano Feb. 16, 2021, 11:49 p.m. UTC | #1

Ævar Arnfjörð Bjarmason  <avarab@gmail.com> writes:

> Refactor a test added in 9466e3809d (blame: enable funcname blaming
> with userdiff driver, 2020-11-01) so that the blame tests don't rely
> on stealing the contents of "t/t4018/fortran-external-function".

I like changes like this and wish they (I haven't finished reading
the 27 patches, but I am hoping that there may be more) were
separately available ;-)

diff --git a/t/annotate-tests.sh b/t/annotate-tests.sh
index 29ce89090d..04a2c58594 100644
--- a/t/annotate-tests.sh
+++ b/t/annotate-tests.sh
@@ -482,12 +482,22 @@  test_expect_success 'blame -L ^:RE (absolute: end-of-file)' '
 test_expect_success 'setup -L :funcname with userdiff driver' '
 	echo "fortran-* diff=fortran" >.gitattributes &&
 	fortran_file=fortran-external-function &&
-	orig_file="$TEST_DIRECTORY/t4018/$fortran_file" &&
-	cp "$orig_file" . &&
+	cat >$fortran_file <<-\EOF &&
+	function RIGHT(a, b) result(c)
+
+	integer, intent(in) :: ChangeMe
+	integer, intent(in) :: b
+	integer, intent(out) :: c
+
+	c = a+b
+
+	end function RIGHT
+	EOF
 	git add "$fortran_file" &&
 	GIT_AUTHOR_NAME="A" GIT_AUTHOR_EMAIL="A@test.git" \
 	git commit -m "add fortran file" &&
-	sed -e "s/ChangeMe/IWasChanged/" <"$orig_file" >"$fortran_file" &&
+	sed -e "s/ChangeMe/IWasChanged/" <"$fortran_file" >"$fortran_file".tmp &&
+	mv "$fortran_file".tmp "$fortran_file" &&
 	git add "$fortran_file" &&
 	GIT_AUTHOR_NAME="B" GIT_AUTHOR_EMAIL="B@test.git" \
 	git commit -m "change fortran file"

[v2,10/27] blame tests: don't rely on t/t4018/ directory

Commit Message

Comments

Patch