From 922908818fafb2e7e304d90343808ca5d756f327 Mon Sep 17 00:00:00 2001
From: Georgios Kalpakas <kalpakas.g@gmail.com>
Date: Sat, 5 Aug 2017 20:04:32 +0300
Subject: [PATCH] test: minor improvements in examples e2e tests script
 (#18487) (#18487)

PR Close #18487

PR Close #18487
---
 packages/examples/build.sh | 50 ++++++++++++++++++++------------------
 packages/examples/test.sh  | 19 +++++++++++----
 2 files changed, 40 insertions(+), 29 deletions(-)

diff --git a/packages/examples/build.sh b/packages/examples/build.sh
index 3747ad560d..ce521af07a 100755
--- a/packages/examples/build.sh
+++ b/packages/examples/build.sh
@@ -9,34 +9,36 @@ set -u -e -o pipefail
 # can be used to run each of the examples in isolation via http as well.
 #
 
-cd `dirname $0`
+(
+  cd `dirname $0`
 
-DIST="../../dist/examples";
-rm -rf -- $DIST
-$(npm bin)/tsc -p ./tsconfig-build.json --importHelpers false
+  DIST="../../dist/examples";
+  rm -rf -- $DIST
+  $(npm bin)/tsc -p ./tsconfig-build.json --importHelpers false
 
-mkdir $DIST/vendor/
+  mkdir $DIST/vendor/
 
-ln -s ../../../dist/packages-dist/ $DIST/vendor/@angular
+  ln -s ../../../dist/packages-dist/ $DIST/vendor/@angular
 
-for FILE in \
-    ../../../node_modules/angular/angular.js \
-    ../../../node_modules/zone.js/dist/zone.js \
-    ../../../node_modules/zone.js/dist/task-tracking.js \
-    ../../../node_modules/systemjs/dist/system.js \
-    ../../../node_modules/reflect-metadata/Reflect.js \
-    ../../../node_modules/rxjs
-do
-  ln -s $FILE $DIST/vendor/`basename $FILE`
-done
+  for FILE in \
+      ../../../node_modules/angular/angular.js \
+      ../../../node_modules/zone.js/dist/zone.js \
+      ../../../node_modules/zone.js/dist/task-tracking.js \
+      ../../../node_modules/systemjs/dist/system.js \
+      ../../../node_modules/reflect-metadata/Reflect.js \
+      ../../../node_modules/rxjs
+  do
+    ln -s $FILE $DIST/vendor/`basename $FILE`
+  done
 
-for MODULE in `find . -name module.ts`; do
-  FINAL_DIR_PATH=$DIST/`dirname $MODULE`
+  for MODULE in `find . -name module.ts`; do
+    FINAL_DIR_PATH=$DIST/`dirname $MODULE`
 
-  echo "==== $MODULE"
-  cp _common/*.html $FINAL_DIR_PATH
-  cp $DIST/_common/*.js $FINAL_DIR_PATH
-  cp $DIST/_common/*.js.map $FINAL_DIR_PATH
+    echo "==== $MODULE"
+    cp _common/*.html $FINAL_DIR_PATH
+    cp $DIST/_common/*.js $FINAL_DIR_PATH
+    cp $DIST/_common/*.js.map $FINAL_DIR_PATH
 
-  find `dirname $MODULE` -name \*.css -exec cp {} $FINAL_DIR_PATH \;
-done
+    find `dirname $MODULE` -name \*.css -exec cp {} $FINAL_DIR_PATH \;
+  done
+)
diff --git a/packages/examples/test.sh b/packages/examples/test.sh
index 1d5e163c51..c8827305a8 100755
--- a/packages/examples/test.sh
+++ b/packages/examples/test.sh
@@ -1,8 +1,17 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
-cd `dirname $0`
-./build.sh
+set -u -e -o pipefail
 
-gulp serve-examples &
+(
+  cd `dirname $0`
+  ./build.sh
 
-(cd ../../ && NODE_PATH=$NODE_PATH:dist/all $(npm bin)/protractor protractor-examples-e2e.conf.js --bundles=true)
+  gulp serve-examples &
+  trap "kill $!" EXIT
+
+  (
+    cd ../../
+    NODE_PATH=${NODE_PATH:-}:dist/all
+    $(npm bin)/protractor protractor-examples-e2e.conf.js --bundles=true
+  )
+)