Skip to content

Commit 6c473a5

Browse files
felipecgitster
authored andcommitted
build: generate and clean test scripts
Commit 416fda6 (build: do not install git-remote-testpy) made it so git-remote-testpy is not only not installed, but also not generated by default. From a fresh checkout, "make --test=5800 test" would have failed. This was not found primarily because "make clean" failed to remove git-remote-testpy, which is another bug in the same commit. Fix the former by having 'all' target depend on $(NO_INSTALL) and the latter by removing $(NO_INSTALL) in the 'clean' target. Signed-off-by: Felipe Contreras <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 81b4f18 commit 6c473a5

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2205,6 +2205,7 @@ endif
22052205
test_bindir_programs := $(patsubst %,bin-wrappers/%,$(BINDIR_PROGRAMS_NEED_X) $(BINDIR_PROGRAMS_NO_X) $(TEST_PROGRAMS_NEED_X))
22062206

22072207
all:: $(TEST_PROGRAMS) $(test_bindir_programs)
2208+
all:: $(NO_INSTALL)
22082209

22092210
bin-wrappers/%: wrap-for-bin.sh
22102211
@mkdir -p bin-wrappers
@@ -2454,7 +2455,7 @@ clean: profile-clean
24542455
$(RM) *.o block-sha1/*.o ppc/*.o compat/*.o compat/*/*.o xdiff/*.o vcs-svn/*.o \
24552456
builtin/*.o $(LIB_FILE) $(XDIFF_LIB) $(VCSSVN_LIB)
24562457
$(RM) $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS) git$X
2457-
$(RM) $(TEST_PROGRAMS)
2458+
$(RM) $(TEST_PROGRAMS) $(NO_INSTALL)
24582459
$(RM) -r bin-wrappers $(dep_dirs)
24592460
$(RM) -r po/build/
24602461
$(RM) *.spec *.pyc *.pyo */*.pyc */*.pyo common-cmds.h $(ETAGS_TARGET) tags cscope*

0 commit comments

Comments
 (0)