summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYihong Wang <yh.wang@ibm.com>2018-07-24 13:44:09 -0700
committerBeth Griggs <Bethany.Griggs@uk.ibm.com>2019-03-20 23:40:24 +0000
commitc07ba9681fd16c5aaa8dce66478efa6a80372d2a (patch)
tree0dc5cdb373edc70cc6a31976f1a71c6d4e18f290
parent63522886ea298073d8bb6cd4a5ee835c98dce13d (diff)
downloadnode-new-c07ba9681fd16c5aaa8dce66478efa6a80372d2a.tar.gz
build: skip cctest on Windows shared lib build
cctest depends on some internal APIs which don't declare `__declspec(dllexport)` and causes build failure when building node as shared lib on Windows. Since we already have good test coverage in static lib, we decide to skip the cctest in shared lib build on Windows. Signed-off-by: Yihong Wang <yh.wang@ibm.com> Backport-PR-URL: https://github.com/nodejs/node/pull/25758 PR-URL: https://github.com/nodejs/node/pull/21228 Reviewed-By: Refael Ackermann <refack@gmail.com>
-rw-r--r--node.gyp4
-rw-r--r--vcbuild.bat1
2 files changed, 5 insertions, 0 deletions
diff --git a/node.gyp b/node.gyp
index 43ba985df5..2967b5efc3 100644
--- a/node.gyp
+++ b/node.gyp
@@ -961,6 +961,10 @@
'OTHER_LDFLAGS': [ '-Wl,-rpath,@loader_path', ],
},
}],
+ # Skip cctest while building shared lib node for Windows
+ [ 'OS=="win" and node_shared=="true"', {
+ 'type': 'none',
+ }],
],
}
], # end targets
diff --git a/vcbuild.bat b/vcbuild.bat
index 4396232485..7143d841a4 100644
--- a/vcbuild.bat
+++ b/vcbuild.bat
@@ -474,6 +474,7 @@ if errorlevel 1 goto exit
if "%test_args%"=="" goto test-v8
if "%config%"=="Debug" set test_args=--mode=debug %test_args%
if "%config%"=="Release" set test_args=--mode=release %test_args%
+if not exist %config%\cctest.exe goto run-test-py
echo running 'cctest %cctest_args%'
"%config%\cctest" %cctest_args%
REM when building a static library there's no binary to run tests