summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Vatamaniuc <vatamane@apache.org>2020-04-09 17:25:42 -0400
committerNick Vatamaniuc <nickva@users.noreply.github.com>2020-04-09 18:30:17 -0400
commitcbad08d5fa4308fa9d243bae8eabd4872eaa5837 (patch)
tree78fb3d98bf3a3ebb2cc8c27a39c94f8e11212d90
parentdaf10824af695669dde61828414e8aff9e2de9d9 (diff)
downloadcouchdb-cbad08d5fa4308fa9d243bae8eabd4872eaa5837.tar.gz
Make 'make check' run all the passing FDB tests on this branch
This will let CI gate PRs hopefully as we now have the necessary FDB server bits installed in Jenkins. Eventually when we can run all the tests revert to using `make check-all-tests` as the default.
-rw-r--r--Makefile10
-rw-r--r--build-aux/Jenkinsfile.pr2
2 files changed, 7 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 592093ea3..ebdab2200 100644
--- a/Makefile
+++ b/Makefile
@@ -144,9 +144,11 @@ fauxton: share/www
################################################################################
-.PHONY: check
+# When we can run all the tests with FDB switch this back to be the default
+# "make check" command
+.PHONY: check-all-tests
# target: check - Test everything
-check: all python-black
+check-all-tests: all python-black
@$(MAKE) eunit
@$(MAKE) javascript
@$(MAKE) mango-test
@@ -158,8 +160,8 @@ else
subdirs=$(shell ls src)
endif
-.PHONY: check-fdb
-check-fdb:
+.PHONY: check
+check: all
make eunit apps=couch_eval,couch_expiring_cache,ctrace,couch_jobs,couch_views,fabric,mango,chttpd
make elixir tests=test/elixir/test/basics_test.exs,test/elixir/test/replication_test.exs,test/elixir/test/map_test.exs,test/elixir/test/all_docs_test.exs,test/elixir/test/bulk_docs_test.exs
make exunit tests=src/couch_rate/test/exunit/
diff --git a/build-aux/Jenkinsfile.pr b/build-aux/Jenkinsfile.pr
index 8c9cbd930..ca548ff27 100644
--- a/build-aux/Jenkinsfile.pr
+++ b/build-aux/Jenkinsfile.pr
@@ -21,7 +21,7 @@ cd build
tar -xf ${WORKSPACE}/apache-couchdb-*.tar.gz
cd apache-couchdb-*
. /usr/local/kerl/${KERL_VER}/activate
-./configure --with-curl --spidermonkey-version 60
+./configure --with-curl
make check || (make build-report && false)
'''