Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Properly delete Node OpenSSL headers after downloading them #5579

Merged
merged 3 commits into from
Mar 4, 2016
Merged

Properly delete Node OpenSSL headers after downloading them #5579

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d445fc0
Merge remote-tracking branch 'refs/remotes/grpc/master'
murgatroid99 Mar 3, 2016
79a0f06
Properly delete Node OpenSSL headers after downloading them
murgatroid99 Mar 4, 2016
4913ea0
Ensure node and npm are in the path when running tests
murgatroid99 Mar 4, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Ensure node and npm are in the path when running tests
  • Loading branch information
@murgatroid99
murgatroid99 committed Mar 4, 2016
commit 4913ea06eb4093a2229b3009dedb02828af1edc2
4 changes: 4 additions & 0 deletions tools/run_tests/build_node.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@
@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

del /f /q BUILD || rmdir build /s /q

call npm install --build-from-source

@rem delete the redundant openssl headers
Expand Down
2 changes: 2 additions & 0 deletions tools/run_tests/pre_build_node.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +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.

set PATH=%PATH%;C:\Program Files\nodejs\;%APPDATA%\npm

@rem Expire cache after 1 week
call npm update --cache-min 604800

1 change: 1 addition & 0 deletions tools/run_tests/run_node.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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