diff options
-rw-r--r-- | .travis.yml | 28 | ||||
m--------- | tests/travis | 0 |
2 files changed, 7 insertions, 21 deletions
diff --git a/.travis.yml b/.travis.yml index 943fedc5c1..375b1ffa72 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,13 +50,20 @@ matrix: - php: 5.6 env: TEST_SUITE=UnitTests MYSQL_ADAPTER=PDO_MYSQL sudo: false + addons: false # Javascript tests - php: 5.6 env: TEST_SUITE=JavascriptTests MYSQL_ADAPTER=PDO_MYSQL sudo: false + addons: + apt: + packages: + - nginx + - realpath - php: 5.6 env: TEST_SUITE=AngularJSTests MYSQL_ADAPTER=PDO_MYSQL SKIP_COMPOSER_INSTALL=1 sudo: false + addons: false # All tests after another - php: 5.6 env: TEST_SUITE=AllTests MYSQL_ADAPTER=MYSQLI ALLTEST_EXTRA_OPTIONS="--run-first-half-only" @@ -105,27 +112,6 @@ before_script: # make tmpfs and run MySQL on it for reasonnable performance - ./tests/travis/setup_mysql_tmpfs.sh - # print out mysql information - - mysql --version - - mysql -e "SELECT VERSION();" - - # configure mysql - - mysql -e "SET GLOBAL sql_mode = 'NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES'" # Travis default - # try to avoid 'mysql has gone away' errors - - mysql -e "SET GLOBAL wait_timeout = 36000;" - - mysql -e "SET GLOBAL max_allowed_packet = 134209536;" - - mysql -e "SHOW VARIABLES LIKE 'max_allowed_packet';" - - mysql -e "SHOW VARIABLES LIKE 'wait_timeout';" - - - mysql -e "SELECT @@sql_mode;" - # - mysql -e "SHOW GLOBAL VARIABLES;" - - # print out more debugging info - - uname -a - - date - - php -r "var_dump(gd_info());" - - mysql -e 'create database piwik_tests;' - - ./tests/travis/prepare.sh - ./tests/travis/setup_webserver.sh - ./tests/travis/install_phantomjs.sh; export PATH=$PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64/bin:$PATH; diff --git a/tests/travis b/tests/travis -Subproject c327e5705096d3787a8f70ff1d16306e2e263a6 +Subproject 492cf08635ce5d40af1bd9277ae763eccf335d8 |