aboutsummaryrefslogtreecommitdiffhomepage
path: root/test/distrib
diff options
context:
space:
mode:
authorGravatar murgatroid99 <mlumish@google.com>2016-02-12 09:56:14 -0800
committerGravatar murgatroid99 <mlumish@google.com>2016-02-12 09:56:14 -0800
commit166214f9f6724ea1b1f898822b60208a36f50fcb (patch)
tree75ba6021840f65a516f23314e0d21b989bee4084 /test/distrib
parent7ca0dcc843cd081252f1c5f6af4c244b66f9196e (diff)
Don't fail distrib test if a static server is running
Diffstat (limited to 'test/distrib')
-rwxr-xr-xtest/distrib/node/run_distrib_test.sh3
1 files changed, 3 insertions, 0 deletions
diff --git a/test/distrib/node/run_distrib_test.sh b/test/distrib/node/run_distrib_test.sh
index 99a51f01f7..9b8f15771b 100755
--- a/test/distrib/node/run_distrib_test.sh
+++ b/test/distrib/node/run_distrib_test.sh
@@ -38,6 +38,9 @@ nvm install $NODE_VERSION
npm install -g node-static
+# Kill off existing static servers
+kill -9 $(ps aux | grep '[n]ode .*static' | awk '{print $2}') || true
+
STATIC_SERVER=127.0.0.1
STATIC_PORT=8080