From 23c5cd83b98367a33e6c0ecb5e17b346f0b07c15 Mon Sep 17 00:00:00 2001
From: Peter 'Pita' Martischka <petermartischka@googlemail.com>
Date: Sun, 28 Oct 2012 18:51:05 +0000
Subject: [PATCH] travis, will you like this?

---
 .travis.yml                           | 3 ++-
 tests/frontend/travis/sauce_tunnel.sh | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9ecd541ab..2eafcf2b1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,8 @@ env:
   global:
     - secure: zGX8AFKQnuh6WWLJw58WnRZiVQ4dIbN0gIQ0NpJIKmzQw2yQ+rqQEo2UoT5p\n+SSX/DJnU0yZzZ2RkiN8sabyY3e3Y2JhjO5GUTdoUxxB7ffCDLM4W1T8ckyl\nmSUW/ajrxMbGxruYbKQfepCRK6w4OoUsROYI0MpeoDo8ngxmcFw="
     - SAUCE_USER: pita
-
+jdk:
+  - oraclejdk6
 notifications:
   email:
     - petermartischka@googlemail.com
\ No newline at end of file
diff --git a/tests/frontend/travis/sauce_tunnel.sh b/tests/frontend/travis/sauce_tunnel.sh
index 02bcb77f5..306226e69 100644
--- a/tests/frontend/travis/sauce_tunnel.sh
+++ b/tests/frontend/travis/sauce_tunnel.sh
@@ -4,8 +4,9 @@ curl http://saucelabs.com/downloads/Sauce-Connect-latest.zip > /tmp/sauce.zip
 unzip /tmp/sauce.zip -d /tmp
 
 #start the sauce connector in background and make sure it doesn't output the secret key
-java -jar /tmp/Sauce-Connect.jar $SAUCE_USER $SAUCE_KEY & | grep -v $SAUCE_KEY
+(java -jar /tmp/Sauce-Connect.jar $SAUCE_USER $SAUCE_KEY | grep -v $SAUCE_KEY)&
 
 #save the sauce pid in a file and give it a bit of time to connect
 echo $! > /tmp/sauce.pid
-wait 30
\ No newline at end of file
+wait 30
+kill $!
\ No newline at end of file