aboutsummaryrefslogtreecommitdiff
path: root/gitweb
diff options
context:
space:
mode:
authorJakub Narebski <jnareb@gmail.com>2010-09-26 15:02:26 +0200
committerJunio C Hamano <gitster@pobox.com>2010-09-30 11:50:26 -0700
commit958a8467216ca607ca6a24059d5c641347927333 (patch)
treeec568587ed5b8bd7fe6d055399cb7d719bf5933f /gitweb
parent929909375034eb609f855fe51b2ffc57123e6dd4 (diff)
downloadgit-958a8467216ca607ca6a24059d5c641347927333.tar.gz
git-958a8467216ca607ca6a24059d5c641347927333.tar.xz
gitweb/Makefile: Add 'test' and 'test-installed' targets
The 'test-installed' target in gitweb/Makefile tests installed gitweb, using the same destination directory that 'install' target uses. The 'test' target is just a convenience wrapper invoking 'gitweb-test' target of t/Makefile. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'gitweb')
-rw-r--r--gitweb/Makefile11
1 files changed, 10 insertions, 1 deletions
diff --git a/gitweb/Makefile b/gitweb/Makefile
index 2fb7c2d77..f2180741f 100644
--- a/gitweb/Makefile
+++ b/gitweb/Makefile
@@ -143,6 +143,15 @@ gitweb.cgi: gitweb.perl GITWEB-BUILD-OPTIONS
chmod +x $@+ && \
mv $@+ $@
+### Testing rules
+
+test:
+ $(MAKE) -C ../t gitweb-test
+
+test-installed:
+ GITWEB_TEST_INSTALLED='$(DESTDIR_SQ)$(gitwebdir_SQ)' \
+ $(MAKE) -C ../t gitweb-test
+
### Installation rules
install: all
@@ -156,5 +165,5 @@ install: all
clean:
$(RM) gitweb.cgi static/gitweb.min.js static/gitweb.min.css GITWEB-BUILD-OPTIONS
-.PHONY: all clean install .FORCE-GIT-VERSION-FILE FORCE
+.PHONY: all clean install test test-installed .FORCE-GIT-VERSION-FILE FORCE