Merge pull request #5579 from murgatroid99/node_windows_tests

Properly delete Node OpenSSL headers after downloading them
pull/5547/head^2
Jan Tattermusch 9 years ago
commit 1ec0237ee4
  1. 14
      tools/run_tests/build_node.bat
  2. 11
      tools/run_tests/pre_build_node.bat
  3. 1
      tools/run_tests/run_node.bat

@ -27,4 +27,16 @@
@rem (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
@rem OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
npm install --build-from-source
set PATH=%PATH%;C:\Program Files\nodejs\;%APPDATA%\npm
del /f /q BUILD || rmdir build /s /q
call npm install --build-from-source
@rem delete the redundant openssl headers
for /f "delims=v" %%v in ('node --version') do (
rmdir "%HOMEDRIVE%%HOMEPATH%\.node-gyp\%%v\include\node\openssl" /S /Q
)
@rem rebuild, because it probably failed the first time
call npm install --build-from-source

@ -27,13 +27,8 @@
@rem (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
@rem OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
@rem Expire cache after 1 week
npm update --cache-min 604800
set PATH=%PATH%;C:\Program Files\nodejs\;%APPDATA%\npm
npm install node-gyp-install
.\node_modules\.bin\node-gyp-install.cmd
@rem Expire cache after 1 week
call npm update --cache-min 604800
@rem delete the redundant openssl headers
for /f "delims=v" %%v in ('node --version') do (
rmdir "%HOMEDRIVE%%HOMEPATH%\.node-gyp\%%v\include\node\openssl" /S /Q
)

@ -27,6 +27,7 @@
@rem (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
@rem OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
set PATH=%PATH%;C:\Program Files\nodejs\;%APPDATA%\npm
set JUNIT_REPORT_PATH=src\node\report.xml
set JUNIT_REPORT_STACK=1
.\node_modules\.bin\mocha.cmd --reporter mocha-jenkins-reporter --timeout 8000 src\node\test
Loading…
Cancel
Save