From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 28 Jan 2025 21:02:22 +0000 (-0800)
Subject: Merge branch 'sk/unit-tests'
X-Git-Tag: v2.49.0-rc0~82
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8d335468eca3c8b37d7b939f7d7f17b31c514e8f;p=thirdparty%2Fgit.git

Merge branch 'sk/unit-tests'

Move a few more unit tests to the clar test framework.

* sk/unit-tests:
  t/unit-tests: convert reftable tree test to use clar test framework
  t/unit-tests: adapt priority queue test to use clar test framework
  t/unit-tests: convert mem-pool test to use clar test framework
  t/unit-tests: handle dashes in test suite filenames
---

8d335468eca3c8b37d7b939f7d7f17b31c514e8f
diff --cc Makefile
index d3011e30f7,75dbb8e25f..b0cdc1fd4a
--- a/Makefile
+++ b/Makefile
@@@ -1338,7 -1338,9 +1338,10 @@@ THIRD_PARTY_SOURCES += $(UNIT_TEST_DIR)
  THIRD_PARTY_SOURCES += $(UNIT_TEST_DIR)/clar/clar/%
  
  CLAR_TEST_SUITES += u-ctype
 +CLAR_TEST_SUITES += u-hash
+ CLAR_TEST_SUITES += u-mem-pool
+ CLAR_TEST_SUITES += u-prio-queue
+ CLAR_TEST_SUITES += u-reftable-tree
  CLAR_TEST_SUITES += u-strvec
  CLAR_TEST_PROG = $(UNIT_TEST_BIN)/unit-tests$(X)
  CLAR_TEST_OBJS = $(patsubst %,$(UNIT_TEST_DIR)/%.o,$(CLAR_TEST_SUITES))
@@@ -1346,8 -1348,8 +1349,7 @@@ CLAR_TEST_OBJS += $(UNIT_TEST_DIR)/clar
  CLAR_TEST_OBJS += $(UNIT_TEST_DIR)/unit-test.o
  
  UNIT_TEST_PROGRAMS += t-example-decorate
 -UNIT_TEST_PROGRAMS += t-hash
  UNIT_TEST_PROGRAMS += t-hashmap
- UNIT_TEST_PROGRAMS += t-mem-pool
  UNIT_TEST_PROGRAMS += t-oid-array
  UNIT_TEST_PROGRAMS += t-oidmap
  UNIT_TEST_PROGRAMS += t-oidtree
diff --cc t/meson.build
index 7b35eadbc8,6dd41216ef..14fea8dddf
--- a/t/meson.build
+++ b/t/meson.build
@@@ -1,6 -1,8 +1,9 @@@
  clar_test_suites = [
    'unit-tests/u-ctype.c',
 +  'unit-tests/u-hash.c',
+   'unit-tests/u-mem-pool.c',
+   'unit-tests/u-prio-queue.c',
+   'unit-tests/u-reftable-tree.c',
    'unit-tests/u-strvec.c',
  ]
  
@@@ -42,8 -44,8 +45,7 @@@ test('unit-tests', clar_unit_tests
  
  unit_test_programs = [
    'unit-tests/t-example-decorate.c',
 -  'unit-tests/t-hash.c',
    'unit-tests/t-hashmap.c',
-   'unit-tests/t-mem-pool.c',
    'unit-tests/t-oid-array.c',
    'unit-tests/t-oidmap.c',
    'unit-tests/t-oidtree.c',