test deps

Author: jiahuili430

.gitignore

@@ -56,7 +56,6 @@ apps/excoveralls/
 apps/fauxton/
 apps/folsom/
 apps/hackney/
-apps/hqueue/
 apps/hyper/
 apps/ibrowse/
 apps/idna/

Makefile

@@ -140,7 +140,8 @@ fauxton: share/www
 
 .PHONY: escriptize
 # target: escriptize - Build CLI tools
-escriptize:
+escriptize: couch
+	@COUCHDB_VERSION=$(COUCHDB_VERSION) COUCHDB_GIT_SHA=$(COUCHDB_GIT_SHA) $(REBAR3) escriptize -a weatherreport
 	@cp _build/default/bin/weatherreport bin/weatherreport
 
 
@@ -172,7 +173,7 @@ eunit: export COUCHDB_QUERY_SERVER_JAVASCRIPT = $(shell pwd)/bin/couchjs $(shell
 eunit: export COUCHDB_TEST_ADMIN_PARTY_OVERRIDE=1
 eunit: couch
 	@COUCHDB_VERSION=$(COUCHDB_VERSION) COUCHDB_GIT_SHA=$(COUCHDB_GIT_SHA) $(REBAR3) ic setup_eunit 2> /dev/null
-	@$(REBAR3) eunit
+	@COUCHDB_VERSION=$(COUCHDB_VERSION) COUCHDB_GIT_SHA=$(COUCHDB_GIT_SHA) $(REBAR3) eunit || exit 1
 
 
 .PHONY: exunit
@@ -194,14 +195,14 @@ setup-eunit:
 just-eunit: export BUILDDIR = $(shell pwd)
 just-eunit: export ERL_AFLAGS = -config $(shell pwd)/rel/files/eunit.config
 just-eunit:
-	@$(REBAR3) eunit $(EUNIT_OPTS)
+	@$(REBAR3) eunit
 
 .PHONY: soak-eunit
 soak-eunit: export BUILDDIR = $(shell pwd)
 soak-eunit: export ERL_AFLAGS = -config $(shell pwd)/rel/files/eunit.config
 soak-eunit: couch
-	@$(REBAR3) setup_eunit 2> /dev/null
-	while [ $$? -eq 0 ] ; do $(REBAR3) eunit $(EUNIT_OPTS) ; done
+	@$(REBAR3) ic setup_eunit 2> /dev/null
+	while [ $$? -eq 0 ] ; do $(REBAR3) eunit; done
 
 erlfmt-check:
 	ERLFMT_PATH=$(ERLFMT) python3 dev/format_check.py

apps/fabric/test/eunit/fabric_db_create_tests.erl

@@ -44,6 +44,4 @@ t_handle_shard_doc_conflict() ->
     ]),
     meck:expect(fabric_util, recv, 4, {error, conflict}),
     ?assertEqual({error, file_exists}, fabric_db_create:go(DbName, [])),
-
-    meck:unload(),
-    ok = fabric:delete_db(DbName).
+    meck:unload().

build-aux/Jenkinsfile.pr

@@ -21,17 +21,6 @@ cd build
 tar -xf ${WORKSPACE}/apache-couchdb-*.tar.gz
 cd apache-couchdb-*
 ./configure
