[47/50] couchdb commit: updated refs/heads/master to e8e03b6

[ja...@apache.org]

JS test: allow test to run from within a release tarball


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/e9b8875e
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/e9b8875e
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/e9b8875e

Branch: refs/heads/master
Commit: e9b8875e6ffea0c16a4bb079ca3ecdd10f0e0cb8
Parents: 405fdd6
Author: Jan Lehnardt <ja...@apache.org>
Authored: Wed Dec 16 20:50:16 2015 +0100
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Wed Dec 16 20:51:12 2015 +0100

----------------------------------------------------------------------
 Makefile | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/e9b8875e/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index ab44581..0a9e586 100644
--- a/Makefile
+++ b/Makefile
@@ -102,8 +102,17 @@ eunit: couch
 
 .PHONY: javascript
 # target: javascript - Run JavaScript test suites or specific ones defined by suites option
-javascript: all share/www/script/test
-	@dev/run -q --with-admin-party-please test/javascript/run $(suites)
+javascript: all
+	@mkdir -p share/www/script/test
+ifeq ($(IN_RELEASE), true)
+	@cp test/javascript/tests/lorem*.txt share/www/test/
+else
+	@mkdir -p src/fauxton/dist/release/test
+	@cp test/javascript/tests/lorem*.txt src/fauxton/dist/release/test/
+endif
+	@ulimit -n 10240
+	@rm -rf dev/lib
+	@dev/run -n 1 -q --with-admin-party-please test/javascript/run $(suites)
 
 
 .PHONY: list-eunit-apps
@@ -326,7 +335,6 @@ uninstall:
 
 .rebar: build-plt
 
-
 config.erl:
 	@echo "Apache CouchDB has not been configured."
 	@echo "Try \"./configure -h\" for help."
@@ -345,9 +353,3 @@ ifeq ($(with_fauxton), 1)
 	@echo "Building Fauxton"
 	@cd src/fauxton && npm install && ./node_modules/grunt-cli/bin/grunt couchdb
 endif
-
-
-share/www/script/test:
-	@# TODO: Fix tests to look for these files in their new path
-	@mkdir -p $@
-	@cp test/javascript/tests/lorem*.txt share/www/script/test/