From 71bae4749081459ae3725b10522932b2a4ca45f7 Mon Sep 17 00:00:00 2001
From: Thomas Steur <thomas.steur@gmail.com>
Date: Mon, 25 Nov 2013 03:02:21 +0000
Subject: [PATCH] refs #4225 run js tests in a separate group and other after
 each phpunit test

---
 .travis.yml             |  5 +++++
 tests/PHPUnit/travis.sh | 23 +++++++----------------
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1f5335a15ed..5c44b963bea 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,6 +12,7 @@ env:
     - TEST_SUITE=IntegrationTests MYSQL_ADAPTER=PDO_MYSQL
     - TEST_SUITE=PluginTests MYSQL_ADAPTER=PDO_MYSQL
     - TEST_SUITE=CoreTests MYSQL_ADAPTER=PDO_MYSQL
+    - TEST_SUITE=JsTests MYSQL_ADAPTER=PDO_MYSQL
     - TEST_SUITE=IntegrationTests MYSQL_ADAPTER=MYSQLI
   global:
     - secure: "AMhZmPZx4SUcuZRBzGHlQPxzM4D8FvFB3UThDa52gbi9KIBrwcumzV2VGi6B\n5fgjwtB4XTE1In7qhY2HMikPWBmWYYOQ5QcMPJsqqHt4iMmahx8WKzne6NOk\nNpqAuje/fulNGeP2LJZi0nrub3Fh4VwXaOvpNloKNQN/2JuqPtM="
@@ -23,6 +24,10 @@ matrix:
     env: TEST_SUITE=IntegrationTests MYSQL_ADAPTER=MYSQLI
   - php: 5.5
     env: TEST_SUITE=IntegrationTests MYSQL_ADAPTER=MYSQLI
+  - php: 5.4
+    env: TEST_SUITE=JsTests MYSQL_ADAPTER=PDO_MYSQL
+  - php: 5.5
+    env: TEST_SUITE=JsTests MYSQL_ADAPTER=PDO_MYSQL
 
 script: ./travis.sh
 
diff --git a/tests/PHPUnit/travis.sh b/tests/PHPUnit/travis.sh
index dcc127b6010..c67a809f10d 100755
--- a/tests/PHPUnit/travis.sh
+++ b/tests/PHPUnit/travis.sh
@@ -1,9 +1,5 @@
 #!/bin/bash
 
-RESULT_JS=0
-RESULT_PHP=0
-touch ../javascript/enable_sqlite
-
 if [ `phpunit --group __nogroup__ | grep "No tests executed" | wc -l` -ne 1 ]
 then
     echo "=====> There are some tests functions which do not have a @group set. "
@@ -13,10 +9,13 @@ then
 else
     if [ -n "$TEST_SUITE" ]
     then
-        phpunit --configuration phpunit.xml --testsuite $TEST_SUITE --colors
-        RESULT_PHP=$?
-        phantomjs ../javascript/testrunner.js
-        RESULT_JS=$?
+        if [ "$TEST_SUITE" = "JsTests" ]
+        then
+            touch ../javascript/enable_sqlite
+            phantomjs ../javascript/testrunner.js
+        else
+            phpunit --configuration phpunit.xml --testsuite $TEST_SUITE --colors
+        fi
     else
       if [ -n "$TEST_DIR" ]
       then
@@ -29,16 +28,8 @@ else
         fi
 
         phpunit --colors $TEST_DIR
-        RESULT_PHP=$?
       else
         phpunit --configuration phpunit.xml --coverage-text --colors
-        RESULT_PHP=$?
       fi
     fi
-fi
-
-if [ 0 == $RESULT_PHP ] && [ 0 == $RESULT_JS ]; then
-   exit 0;
-else
-   exit 1;
 fi
\ No newline at end of file