From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 29 Aug 2024 18:08:16 +0000 (-0700)
Subject: Merge branch 'cp/unit-test-reftable-block'
X-Git-Tag: v2.47.0-rc0~83
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=839b808325724e4e47c3ca18b2b131c205123632;p=thirdparty%2Fgit.git

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

Another test for reftable library ported to the unit test framework.

* cp/unit-test-reftable-block:
  t-reftable-block: mark unused argv/argc
  t-reftable-block: add tests for index blocks
  t-reftable-block: add tests for obj blocks
  t-reftable-block: add tests for log blocks
  t-reftable-block: remove unnecessary variable 'j'
  t-reftable-block: use xstrfmt() instead of xstrdup()
  t-reftable-block: use block_iter_reset() instead of block_iter_close()
  t-reftable-block: use reftable_record_key() instead of strbuf_addstr()
  t-reftable-block: use reftable_record_equal() instead of check_str()
  t-reftable-block: release used block reader
  t: harmonize t-reftable-block.c with coding guidelines
  t: move reftable/block_test.c to the unit testing framework
---

839b808325724e4e47c3ca18b2b131c205123632
diff --cc Makefile
index b72725d2b0,4c94bc718f..5b84e985dd
--- a/Makefile
+++ b/Makefile
@@@ -1340,9 -1341,9 +1340,10 @@@ 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-block
  UNIT_TEST_PROGRAMS += t-reftable-merged
  UNIT_TEST_PROGRAMS += t-reftable-pq
 +UNIT_TEST_PROGRAMS += t-reftable-readwrite
  UNIT_TEST_PROGRAMS += t-reftable-record
  UNIT_TEST_PROGRAMS += t-reftable-tree
  UNIT_TEST_PROGRAMS += t-strbuf
@@@ -2682,7 -2683,8 +2683,6 @@@ REFTABLE_OBJS += reftable/stack.
  REFTABLE_OBJS += reftable/tree.o
  REFTABLE_OBJS += reftable/writer.o
  
- REFTABLE_TEST_OBJS += reftable/block_test.o
 -REFTABLE_TEST_OBJS += reftable/dump.o
 -REFTABLE_TEST_OBJS += reftable/readwrite_test.o
  REFTABLE_TEST_OBJS += reftable/stack_test.o
  REFTABLE_TEST_OBJS += reftable/test_framework.o
  
diff --cc reftable/reftable-tests.h
index 8d44ddc151,3d9118b91b..5d725c69c7
--- a/reftable/reftable-tests.h
+++ b/reftable/reftable-tests.h
@@@ -9,7 -9,10 +9,6 @@@ https://developers.google.com/open-sour
  #ifndef REFTABLE_TESTS_H
  #define REFTABLE_TESTS_H
  
- int block_test_main(int argc, const char **argv);
 -int basics_test_main(int argc, const char **argv);
 -int record_test_main(int argc, const char **argv);
 -int readwrite_test_main(int argc, const char **argv);
  int stack_test_main(int argc, const char **argv);
 -int reftable_dump_main(int argc, char *const *argv);
  
  #endif
diff --cc t/helper/test-reftable.c
index 1340db8aff,7bdd18430b..3cd3314f07
--- a/t/helper/test-reftable.c
+++ b/t/helper/test-reftable.c
@@@ -12,7 -5,7 +12,6 @@@
  int cmd__reftable(int argc, const char **argv)
  {
  	/* test from simple to complex. */
- 	block_test_main(argc, argv);
 -	readwrite_test_main(argc, argv);
  	stack_test_main(argc, argv);
  	return 0;
  }