summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Ævar Arnfjörð Bjarmason <avarab@gmail.com>2021-04-08 17:04:23 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-04-08 12:19:10 -0700
commitb269441be249152a9be6bd9f0a3f6fb5923d2be4 (patch)
tree132505de389e5498d7fe3ff542e21d88bfc164f5
parentuserdiff: remove support for "broken" tests (diff)
downloadtgif-b269441be249152a9be6bd9f0a3f6fb5923d2be4.tar.xz
blame tests: don't rely on t/t4018/ directory
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 have another patch series that'll possibly (or not) refactor that file, but having this test inter-dependency makes things simple in any case by making this test more readable. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--t/annotate-tests.sh16
1 files changed, 13 insertions, 3 deletions
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"