diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-11-17 14:59:22 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-11-17 14:59:22 -0800 |
| commit | 430fac9e5bdf24a2969f854ff0ff376140f88090 (patch) | |
| tree | 97af5770aa6afef8fc1739ca5496b1c3ca6ce869 /gitweb | |
| parent | 8cf666c9eea7d6c40784efde545c9d00edea1959 (diff) | |
| parent | 9b93aeb29cea16880926bc150ac31cfb31475a44 (diff) | |
| download | git-430fac9e5bdf24a2969f854ff0ff376140f88090.tar.gz | |
Merge branch 'jn/gitweb-test'
* jn/gitweb-test:
gitweb/Makefile: Include gitweb/config.mak
gitweb/Makefile: Add 'test' and 'test-installed' targets
t/gitweb-lib.sh: Add support for GITWEB_TEST_INSTALLED
gitweb: Move call to evaluate_git_version after evaluate_gitweb_config
Diffstat (limited to 'gitweb')
| -rw-r--r-- | gitweb/Makefile | 12 | ||||
| -rwxr-xr-x | gitweb/gitweb.perl | 2 |
2 files changed, 12 insertions, 2 deletions
diff --git a/gitweb/Makefile b/gitweb/Makefile index e32ee76309..0a6ac00631 100644 --- a/gitweb/Makefile +++ b/gitweb/Makefile @@ -40,6 +40,7 @@ HIGHLIGHT_BIN = highlight # include user config -include ../config.mak.autogen -include ../config.mak +-include config.mak # determine version ../GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE @@ -145,6 +146,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 @@ -158,5 +168,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 diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index 253f41adc9..679f2da3ee 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -1075,6 +1075,7 @@ sub run_request { evaluate_uri(); evaluate_gitweb_config(); + evaluate_git_version(); check_loadavg(); # $projectroot and $projects_list might be set in gitweb config file @@ -1127,7 +1128,6 @@ sub evaluate_argv { sub run { evaluate_argv(); - evaluate_git_version(); $pre_listen_hook->() if $pre_listen_hook; |