diff options
| author |  Michael Lumish <mlumish@google.com> | 2016-03-03 17:22:53 -0800 |
|---|---|---|
| committer | Michael Lumish <mlumish@google.com> | 2016-03-03 17:22:53 -0800 |
| commit | 4913ea06eb4093a2229b3009dedb02828af1edc2 (patch) | |
| tree | f75718acb15d8f72a69ba293cea35865399356da /tools | |
| parent | 79a0f0611c6235fbf636c3e754860e6de28b4e3c (diff) | |
Ensure node and npm are in the path when running tests
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/run_tests/build_node.bat | 4 | ||||
| -rw-r--r-- | tools/run_tests/pre_build_node.bat | 2 | ||||
| -rw-r--r-- | tools/run_tests/run_node.bat | 1 |
3 files changed, 7 insertions, 0 deletions
diff --git a/tools/run_tests/build_node.bat b/tools/run_tests/build_node.bat index 3ddd0e73cf..886af0610f 100644 --- a/tools/run_tests/build_node.bat +++ b/tools/run_tests/build_node.bat @@ -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 diff --git a/tools/run_tests/pre_build_node.bat b/tools/run_tests/pre_build_node.bat index ffb4a09f15..a29456f9ed 100644 --- a/tools/run_tests/pre_build_node.bat +++ b/tools/run_tests/pre_build_node.bat @@ -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 diff --git a/tools/run_tests/run_node.bat b/tools/run_tests/run_node.bat index 4177736356..0987fbee55 100644 --- a/tools/run_tests/run_node.bat +++ b/tools/run_tests/run_node.bat @@ -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
\ No newline at end of file |