From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 14 Aug 2024 21:54:56 +0000 (-0700)
Subject: Merge branch 'cp/unit-test-reftable-tree'
X-Git-Tag: v2.47.0-rc0~136
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7b11e20bfff8cd9e448290709070266ca9d0c74f;p=thirdparty%2Fgit.git

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

A test in reftable library has been rewritten using the unit test
framework.

* cp/unit-test-reftable-tree:
  t-reftable-tree: improve the test for infix_walk()
  t-reftable-tree: add test for non-existent key
  t-reftable-tree: split test_tree() into two sub-test functions
  t: move reftable/tree_test.c to the unit testing framework
  reftable: remove unnecessary curly braces in reftable/tree.c
---

7b11e20bfff8cd9e448290709070266ca9d0c74f
diff --cc Makefile
index 699af109f7,d736b2f8bd..13890710f8
--- a/Makefile
+++ b/Makefile
@@@ -1333,16 -1334,9 +1333,17 @@@ THIRD_PARTY_SOURCES += sha1collisiondet
  THIRD_PARTY_SOURCES += sha1dc/%
  
  UNIT_TEST_PROGRAMS += t-ctype
 +UNIT_TEST_PROGRAMS += t-example-decorate
 +UNIT_TEST_PROGRAMS += t-hash
  UNIT_TEST_PROGRAMS += t-mem-pool
 +UNIT_TEST_PROGRAMS += t-oidmap
 +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-pq
 +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
diff --cc t/helper/test-reftable.c
index 672eaedae0,9475db2f76..623cf3f0f5
--- a/t/helper/test-reftable.c
+++ b/t/helper/test-reftable.c
@@@ -5,9 -5,12 +5,8 @@@
  int cmd__reftable(int argc, const char **argv)
  {
  	/* test from simple to complex. */
 -	basics_test_main(argc, argv);
 -	record_test_main(argc, argv);
  	block_test_main(argc, argv);
- 	tree_test_main(argc, argv);
 -	pq_test_main(argc, argv);
  	readwrite_test_main(argc, argv);
 -	merged_test_main(argc, argv);
  	stack_test_main(argc, argv);
  	return 0;
  }