Skip to content

Commit 27438ef

Browse files
avargitster
authored andcommitted
gitweb: remove "test" and "test-installed" targets
Remove the special "test" targets for gitweb added in 958a846 (gitweb/Makefile: Add 'test' and 'test-installed' targets, 2010-09-26). Unlike e.g. "contrib/scalar" and "contrib/subtree" the "gitweb" tests themselves live in our top-level t/ directory. It therefore doesn't make sense to maintain this indirection, no more than it would to have a "git-send-email-test". By dropping it we'll also free other tests to use the t95*.sh prefix. These removed targets are unlikely to be used by anyone, and to the extent that they are we can easily use an invocation like this instead: make test T='t[0-9]*gitweb*.sh' Signed-off-by: Ævar Arnfjörð Bjarmason <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent b82d66e commit 27438ef

File tree

2 files changed

+0
-15
lines changed

2 files changed

+0
-15
lines changed

gitweb/Makefile

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -183,17 +183,6 @@ $(MAK_DIR_GITWEB)static/gitweb.js: $(addprefix $(MAK_DIR_GITWEB),$(GITWEB_JSLIB_
183183
cat $^ >$@+ && \
184184
mv $@+ $@
185185

186-
### Testing rules
187-
188-
.PHONY: test
189-
test:
190-
$(MAKE) -C ../t gitweb-test
191-
192-
.PHONY: test-installed
193-
test-installed:
194-
GITWEB_TEST_INSTALLED='$(DESTDIR_SQ)$(gitwebdir_SQ)' \
195-
$(MAKE) -C ../t gitweb-test
196-
197186
### Installation rules
198187

199188
.PHONY: install

t/Makefile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ TEST_RESULTS_DIRECTORY_SQ = $(subst ','\'',$(TEST_RESULTS_DIRECTORY))
3535
CHAINLINTTMP_SQ = $(subst ','\'',$(CHAINLINTTMP))
3636

3737
T = $(sort $(wildcard t[0-9][0-9][0-9][0-9]-*.sh))
38-
TGITWEB = $(sort $(wildcard t95[0-9][0-9]-*.sh))
3938
THELPERS = $(sort $(filter-out $(T),$(wildcard *.sh)))
4039
TPERF = $(sort $(wildcard perf/p[0-9][0-9][0-9][0-9]-*.sh))
4140
CHAINLINTTESTS = $(sort $(patsubst chainlint/%.test,%,$(wildcard chainlint/*.test)))
@@ -112,9 +111,6 @@ aggregate-results:
112111
echo "$$f"; \
113112
done | '$(SHELL_PATH_SQ)' ./aggregate-results.sh
114113

115-
gitweb-test:
116-
$(MAKE) $(TGITWEB)
117-
118114
valgrind:
119115
$(MAKE) GIT_TEST_OPTS="$(GIT_TEST_OPTS) --valgrind"
120116

0 commit comments

Comments
 (0)