From: Junio C Hamano Date: Fri, 30 Mar 2018 19:42:07 +0000 (-0700) Subject: Merge branch 'nd/combined-test-helper' into next X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ea73d57c30f41609e7c2985976b18cf7acd4bda9 Merge branch 'nd/combined-test-helper' into next Small test-helper programs have been consolidated into a single binary. * nd/combined-test-helper: (36 commits) t/helper: merge test-write-cache into test-tool t/helper: merge test-wildmatch into test-tool t/helper: merge test-urlmatch-normalization into test-tool t/helper: merge test-subprocess into test-tool t/helper: merge test-submodule-config into test-tool t/helper: merge test-string-list into test-tool t/helper: merge test-strcmp-offset into test-tool t/helper: merge test-sigchain into test-tool t/helper: merge test-sha1-array into test-tool t/helper: merge test-scrap-cache-tree into test-tool t/helper: merge test-run-command into test-tool t/helper: merge test-revision-walking into test-tool t/helper: merge test-regex into test-tool t/helper: merge test-ref-store into test-tool t/helper: merge test-read-cache into test-tool t/helper: merge test-prio-queue into test-tool t/helper: merge test-path-utils into test-tool t/helper: merge test-online-cpus into test-tool t/helper: merge test-mktemp into test-tool t/helper: merge (unused) test-mergesort into test-tool ... --- ea73d57c30f41609e7c2985976b18cf7acd4bda9 diff --cc Makefile index 7dcb37c18f,8ad9a2a1a9..ff7effb2f9 --- a/Makefile +++ b/Makefile @@@ -658,48 -652,49 +659,50 @@@ X PROGRAMS += $(patsubst %.o,git-%$X,$(PROGRAM_OBJS)) - TEST_PROGRAMS_NEED_X += test-chmtime - TEST_PROGRAMS_NEED_X += test-ctype - TEST_PROGRAMS_NEED_X += test-config - TEST_PROGRAMS_NEED_X += test-date - TEST_PROGRAMS_NEED_X += test-delta - TEST_PROGRAMS_NEED_X += test-drop-caches - TEST_PROGRAMS_NEED_X += test-dump-cache-tree + TEST_BUILTINS_OBJS += test-chmtime.o + TEST_BUILTINS_OBJS += test-config.o + TEST_BUILTINS_OBJS += test-ctype.o + 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-split-index.o + TEST_BUILTINS_OBJS += test-example-decorate.o + TEST_BUILTINS_OBJS += test-genrandom.o + TEST_BUILTINS_OBJS += test-hashmap.o + TEST_BUILTINS_OBJS += test-index-version.o + TEST_BUILTINS_OBJS += test-lazy-init-name-hash.o + TEST_BUILTINS_OBJS += test-match-trees.o + TEST_BUILTINS_OBJS += test-mergesort.o + TEST_BUILTINS_OBJS += test-mktemp.o + 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-regex.o + TEST_BUILTINS_OBJS += test-revision-walking.o + TEST_BUILTINS_OBJS += test-run-command.o + TEST_BUILTINS_OBJS += test-scrap-cache-tree.o + TEST_BUILTINS_OBJS += test-sha1-array.o + TEST_BUILTINS_OBJS += test-sha1.o + TEST_BUILTINS_OBJS += test-sigchain.o + TEST_BUILTINS_OBJS += test-strcmp-offset.o + TEST_BUILTINS_OBJS += test-string-list.o + TEST_BUILTINS_OBJS += test-submodule-config.o + TEST_BUILTINS_OBJS += test-subprocess.o + 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-dump-split-index TEST_PROGRAMS_NEED_X += test-dump-untracked-cache - TEST_PROGRAMS_NEED_X += test-example-decorate TEST_PROGRAMS_NEED_X += test-fake-ssh - TEST_PROGRAMS_NEED_X += test-genrandom - TEST_PROGRAMS_NEED_X += test-hashmap - TEST_PROGRAMS_NEED_X += test-index-version - TEST_PROGRAMS_NEED_X += test-lazy-init-name-hash TEST_PROGRAMS_NEED_X += test-line-buffer - TEST_PROGRAMS_NEED_X += test-match-trees - TEST_PROGRAMS_NEED_X += test-mergesort - TEST_PROGRAMS_NEED_X += test-mktemp - TEST_PROGRAMS_NEED_X += test-online-cpus TEST_PROGRAMS_NEED_X += test-parse-options - TEST_PROGRAMS_NEED_X += test-path-utils +TEST_PROGRAMS_NEED_X += test-pkt-line - TEST_PROGRAMS_NEED_X += test-prio-queue - TEST_PROGRAMS_NEED_X += test-read-cache - 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 - TEST_PROGRAMS_NEED_X += test-scrap-cache-tree - TEST_PROGRAMS_NEED_X += test-sha1 - TEST_PROGRAMS_NEED_X += test-sha1-array - TEST_PROGRAMS_NEED_X += test-sigchain - TEST_PROGRAMS_NEED_X += test-strcmp-offset - TEST_PROGRAMS_NEED_X += test-string-list - TEST_PROGRAMS_NEED_X += test-submodule-config - TEST_PROGRAMS_NEED_X += test-subprocess TEST_PROGRAMS_NEED_X += test-svn-fe - TEST_PROGRAMS_NEED_X += test-urlmatch-normalization - TEST_PROGRAMS_NEED_X += test-wildmatch + TEST_PROGRAMS_NEED_X += test-tool TEST_PROGRAMS = $(patsubst %,t/helper/%$X,$(TEST_PROGRAMS_NEED_X))