couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject [2/4] couchdb commit: updated refs/heads/port-js-tests-to-2.0 to f6c87e4
Date Thu, 25 Jun 2015 20:33:26 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/db972ed9
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/db972ed9
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/db972ed9

Branch: refs/heads/port-js-tests-to-2.0
Commit: db972ed980d25e9778ca37132ea87f2b85bb822d
Parents: d0e2755
Author: Jan Lehnardt <jan@apache.org>
Authored: Thu Jun 25 22:25:40 2015 +0200
Committer: Jan Lehnardt <jan@apache.org>
Committed: Thu Jun 25 22:25:40 2015 +0200

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


http://git-wip-us.apache.org/repos/asf/couchdb/blob/db972ed9/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index 5c96cf8..cc4e153 100644
--- a/Makefile
+++ b/Makefile
@@ -159,9 +159,13 @@ eunit: couch
 	@rebar -r eunit skip_deps=meck,mochiweb,lager,snappy,couch_replicator,fabric,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