couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kxe...@apache.org
Subject [04/16] couchdb commit: updated refs/heads/2876-js-tests to 805a427
Date Wed, 11 Nov 2015 22:50:20 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/6a03c314
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/6a03c314
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/6a03c314

Branch: refs/heads/2876-js-tests
Commit: 6a03c314ad293a4ef39d914cbbbf52ee11504a62
Parents: 92ece65
Author: Jan Lehnardt <jan@apache.org>
Authored: Thu Jun 25 22:25:40 2015 +0200
Committer: Jan Lehnardt <jan@apache.org>
Committed: Mon Oct 5 20:51:14 2015 +0200

----------------------------------------------------------------------
 Makefile | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/6a03c314/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index d07fb0e..23c125a 100644
--- a/Makefile
+++ b/Makefile
@@ -160,9 +160,13 @@ eunit: couch
 	@${REBAR} -r eunit skip_deps=meck,mochiweb,lager,snappy,folsom
 
 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/
+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
 


Mime
View raw message