simplified travis installation

switchy · Aug 28, 2014 · c4dffa0 · c4dffa0
1 parent 63543c0
commit c4dffa0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -47,9 +47,7 @@ install:
  - tests/unit/data/travis/memcache-setup.sh
  - tests/unit/data/travis/cubrid-setup.sh
 # codeception
- - composer global require "codeception/codeception=2.0.*"
- - composer global require "codeception/specify=*"
- - composer global require "codeception/verify=*"
+ - composer global require "codeception/codeception=2.0.*" "codeception/specify=*" "codeception/verify=*"
 # basic and advanced application:
  - tests/unit/data/travis/setup-apps.sh
 

diff --git a/tests/unit/data/travis/cubrid-setup.sh b/tests/unit/data/travis/cubrid-setup.sh
@@ -60,8 +60,8 @@ echo ""
 
 # cubrid pdo
 install_pdo_cubrid() {
- if (test "! -f PDO_CUBRID-$CUBRID_PDO_VERSION.tgz"); then
- wget "http:https://pecl.php.net/get/PDO_CUBRID-$CUBRID_PDO_VERSION.tgz"
+ if (test "! (-f PDO_CUBRID-$CUBRID_PDO_VERSION.tgz)"); then
+ wget "http:https://pecl.php.net/get/PDO_CUBRID-$CUBRID_PDO_VERSION.tgz" -O PDO_CUBRID-$CUBRID_PDO_VERSION.tgz
  fi
  tar -zxf "PDO_CUBRID-$CUBRID_PDO_VERSION.tgz"
  sh -c "cd PDO_CUBRID-$CUBRID_PDO_VERSION && phpize && ./configure --prefix=$CWD/cubrid/PDO_CUBRID-$CUBRID_PDO_VERSION && make"