Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8B052185F4 for ; Wed, 16 Dec 2015 19:52:03 +0000 (UTC) Received: (qmail 21944 invoked by uid 500); 16 Dec 2015 19:51:58 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 21760 invoked by uid 500); 16 Dec 2015 19:51:58 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 19267 invoked by uid 99); 16 Dec 2015 19:51:57 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 Dec 2015 19:51:57 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 88120E00BB; Wed, 16 Dec 2015 19:51:57 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jan@apache.org To: commits@couchdb.apache.org Date: Wed, 16 Dec 2015 19:52:44 -0000 Message-Id: <24a6608a84e34938a9a833d8024dcb01@git.apache.org> In-Reply-To: <4fb47a3ceac2484b9bb933726f5ed4b5@git.apache.org> References: <4fb47a3ceac2484b9bb933726f5ed4b5@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [49/50] couchdb commit: updated refs/heads/2876-js-tests-merged-squashed to f44e15f 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/2876-js-tests-merged-squashed Commit: e9b8875e6ffea0c16a4bb079ca3ecdd10f0e0cb8 Parents: 405fdd6 Author: Jan Lehnardt Authored: Wed Dec 16 20:50:16 2015 +0100 Committer: Jan Lehnardt 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/