summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuanjo Rodriguez <juanjo@apache.org>2020-03-24 08:51:33 +0100
committerJuanjo Rodriguez <jjrodrig@gmail.com>2020-04-01 23:52:14 +0200
commit54a05e43c3098f6d37b12ea8831a8cc11e062391 (patch)
tree958e9eacb869bc541c0b459f41e2457ae5061b21
parentfb9d40442854aa8bd5c4ed9c7448eaaad456bd87 (diff)
downloadcouchdb-54a05e43c3098f6d37b12ea8831a8cc11e062391.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 60b6e3d07..97fc97c85 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 92c60bbbb..bdecc7315 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -237,7 +237,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