git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v4 01/10] t/unit-tests: implement clar specific reftable test helper functions

From
Seyi Kuforiji <kuforiji98@gmail.com>
Date
Jun 5, 2025, 14:06 UTC
Message-ID
<20250605140644.239199-2-kuforiji98@gmail.com>
In-Reply-To
<20250605140644.239199-1-kuforiji98@gmail.com>

Helper functions defined in `t/unit-tests/lib-reftable.{c,h}` are required for the reftable-related test files to run. In the current implementation these functions are designed to conform with our homegrown unit-testing structure. So in other to convert the reftable test files, there is need for a clar specific implementation of these helper functions.

Implement equivalent helper functions in `lib-reftable-clar.{c,h}` to use clar. These functions conform with the clar testing framework and become available for all reftable-related test files implemented using the clar testing framework, which requires them. This will be used by subsequent commits.

Signed-off-by: Seyi Kuforiji <kuforiji98@gmail.com>
---
 Makefile                         |   1 +
 t/meson.build                    |   3 +-
 t/unit-tests/lib-reftable-clar.c | 101 +++++++++++++++++++++++++++++++
 t/unit-tests/lib-reftable-clar.h |  20 ++++++
 4 files changed, 124 insertions(+), 1 deletion(-)
 create mode 100644 t/unit-tests/lib-reftable-clar.c
 create mode 100644 t/unit-tests/lib-reftable-clar.h
diff --git a/Makefile b/Makefile
index 70d1543b6b..e4fa038508 100644
--- a/Makefile
+++ b/Makefile
@@ -1375,6 +1375,7 @@ CLAR_TEST_OBJS = $(patsubst %,$(UNIT_TEST_DIR)/%.o,$(CLAR_TEST_SUITES))
 CLAR_TEST_OBJS += $(UNIT_TEST_DIR)/clar/clar.o
 CLAR_TEST_OBJS += $(UNIT_TEST_DIR)/unit-test.o
 CLAR_TEST_OBJS += $(UNIT_TEST_DIR)/lib-oid.o
+CLAR_TEST_OBJS += $(UNIT_TEST_DIR)/lib-reftable-clar.o
 
 UNIT_TEST_PROGRAMS += t-reftable-basics
 UNIT_TEST_PROGRAMS += t-reftable-block
