You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by wo...@apache.org on 2020/04/30 16:07:58 UTC

[couchdb] 02/03: allow to run 'javascript' target with other test targets in the same 'make' process

This is an automated email from the ASF dual-hosted git repository.

wohali pushed a commit to branch 3.0.x-backports-verbump
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit 74a91eced272d0208d794dbd688ec4fbfc84e8e2
Author: Juanjo Rodriguez <ju...@apache.org>
AuthorDate: Tue Mar 24 08:51:33 2020 +0100

    allow to run 'javascript' target with other test targets in the same 'make' process
---
 Makefile     | 4 +++-
 Makefile.win | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 7d047cb..56d6d51 100644
--- a/Makefile
+++ b/Makefile
@@ -260,7 +260,9 @@ elixir-credo: elixir-init
 .PHONY: javascript
 # target: javascript - Run JavaScript test suites or specific ones defined by suites option
 javascript: export COUCHDB_TEST_ADMIN_PARTY_OVERRIDE=1
-javascript: devclean
+javascript: 
+
+	@$(MAKE) devclean
 	@mkdir -p share/www/script/test
 ifeq ($(IN_RELEASE), true)
 	@cp test/javascript/tests/lorem*.txt share/www/script/test/
diff --git a/Makefile.win b/Makefile.win
index 7030089..198c945 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -235,7 +235,8 @@ elixir-credo: elixir-init
 .PHONY: javascript
 # target: javascript - Run JavaScript test suites or specific ones defined by suites option
 javascript: export COUCHDB_TEST_ADMIN_PARTY_OVERRIDE=1
-javascript: devclean
+javascript:
+	@$(MAKE) devclean
 	-@mkdir share\www\script\test
 ifeq ($(IN_RELEASE), true)
 	@copy test\javascript\tests\lorem*.txt share\www\script\test