From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 10 Oct 2018 03:37:16 +0000 (+0900)
Subject: Merge branch 'nd/test-tool'
X-Git-Tag: v2.20.0-rc0~199
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/77b5046ae36732db899d59fab9f5a8fa42f6c21e

Merge branch 'nd/test-tool'

Test helper binaries clean-up.

* nd/test-tool:
Makefile: add a hint about TEST_BUILTINS_OBJS
t/helper: merge test-dump-fsmonitor into test-tool
t/helper: merge test-parse-options into test-tool
t/helper: merge test-pkt-line into test-tool
t/helper: merge test-dump-untracked-cache into test-tool
t/helper: keep test-tool command list sorted
---

77b5046ae36732db899d59fab9f5a8fa42f6c21e
diff --cc Makefile
index 13e1c52478,39d39257e0..5c8307b7c4
--- a/Makefile
+++ b/Makefile
@@@ -720,11 -722,11 +722,13 @@@ TEST_BUILTINS_OBJS += test-match-trees.
  TEST_BUILTINS_OBJS += test-mergesort.o
  TEST_BUILTINS_OBJS += test-mktemp.o
  TEST_BUILTINS_OBJS += test-online-cpus.o
+ TEST_BUILTINS_OBJS += test-parse-options.o
  TEST_BUILTINS_OBJS += test-path-utils.o
+ TEST_BUILTINS_OBJS += test-pkt-line.o
  TEST_BUILTINS_OBJS += test-prio-queue.o
 +TEST_BUILTINS_OBJS += test-reach.o
  TEST_BUILTINS_OBJS += test-read-cache.o
 +TEST_BUILTINS_OBJS += test-read-midx.o
  TEST_BUILTINS_OBJS += test-ref-store.o
  TEST_BUILTINS_OBJS += test-regex.o
  TEST_BUILTINS_OBJS += test-repository.o
@@@ -740,15 -742,12 +744,13 @@@ TEST_BUILTINS_OBJS += test-submodule-co
  TEST_BUILTINS_OBJS += test-subprocess.o
  TEST_BUILTINS_OBJS += test-urlmatch-normalization.o
  TEST_BUILTINS_OBJS += test-wildmatch.o
 +TEST_BUILTINS_OBJS += test-windows-named-pipe.o
  TEST_BUILTINS_OBJS += test-write-cache.o
  
- TEST_PROGRAMS_NEED_X += test-dump-fsmonitor
- TEST_PROGRAMS_NEED_X += test-dump-untracked-cache
+ # Do not add more tests here unless they have extra dependencies. Add
+ # them in TEST_BUILTINS_OBJS above.
  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-pkt-line
  TEST_PROGRAMS_NEED_X += test-svn-fe
  TEST_PROGRAMS_NEED_X += test-tool
  
diff --cc t/helper/test-tool.c
index b87a8c1f22,6261c2fda0..6b5836dc1b
--- a/t/helper/test-tool.c
+++ b/t/helper/test-tool.c
@@@ -25,11 -27,11 +27,13 @@@ static struct test_cmd cmds[] = 
  	{ "mergesort", cmd__mergesort },
  	{ "mktemp", cmd__mktemp },
  	{ "online-cpus", cmd__online_cpus },
+ 	{ "parse-options", cmd__parse_options },
  	{ "path-utils", cmd__path_utils },
+ 	{ "pkt-line", cmd__pkt_line },
  	{ "prio-queue", cmd__prio_queue },
 +	{ "reach", cmd__reach },
  	{ "read-cache", cmd__read_cache },
 +	{ "read-midx", cmd__read_midx },
  	{ "ref-store", cmd__ref_store },
  	{ "regex", cmd__regex },
  	{ "repository", cmd__repository },
diff --cc t/helper/test-tool.h
index e074957279,38da025511..e4890566da
--- a/t/helper/test-tool.h
+++ b/t/helper/test-tool.h
@@@ -21,11 -23,11 +23,13 @@@ int cmd__match_trees(int argc, const ch
  int cmd__mergesort(int argc, const char **argv);
  int cmd__mktemp(int argc, const char **argv);
  int cmd__online_cpus(int argc, const char **argv);
+ int cmd__parse_options(int argc, const char **argv);
  int cmd__path_utils(int argc, const char **argv);
+ int cmd__pkt_line(int argc, const char **argv);
  int cmd__prio_queue(int argc, const char **argv);
 +int cmd__reach(int argc, const char **argv);
  int cmd__read_cache(int argc, const char **argv);
 +int cmd__read_midx(int argc, const char **argv);
  int cmd__ref_store(int argc, const char **argv);
  int cmd__regex(int argc, const char **argv);
  int cmd__repository(int argc, const char **argv);