summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorDaniel Bevenius <daniel.bevenius@gmail.com>2017-08-17 12:48:01 +0200
committerDaniel Bevenius <daniel.bevenius@gmail.com>2017-08-24 05:52:23 +0200
commita36b5405029597ce09e15373a321c47930689c08 (patch)
tree1e5d6923a8bc8b00c8c6dcebdb6f18bdc209de11 /Makefile
parent86c4655a0fbeeaa29c49d5537e190f6cdedfd4d8 (diff)
downloadandroid-node-v8-a36b5405029597ce09e15373a321c47930689c08.tar.gz
android-node-v8-a36b5405029597ce09e15373a321c47930689c08.tar.bz2
android-node-v8-a36b5405029597ce09e15373a321c47930689c08.zip
build: for --enable-static, run only cctest
Currently when building with --enable-static and running the test target the following error will be reported: Building addon /node/test/addons/01_function_arguments/ env: ./node: No such file or directory make[1]: *** [test/addons/.buildstamp] Error 1 Note that this is with a clean build where no prior node executable was built. This commit suggests only running the cctest target when --enable-static is specified. PR-URL: https://github.com/nodejs/node/pull/14892 Reviewed-By: Refael Ackermann <refack@gmail.com> Reviewed-By: Lance Ball <lball@redhat.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 5 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 5b4f6d87f9..6a334d9690 100644
--- a/Makefile
+++ b/Makefile
@@ -192,6 +192,10 @@ v8:
tools/make-v8.sh
$(MAKE) -C deps/v8 $(V8_ARCH).$(BUILDTYPE_LOWER) $(V8_BUILD_OPTIONS)
+ifeq ($(NODE_TARGET_TYPE),static_library)
+test: all
+ $(MAKE) cctest
+else
test: all
$(MAKE) build-addons
$(MAKE) build-addons-napi
@@ -200,6 +204,7 @@ test: all
$(CI_JS_SUITES) \
$(CI_NATIVE_SUITES)
$(MAKE) lint
+endif
test-parallel: all
$(PYTHON) tools/test.py --mode=release parallel -J