Skip to content

Commit 668843e

Browse files
committed
Merge branch 'cp/unit-test-reftable-readwrite'
* cp/unit-test-reftable-readwrite: t-reftable-readwrite: add test for known error t-reftable-readwrite: use 'for' in place of infinite 'while' loops t-reftable-readwrite: use free_names() instead of a for loop t: move reftable/readwrite_test.c to the unit testing framework
2 parents 5e56a39 + 5e440bf commit 668843e

File tree

4 files changed

+219
-226
lines changed

4 files changed

+219
-226
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1343,6 +1343,7 @@ UNIT_TEST_PROGRAMS += t-prio-queue
13431343
UNIT_TEST_PROGRAMS += t-reftable-basics
13441344
UNIT_TEST_PROGRAMS += t-reftable-merged
13451345
UNIT_TEST_PROGRAMS += t-reftable-pq
1346+
UNIT_TEST_PROGRAMS += t-reftable-readwrite
13461347
UNIT_TEST_PROGRAMS += t-reftable-record
13471348
UNIT_TEST_PROGRAMS += t-reftable-tree
13481349
UNIT_TEST_PROGRAMS += t-strbuf
@@ -2684,7 +2685,6 @@ REFTABLE_OBJS += reftable/writer.o
26842685

26852686
REFTABLE_TEST_OBJS += reftable/block_test.o
26862687
REFTABLE_TEST_OBJS += reftable/dump.o
2687-
REFTABLE_TEST_OBJS += reftable/readwrite_test.o
26882688
REFTABLE_TEST_OBJS += reftable/stack_test.o
26892689
REFTABLE_TEST_OBJS += reftable/test_framework.o
26902690

reftable/reftable-tests.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ license that can be found in the LICENSE file or at
1212
int basics_test_main(int argc, const char **argv);
1313
int block_test_main(int argc, const char **argv);
1414
int record_test_main(int argc, const char **argv);
15-
int readwrite_test_main(int argc, const char **argv);
1615
int stack_test_main(int argc, const char **argv);
1716
int reftable_dump_main(int argc, char *const *argv);
1817

t/helper/test-reftable.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ int cmd__reftable(int argc, const char **argv)
66
{
77
/* test from simple to complex. */
88
block_test_main(argc, argv);
9-
readwrite_test_main(argc, argv);
109
stack_test_main(argc, argv);
1110
return 0;
1211
}

0 commit comments

Comments
 (0)