Merge branch 'sk/clar-trailer-urlmatch-norm-test'

A few traditional unit tests have been rewritten to use the clar
framework.

* sk/clar-trailer-urlmatch-norm-test:
  t/unit-tests: convert urlmatch-normalization test to clar
  t/unit-tests: convert trailer test to use clar

diff --cc Makefile
index a9d5f13f0c5678304f7353be3c9a07783f044dff,a4787bff5dc976f288746c96f7ff0a9b95b56c6b..631787bb01b782b20d334fd34f55b3cb904cb34e
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1381,10 -1379,9 +1383,8 @@@ UNIT_TEST_PROGRAMS += t-reftable-reade
  UNIT_TEST_PROGRAMS += t-reftable-readwrite
  UNIT_TEST_PROGRAMS += t-reftable-record
  UNIT_TEST_PROGRAMS += t-reftable-stack
- UNIT_TEST_PROGRAMS += t-trailer
- UNIT_TEST_PROGRAMS += t-urlmatch-normalization
  UNIT_TEST_PROGS = $(patsubst %,$(UNIT_TEST_BIN)/%$X,$(UNIT_TEST_PROGRAMS))
  UNIT_TEST_OBJS += $(UNIT_TEST_DIR)/test-lib.o
 -UNIT_TEST_OBJS += $(UNIT_TEST_DIR)/lib-oid.o
  UNIT_TEST_OBJS += $(UNIT_TEST_DIR)/lib-reftable.o
  
  # xdiff and reftable libs may in turn depend on what is in libgit.a

diff --cc t/meson.build
Simple merge