summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuanjo Rodriguez <juanjo@apache.org>2020-03-19 23:37:04 +0100
committerJuanjo Rodriguez <jjrodrig@gmail.com>2020-09-24 09:34:20 +0200
commit001edc9c60acec48065c00c7cf690c7520c63071 (patch)
tree3cb1ad478cf1e6c56bdb29876a60563ca350b7dc
parent7c0878939e7015910397d55254416f77eba2f20a (diff)
downloadcouchdb-001edc9c60acec48065c00c7cf690c7520c63071.tar.gz
Update Makefile.win to Include locad configs and clean configs in devclean
-rw-r--r--Makefile2
-rw-r--r--Makefile.win7
2 files changed, 7 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 56d6d51ae..564c90812 100644
--- a/Makefile
+++ b/Makefile
@@ -482,7 +482,7 @@ endif
# target: devclean - Remove dev cluster artifacts
devclean:
@rm -rf dev/lib/*/data
-
+ @rm -rf dev/lib/*/etc
################################################################################
# Misc
diff --git a/Makefile.win b/Makefile.win
index 700e7b110..36968f3f3 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -200,7 +200,9 @@ python-black-update: .venv/bin/black
elixir: export MIX_ENV=integration
elixir: export COUCHDB_TEST_ADMIN_PARTY_OVERRIDE=1
elixir: elixir-init elixir-check-formatted elixir-credo devclean
- @dev\run $(TEST_OPTS) -a adm:pass -n 1 --enable-erlang-views --no-eval 'mix test --trace --exclude without_quorum_test --exclude with_quorum_test $(EXUNIT_OPTS)'
+ @dev\run $(TEST_OPTS) -a adm:pass -n 1 --enable-erlang-views \
+ --locald-config test/elixir/test/config/test-config.ini \
+ --no-eval 'mix test --trace --exclude without_quorum_test --exclude with_quorum_test $(EXUNIT_OPTS)'
.PHONY: elixir-init
elixir-init: MIX_ENV=test
@@ -406,6 +408,9 @@ devclean:
-@rmdir /s/q dev\lib\node1\data
-@rmdir /s/q dev\lib\node2\data
-@rmdir /s/q dev\lib\node3\data
+ -@rmdir /s/q dev\lib\node1\etc
+ -@rmdir /s/q dev\lib\node2\etc
+ -@rmdir /s/q dev\lib\node3\etc
################################################################################