From: Seyi Kufoiji <ibed@xxxxxxxxxxxx>
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 (5):
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 | 13 +-
t/Makefile | 1 -
t/meson.build | 34 +-
t/unit-tests/lib-reftable-clar.c | 101 ---
t/unit-tests/lib-reftable-clar.h | 20 -
t/unit-tests/lib-reftable.c | 35 +-
t/unit-tests/lib-reftable.h | 15 +-
t/unit-tests/u-reftable-basics.c | 2 +-
t/unit-tests/u-reftable-block.c | 2 +-
t/unit-tests/u-reftable-merged.c | 2 +-
t/unit-tests/u-reftable-pq.c | 2 +-
...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 +-
15 files changed, 711 insertions(+), 1022 deletions(-)
delete mode 100644 t/unit-tests/lib-reftable-clar.c
delete mode 100644 t/unit-tests/lib-reftable-clar.h
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: cf8b0471fd ! 1: 7c159bd2fe 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: cbe70c5c23 = 2: 3ae3b2cf9c t/unit-tests: convert reftable readwrite test to use clar
3: 38e2198eac ! 3: d4303eb913 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: 8de9dbbd3b ! 4: df582f6e2c 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: a69c3370ee ! 5: 9340e7ce88 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
