diff options
author | Junio C Hamano <gitster@pobox.com> | 2021-04-20 17:23:34 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-04-20 17:23:34 -0700 |
commit | ab99efc817d463ddcd507a6457d33cd7643ed6dd (patch) | |
tree | 2b1597971df4d0e396e63e5c323f5c65281282fb /Makefile | |
parent | 6d7a62d74d4638f0e8ae026ad650269960201815 (diff) | |
parent | f08b4013c3faf5535ca8d5271ffb1840ce6ddaab (diff) | |
download | git-ab99efc817d463ddcd507a6457d33cd7643ed6dd.tar.gz |
Merge branch 'ab/userdiff-tests'
A bit of code clean-up and a lot of test clean-up around userdiff
area.
* ab/userdiff-tests:
blame tests: simplify userdiff driver test
blame tests: don't rely on t/t4018/ directory
userdiff: remove support for "broken" tests
userdiff tests: list builtin drivers via test-tool
userdiff tests: explicitly test "default" pattern
userdiff: add and use for_each_userdiff_driver()
userdiff style: normalize pascal regex declaration
userdiff style: declare patterns with consistent style
userdiff style: re-order drivers in alphabetical order
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -753,6 +753,7 @@ TEST_BUILTINS_OBJS += test-submodule-nested-repo-config.o TEST_BUILTINS_OBJS += test-subprocess.o TEST_BUILTINS_OBJS += test-trace2.o TEST_BUILTINS_OBJS += test-urlmatch-normalization.o +TEST_BUILTINS_OBJS += test-userdiff.o TEST_BUILTINS_OBJS += test-wildmatch.o TEST_BUILTINS_OBJS += test-windows-named-pipe.o TEST_BUILTINS_OBJS += test-write-cache.o |