[couchdb] branch jenkins-cpse-debugging updated: Moar debugging, esp. on COUCHDB_VERSION

[kocolosk]

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


The following commit(s) were added to refs/heads/jenkins-cpse-debugging by this 
push:
     new 0f12623  Moar debugging, esp. on COUCHDB_VERSION
0f12623 is described below

commit 0f12623796ff9c97000048124ef90a7e49c47001
Author: Adam Kocoloski <kocol...@apache.org>
AuthorDate: Tue Aug 13 15:24:04 2019 -0400

    Moar debugging, esp. on COUCHDB_VERSION
---
 Makefile                                | 6 ++++--
 src/couch_pse_tests/src/cpse_gather.erl | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 8f85ab8..8ea161e 100644
--- a/Makefile
+++ b/Makefile
@@ -120,6 +120,7 @@ help:
 .PHONY: couch
 # target: couch - Build CouchDB core, use ERL_OPTS to provide custom 
compiler's options
 couch: config.erl
+       @echo "CouchDB version is $(COUCHDB_VERSION)"
        @COUCHDB_VERSION=$(COUCHDB_VERSION) COUCHDB_GIT_SHA=$(COUCHDB_GIT_SHA) 
$(REBAR) compile $(COMPILE_OPTS)
        @cp src/couch/priv/couchjs bin/
 
@@ -168,11 +169,12 @@ 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
+       @echo "CouchDB version is $(COUCHDB_VERSION)"
+       @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 \
diff --git a/src/couch_pse_tests/src/cpse_gather.erl 
b/src/couch_pse_tests/src/cpse_gather.erl
index 7804d41..61078eb 100644
--- a/src/couch_pse_tests/src/cpse_gather.erl
+++ b/src/couch_pse_tests/src/cpse_gather.erl
@@ -80,14 +80,14 @@ make_test_fun(Module, Fun, Arity) ->
     case Arity of
         0 ->
             fun(_) ->
-                {timeout, 60, {Name, fun() ->
+                {timeout, 180, {Name, fun() ->
                     process_flag(trap_exit, true),
                     Module:Fun()
                 end}}
             end;
         1 ->
             fun(Arg) ->
-                {timeout, 60, {Name, fun() ->
+                {timeout, 180, {Name, fun() ->
                     process_flag(trap_exit, true),
                     Module:Fun(Arg)
                 end}}