[0/6] Merge remaining t/helper binaries to test-tool

Message

Duy Nguyen Sept. 9, 2018, 5:36 p.m. UTC

Last time when I added test-tool in 27f25845cf (Merge branch
'nd/combined-test-helper' - 2018-04-11) I left out a few test programs
because there were a couple in-flight new tests that used them. All
those topics are merged now. So we can merge these to test-tool and
call it done.

Nguyễn Thái Ngọc Duy (6):
  t/helper: keep test-tool command list sorted
  t/helper: merge test-dump-untracked-cache into test-tool
  t/helper: merge test-pkt-line into test-tool
  t/helper: merge test-parse-options into test-tool
  t/helper: merge test-dump-fsmonitor into test-tool
  Makefile: add a hint about TEST_BUILTINS_OBJS

 Makefile                             | 12 +++--
 t/helper/test-dump-fsmonitor.c       |  3 +-
 t/helper/test-dump-untracked-cache.c |  3 +-
 t/helper/test-parse-options.c        |  5 +-
 t/helper/test-pkt-line.c             |  3 +-
 t/helper/test-tool.c                 |  6 ++-
 t/helper/test-tool.h                 |  6 ++-
 t/t0040-parse-options.sh             | 70 ++++++++++++++--------------
 t/t5701-git-serve.sh                 | 36 +++++++-------
 t/t5702-protocol-v2.sh               |  2 +-
 t/t5703-upload-pack-ref-in-want.sh   | 14 +++---
 t/t7063-status-untracked-cache.sh    | 68 +++++++++++++--------------
 t/t7519-status-fsmonitor.sh          | 14 +++---
 13 files changed, 128 insertions(+), 114 deletions(-)

Comments

Ævar Arnfjörð Bjarmason Sept. 9, 2018, 6:09 p.m. UTC | #1

On Sun, Sep 09 2018, Nguyễn Thái Ngọc Duy wrote:

> Last time when I added test-tool in 27f25845cf (Merge branch
> 'nd/combined-test-helper' - 2018-04-11) I left out a few test programs
> because there were a couple in-flight new tests that used them. All
> those topics are merged now. So we can merge these to test-tool and
> call it done.

This is great. Just a small side-note: Am I the only one who misses the
2.8.0 days when you could do "git clean -dxff" in the t/ directory to
clean up various test crap without breaking subsequent tests?

That went away in e6e7530d10 ("test helpers: move test-* to t/helper/
subdirectory", 2016-04-13) when we started building stuff in t/helper/.

So now that this is one binary perhaps we can build it in the root
directory and get that functionality back?

Duy Nguyen Sept. 9, 2018, 6:24 p.m. UTC | #2

On Sun, Sep 9, 2018 at 8:09 PM Ævar Arnfjörð Bjarmason <[e-mail]> wrote:
>
>
> On Sun, Sep 09 2018, Nguyễn Thái Ngọc Duy wrote:
>
> > Last time when I added test-tool in 27f25845cf (Merge branch
> > 'nd/combined-test-helper' - 2018-04-11) I left out a few test programs
> > because there were a couple in-flight new tests that used them. All
> > those topics are merged now. So we can merge these to test-tool and
> > call it done.
>
> This is great. Just a small side-note: Am I the only one who misses the
> 2.8.0 days when you could do "git clean -dxff" in the t/ directory to
> clean up various test crap without breaking subsequent tests?

Isn't "make clean" (in t/) enough?

> That went away in e6e7530d10 ("test helpers: move test-* to t/helper/
> subdirectory", 2016-04-13) when we started building stuff in t/helper/.
>
> So now that this is one binary perhaps we can build it in the root
> directory and get that functionality back?

It's still a few binaries. Most of them are now merged to test-tool,
but ones that need separate program name, or have extra deps, stay
separate. Having said that, producing the binaries at root directory
is possible. I'm just not sure if it's worth doing.