From 9375895a4de10effecbbd9ed64f027bf5c4475e5 Mon Sep 17 00:00:00 2001
From: murgatroid99 <mlumish@google.com>
Date: Wed, 14 Oct 2015 11:51:05 -0700
Subject: [PATCH] Moved Node pre-build steps to a separate shell script

---
 tools/run_tests/pre_build_node.sh | 40 +++++++++++++++++++++++++++++++
 tools/run_tests/run_tests.py      |  4 +---
 2 files changed, 41 insertions(+), 3 deletions(-)
 create mode 100644 tools/run_tests/pre_build_node.sh

diff --git a/tools/run_tests/pre_build_node.sh b/tools/run_tests/pre_build_node.sh
new file mode 100644
index 00000000000..28ce354f276
--- /dev/null
+++ b/tools/run_tests/pre_build_node.sh
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+# Copyright 2015, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+set -ex
+
+export GRPC_CONFIG=${CONFIG:-opt}
+
+# Expire cache after 1 week
+npm update --cache-min 604800
+
+npm install node-gyp-install
+./node_modules/.bin/node-gyp-install
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py
index aa13d89c7bc..84262aa773a 100755
--- a/tools/run_tests/run_tests.py
+++ b/tools/run_tests/run_tests.py
@@ -202,9 +202,7 @@ class NodeLanguage(object):
 
   def pre_build_steps(self):
     # Default to 1 week cache expiration
-    return [['npm', 'update', '--cache-min', '604800'],
-            ['npm', 'install', '-g', 'node-gyp-install'],
-            ['node-gyp-install']]
+    return [['tools/run_tests/pre_build_node.sh']]
 
   def make_targets(self):
     return []