From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 23 Aug 2024 16:02:35 +0000 (-0700)
Subject: Merge branch 'cp/unit-test-reftable-readwrite'
X-Git-Tag: v2.47.0-rc0~102
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=668843e6d8568b1054a55c4f3e8ee7c55acb5380;p=thirdparty%2Fgit.git

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

* cp/unit-test-reftable-readwrite:
  t-reftable-readwrite: add test for known error
  t-reftable-readwrite: use 'for' in place of infinite 'while' loops
  t-reftable-readwrite: use free_names() instead of a for loop
  t: move reftable/readwrite_test.c to the unit testing framework
---

668843e6d8568b1054a55c4f3e8ee7c55acb5380
diff --cc Makefile
index a87e18b317,76e4d1c1ec..e298c8b55e
--- a/Makefile
+++ b/Makefile
@@@ -1342,9 -1341,8 +1342,10 @@@ UNIT_TEST_PROGRAMS += t-oidtre
  UNIT_TEST_PROGRAMS += t-prio-queue
  UNIT_TEST_PROGRAMS += t-reftable-basics
  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
  UNIT_TEST_PROGRAMS += t-strcmp-offset
  UNIT_TEST_PROGRAMS += t-strvec
@@@ -2684,9 -2682,10 +2685,8 @@@ REFTABLE_OBJS += reftable/writer.
  
  REFTABLE_TEST_OBJS += reftable/block_test.o
  REFTABLE_TEST_OBJS += reftable/dump.o
- REFTABLE_TEST_OBJS += reftable/readwrite_test.o
 -REFTABLE_TEST_OBJS += reftable/pq_test.o
  REFTABLE_TEST_OBJS += reftable/stack_test.o
  REFTABLE_TEST_OBJS += reftable/test_framework.o
 -REFTABLE_TEST_OBJS += reftable/tree_test.o
  
  TEST_OBJS := $(patsubst %$X,%.o,$(TEST_PROGRAMS)) $(patsubst %,t/helper/%,$(TEST_BUILTINS_OBJS))
  
diff --cc reftable/reftable-tests.h
index 4b666810af,7d955393d2..f25034fca8
--- a/reftable/reftable-tests.h
+++ b/reftable/reftable-tests.h
@@@ -11,9 -11,10 +11,8 @@@ https://developers.google.com/open-sour
  
  int basics_test_main(int argc, const char **argv);
  int block_test_main(int argc, const char **argv);
 -int pq_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 tree_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 623cf3f0f5,d371e9f9dd..ded28ee5fb
--- a/t/helper/test-reftable.c
+++ b/t/helper/test-reftable.c
@@@ -6,7 -6,8 +6,6 @@@ int cmd__reftable(int argc, const char 
  {
  	/* test from simple to complex. */
  	block_test_main(argc, argv);
- 	readwrite_test_main(argc, argv);
 -	tree_test_main(argc, argv);
 -	pq_test_main(argc, argv);
  	stack_test_main(argc, argv);
  	return 0;
  }