couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject [04/35] couchdb commit: updated refs/heads/2876-js-tests-merged to 6d9b2eb
Date Sat, 12 Dec 2015 16:01:25 GMT
correctly copy test utility files


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

Branch: refs/heads/2876-js-tests-merged
Commit: e1683e010f97370dc67b43ee5756f94e12360996
Parents: d9eb5b0
Author: Jan Lehnardt <jan@apache.org>
Authored: Thu Jun 25 22:25:40 2015 +0200
Committer: Jan Lehnardt <jan@apache.org>
Committed: Sat Dec 12 15:23:25 2015 +0100

----------------------------------------------------------------------
 Makefile | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/e1683e01/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index ab44581..0d2aa2b 100644
--- a/Makefile
+++ b/Makefile
@@ -102,7 +102,16 @@ eunit: couch
 
 .PHONY: javascript
 # target: javascript - Run JavaScript test suites or specific ones defined by suites option
-javascript: all share/www/script/test
+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
+	@dev/run -q --with-admin-party-please test/javascript/run
+	@rm -rf share/www/script
 	@dev/run -q --with-admin-party-please test/javascript/run $(suites)
 
 
@@ -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/


Mime
View raw message