From 8adaecb9be22f9ba784825bbf6f0ac3bd52d1fa7 Mon Sep 17 00:00:00 2001
From: spalger <email@spalger.com>
Date: Tue, 5 Jul 2016 12:46:53 -0700
Subject: [PATCH] [ci] source the setup script instead of executing it

---
 test/scripts/{jenkins_setup.sh => _jenkins_setup.sh} | 2 --
 test/scripts/jenkins_build_snapshot.sh               | 5 ++---
 test/scripts/jenkins_selenium.sh                     | 3 +--
 test/scripts/jenkins_unit.sh                         | 5 ++---
 4 files changed, 5 insertions(+), 10 deletions(-)
 rename test/scripts/{jenkins_setup.sh => _jenkins_setup.sh} (95%)

diff --git a/test/scripts/jenkins_setup.sh b/test/scripts/_jenkins_setup.sh
similarity index 95%
rename from test/scripts/jenkins_setup.sh
rename to test/scripts/_jenkins_setup.sh
index b023f5891d0fe..850bfd91c364d 100755
--- a/test/scripts/jenkins_setup.sh
+++ b/test/scripts/_jenkins_setup.sh
@@ -37,5 +37,3 @@ if [ -z "$(npm bin)" ]; then
   echo "npm does not know where it stores executables..... huh??"
   exit 1
 fi
-
-export GRUNT="$(npm bin)/grunt"
diff --git a/test/scripts/jenkins_build_snapshot.sh b/test/scripts/jenkins_build_snapshot.sh
index e20e1bece1113..ffba35160afdd 100755
--- a/test/scripts/jenkins_build_snapshot.sh
+++ b/test/scripts/jenkins_build_snapshot.sh
@@ -1,7 +1,6 @@
 #!/usr/bin/env bash
 
 set -e
+source "$(dirname $0)/_jenkins_setup.sh"
 
-"$(dirname $0)/jenkins_setup.sh"
-
-"$GRUNT" build;
+"$(npm bin)/grunt" build;
diff --git a/test/scripts/jenkins_selenium.sh b/test/scripts/jenkins_selenium.sh
index be4e95d902736..58224b32909b9 100755
--- a/test/scripts/jenkins_selenium.sh
+++ b/test/scripts/jenkins_selenium.sh
@@ -1,7 +1,6 @@
 #!/usr/bin/env bash
 
 set -e
-
-"$(dirname $0)/jenkins_setup.sh"
+source "$(dirname $0)/_jenkins_setup.sh"
 
 xvfb-run "$(npm bin)/grunt" jenkins:selenium;
diff --git a/test/scripts/jenkins_unit.sh b/test/scripts/jenkins_unit.sh
index 44ff95d4d0f09..ebeceabed8eeb 100755
--- a/test/scripts/jenkins_unit.sh
+++ b/test/scripts/jenkins_unit.sh
@@ -1,7 +1,6 @@
 #!/usr/bin/env bash
 
 set -e
+source "$(dirname $0)/_jenkins_setup.sh"
 
-"$(dirname $0)/jenkins_setup.sh"
-
-xvfb-run "$GRUNT" jenkins:unit;
+xvfb-run "$(npm bin)/grunt" jenkins:unit;