Browse Source

t/helper: merge test-revision-walking into test-tool

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Nguyễn Thái Ngọc Duy 7 years ago committed by Junio C Hamano
parent
commit
77d4b8c832
  1. 2
      Makefile
  2. 3
      t/helper/test-revision-walking.c
  3. 1
      t/helper/test-tool.c
  4. 1
      t/helper/test-tool.h
  5. 2
      t/t0062-revision-walking.sh

2
Makefile

@ -674,6 +674,7 @@ TEST_BUILTINS_OBJS += test-prio-queue.o @@ -674,6 +674,7 @@ TEST_BUILTINS_OBJS += test-prio-queue.o
TEST_BUILTINS_OBJS += test-read-cache.o
TEST_BUILTINS_OBJS += test-ref-store.o
TEST_BUILTINS_OBJS += test-regex.o
TEST_BUILTINS_OBJS += test-revision-walking.o
TEST_BUILTINS_OBJS += test-sha1.o

TEST_PROGRAMS_NEED_X += test-dump-fsmonitor
@ -682,7 +683,6 @@ TEST_PROGRAMS_NEED_X += test-fake-ssh @@ -682,7 +683,6 @@ TEST_PROGRAMS_NEED_X += test-fake-ssh
TEST_PROGRAMS_NEED_X += test-line-buffer
TEST_PROGRAMS_NEED_X += test-parse-options
TEST_PROGRAMS_NEED_X += test-write-cache
TEST_PROGRAMS_NEED_X += test-revision-walking
TEST_PROGRAMS_NEED_X += test-run-command
TEST_PROGRAMS_NEED_X += test-scrap-cache-tree
TEST_PROGRAMS_NEED_X += test-sha1-array

3
t/helper/test-revision-walking.c

@ -8,6 +8,7 @@ @@ -8,6 +8,7 @@
* published by the Free Software Foundation.
*/

#include "test-tool.h"
#include "cache.h"
#include "commit.h"
#include "diff.h"
@ -45,7 +46,7 @@ static int run_revision_walk(void) @@ -45,7 +46,7 @@ static int run_revision_walk(void)
return got_revision;
}

int cmd_main(int argc, const char **argv)
int cmd__revision_walking(int argc, const char **argv)
{
if (argc < 2)
return 1;

1
t/helper/test-tool.c

@ -29,6 +29,7 @@ static struct test_cmd cmds[] = { @@ -29,6 +29,7 @@ static struct test_cmd cmds[] = {
{ "read-cache", cmd__read_cache },
{ "ref-store", cmd__ref_store },
{ "regex", cmd__regex },
{ "revision-walking", cmd__revision_walking },
{ "sha1", cmd__sha1 },
};


1
t/helper/test-tool.h

@ -23,6 +23,7 @@ int cmd__prio_queue(int argc, const char **argv); @@ -23,6 +23,7 @@ int cmd__prio_queue(int argc, const char **argv);
int cmd__read_cache(int argc, const char **argv);
int cmd__ref_store(int argc, const char **argv);
int cmd__regex(int argc, const char **argv);
int cmd__revision_walking(int argc, const char **argv);
int cmd__sha1(int argc, const char **argv);

#endif

2
t/t0062-revision-walking.sh

@ -26,7 +26,7 @@ test_expect_success 'setup' ' @@ -26,7 +26,7 @@ test_expect_success 'setup' '
'

test_expect_success 'revision walking can be done twice' '
test-revision-walking run-twice >run_twice_actual &&
test-tool revision-walking run-twice >run_twice_actual &&
test_cmp run_twice_expected run_twice_actual
'


Loading…
Cancel
Save