From: Jakub Narebski <jnareb@gmail.com>
To: git@vger.kernel.org
Cc: Jakub Narebski <jnareb@gmail.com>
Subject: [RFC/PATCH 3/3] gitweb/Makefile: Add test-installed target
Date: Wed, 22 Sep 2010 16:21:26 +0200 [thread overview]
Message-ID: <1285165286-12452-4-git-send-email-jnareb@gmail.com> (raw)
In-Reply-To: <1285165286-12452-1-git-send-email-jnareb@gmail.com>
The 'test-installed' target in gitweb/Makefile installs and tests
installed gitweb.
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
---
RFC, because I am not 100% sure that 'test-installed' should have
'install' target as a dependency.
Probably should be marked .PHONY, but then there are some other
targets that should be marked such beside 'test-installed'.
The t/Makefile part is fairly uncontroversial, I think.
gitweb/Makefile | 4 ++++
t/Makefile | 4 ++++
2 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/gitweb/Makefile b/gitweb/Makefile
index 88bcf08..90f7212 100644
--- a/gitweb/Makefile
+++ b/gitweb/Makefile
@@ -152,6 +152,10 @@ install: all
$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(gitwebstaticdir_SQ)'
$(INSTALL) -m 644 $(GITWEB_FILES) '$(DESTDIR_SQ)$(gitwebstaticdir_SQ)'
+test-installed: install
+ GITWEB_TEST_INSTALLED='$(DESTDIR_SQ)$(gitwebdir_SQ)' \
+ $(MAKE) -C ../t gitweb-test
+
### Cleaning rules
clean:
diff --git a/t/Makefile b/t/Makefile
index c7baefb..7aa409a 100644
--- a/t/Makefile
+++ b/t/Makefile
@@ -17,6 +17,7 @@ SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
T = $(wildcard t[0-9][0-9][0-9][0-9]-*.sh)
TSVN = $(wildcard t91[0-9][0-9]-*.sh)
+TGITWEB = $(wildcard t95[0-9][0-9]-*.sh)
all: pre-clean
$(MAKE) aggregate-results-and-cleanup
@@ -46,6 +47,9 @@ full-svn-test:
$(MAKE) $(TSVN) GIT_SVN_NO_OPTIMIZE_COMMITS=1 LC_ALL=C
$(MAKE) $(TSVN) GIT_SVN_NO_OPTIMIZE_COMMITS=0 LC_ALL=en_US.UTF-8
+gitweb-test:
+ $(MAKE) $(TGITWEB)
+
valgrind:
GIT_TEST_OPTS=--valgrind $(MAKE)
--
1.7.2.1
prev parent reply other threads:[~2010-09-22 14:22 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-22 14:21 [PATCH 0/3] Testing installed gitweb Jakub Narebski
2010-09-22 14:21 ` [PATCH/RFC 1/3] gitweb/Makefile: Include gitweb/config.mak Jakub Narebski
2010-09-22 14:21 ` [PATCHv2 2/3] t/gitweb-lib.sh: Add support for GITWEB_TEST_INSTALLED Jakub Narebski
2010-09-22 14:21 ` Jakub Narebski [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1285165286-12452-4-git-send-email-jnareb@gmail.com \
--to=jnareb@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).