diff options
| author | iilyak <iilyak@users.noreply.github.com> | 2020-05-07 03:42:45 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-07 03:42:45 -0700 |
| commit | 25bf5cbc4d08fe2f0cc4291b4451beebbaf1e43d (patch) | |
| tree | cc7d36b1c6178ff296106aed88d5a9d0fe1dfea8 | |
| parent | 7e7a3f6651ea33643ea506d6786fe30f17ef4617 (diff) | |
| parent | 51b8cc1e56ecfd5ce3a75347bf868dfd8deceaaf (diff) | |
| download | couchdb-25bf5cbc4d08fe2f0cc4291b4451beebbaf1e43d.tar.gz | |
Merge pull request #2874 from cloudant/enable-exunit
Re-enable ExUnit tests
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | Makefile.win | 1 | ||||
| -rw-r--r-- | rebar.config.script | 2 |
3 files changed, 4 insertions, 2 deletions
@@ -165,7 +165,7 @@ check: all @$(MAKE) emilio 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/ + make exunit apps=couch_rate,chttpd make mango-test .PHONY: eunit @@ -188,6 +188,7 @@ exunit: export MIX_ENV=test exunit: export ERL_LIBS = $(shell pwd)/src exunit: export ERL_AFLAGS = -config $(shell pwd)/rel/files/eunit.config exunit: export COUCHDB_QUERY_SERVER_JAVASCRIPT = $(shell pwd)/bin/couchjs $(shell pwd)/share/server/main.js +exunit: export COUCHDB_TEST_ADMIN_PARTY_OVERRIDE=1 exunit: couch elixir-init setup-eunit elixir-check-formatted elixir-credo @mix test --cover --trace $(EXUNIT_OPTS) diff --git a/Makefile.win b/Makefile.win index 885b7741c..265cdf339 100644 --- a/Makefile.win +++ b/Makefile.win @@ -163,6 +163,7 @@ exunit: export MIX_ENV=test exunit: export ERL_LIBS = $(shell echo %cd%)\src exunit: export ERL_AFLAGS = -config $(shell echo %cd%)/rel/files/eunit.config exunit: export COUCHDB_QUERY_SERVER_JAVASCRIPT = $(shell echo %cd%)/bin/couchjs $(shell echo %cd%)/share/server/main.js +exunit: export COUCHDB_TEST_ADMIN_PARTY_OVERRIDE=1 exunit: couch elixir-init setup-eunit elixir-check-formatted elixir-credo @mix test --cover --trace $(EXUNIT_OPTS) diff --git a/rebar.config.script b/rebar.config.script index b0d2f15d5..03c380f46 100644 --- a/rebar.config.script +++ b/rebar.config.script @@ -152,7 +152,7 @@ DepDescs = [ %% Independent Apps {config, "config", {tag, "2.1.7"}}, {b64url, "b64url", {tag, "1.0.2"}}, -{erlfdb, "erlfdb", {tag, "v1.1.0"}}, +{erlfdb, "erlfdb", {tag, "v1.2.0"}}, {ets_lru, "ets-lru", {tag, "1.1.0"}}, {khash, "khash", {tag, "1.1.0"}}, {snappy, "snappy", {tag, "CouchDB-1.0.4"}}, |