From 903b870466b62e8a655a0f6564d052583c0fb7ec Mon Sep 17 00:00:00 2001 From: Thomas Steur Date: Mon, 29 Aug 2016 04:13:24 +0000 Subject: fix tests --- .travis.yml | 30 ++++-------------------------- 1 file changed, 4 insertions(+), 26 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index ba201c014c..267b63c8fc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -62,16 +62,6 @@ matrix: - php: 5.5 env: TEST_SUITE=IntegrationTests MYSQL_ADAPTER=PDO_MYSQL - php: 5.5 - env: TEST_SUITE=AllTests MYSQL_ADAPTER=PDO_MYSQL - - php: 7 - env: TEST_SUITE=AllTests MYSQL_ADAPTER=PDO_MYSQL - - php: 5.5 - env: TEST_SUITE=UnitTests MYSQL_ADAPTER=PDO_MYSQL - - php: hhvm - env: TEST_SUITE=SystemTests MYSQL_ADAPTER=PDO_MYSQL - - php: hhvm - env: TEST_SUITE=IntegrationTests MYSQL_ADAPTER=PDO_MYSQL - - php: hhvm env: TEST_SUITE=UnitTests MYSQL_ADAPTER=PDO_MYSQL # run UI tests on PHP 5.5 only - php: 5.6 @@ -79,29 +69,17 @@ matrix: - php: 5.6 env: TEST_SUITE=UITests MYSQL_ADAPTER=PDO_MYSQL UITEST_EXTRA_OPTIONS="--run-second-half-only" # run all tests not on PHP 5.6 and run MySQLI tests only on 5.6 - - php: 5.6 - env: TEST_SUITE=AllTests MYSQL_ADAPTER=PDO_MYSQL - php: 5.5 - env: TEST_SUITE=AllTests MYSQL_ADAPTER=MYSQLI - - php: 7 - env: TEST_SUITE=AllTests MYSQL_ADAPTER=MYSQLI - - php: hhvm - env: TEST_SUITE=AllTests MYSQL_ADAPTER=MYSQLI + env: TEST_SUITE=AllTests MYSQL_ADAPTER=MYSQLI ALLTEST_EXTRA_OPTIONS="--run-first-half-only" + - php: 5.5 + env: TEST_SUITE=AllTests MYSQL_ADAPTER=MYSQLI ALLTEST_EXTRA_OPTIONS="--run-second-half-only" # Javascript tests need to run only on one PHP version - php: 5.5 env: TEST_SUITE=JavascriptTests MYSQL_ADAPTER=PDO_MYSQL - - php: hhvm - env: TEST_SUITE=JavascriptTests MYSQL_ADAPTER=PDO_MYSQL - - php: 7 - env: TEST_SUITE=JavascriptTests MYSQL_ADAPTER=PDO_MYSQL # AngularJS tests need to run only on one PHP version - php: 5.5 env: TEST_SUITE=AngularJSTests MYSQL_ADAPTER=PDO_MYSQL SKIP_COMPOSER_INSTALL=1 - - php: hhvm - env: TEST_SUITE=AngularJSTests MYSQL_ADAPTER=PDO_MYSQL SKIP_COMPOSER_INSTALL=1 - - php: 7 - env: TEST_SUITE=AngularJSTests MYSQL_ADAPTER=PDO_MYSQL SKIP_COMPOSER_INSTALL=1 - + sudo: required script: $PIWIK_ROOT_DIR/tests/travis/travis.sh -- cgit v1.2.3