Skip to content

Commit 560d3c7

Browse files
gitsterChandra Pratap
authored and
Chandra Pratap
committed
t: clean up leftover reftable test cruft
With the migration of reftable tests to the unit-tests framework, "test-tool reftable" becomes a no-op. Get rid of everything that uses "test-tool reftable" alongside everything that is used to implement it. While at it, alphabetically sort the cmds[] list in helper/test-tool.c by moving the entry for "dump-reftable". Mentored-by: Patrick Steinhardt <ps@pks.im> Mentored-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Chandra Pratap <chandrapratap3519@gmail.com>
1 parent 05e4b7e commit 560d3c7

File tree

8 files changed

+1
-129
lines changed

8 files changed

+1
-129
lines changed

Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2692,8 +2692,6 @@ REFTABLE_OBJS += reftable/stack.o
26922692
REFTABLE_OBJS += reftable/tree.o
26932693
REFTABLE_OBJS += reftable/writer.o
26942694

2695-
REFTABLE_TEST_OBJS += reftable/test_framework.o
2696-
26972695
TEST_OBJS := $(patsubst %$X,%.o,$(TEST_PROGRAMS)) $(patsubst %,t/helper/%,$(TEST_BUILTINS_OBJS))
26982696

26992697
.PHONY: test-objs

reftable/reftable-tests.h

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

reftable/test_framework.c

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

reftable/test_framework.h

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

t/helper/test-reftable.c

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,8 @@
66
#include "reftable/reftable-merged.h"
77
#include "reftable/reftable-reader.h"
88
#include "reftable/reftable-stack.h"
9-
#include "reftable/reftable-tests.h"
109
#include "test-tool.h"
1110

12-
int cmd__reftable(int argc, const char **argv)
13-
{
14-
/* test from simple to complex. */
15-
return 0;
16-
}
17-
1811
static void print_help(void)
1912
{
2013
printf("usage: dump [-st] arg\n\n"

t/helper/test-tool.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ static struct test_cmd cmds[] = {
2626
{ "drop-caches", cmd__drop_caches },
2727
{ "dump-cache-tree", cmd__dump_cache_tree },
2828
{ "dump-fsmonitor", cmd__dump_fsmonitor },
29+
{ "dump-reftable", cmd__dump_reftable },
2930
{ "dump-split-index", cmd__dump_split_index },
3031
{ "dump-untracked-cache", cmd__dump_untracked_cache },
3132
{ "env-helper", cmd__env_helper },
@@ -61,9 +62,7 @@ static struct test_cmd cmds[] = {
6162
{ "read-graph", cmd__read_graph },
6263
{ "read-midx", cmd__read_midx },
6364
{ "ref-store", cmd__ref_store },
64-
{ "reftable", cmd__reftable },
6565
{ "rot13-filter", cmd__rot13_filter },
66-
{ "dump-reftable", cmd__dump_reftable },
6766
{ "regex", cmd__regex },
6867
{ "repository", cmd__repository },
6968
{ "revision-walking", cmd__revision_walking },

t/helper/test-tool.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ int cmd__read_graph(int argc, const char **argv);
5555
int cmd__read_midx(int argc, const char **argv);
5656
int cmd__ref_store(int argc, const char **argv);
5757
int cmd__rot13_filter(int argc, const char **argv);
58-
int cmd__reftable(int argc, const char **argv);
5958
int cmd__regex(int argc, const char **argv);
6059
int cmd__repository(int argc, const char **argv);
6160
int cmd__revision_walking(int argc, const char **argv);

t/t0032-reftable-unittest.sh

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

0 commit comments

Comments
 (0)