You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ko...@apache.org on 2019/08/14 17:06:56 UTC
[couchdb] 01/02: Ensure EUnit inherits appropriate env vars
This is an automated email from the ASF dual-hosted git repository.
kocolosk pushed a commit to branch jenkins-cpse-debugging
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit dc1e8a64fa65d2183b3e4ef3110a0e4a5ec202ef
Author: Adam Kocoloski <ko...@apache.org>
AuthorDate: Fri Aug 9 16:34:43 2019 -0400
Ensure EUnit inherits appropriate env vars
Omitting COUCHDB_VERSION caused the EUnit build of the replicator to
have a corrupted User-Agent header. It tried to construct a version
using git, but when building from a release tarball there is no git
repo so the UA had a git error message in it. This error message
contained a newline, which plausibly confused some part of the HTTP
stack and caused replicator HTTP requests to hang.
Related to #2098.
---
Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 8f85ab8..f09ae32 100644
--- a/Makefile
+++ b/Makefile
@@ -168,11 +168,11 @@ eunit: export BUILDDIR = $(shell pwd)
eunit: export ERL_AFLAGS = -config $(shell pwd)/rel/files/eunit.config
eunit: export COUCHDB_QUERY_SERVER_JAVASCRIPT = $(shell pwd)/bin/couchjs $(shell pwd)/share/server/main.js
eunit: couch
- @$(REBAR) setup_eunit 2> /dev/null
+ @COUCHDB_VERSION=$(COUCHDB_VERSION) COUCHDB_GIT_SHA=$(COUCHDB_GIT_SHA) $(REBAR) setup_eunit 2> /dev/null
@for dir in $(subdirs); do \
tries=0; \
while true; do \
- $(REBAR) -r eunit $(EUNIT_OPTS) apps=$$dir ; \
+ COUCHDB_VERSION=$(COUCHDB_VERSION) COUCHDB_GIT_SHA=$(COUCHDB_GIT_SHA) $(REBAR) -r eunit $(EUNIT_OPTS) apps=$$dir ; \
if [ $$? -eq 0 ]; then \
break; \
else \