You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by kx...@apache.org on 2015/11/12 00:07:42 UTC

[30/50] couchdb commit: updated refs/heads/2876-js-tests to bd19653

Reorganize javascript target


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

Branch: refs/heads/2876-js-tests
Commit: 9eabbc63620a0279cbc5ef06db814f38405e2cdc
Parents: e767957
Author: Alexander Shorin <kx...@apache.org>
Authored: Sat Oct 17 19:16:25 2015 +0300
Committer: Alexander Shorin <kx...@apache.org>
Committed: Mon Oct 19 14:02:14 2015 +0300

----------------------------------------------------------------------
 Makefile | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/9eabbc63/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index 5d3716f..bb0114c 100644
--- a/Makefile
+++ b/Makefile
@@ -97,13 +97,9 @@ eunit: couch
 
 
 .PHONY: javascript
-# target: javascript - Run JavaScript tests suite
-javascript: all
-	# TODO: Fix tests to look for these files in their new path
-	@mkdir -p share/www/script/test
-	@cp test/javascript/tests/lorem*.txt share/www/script/test/
-	@dev/run -q --with-admin-party-please test/javascript/run $(tests)
-	@rm -rf share/www/script
+# 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)
 
 
 .PHONY: build-test
@@ -295,3 +291,9 @@ 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/