You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ei...@apache.org on 2018/01/31 22:29:27 UTC

[couchdb] branch master updated: Fix for issue #1134 clean up dev/lib before run mango tests (#1135)

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 7a296d2  Fix for issue #1134 clean up dev/lib before run mango tests (#1135)
7a296d2 is described below

commit 7a296d2d6348195ed7788ef707b35486fa6ded0c
Author: Juanjo Rodriguez <jj...@gmail.com>
AuthorDate: Wed Jan 31 23:29:24 2018 +0100

    Fix for issue #1134 clean up dev/lib before run mango tests (#1135)
    
    * make javascript, test-cluster-with[out]-quorum and mango tests dependent of devclean target
---
 Makefile | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 8ccbf82..bd3b8ac 100644
--- a/Makefile
+++ b/Makefile
@@ -116,7 +116,7 @@ soak-eunit: couch
 
 .PHONY: javascript
 # target: javascript - Run JavaScript test suites or specific ones defined by suites option
-javascript:
+javascript: devclean
 	@mkdir -p share/www/script/test
 ifeq ($(IN_RELEASE), true)
 	@cp test/javascript/tests/lorem*.txt share/www/script/test/
@@ -124,7 +124,6 @@ else
 	@mkdir -p src/fauxton/dist/release/test
 	@cp test/javascript/tests/lorem*.txt src/fauxton/dist/release/test/
 endif
-	@rm -rf dev/lib
 	@dev/run -n 1 -q --with-admin-party-please \
             --enable-erlang-views \
             -c 'startup_jitter=0' \
@@ -133,7 +132,7 @@ endif
 
 # TODO: port to Makefile.win
 .PHONY: test-cluster-with-quorum
-test-cluster-with-quorum:
+test-cluster-with-quorum: devclean
 	@mkdir -p share/www/script/test
 ifeq ($(IN_RELEASE), true)
 	@cp test/javascript/tests/lorem*.txt share/www/script/test/
@@ -141,7 +140,6 @@ else
 	@mkdir -p src/fauxton/dist/release/test
 	@cp test/javascript/tests/lorem*.txt src/fauxton/dist/release/test/
 endif
-	@rm -rf dev/lib
 	@dev/run -n 3 -q --with-admin-party-please \
             --enable-erlang-views --degrade-cluster 1 \
             -c 'startup_jitter=0' \
@@ -151,7 +149,7 @@ endif
 
 # TODO: port to Makefile.win
 .PHONY: test-cluster-without-quorum
-test-cluster-without-quorum:
+test-cluster-without-quorum: devclean
 	@mkdir -p share/www/script/test
 ifeq ($(IN_RELEASE), true)
 	@cp test/javascript/tests/lorem*.txt share/www/script/test/
@@ -159,7 +157,6 @@ else
 	@mkdir -p src/fauxton/dist/release/test
 	@cp test/javascript/tests/lorem*.txt src/fauxton/dist/release/test/
 endif
-	@rm -rf dev/lib
 	@dev/run -n 3 -q --with-admin-party-please \
             --enable-erlang-views --degrade-cluster 2 \
             -c 'startup_jitter=0' \
@@ -222,7 +219,7 @@ build-test:
 
 .PHONY: mango-test
 # target: mango-test - Run Mango tests
-mango-test: all
+mango-test: devclean all
 	./test/build/test-run-couch-for-mango.sh \
 
 

-- 
To stop receiving notification emails like this one, please contact
eiri@apache.org.