From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 31 Jul 2024 20:34:19 +0000 (-0700)
Subject: Merge branch 'cp/unit-test-reftable-merged'
X-Git-Tag: v2.47.0-rc0~171
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6c70d65712c055064fa46933b78768370a8bdc98;p=thirdparty%2Fgit.git

Merge branch 'cp/unit-test-reftable-merged'

Another reftable test has been ported to use the unit test framework.

* cp/unit-test-reftable-merged:
  t-reftable-merged: add test for REFTABLE_FORMAT_ERROR
  t-reftable-merged: use reftable_ref_record_equal to compare ref records
  t-reftable-merged: add tests for reftable_merged_table_max_update_index
  t-reftable-merged: improve the const-correctness of helper functions
  t-reftable-merged: improve the test t_merged_single_record()
  t: harmonize t-reftable-merged.c with coding guidelines
  t: move reftable/merged_test.c to the unit testing framework
---

6c70d65712c055064fa46933b78768370a8bdc98
diff --cc Makefile
index ce3ff2476c,e5d1b53991..3863e60b66
--- a/Makefile
+++ b/Makefile
@@@ -1340,7 -1340,7 +1340,8 @@@ UNIT_TEST_PROGRAMS += t-oidma
  UNIT_TEST_PROGRAMS += t-oidtree
  UNIT_TEST_PROGRAMS += t-prio-queue
  UNIT_TEST_PROGRAMS += t-reftable-basics
+ UNIT_TEST_PROGRAMS += t-reftable-merged
 +UNIT_TEST_PROGRAMS += t-reftable-record
  UNIT_TEST_PROGRAMS += t-strbuf
  UNIT_TEST_PROGRAMS += t-strcmp-offset
  UNIT_TEST_PROGRAMS += t-strvec
@@@ -2680,8 -2680,8 +2681,7 @@@ REFTABLE_OBJS += reftable/writer.
  
  REFTABLE_TEST_OBJS += reftable/block_test.o
  REFTABLE_TEST_OBJS += reftable/dump.o
- REFTABLE_TEST_OBJS += reftable/merged_test.o
  REFTABLE_TEST_OBJS += reftable/pq_test.o
 -REFTABLE_TEST_OBJS += reftable/record_test.o
  REFTABLE_TEST_OBJS += reftable/readwrite_test.o
  REFTABLE_TEST_OBJS += reftable/stack_test.o
  REFTABLE_TEST_OBJS += reftable/test_framework.o