diff --git a/t/meson.build b/t/meson.build
index d052fc3e23..f77f21536e 100644
--- a/t/meson.build
+++ b/t/meson.build
@@ -19,7 +19,8 @@ clar_test_suites = [
 clar_sources = [
   'unit-tests/clar/clar.c',
   'unit-tests/unit-test.c',
-  'unit-tests/lib-oid.c'
+  'unit-tests/lib-oid.c',
+  'unit-tests/lib-reftable-clar.c'
 ]
 
 clar_decls_h = custom_target(
diff --git a/t/unit-tests/lib-reftable-clar.c b/t/unit-tests/lib-reftable-clar.c
new file mode 100644
index 0000000000..64e40a106e
--- /dev/null
+++ b/t/unit-tests/lib-reftable-clar.c
@@ -0,0 +1,101 @@
+#include "unit-test.h"
+#include "lib-reftable-clar.h"
+#include "hex.h"
+#include "parse-options.h"
+#include "reftable/constants.h"
+#include "reftable/writer.h"
+#include "strbuf.h"
+#include "string-list.h"
+#include "strvec.h"
+
+void cl_reftable_set_hash(uint8_t *p, int i, enum reftable_hash id)
+{
+	memset(p, (uint8_t)i, hash_size(id));
+}
+
+static ssize_t strbuf_writer_write(void *b, const void *data, size_t sz)
+{
+	strbuf_add(b, data, sz);
+	return sz;
+}
+
+static int strbuf_writer_flush(void *arg UNUSED)
+{
+	return 0;
+}
+
+struct reftable_writer *cl_reftable_strbuf_writer(struct reftable_buf *buf,
+						 struct reftable_write_options *opts)
+{
+	struct reftable_writer *writer;
+	int ret = reftable_writer_new(&writer, &strbuf_writer_write, &strbuf_writer_flush,
+				      buf, opts);
+	cl_assert(!ret);
+	return writer;
+}
+
+void cl_reftable_write_to_buf(struct reftable_buf *buf,
+			     struct reftable_ref_record *refs,
+			     size_t nrefs,
+			     struct reftable_log_record *logs,
+			     size_t nlogs,
+			     struct reftable_write_options *_opts)
+{
+	struct reftable_write_options opts = { 0 };
+	const struct reftable_stats *stats;
+	struct reftable_writer *writer;
+	uint64_t min = 0xffffffff;
+	uint64_t max = 0;
+	int ret;
+
+	if (_opts)
+		opts = *_opts;
+
+	for (size_t i = 0; i < nrefs; i++) {
+		uint64_t ui = refs[i].update_index;
+		if (ui > max)
+			max = ui;
+		if (ui < min)
+			min = ui;
+	}
+	for (size_t i = 0; i < nlogs; i++) {
+		uint64_t ui = logs[i].update_index;
+		if (ui > max)
+			max = ui;
+		if (ui < min)
+			min = ui;
+	}
+
+	writer = cl_reftable_strbuf_writer(buf, &opts);
+	ret = reftable_writer_set_limits(writer, min, max);
+	cl_assert_equal_i(ret, 0);
+
+	if (nrefs) {
+		ret = reftable_writer_add_refs(writer, refs, nrefs);
+		cl_assert_equal_i(ret, 0);
+	}
+
+	if (nlogs) {
+		ret = reftable_writer_add_logs(writer, logs, nlogs);
+		cl_assert_equal_i(ret, 0);
+	}
+
+	ret = reftable_writer_close(writer);
+	cl_assert_equal_i(ret, 0);
+
+	stats = reftable_writer_stats(writer);
+	for (size_t i = 0; i < (size_t)stats->ref_stats.blocks; i++) {
+		size_t off = i * (opts.block_size ? opts.block_size
+						  : DEFAULT_BLOCK_SIZE);
+		if (!off)
+			off = header_size(opts.hash_id == REFTABLE_HASH_SHA256 ? 2 : 1);
+		cl_assert(buf->buf[off] == 'r');
+	}
+
+	if (nrefs)
+		cl_assert(stats->ref_stats.blocks > 0);
+	if (nlogs)
+		cl_assert(stats->log_stats.blocks > 0);
+
+	reftable_writer_free(writer);
+}
diff --git a/t/unit-tests/lib-reftable-clar.h b/t/unit-tests/lib-reftable-clar.h
new file mode 100644
index 0000000000..b562648973
--- /dev/null
+++ b/t/unit-tests/lib-reftable-clar.h
@@ -0,0 +1,20 @@
+#include "git-compat-util.h"
+#include "clar/clar.h"
+#include "clar-decls.h"
+#include "git-compat-util.h"
+#include "reftable/reftable-writer.h"
+#include "strbuf.h"
+
+struct reftable_buf;
+
+void cl_reftable_set_hash(uint8_t *p, int i, enum reftable_hash id);
+
+struct reftable_writer *cl_reftable_strbuf_writer(struct reftable_buf *buf,
+						  struct reftable_write_options *opts);
+
+void cl_reftable_write_to_buf(struct reftable_buf *buf,
+			     struct reftable_ref_record *refs,
+			     size_t nrecords,
+			     struct reftable_log_record *logs,
+			     size_t nlogs,
+			     struct reftable_write_options *opts);
-- 
2.43.0
Previous: Seyi KuforijiNext: Seyi Kuforiji
Message 2 of 33 in “t/unit-tests: convert unit-tests to use clar”
  1. 00/10 t/unit-tests: convert unit-tests to use clarSeyi Kuforiji, Jun 5, 2025
  2. 01/10 t/unit-tests: implement clar specific reftable test helper functionsSeyi Kuforiji, Jun 5, 2025
  3. 02/10 t/unit-tests: convert reftable basics test to use clar test frameworkSeyi Kuforiji, Jun 5, 2025
  4. 03/10 t/unit-tests: convert reftable block test to use clarSeyi Kuforiji, Jun 5, 2025
  5. 04/10 t/unit-tests: convert reftable merged test to use clarSeyi Kuforiji, Jun 5, 2025
  6. 05/10 t/unit-tests: convert reftable pq test to use clarSeyi Kuforiji, Jun 5, 2025
  7. 06/10 t/unit-tests: convert reftable table test to use clarSeyi Kuforiji, Jun 5, 2025
  8. Junio C HamanoJun 5, 2025
  9. 07/10 t/unit-tests: convert reftable readwrite test to use clarSeyi Kuforiji, Jun 5, 2025
  10. 08/10 t/unit-tests: convert reftable record test to use clarSeyi Kuforiji, Jun 5, 2025
  11. 09/10 t/unit-tests: convert reftable stack test to use clarSeyi Kuforiji, Jun 5, 2025
  12. Patrick SteinhardtJul 24, 2025
  13. 10/10 t/unit-tests: finalize migration of reftable-related testsSeyi Kuforiji, Jun 5, 2025
  14. Junio C HamanoJul 23, 2025
  15. Patrick SteinhardtJul 24, 2025
  16. 0/5 t/unit-tests: convert unit-tests to use clarSeyi Kufoiji, Jul 24, 2025
  17. 1/5 t/unit-tests: convert reftable table test to use clarSeyi Kufoiji, Jul 24, 2025
  18. 2/5 t/unit-tests: convert reftable readwrite test to use clarSeyi Kufoiji, Jul 24, 2025
  19. 3/5 t/unit-tests: convert reftable record test to use clarSeyi Kufoiji, Jul 24, 2025
  20. 4/5 t/unit-tests: convert reftable stack test to use clarSeyi Kufoiji, Jul 24, 2025
  21. 00/10 t/unit-tests: convert unit-tests to use clarSeyi Kufoiji, Jul 24, 2025
  22. 01/10 t/unit-tests: implement clar specific reftable test helper functionsSeyi Kufoiji, Jul 24, 2025
  23. 02/10 t/unit-tests: convert reftable basics test to use clar test frameworkSeyi Kufoiji, Jul 24, 2025
  24. 03/10 t/unit-tests: convert reftable block test to use clarSeyi Kufoiji, Jul 24, 2025
  25. 04/10 t/unit-tests: convert reftable merged test to use clarSeyi Kufoiji, Jul 24, 2025
  26. 05/10 t/unit-tests: convert reftable pq test to use clarSeyi Kufoiji, Jul 24, 2025
  27. 06/10 t/unit-tests: convert reftable table test to use clarSeyi Kufoiji, Jul 24, 2025
  28. 07/10 t/unit-tests: convert reftable readwrite test to use clarSeyi Kufoiji, Jul 24, 2025
  29. 08/10 t/unit-tests: convert reftable record test to use clarSeyi Kufoiji, Jul 24, 2025
  30. 09/10 t/unit-tests: convert reftable stack test to use clarSeyi Kufoiji, Jul 24, 2025
  31. 10/10 t/unit-tests: finalize migration of reftable-related testsSeyi Kufoiji, Jul 24, 2025
  32. Patrick SteinhardtJul 24, 2025
  33. Junio C HamanoJul 24, 2025

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.