diff options
author | murgatroid99 <mlumish@google.com> | 2016-03-25 15:00:47 -0700 |
---|---|---|
committer | murgatroid99 <mlumish@google.com> | 2016-03-25 15:02:32 -0700 |
commit | def177b7febd6f96eed31628144cba964f1bae77 (patch) | |
tree | 8b39c2986a18405d17cca2d6eb4e02a9d79fc574 /tools | |
parent | d54a702484cca944f976aad5bb759c0fd79cdf91 (diff) |
Don't set -ex for nvm functions
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/run_tests/build_artifact_node.sh | 2 | ||||
-rwxr-xr-x | tools/run_tests/build_node.sh | 2 | ||||
-rwxr-xr-x | tools/run_tests/build_package_node.sh | 2 | ||||
-rwxr-xr-x | tools/run_tests/pre_build_node.sh | 2 | ||||
-rwxr-xr-x | tools/run_tests/run_node.sh | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/tools/run_tests/build_artifact_node.sh b/tools/run_tests/build_artifact_node.sh index 6aa4824538..ef3476a038 100755 --- a/tools/run_tests/build_artifact_node.sh +++ b/tools/run_tests/build_artifact_node.sh @@ -30,9 +30,9 @@ NODE_TARGET_ARCH=$1 source ~/.nvm/nvm.sh -set -ex nvm use 4 +set -ex cd $(dirname $0)/../.. diff --git a/tools/run_tests/build_node.sh b/tools/run_tests/build_node.sh index 9c4af07185..cbe0e31d2e 100755 --- a/tools/run_tests/build_node.sh +++ b/tools/run_tests/build_node.sh @@ -31,9 +31,9 @@ NODE_VERSION=$1 source ~/.nvm/nvm.sh -set -ex nvm use $NODE_VERSION +set -ex CONFIG=${CONFIG:-opt} diff --git a/tools/run_tests/build_package_node.sh b/tools/run_tests/build_package_node.sh index aca90a3750..540c826311 100755 --- a/tools/run_tests/build_package_node.sh +++ b/tools/run_tests/build_package_node.sh @@ -29,9 +29,9 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. source ~/.nvm/nvm.sh -set -ex nvm use 4 +set -ex cd $(dirname $0)/../.. diff --git a/tools/run_tests/pre_build_node.sh b/tools/run_tests/pre_build_node.sh index 11f46d60fc..1f55df0b7b 100755 --- a/tools/run_tests/pre_build_node.sh +++ b/tools/run_tests/pre_build_node.sh @@ -31,9 +31,9 @@ NODE_VERSION=$1 source ~/.nvm/nvm.sh -set -ex nvm use $NODE_VERSION +set -ex export GRPC_CONFIG=${CONFIG:-opt} diff --git a/tools/run_tests/run_node.sh b/tools/run_tests/run_node.sh index d33890068d..b94dc3ec62 100755 --- a/tools/run_tests/run_node.sh +++ b/tools/run_tests/run_node.sh @@ -30,9 +30,9 @@ NODE_VERSION=$1 source ~/.nvm/nvm.sh -set -ex nvm use $NODE_VERSION +set -ex CONFIG=${CONFIG:-opt} |