diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2022-06-28 12:15:59 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-06-28 13:20:05 -0700 |
| commit | 27438ef5e043ebca6336274c5b4e79287749eca6 (patch) | |
| tree | 6371a5cdd05102681092c5ae32c020f5232fcb85 | |
| parent | gitweb/Makefile: prepare to merge into top-level Makefile (diff) | |
| download | git-27438ef5e043ebca6336274c5b4e79287749eca6.tar.gz git-27438ef5e043ebca6336274c5b4e79287749eca6.zip | |
gitweb: remove "test" and "test-installed" targets
Remove the special "test" targets for gitweb added in
958a8467216 (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 <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | gitweb/Makefile | 11 | ||||
| -rw-r--r-- | t/Makefile | 4 |
2 files changed, 0 insertions, 15 deletions
diff --git a/gitweb/Makefile b/gitweb/Makefile index 74e896767e..eaf0cfcf80 100644 --- a/gitweb/Makefile +++ b/gitweb/Makefile @@ -183,17 +183,6 @@ $(MAK_DIR_GITWEB)static/gitweb.js: $(addprefix $(MAK_DIR_GITWEB),$(GITWEB_JSLIB_ cat $^ >$@+ && \ mv $@+ $@ -### Testing rules - -.PHONY: test -test: - $(MAKE) -C ../t gitweb-test - -.PHONY: test-installed -test-installed: - GITWEB_TEST_INSTALLED='$(DESTDIR_SQ)$(gitwebdir_SQ)' \ - $(MAKE) -C ../t gitweb-test - ### Installation rules .PHONY: install diff --git a/t/Makefile b/t/Makefile index 056ce55dcc..7f56e52f76 100644 --- a/t/Makefile +++ b/t/Makefile @@ -35,7 +35,6 @@ TEST_RESULTS_DIRECTORY_SQ = $(subst ','\'',$(TEST_RESULTS_DIRECTORY)) CHAINLINTTMP_SQ = $(subst ','\'',$(CHAINLINTTMP)) T = $(sort $(wildcard t[0-9][0-9][0-9][0-9]-*.sh)) -TGITWEB = $(sort $(wildcard t95[0-9][0-9]-*.sh)) THELPERS = $(sort $(filter-out $(T),$(wildcard *.sh))) TPERF = $(sort $(wildcard perf/p[0-9][0-9][0-9][0-9]-*.sh)) CHAINLINTTESTS = $(sort $(patsubst chainlint/%.test,%,$(wildcard chainlint/*.test))) @@ -112,9 +111,6 @@ aggregate-results: echo "$$f"; \ done | '$(SHELL_PATH_SQ)' ./aggregate-results.sh -gitweb-test: - $(MAKE) $(TGITWEB) - valgrind: $(MAKE) GIT_TEST_OPTS="$(GIT_TEST_OPTS) --valgrind" |