Use separate webservers for basic and advanced apps in travis

superedo73 · Aug 17, 2014 · 57b2996 · 57b2996
1 parent ac32c33
commit 57b2996
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -56,8 +56,14 @@ script:
     if (php --version | grep -i HipHop > /dev/null); then
       echo "skipping application tests on HHVM"
     else
-      cd apps/basic/tests && php ../vendor/bin/codecept run
-      cd ../../advanced/tests && ../vendor/bin/codecept run
+	  cd apps/basic/web && php -S localhost:8080 > /dev/null 2>&1 &
+	  PHPPID=$!
+      cd ../tests && codecept run
+	  kill -9 $PHPPID
+      cd ../../advanced && php -S localhost:8080 > /dev/null 2>&1 &
+	  PHPPID=$!
+	  cd tests && codecept run
+	  kill -9 $PHPPID
     fi
 
 after_script:

diff --git a/tests/unit/data/travis/setup-apps.sh b/tests/unit/data/travis/setup-apps.sh
@@ -23,8 +23,4 @@ else
     cd ../console && codecept build
     cd ../frontend && codecept build
     cd ../../../
-
-    # boot server
-    php -S localhost:8080 > /dev/null 2>&1 &
-
 fi