threads / patch / 42761

patchMakefile: drop extra dependencies for test helpers

Subject: [PATCH] Makefile: drop extra dependencies for test helpers

## tl;dr

2 messages between Jul 1, 2016 and Jul 1, 2016. Diffs are folded; open one to read it.

replies: 1people: 1as markdown or json

Jeff King· Jul 1, 2016, 07:56 UTC · lore

A few test-helpers have Makefile dependencies on specific object files. But since these files are part of libgit.a (which all of the helpers link against), the inclusion is simply redundant.

These were once necessary, but became redundant due to 5c5ba73 (Makefile: Use generic rule to build test programs, 2007-05-31), which added the $(GITLIBS) dependency (but didn't prune the extra dependency lines). Later commits then cargo-culted the practice (e.g., b4285c7).

Note that we _do_ need to leave the dependencies on the svn library, as that is not part of the usual link command.

Signed-off-by: Jeff King <peff@peff.net>
---
Just a cleanup I noticed while working on the common-main series.

 Makefile | 8 --------
 1 file changed, 8 deletions(-)

Show changes to Makefile +0 −8

diff --git a/Makefile b/Makefile
index de5a030..22815a2 100644
--- a/Makefile
+++ b/Makefile
@@ -2225,16 +2225,8 @@ perf: all
 
 .PHONY: test perf
 
-t/helper/test-ctype$X: ctype.o
-
-t/helper/test-date$X: date.o ctype.o
-
-t/helper/test-delta$X: diff-delta.o patch-delta.o
-
 t/helper/test-line-buffer$X: vcs-svn/lib.a
 
-t/helper/test-parse-options$X: parse-options.o parse-options-cb.o
-
 t/helper/test-svn-fe$X: vcs-svn/lib.a
 
 .PRECIOUS: $(TEST_OBJS)

-- 
2.9.0.317.g65b4e7c

Jeff King· Jul 1, 2016, 07:59 UTC · re: Jeff King · lore

[PATCH] Makefile: use VCSSVN_LIB to refer to svn library

We have an abstracted variable; let's use it consistently.

Signed-off-by: Jeff King <peff@peff.net>
---
On top of the cleanup earlier in the thread.

I actually wonder if we should drop the vcs-svn code entirely. The last update that wasn't just part of a "I'm grepping the whole code base to change this interface" patch was almost 4 years ago, and AFAICT it never reached a shippable point (we _do_ actually install git-remote-testsvn, but given the name, I sort of assume nobody is using it).

But I don't want to step on the toes of anybody who actually is using it, or is planning to work on it more.

 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Show changes to Makefile +2 −2

diff --git a/Makefile b/Makefile
index 22815a2..4579eab 100644
--- a/Makefile
+++ b/Makefile
@@ -2225,9 +2225,9 @@ perf: all
 
 .PHONY: test perf
 
-t/helper/test-line-buffer$X: vcs-svn/lib.a
+t/helper/test-line-buffer$X: $(VCSSVN_LIB)
 
-t/helper/test-svn-fe$X: vcs-svn/lib.a
+t/helper/test-svn-fe$X: $(VCSSVN_LIB)
 
 .PRECIOUS: $(TEST_OBJS)

-- 
2.9.0.317.g65b4e7c