mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-07 17:26:09 +02:00
Code

t/helper: merge test-ref-store 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>
This commit is contained in:
Nguyễn Thái Ngọc Duy 2018-03-24 08:44:52 +01:00 committed by Junio C Hamano
parent 5fbe600cb5
commit 65370d81ef
7 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -672,6 +672,7 @@ TEST_BUILTINS_OBJS += test-online-cpus.o
TEST_BUILTINS_OBJS += test-path-utils.o
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-sha1.o
TEST_PROGRAMS_NEED_X += test-dump-fsmonitor
@ -680,7 +681,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-ref-store
TEST_PROGRAMS_NEED_X += test-regex
TEST_PROGRAMS_NEED_X += test-revision-walking
TEST_PROGRAMS_NEED_X += test-run-command

3
t/helper/test-ref-store.c
View File

@ -1,3 +1,4 @@
#include "test-tool.h"
#include "cache.h"
#include "refs.h"
#include "worktree.h"
@ -274,7 +275,7 @@ static struct command commands[] = {
{ NULL, NULL }
};
int cmd_main(int argc, const char **argv)
int cmd__ref_store(int argc, const char **argv)
{
struct ref_store *refs;
const char *func;

1
t/helper/test-tool.c
View File

@ -27,6 +27,7 @@ static struct test_cmd cmds[] = {
{ "path-utils", cmd__path_utils },
{ "prio-queue", cmd__prio_queue },
{ "read-cache", cmd__read_cache },
{ "ref-store", cmd__ref_store },
{ "sha1", cmd__sha1 },
};

1
t/helper/test-tool.h
View File

@ -21,6 +21,7 @@ int cmd__online_cpus(int argc, const char **argv);
int cmd__path_utils(int argc, const char **argv);
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__sha1(int argc, const char **argv);
#endif

2
t/t1405-main-ref-store.sh
View File

@ -4,7 +4,7 @@ test_description='test main ref store api'
. ./test-lib.sh
RUN="test-ref-store main"
RUN="test-tool ref-store main"
test_expect_success 'pack_refs(PACK_REFS_ALL | PACK_REFS_PRUNE)' '
test_commit one &&

2
t/t1406-submodule-ref-store.sh
View File

@ -4,7 +4,7 @@ test_description='test submodule ref store api'
. ./test-lib.sh
RUN="test-ref-store submodule:sub"
RUN="test-tool ref-store submodule:sub"
test_expect_success 'setup' '
git init sub &&

4
t/t1407-worktree-ref-store.sh
View File

@ -4,8 +4,8 @@ test_description='test worktree ref store api'
. ./test-lib.sh
RWT="test-ref-store worktree:wt"
RMAIN="test-ref-store worktree:main"
RWT="test-tool ref-store worktree:wt"
RMAIN="test-tool ref-store worktree:main"
test_expect_success 'setup' '
test_commit first &&