Hello, This patch series marks the final batch of our existing unit test files transitioned to the Clar testing framework. It covers all the reftable-related test files, and is part of our ongoing effort to standardize our testing framework to enhance its maintainability. Changes in v5: - some code refactoring and cleanup based on review. Thanks Seyi Signed-off-by: Seyi Kuforiji <kuforiji98@xxxxxxxxx> Seyi Kuforiji (10): t/unit-tests: implement clar specific reftable test helper functions t/unit-tests: convert reftable basics test to use clar test framework t/unit-tests: convert reftable block test to use clar t/unit-tests: convert reftable merged test to use clar t/unit-tests: convert reftable pq test to use clar t/unit-tests: convert reftable table test to use clar t/unit-tests: convert reftable readwrite test to use clar t/unit-tests: convert reftable record test to use clar t/unit-tests: convert reftable stack test to use clar t/unit-tests: finalize migration of reftable-related tests Makefile | 20 +- t/Makefile | 1 - t/meson.build | 42 +- t/unit-tests/lib-reftable.c | 35 +- t/unit-tests/lib-reftable.h | 15 +- t/unit-tests/t-reftable-basics.c | 219 ----- t/unit-tests/u-reftable-basics.c | 227 +++++ ...{t-reftable-block.c => u-reftable-block.c} | 164 ++-- ...-reftable-merged.c => u-reftable-merged.c} | 160 ++-- .../{t-reftable-pq.c => u-reftable-pq.c} | 59 +- ...ble-readwrite.c => u-reftable-readwrite.c} | 403 ++++----- ...-reftable-record.c => u-reftable-record.c} | 250 +++--- ...{t-reftable-stack.c => u-reftable-stack.c} | 780 ++++++++---------- ...{t-reftable-table.c => u-reftable-table.c} | 73 +- 14 files changed, 1117 insertions(+), 1331 deletions(-) delete mode 100644 t/unit-tests/t-reftable-basics.c create mode 100644 t/unit-tests/u-reftable-basics.c rename t/unit-tests/{t-reftable-block.c => u-reftable-block.c} (74%) rename t/unit-tests/{t-reftable-merged.c => u-reftable-merged.c} (77%) rename t/unit-tests/{t-reftable-pq.c => u-reftable-pq.c} (64%) rename t/unit-tests/{t-reftable-readwrite.c => u-reftable-readwrite.c} (68%) rename t/unit-tests/{t-reftable-record.c => u-reftable-record.c} (62%) rename t/unit-tests/{t-reftable-stack.c => u-reftable-stack.c} (59%) rename t/unit-tests/{t-reftable-table.c => u-reftable-table.c} (75%) Range-diff against v4: -: ---------- > 1: 4a04557ae3 t/unit-tests: implement clar specific reftable test helper functions -: ---------- > 2: 2c576ddd11 t/unit-tests: convert reftable basics test to use clar test framework -: ---------- > 3: 04d54fef89 t/unit-tests: convert reftable block test to use clar -: ---------- > 4: 06eba27f8e t/unit-tests: convert reftable merged test to use clar -: ---------- > 5: eaa8b8d636 t/unit-tests: convert reftable pq test to use clar 1: 7c159bd2fe ! 6: cf8b0471fd t/unit-tests: convert reftable table test to use clar @@ Makefile: CLAR_TEST_OBJS += $(UNIT_TEST_DIR)/lib-reftable-clar.o UNIT_TEST_PROGS = $(patsubst %,$(UNIT_TEST_BIN)/%$X,$(UNIT_TEST_PROGRAMS)) UNIT_TEST_OBJS += $(UNIT_TEST_DIR)/test-lib.o UNIT_TEST_OBJS += $(UNIT_TEST_DIR)/lib-reftable.o -@@ Makefile: $(LIBGIT_HIDDEN_EXPORT): $(LIBGIT_PARTIAL_EXPORT) - $(OBJCOPY) --localize-hidden $^ $@ - - contrib/libgit-sys/libgitpub.a: $(LIBGIT_HIDDEN_EXPORT) -- $(AR) $(ARFLAGS) $@ $^ -+ $(AR) $(ARFLAGS) $@ $^ - \ No newline at end of file ## t/meson.build ## @@ t/meson.build: clar_test_suites = [ 2: 3ae3b2cf9c = 7: cbe70c5c23 t/unit-tests: convert reftable readwrite test to use clar 3: d4303eb913 ! 8: 38e2198eac t/unit-tests: convert reftable record test to use clar @@ Makefile: CLAR_TEST_OBJS += $(UNIT_TEST_DIR)/unit-test.o UNIT_TEST_OBJS += $(UNIT_TEST_DIR)/test-lib.o ## t/meson.build ## +@@ t/meson.build: clar_test_suites = [ + 'unit-tests/u-reftable-merged.c', + 'unit-tests/u-reftable-pq.c', + 'unit-tests/u-reftable-readwrite.c', ++ 'unit-tests/u-reftable-record.c', + 'unit-tests/u-reftable-table.c', + 'unit-tests/u-reftable-tree.c', + 'unit-tests/u-strbuf.c', @@ t/meson.build: clar_unit_tests = executable('unit-tests', test('unit-tests', clar_unit_tests) 4: df582f6e2c ! 9: 8de9dbbd3b t/unit-tests: convert reftable stack test to use clar @@ Makefile: CLAR_TEST_OBJS += $(UNIT_TEST_DIR)/unit-test.o ## t/meson.build ## @@ t/meson.build: clar_test_suites = [ - 'unit-tests/u-reftable-merged.c', 'unit-tests/u-reftable-pq.c', 'unit-tests/u-reftable-readwrite.c', -+ 'unit-tests/u-reftable-record.c', + 'unit-tests/u-reftable-record.c', + 'unit-tests/u-reftable-stack.c', 'unit-tests/u-reftable-table.c', 'unit-tests/u-reftable-tree.c', 5: 9340e7ce88 ! 10: a69c3370ee t/unit-tests: finalize migration of reftable-related tests @@ Makefile: CLAR_TEST_SUITES += u-urlmatch-normalization # xdiff and reftable libs may in turn depend on what is in libgit.a GITLIBS = common-main.o $(LIB_FILE) $(XDIFF_LIB) $(REFTABLE_LIB) $(LIB_FILE) -@@ Makefile: $(LIBGIT_HIDDEN_EXPORT): $(LIBGIT_PARTIAL_EXPORT) - $(OBJCOPY) --localize-hidden $^ $@ - - contrib/libgit-sys/libgitpub.a: $(LIBGIT_HIDDEN_EXPORT) -- $(AR) $(ARFLAGS) $@ $^ - \ No newline at end of file -+ $(AR) $(ARFLAGS) $@ $^ ## t/Makefile ## @@ t/Makefile: check-meson: -- 2.43.0