Skip to content

Commit

Permalink
Merge branch 'maint'
Browse files Browse the repository at this point in the history
* maint:
  documentation: trivial whitespace cleanups
  t/Makefile: remove smoke test targets
  • Loading branch information
Junio C Hamano committed Apr 28, 2013
2 parents c85f0a2 + 240ae2b commit 8974033
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 44 deletions.
12 changes: 6 additions & 6 deletions Documentation/config.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1104,11 +1104,11 @@ format.thread::
value disables threading.

format.signoff::
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
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.
Please see the 'SubmittingPatches' document for further discussion.
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
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.
Please see the 'SubmittingPatches' document for further discussion.

format.coverLetter::
A boolean that controls whether to generate a cover-letter when
Expand Down Expand Up @@ -1225,7 +1225,7 @@ gitcvs.dbname::

gitcvs.dbdriver::
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
reported *not* to work with 'DBD::mysql'. Experimental feature.
May not contain double colons (`:`). Default: 'SQLite'.
Expand Down
38 changes: 0 additions & 38 deletions t/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -83,42 +83,4 @@ valgrind:
perf:
$(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

0 comments on commit 8974033

Please sign in to comment.