summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul J. Davis <paul.joseph.davis@gmail.com>2019-05-17 15:08:43 -0500
committerPaul J. Davis <paul.joseph.davis@gmail.com>2019-05-17 15:08:43 -0500
commit1150b44023cff6870195ac5e6aac105348bac730 (patch)
tree6e9fcdd62901bb09c9b75e4ae23e03125d839006
parent6c8532dc877d09e50d8d88b024578e2a11e87273 (diff)
downloadcouchdb-1150b44023cff6870195ac5e6aac105348bac730.tar.gz
Get elixir tests running
-rw-r--r--.gitignore1
-rw-r--r--Makefile8
-rwxr-xr-xdev/run3
-rwxr-xr-xtest/elixir/run-only3
4 files changed, 11 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore
index c52bf89b3..2a1be200e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@
.venv
.DS_Store
.rebar/
+.erlfdb/
.eunit/
log
apache-couchdb-*/
diff --git a/Makefile b/Makefile
index e68bf627e..a70b8c02e 100644
--- a/Makefile
+++ b/Makefile
@@ -208,8 +208,12 @@ python-black-update: .venv/bin/black
. dev/run rel/overlay/bin/couchup test/javascript/run
.PHONY: elixir
-elixir: devclean
- @dev/run -n 1 -a adm:pass --no-eval 'test/elixir/run --exclude without_quorum_test --exclude with_quorum_test $(EXUNIT_OPTS)'
+elixir: elixir-init elixir-check-formatted elixir-credo devclean
+ @dev/run --erlang-config=rel/files/eunit.config -n 1 -a adm:pass --no-eval 'test/elixir/run --exclude without_quorum_test --exclude with_quorum_test $(EXUNIT_OPTS)'
+
+.PHONY: elixir-only
+elixir-only: devclean
+ @dev/run --erlang-config=rel/files/eunit.config -n 1 -a adm:pass --no-eval 'test/elixir/run-only --exclude without_quorum_test --exclude with_quorum_test $(EXUNIT_OPTS)'
.PHONY: elixir-init
elixir-init:
diff --git a/dev/run b/dev/run
index 01fba0975..db6fc013a 100755
--- a/dev/run
+++ b/dev/run
@@ -564,8 +564,7 @@ def boot_node(ctx, node):
"-args_file",
os.path.join(node_etcdir, "vm.args"),
"-config",
- #os.path.join(ctx["rootdir"], ctx["erlang_config"]),
- os.path.join(reldir, "files", "sys"),
+ os.path.join(ctx["rootdir"], ctx["erlang_config"]),
"-couch_ini",
os.path.join(node_etcdir, "default.ini"),
os.path.join(node_etcdir, "local.ini"),
diff --git a/test/elixir/run-only b/test/elixir/run-only
new file mode 100755
index 000000000..7c2a4aeea
--- /dev/null
+++ b/test/elixir/run-only
@@ -0,0 +1,3 @@
+#!/bin/bash -e
+cd "$(dirname "$0")"
+mix test --trace "$@"