mirror of
https://github.com/git/git
synced 2024-08-27 03:29:21 +00:00
t/helper: merge test-dump-fsmonitor 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:
parent
2f17c78ceb
commit
f1ef0b024c
2
Makefile
2
Makefile
|
@ -709,6 +709,7 @@ TEST_BUILTINS_OBJS += test-date.o
|
|||
TEST_BUILTINS_OBJS += test-delta.o
|
||||
TEST_BUILTINS_OBJS += test-drop-caches.o
|
||||
TEST_BUILTINS_OBJS += test-dump-cache-tree.o
|
||||
TEST_BUILTINS_OBJS += test-dump-fsmonitor.o
|
||||
TEST_BUILTINS_OBJS += test-dump-split-index.o
|
||||
TEST_BUILTINS_OBJS += test-dump-untracked-cache.o
|
||||
TEST_BUILTINS_OBJS += test-example-decorate.o
|
||||
|
@ -743,7 +744,6 @@ TEST_BUILTINS_OBJS += test-urlmatch-normalization.o
|
|||
TEST_BUILTINS_OBJS += test-wildmatch.o
|
||||
TEST_BUILTINS_OBJS += test-write-cache.o
|
||||
|
||||
TEST_PROGRAMS_NEED_X += test-dump-fsmonitor
|
||||
TEST_PROGRAMS_NEED_X += test-fake-ssh
|
||||
TEST_PROGRAMS_NEED_X += test-line-buffer
|
||||
TEST_PROGRAMS_NEED_X += test-svn-fe
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
#include "test-tool.h"
|
||||
#include "cache.h"
|
||||
|
||||
int cmd_main(int ac, const char **av)
|
||||
int cmd__dump_fsmonitor(int ac, const char **av)
|
||||
{
|
||||
struct index_state *istate = &the_index;
|
||||
int i;
|
||||
|
|
|
@ -14,6 +14,7 @@ static struct test_cmd cmds[] = {
|
|||
{ "delta", cmd__delta },
|
||||
{ "drop-caches", cmd__drop_caches },
|
||||
{ "dump-cache-tree", cmd__dump_cache_tree },
|
||||
{ "dump-fsmonitor", cmd__dump_fsmonitor },
|
||||
{ "dump-split-index", cmd__dump_split_index },
|
||||
{ "dump-untracked-cache", cmd__dump_untracked_cache },
|
||||
{ "example-decorate", cmd__example_decorate },
|
||||
|
|
|
@ -10,6 +10,7 @@ int cmd__date(int argc, const char **argv);
|
|||
int cmd__delta(int argc, const char **argv);
|
||||
int cmd__drop_caches(int argc, const char **argv);
|
||||
int cmd__dump_cache_tree(int argc, const char **argv);
|
||||
int cmd__dump_fsmonitor(int argc, const char **argv);
|
||||
int cmd__dump_split_index(int argc, const char **argv);
|
||||
int cmd__dump_untracked_cache(int argc, const char **argv);
|
||||
int cmd__example_decorate(int argc, const char **argv);
|
||||
|
|
|
@ -84,21 +84,21 @@ test_expect_success 'setup' '
|
|||
|
||||
# test that the fsmonitor extension is off by default
|
||||
test_expect_success 'fsmonitor extension is off by default' '
|
||||
test-dump-fsmonitor >actual &&
|
||||
test-tool dump-fsmonitor >actual &&
|
||||
grep "^no fsmonitor" actual
|
||||
'
|
||||
|
||||
# test that "update-index --fsmonitor" adds the fsmonitor extension
|
||||
test_expect_success 'update-index --fsmonitor" adds the fsmonitor extension' '
|
||||
git update-index --fsmonitor &&
|
||||
test-dump-fsmonitor >actual &&
|
||||
test-tool dump-fsmonitor >actual &&
|
||||
grep "^fsmonitor last update" actual
|
||||
'
|
||||
|
||||
# test that "update-index --no-fsmonitor" removes the fsmonitor extension
|
||||
test_expect_success 'update-index --no-fsmonitor" removes the fsmonitor extension' '
|
||||
git update-index --no-fsmonitor &&
|
||||
test-dump-fsmonitor >actual &&
|
||||
test-tool dump-fsmonitor >actual &&
|
||||
grep "^no fsmonitor" actual
|
||||
'
|
||||
|
||||
|
@ -307,9 +307,9 @@ test_expect_success 'splitting the index results in the same state' '
|
|||
dirty_repo &&
|
||||
git update-index --fsmonitor &&
|
||||
git ls-files -f >expect &&
|
||||
test-dump-fsmonitor >&2 && echo &&
|
||||
test-tool dump-fsmonitor >&2 && echo &&
|
||||
git update-index --fsmonitor --split-index &&
|
||||
test-dump-fsmonitor >&2 && echo &&
|
||||
test-tool dump-fsmonitor >&2 && echo &&
|
||||
git ls-files -f >actual &&
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
|
Loading…
Reference in a new issue