summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuanjo Rodriguez <juanjo@apache.org>2020-03-24 08:51:33 +0100
committerJoan Touzet <wohali@apache.org>2020-04-30 09:08:45 -0700
commit10997729c956fb5edfbdf243503380e48f3fe0bd (patch)
tree7448ad8e5afe11ad411179927c7e5e9e95efb898
parent24e00ec57a49fb14dd6d17917abaa53ca8a6a50d (diff)
downloadcouchdb-10997729c956fb5edfbdf243503380e48f3fe0bd.tar.gz
allow to run 'javascript' target with other test targets in the same 'make' process
-rw-r--r--Makefile4
-rw-r--r--Makefile.win3
2 files changed, 5 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 7d047cbca..56d6d51ae 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 70300893d..198c94586 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