Permalink
Browse files

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: #14892
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Lance Ball <lball@redhat.com>
  • Loading branch information...
danbev authored and MylesBorins committed Aug 17, 2017
1 parent 77dfa73 commit c8be90cabfee2461fe489e575143810a9be5300b
Showing with 11 additions and 2 deletions.
  1. +5 −0 Makefile
  2. +2 −0 configure
  3. +4 −2 vcbuild.bat
View
@@ -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
View
@@ -1419,6 +1419,8 @@ config = {
'BUILDTYPE': 'Debug' if options.debug else 'Release',
'USE_XCODE': str(int(options.use_xcode or 0)),
'PYTHON': sys.executable,
'NODE_TARGET_TYPE': variables['node_target_type'] if options.enable_static \
else '',
}
if options.prefix:
View
@@ -107,7 +107,7 @@ if /i "%1"=="download-all" set download_arg="--download=all"&goto arg-ok
if /i "%1"=="ignore-flaky" set test_args=%test_args% --flaky-tests=dontcare&goto arg-ok
if /i "%1"=="enable-vtune" set enable_vtune_arg=1&goto arg-ok
if /i "%1"=="dll" set dll=1&goto arg-ok
if /i "%1"=="static" set enable_static=1&goto arg-ok
if /i "%1"=="static" set enable_static=1&goto arg-ok
if /i "%1"=="no-NODE-OPTIONS" set no_NODE_OPTIONS=1&goto arg-ok
if /i "%1"=="debug-http2" set debug_http2=1&goto arg-ok
if /i "%1"=="debug-nghttp2" set debug_nghttp2=1&goto arg-ok
@@ -445,8 +445,9 @@ if "%config%"=="Debug" set test_args=--mode=debug %test_args%
if "%config%"=="Release" set test_args=--mode=release %test_args%
echo running 'cctest %cctest_args%'
"%config%\cctest" %cctest_args%
REM when building a static library there's no binary to run tests
if defined enable_static goto test-v8
call :run-python tools\test.py %test_args%
goto test-v8
:test-v8
if not defined custom_v8_test goto cpplint
@@ -494,6 +495,7 @@ set "localcppfilelist=%localcppfilelist% %1"
goto exit
:jslint
if defined enable_static goto exit
if defined jslint_ci goto jslint-ci
if not defined jslint goto exit
if not exist tools\eslint\bin\eslint.js goto no-lint

0 comments on commit c8be90c

Please sign in to comment.