[GitHub] eiri closed pull request #1135: Fix for issue #1134 clean up dev/lib before run mango tests

[GitBox <gi...@apache.org>]

eiri closed pull request #1135: Fix for issue #1134 clean up dev/lib before run mango tests
URL: https://github.com/apache/couchdb/pull/1135
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/Makefile b/Makefile
index 8ccbf820c9..bd3b8ac586 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 \
 
 


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services