summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Lehnardt <jan@apache.org>2015-12-16 20:50:16 +0100
committerJan Lehnardt <jan@apache.org>2015-12-16 20:51:12 +0100
commite9b8875e6ffea0c16a4bb079ca3ecdd10f0e0cb8 (patch)
treea73d549e256016c76bf3a4bc1eee536ea31f273d
parent405fdd6b921843ba104627fbaa8cc1799549a329 (diff)
downloadcouchdb-e9b8875e6ffea0c16a4bb079ca3ecdd10f0e0cb8.tar.gz
JS test: allow test to run from within a release tarball
-rw-r--r--Makefile20
1 files changed, 11 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index ab445814c..0a9e586b0 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/