summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuanjo Rodriguez <juanjo@apache.org>2020-03-19 23:37:04 +0100
committerJuanjo Rodriguez <jjrodrig@gmail.com>2020-04-01 23:52:14 +0200
commitfb9d40442854aa8bd5c4ed9c7448eaaad456bd87 (patch)
treec80fabe2d5fee81206a0846e7b07a46443d6b1a0
parentf3a3312424c0ca780f7c7a49d1adc871996735db (diff)
downloadcouchdb-fb9d40442854aa8bd5c4ed9c7448eaaad456bd87.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 7d56dd1ab..60b6e3d07 100644
--- a/Makefile
+++ b/Makefile
@@ -480,7 +480,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 30ebe0ee3..92c60bbbb 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
@@ -405,6 +407,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
################################################################################