-make couch || (make build-report && false)
-make fauxton || (make build-report && false)
-make docs || (make build-report && false)
-make escriptize || (make build-report && false)
-make python-black || (make build-report && false)
-make exunit || (make build-report && false)
-make eunit || (make build-report && false)
-make mango-test || (make build-report && false)
-make elixir-suite || (make build-report && false)
-make elixir-suite || (make build-report && false)
-make weatherreport-test || (make build-report && false)
 make check || (make build-report && false)
 '''
 
@@ -96,7 +85,6 @@ pipeline {
       post {
         cleanup {
           // UGH see https://issues.jenkins-ci.org/browse/JENKINS-41894
-          sh 'echo ${WORKSPACE}'
           sh 'rm -rf ${WORKSPACE}/*'
         }
       }
@@ -169,25 +157,13 @@ pipeline {
             }
             steps {
               unstash 'tarball'
-              sh 'mkdir -p ${ERLANG_VERSION}'
-              sh 'cd ${ERLANG_VERSION}}'
-              sh 'rm -rf build'
-              sh 'mkdir build'
-              sh 'cd build'
-              sh 'tar -xf ${WORKSPACE}/apache-couchdb-*.tar.gz'
-              sh 'cd apache-couchdb-*'
-              sh 'echo #######################################'
-              sh 'echo " +++ ./configure"'
-              sh './configure'
-              sh 'echo " +++ make couch"'
-              sh 'make couch || (make build-report && false)'
+              sh( script: build_and_test )
             }
             post {
               always {
                 junit '_build/test/*.xml'
               }
               cleanup {
-                sh 'echo ${WORKSPACE}'
                 sh 'rm -rf ${WORKSPACE}/*'
               }
             }

build-aux/couchdb-build-release.sh

@@ -18,17 +18,17 @@ CURRENT_BRANCH=`git rev-parse --abbrev-ref HEAD`
 
 # copy sources over
 git archive ${CURRENT_BRANCH} | tar -xC ${REL_DIR}/ -f -
-cd _build/default/lib/
+cd apps
 for repo in *; do
   cd ${repo}
   if [ -d ".git" ]; then
-    mkdir -p ../../../../${REL_DIR}/apps/${repo}
+    mkdir -p ../../${REL_DIR}/apps/${repo}
     git_ish=`git rev-parse --short HEAD`
     git archive ${git_ish} \
-        | tar --exclude '*do_not_compile.erl' -xC ../../../../${REL_DIR}/apps/${repo}/ -f -
+        | tar --exclude '*do_not_compile.erl' -xC ../../${REL_DIR}/apps/${repo}/ -f -
   fi
   set +e
-  grep -rl '{vsn, git}' ../../../../${REL_DIR}/apps/${repo}/ 2>/dev/null \
+  grep -rl '{vsn, git}' ../../${REL_DIR}/apps/${repo}/ 2>/dev/null \
       | xargs sed -ie "s/{vsn, git}/{vsn, \"${VERSION}\"}/" 2>/dev/null
   set -e
   cd ..
@@ -53,5 +53,4 @@ if test -e .git; then
 fi
 
 # copy our rebar
-cd ../..
 cp bin/rebar3 ${REL_DIR}/bin/rebar3

build-aux/show-test-results.py

@@ -9,7 +9,7 @@
 
 
 TEST_COLLECTIONS = {
-    "EUnit": "_build/test/lib/**/.eunit/*.xml",
+    "EUnit": "_build/test/*.xml",
     "EXUnit": "_build/integration/lib/couchdbtest/*.xml",
     "Mango": "src/mango/*.xml",
     "JavaScript": "test/javascript/*.xml",

configure

@@ -306,7 +306,6 @@ if [ -z "${ERLFMT}" ]; then
 fi
 
 install_dependencies() {
-    echo "==> Installing dependencies"
     regex='(https?|ftp|file)://[-[:alnum:]\+&@#/%?=~_|!:,.;]*[-[:alnum:]\+&@#/%=~_|]'
 
     while IFS= read -r deps; do
@@ -322,22 +321,25 @@ install_dependencies() {
     done < "deps.txt"
 
     if [ ! -d "${rootdir}/apps/proper" ] && [ $WITH_PROPER == "true" ]; then
-        echo "==> Fetching proper}"
+        echo "==> Fetching proper"
         git clone --depth 1 --branch v1.4 https://github.com/proper-testing/proper "${rootdir}/apps/proper"
     fi
 
     if [ ! -d "${rootdir}/apps/fauxton" ] && [ $WITH_FAUXTON == 1 ]; then
-        echo "==> Fetching fauxton}"
+        echo "==> Fetching fauxton"
         git clone --depth 1 --branch v1.2.8 https://github.com/apache/couchdb-fauxton "${rootdir}/apps/fauxton"
     fi
 
     if [ ! -d "${rootdir}/apps/docs" ] && [ $WITH_DOCS == 1 ]; then
-        echo "==> Fetching couchdb-documentation}"
+        echo "==> Fetching couchdb-documentation"
         git clone --depth 1 --branch 82-rebar3 https://github.com/jiahuili430/couchdb-documentation "${rootdir}/apps/docs"
     fi
 }
 
-install_dependencies
+if [ $SKIP_DEPS -ne 1 ]; then
+    echo "==> installing dependencies"
+    install_dependencies
+fi
 
 # only update dependencies, when we are not in a release tarball
 if [ -d .git  -a $SKIP_DEPS -ne 1 ]; then

deps.txt

@@ -1,4 +1,4 @@
-config config tag 2.1.9
+config config https://github.com/jiahuili430/couchdb-config.git 82-rebar3
 b64url b64url tag 1.0.3
 ets_lru ets-lru tag 1.1.0
 khash khash https://github.com/jiahuili430/couchdb-khash 82-rebar3

rebar.config.script

@@ -168,7 +168,6 @@ AddConfig = [
         {application, couch_epi}
     ]},
     {profiles, [{test, [{extra_src_dirs, [{"test", [{recursive, true}]}]}]}]},
-    {escript_main_app, weatherreport},
     {dialyzer, [
         {plt_location, local},
         {plt_location, COUCHDB_ROOT},
@@ -267,8 +266,6 @@ AddConfig = [
             {template, "rel/files/couchdb.cmd.in", "bin/couchdb.cmd"}
         ]}
     ]},
-    {provider_hooks, [{post, [{compile, escriptize}]}]},
-    {artifacts, ["bin/weatherreport"]},
     {post_hooks, [{compile, "escript support/build_js.escript"}]}
 ].
 

rel/overlay/etc/default.ini

@@ -14,7 +14,7 @@ view_index_dir = {{view_index_dir}}
 ; The actual limit may be slightly lower depending on how
 ; many schedulers you have as the allowance is divided evenly
 ; among them.
-;max_dbs_open = 500
+max_dbs_open = 500
 
 ; Method used to compress everything that is appended to database and view index files, except
 ; for attachments (see the attachments section). Available methods are: