You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ju...@apache.org on 2020/04/01 21:52:26 UTC

[couchdb] 01/02: Update Makefile.win to Include locad configs and clean configs in devclean

This is an automated email from the ASF dual-hosted git repository.

juanjo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit fb9d40442854aa8bd5c4ed9c7448eaaad456bd87
Author: Juanjo Rodriguez <ju...@apache.org>
AuthorDate: Thu Mar 19 23:37:04 2020 +0100

    Update Makefile.win to Include locad configs and clean configs in devclean
---
 Makefile     | 2 +-
 Makefile.win | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 7d56dd1..60b6e3d 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 30ebe0e..92c60bb 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
 
 
 ################################################################################