Since f1b75fbaf1 (t4018: convert custom pattern test to the new
infrastructure, 2014-03-21) we have been doing the basic sanity check
of whether patterns in userdiff.c compile on the "custom" patterns.
That we were doing this was an emergent effect of that change and an
earlier refactoring in bfa7d01413 (t4018: an infrastructure to test
hunk headers, 2014-03-21).
This was never intended by the test added in
e3bf5e43fd (t4018-diff-funcname: test syntax of builtin xfuncname
patterns, 2008-09-22), nor is there any point in doing this. We'll
error out in the custom.sh test itself if those patterns don't
compile.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx>
---
t/t4018-diff-funcname.sh | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/t/t4018-diff-funcname.sh b/t/t4018-diff-funcname.sh
index d80a2ad4a4..3ba9d657b1 100755
--- a/t/t4018-diff-funcname.sh
+++ b/t/t4018-diff-funcname.sh
@@ -16,12 +16,7 @@ test_expect_success 'setup' '
echo B >B.java
'
-diffpatterns="
- $builtin_drivers
- custom
-"
-
-for p in $diffpatterns
+for p in $builtin_drivers
do
test_expect_success "builtin $p pattern compiles" '
echo "*.java diff=$p" >.gitattributes &&
@@ -74,7 +69,7 @@ test_diff_funcname () {
'
}
-for what in $diffpatterns
+for what in $builtin_drivers custom
do
test="$TEST_DIRECTORY/t4018/$what.sh"
if ! test -e "$test"
--
2.30.0.284.gd98b1dd5eaa7
