You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by da...@apache.org on 2019/05/17 20:09:03 UTC
[couchdb] branch prototype/rfc-001-revision-metadata-model updated
(ef5270f -> 1150b44)
This is an automated email from the ASF dual-hosted git repository.
davisp pushed a change to branch prototype/rfc-001-revision-metadata-model
in repository https://gitbox.apache.org/repos/asf/couchdb.git.
from ef5270f Fix parallel doc updates
new 6c8532d Enabling Elixir test suite
new 1150b44 Get elixir tests running
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitignore | 1 +
Makefile | 6 +++++-
dev/run | 9 ++++++++-
test/elixir/run-only | 3 +++
4 files changed, 17 insertions(+), 2 deletions(-)
create mode 100755 test/elixir/run-only
[couchdb] 02/02: Get elixir tests running
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davisp pushed a commit to branch prototype/rfc-001-revision-metadata-model
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 1150b44023cff6870195ac5e6aac105348bac730
Author: Paul J. Davis <pa...@gmail.com>
AuthorDate: Fri May 17 15:08:43 2019 -0500
Get elixir tests running
---
.gitignore | 1 +
Makefile | 8 ++++++--
dev/run | 3 +--
test/elixir/run-only | 3 +++
4 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/.gitignore b/.gitignore
index c52bf89..2a1be20 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 e68bf62..a70b8c0 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 01fba09..db6fc01 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 0000000..7c2a4ae
--- /dev/null
+++ b/test/elixir/run-only
@@ -0,0 +1,3 @@
+#!/bin/bash -e
+cd "$(dirname "$0")"
+mix test --trace "$@"
[couchdb] 01/02: Enabling Elixir test suite
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davisp pushed a commit to branch prototype/rfc-001-revision-metadata-model
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 6c8532dc877d09e50d8d88b024578e2a11e87273
Author: Paul J. Davis <pa...@gmail.com>
AuthorDate: Fri May 17 14:31:57 2019 -0500
Enabling Elixir test suite
---
Makefile | 4 ++--
dev/run | 8 ++++++++
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 62d2f34..e68bf62 100644
--- a/Makefile
+++ b/Makefile
@@ -208,8 +208,8 @@ python-black-update: .venv/bin/black
. dev/run rel/overlay/bin/couchup test/javascript/run
.PHONY: elixir
-elixir: elixir-init elixir-check-formatted elixir-credo devclean
- @dev/run -a adm:pass --no-eval 'test/elixir/run --exclude without_quorum_test --exclude with_quorum_test $(EXUNIT_OPTS)'
+elixir: devclean
+ @dev/run -n 1 -a adm:pass --no-eval 'test/elixir/run --exclude without_quorum_test --exclude with_quorum_test $(EXUNIT_OPTS)'
.PHONY: elixir-init
elixir-init:
diff --git a/dev/run b/dev/run
index fec7d73..01fba09 100755
--- a/dev/run
+++ b/dev/run
@@ -181,6 +181,12 @@ def setup_argparse():
help="Optional key=val config overrides. Can be repeated",
)
parser.add_option(
+ "--erlang-config",
+ dest="erlang_config",
+ default="rel/files/sys.config",
+ help="Specify an alternative Erlang application configuration"
+ )
+ parser.add_option(
"--degrade-cluster",
dest="degrade_cluster",
type=int,
@@ -222,6 +228,7 @@ def setup_context(opts, args):
"haproxy": opts.haproxy,
"haproxy_port": opts.haproxy_port,
"config_overrides": opts.config_overrides,
+ "erlang_config": opts.erlang_config,
"no_eval": opts.no_eval,
"reset_logs": True,
"procs": [],
@@ -557,6 +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"),
"-couch_ini",
os.path.join(node_etcdir, "default.ini"),