From 5d5ec80452864f8020f1b7fdb05318f7637dbb7b Mon Sep 17 00:00:00 2001
From: Alex Kotliarskyi <alex.frantic@gmail.com>
Date: Wed, 22 Apr 2015 16:04:06 -0700
Subject: [PATCH] Fix tests runner

---
 .travis.yml          | 12 +-----------
 scripts/objc-test.sh | 29 +++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 11 deletions(-)
 create mode 100755 scripts/objc-test.sh

diff --git a/.travis.yml b/.travis.yml
index 2ece3da02..35a0f0ef1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,17 +16,7 @@ script:
   if [ "$TEST_TYPE" = objc ]
   then
 
-    (npm start > packager.log 2>&1 &)
-    echo $! > packager.pid
-
-    xctool \
-      -project Examples/UIExplorer/UIExplorer.xcodeproj \
-      -scheme UIExplorer -sdk iphonesimulator8.1 \
-      test
-
-    pkill -9 -F packager.pid
-    cat packager.log
-    rm packager.log packager.pid
+    ./scripts/objc-test.sh
 
   elif [ "$TEST_TYPE" = js ]
   then
diff --git a/scripts/objc-test.sh b/scripts/objc-test.sh
new file mode 100755
index 000000000..6cf9a7592
--- /dev/null
+++ b/scripts/objc-test.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+set -e
+
+SCRIPTS=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+ROOT=$(dirname $SCRIPTS)
+
+export REACT_PACKAGER_LOG="$ROOT/server.log"
+
+cd $ROOT
+
+function cleanup {
+  EXIT_CODE=$?
+  set +e
+
+  if [ $EXIT_CODE -ne 0 ];
+  then
+    WATCHMAN_LOGS=/usr/local/Cellar/watchman/3.1/var/run/watchman/$USER.log
+    [ -f $WATCHMAN_LOGS ] && cat $WATCHMAN_LOGS
+
+    [ -f $REACT_PACKAGER_LOG ] && cat $REACT_PACKAGER_LOG
+  fi
+}
+trap cleanup EXIT
+
+xctool \
+  -project Examples/UIExplorer/UIExplorer.xcodeproj \
+  -scheme UIExplorer -sdk iphonesimulator8.1 \
+  test