Skip to content

Commit 839b808

Browse files
committed
Merge branch 'cp/unit-test-reftable-block'
Another test for reftable library ported to the unit test framework. * cp/unit-test-reftable-block: t-reftable-block: mark unused argv/argc t-reftable-block: add tests for index blocks t-reftable-block: add tests for obj blocks t-reftable-block: add tests for log blocks t-reftable-block: remove unnecessary variable 'j' t-reftable-block: use xstrfmt() instead of xstrdup() t-reftable-block: use block_iter_reset() instead of block_iter_close() t-reftable-block: use reftable_record_key() instead of strbuf_addstr() t-reftable-block: use reftable_record_equal() instead of check_str() t-reftable-block: release used block reader t: harmonize t-reftable-block.c with coding guidelines t: move reftable/block_test.c to the unit testing framework
2 parents d4d6777 + 08e83b5 commit 839b808

File tree

5 files changed

+371
-126
lines changed

5 files changed

+371
-126
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1340,6 +1340,7 @@ UNIT_TEST_PROGRAMS += t-oidmap
13401340
UNIT_TEST_PROGRAMS += t-oidtree
13411341
UNIT_TEST_PROGRAMS += t-prio-queue
13421342
UNIT_TEST_PROGRAMS += t-reftable-basics
1343+
UNIT_TEST_PROGRAMS += t-reftable-block
13431344
UNIT_TEST_PROGRAMS += t-reftable-merged
13441345
UNIT_TEST_PROGRAMS += t-reftable-pq
13451346
UNIT_TEST_PROGRAMS += t-reftable-readwrite
@@ -2682,7 +2683,6 @@ REFTABLE_OBJS += reftable/stack.o
26822683
REFTABLE_OBJS += reftable/tree.o
26832684
REFTABLE_OBJS += reftable/writer.o
26842685

2685-
REFTABLE_TEST_OBJS += reftable/block_test.o
26862686
REFTABLE_TEST_OBJS += reftable/stack_test.o
26872687
REFTABLE_TEST_OBJS += reftable/test_framework.o
26882688

reftable/block_test.c

Lines changed: 0 additions & 123 deletions
This file was deleted.

reftable/reftable-tests.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ license that can be found in the LICENSE file or at
99
#ifndef REFTABLE_TESTS_H
1010
#define REFTABLE_TESTS_H
1111

12-
int block_test_main(int argc, const char **argv);
1312
int stack_test_main(int argc, const char **argv);
1413

1514
#endif

t/helper/test-reftable.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
int cmd__reftable(int argc, const char **argv)
1313
{
1414
/* test from simple to complex. */
15-
block_test_main(argc, argv);
1615
stack_test_main(argc, argv);
1716
return 0;
1817
}

0 commit comments

Comments
 (0)