travis updates for crossbar tests

Volicon · Dec 31, 2015 · e30ab27 · e30ab27
1 parent 512896a
commit e30ab27
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,12 +10,10 @@ php:
 matrix:
     allow_failures:
         - php: hhvm
-        - php: 7
 
 before_install:
-     - sudo apt-get install python-pip -qq
-     - sudo apt-get install -qq build-essential libssl-dev libffi-dev python-dev python-pip
-     - sudo pip install crossbar
+    - export PATH=$HOME/.local/bin:$PATH
+    - pip install crossbar --user `whoami`
 
 before_script:
     - composer install

diff --git a/tests/Crossbar/run_tests b/tests/Crossbar/run_tests
@@ -1,10 +1,9 @@
 #!/bin/sh
 
-timeout 45s /usr/local/bin/crossbar start --cbdir $HOME/hello/.crossbar &
+timeout 45s crossbar start --cbdir $HOME/hello/.crossbar &
 
 sleep 20
 
 phpunit tests/Crossbar/CrossbarTest.php
 
-exit $?
-
+exit $?
diff --git a/tests/Crossbar/travis_install b/tests/Crossbar/travis_install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-/usr/local/bin/crossbar init --template hello:php --appdir $HOME/hello
+crossbar init --template hello:php --appdir $HOME/hello
 
 cd $HOME/hello