From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 16 Apr 2025 20:54:17 +0000 (-0700)
Subject: Merge branch 'sk/clar-trailer-urlmatch-norm-test'
X-Git-Tag: v2.50.0-rc0~110
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=779534d5a7ee08f7af3a7bc038b68359fd59f578;p=thirdparty%2Fgit.git

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
---

779534d5a7ee08f7af3a7bc038b68359fd59f578
diff --cc Makefile
index a9d5f13f0c,a4787bff5d..631787bb01
--- a/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