development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-11-05 18:59:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'maint'

Browse source 
* maint:
  documentation: trivial whitespace cleanups
  t/Makefile: remove smoke test targets
This commit is contained in:
Junio C Hamano 2013-04-28 14:47:24 -07:00
commit 89740333e8
2 changed files with 6 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Documentation/config.txt
View file

@ -1104,11 +1104,11 @@ format.thread::
value disables threading. value disables threading.
format.signoff:: format.signoff::
A boolean value which lets you enable the `-s/--signoff` option of A boolean value which lets you enable the `-s/--signoff` option of
format-patch by default. *Note:* Adding the Signed-off-by: line to a format-patch by default. *Note:* Adding the Signed-off-by: line to a
patch should be a conscious act and means that you certify you have patch should be a conscious act and means that you certify you have
the rights to submit this work under the same open source license. the rights to submit this work under the same open source license.
Please see the 'SubmittingPatches' document for further discussion. Please see the 'SubmittingPatches' document for further discussion.
format.coverLetter:: format.coverLetter::
A boolean that controls whether to generate a cover-letter when A boolean that controls whether to generate a cover-letter when
@ -1225,7 +1225,7 @@ gitcvs.dbname::
gitcvs.dbdriver:: gitcvs.dbdriver::
Used Perl DBI driver. You can specify any available driver Used Perl DBI driver. You can specify any available driver
for this here, but it might not work. git-cvsserver is tested for this here, but it might not work. git-cvsserver is tested
with 'DBD::SQLite', reported to work with 'DBD::Pg', and with 'DBD::SQLite', reported to work with 'DBD::Pg', and
reported *not* to work with 'DBD::mysql'. Experimental feature. reported *not* to work with 'DBD::mysql'. Experimental feature.
May not contain double colons (`:`). Default: 'SQLite'. May not contain double colons (`:`). Default: 'SQLite'.

38
t/Makefile
View file

@ -83,42 +83,4 @@ valgrind:
perf: perf:
$(MAKE) -C perf/ all $(MAKE) -C perf/ all
# Smoke testing targets
-include ../GIT-VERSION-FILE
uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo unknown')
uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo unknown')
test-results:
mkdir -p test-results
test-results/git-smoke.tar.gz: test-results
'$(PERL_PATH_SQ)' ./harness \
--archive="test-results/git-smoke.tar.gz" \
$(T)
smoke: test-results/git-smoke.tar.gz
SMOKE_UPLOAD_FLAGS =
ifdef SMOKE_USERNAME
SMOKE_UPLOAD_FLAGS += -F username="$(SMOKE_USERNAME)" -F password="$(SMOKE_PASSWORD)"
endif
ifdef SMOKE_COMMENT
SMOKE_UPLOAD_FLAGS += -F comments="$(SMOKE_COMMENT)"
endif
ifdef SMOKE_TAGS
SMOKE_UPLOAD_FLAGS += -F tags="$(SMOKE_TAGS)"
endif
smoke_report: smoke
curl \
-H "Expect: " \
-F project=Git \
-F architecture="$(uname_M)" \
-F platform="$(uname_S)" \
-F revision="$(GIT_VERSION)" \
-F report_file=@test-results/git-smoke.tar.gz \
$(SMOKE_UPLOAD_FLAGS) \
http://smoke.git.nix.is/app/projects/process_add_report/1 \
| grep -v ^Redirecting
.PHONY: pre-clean $(T) aggregate-results clean valgrind perf .PHONY: pre-clean $(T) aggregate-results clean valgrind perf