summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuanjo Rodriguez <jjrodrig@gmail.com>2018-01-31 23:29:24 +0100
committerEric Avdey <eiri@eiri.ca>2018-01-31 18:29:24 -0400
commit7a296d2d6348195ed7788ef707b35486fa6ded0c (patch)
tree3f55a0d6f2198525f9bb0c5ccd6aab6b916cc0ad
parent1c39e0c70f8ac1ac5959ae86c84ba9d3f3f9df9e (diff)
downloadcouchdb-7a296d2d6348195ed7788ef707b35486fa6ded0c.tar.gz
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
-rw-r--r--Makefile11
1 files changed, 4 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 8ccbf820c..bd3b8ac58 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 \