From fc51f0ea480a76b49f1f9c60ea1e7941513dee39 Mon Sep 17 00:00:00 2001
From: murgatroid99 <mlumish@google.com>
Date: Mon, 14 May 2018 14:33:05 -0700
Subject: [PATCH] Some test script fixes

---
 run-tests.sh | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/run-tests.sh b/run-tests.sh
index 03a45cfa..7eac3814 100755
--- a/run-tests.sh
+++ b/run-tests.sh
@@ -39,7 +39,6 @@ npm install --unsafe-perm
 
 mkdir -p reports
 export JOBS=8
-export JUNIT_REPORT_PATH="reports/node$version/"
 export JUNIT_REPORT_STACK=1
 
 OS=$(uname)
@@ -57,6 +56,8 @@ fi
 
 # TODO(mlumish): Add electron tests
 
+FAILED="false"
+
 for version in ${node_versions}
 do
   # Install and setup node for the version we want.
@@ -66,6 +67,8 @@ do
   nvm use $version
   set -ex
 
+  export JUNIT_REPORT_PATH="reports/node$version/"
+
   # https://github.com/mapbox/node-pre-gyp/issues/362
   npm install -g node-gyp
 
@@ -87,12 +90,12 @@ set -ex
 
 node merge_kokoro_logs.js
 
-if [ "$FAILED" == "" ]
+if [ "$FAILED" == "true" ]
 then
+  exit 1
+else
   if [ "$OS" == "Linux" ]
   then
     npm run coverage
   fi
-else
-  exit 1
 fi