Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Steur <thomas.steur@googlemail.com>2014-10-05 15:05:47 +0400
committerThomas Steur <thomas.steur@googlemail.com>2014-10-05 15:05:47 +0400
commit5a1eab97f54b44f57356b4276b9c9df2a8eef51b (patch)
tree83864ece2806ccf6e6bb49abf3fd65de92c13ad8 /.travis.yml
parent19bcd2d262343eae9d553378e4c66ce7e033b4d8 (diff)
refs #5940 put tests in correct folders, better testsuite names, some tests still fail and I cannot figure out why
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml24
1 files changed, 12 insertions, 12 deletions
diff --git a/.travis.yml b/.travis.yml
index 67925cbeca..8290476d33 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,12 +22,12 @@ env:
matrix:
# PDO Mysql
- TEST_SUITE=SystemTests MYSQL_ADAPTER=PDO_MYSQL
- - TEST_SUITE=PluginTests MYSQL_ADAPTER=PDO_MYSQL
- - TEST_SUITE=CoreTests MYSQL_ADAPTER=PDO_MYSQL
+ - TEST_SUITE=IntegrationTests MYSQL_ADAPTER=PDO_MYSQL
+ - TEST_SUITE=UnitTests MYSQL_ADAPTER=PDO_MYSQL
# Mysqli
- TEST_SUITE=SystemTests MYSQL_ADAPTER=MYSQLI
- - TEST_SUITE=PluginTests MYSQL_ADAPTER=MYSQLI
- - TEST_SUITE=CoreTests MYSQL_ADAPTER=MYSQLI
+ - TEST_SUITE=IntegrationTests MYSQL_ADAPTER=MYSQLI
+ - TEST_SUITE=UnitTests MYSQL_ADAPTER=MYSQLI
# Javascript tests
- TEST_SUITE=JavascriptTests MYSQL_ADAPTER=PDO_MYSQL
- TEST_SUITE=AngularJSTests MYSQL_ADAPTER=PDO_MYSQL
@@ -79,27 +79,27 @@ matrix:
- php: 5.3.3
env: TEST_SUITE=SystemTests MYSQL_ADAPTER=MYSQLI
- php: 5.3.3
- env: TEST_SUITE=PluginTests MYSQL_ADAPTER=MYSQLI
+ env: TEST_SUITE=IntegrationTests MYSQL_ADAPTER=MYSQLI
- php: 5.3.3
- env: TEST_SUITE=CoreTests MYSQL_ADAPTER=MYSQLI
+ env: TEST_SUITE=UnitTests MYSQL_ADAPTER=MYSQLI
- php: 5.5
env: TEST_SUITE=SystemTests MYSQL_ADAPTER=MYSQLI
- php: 5.5
- env: TEST_SUITE=PluginTests MYSQL_ADAPTER=MYSQLI
+ env: TEST_SUITE=IntegrationTests MYSQL_ADAPTER=MYSQLI
- php: 5.5
- env: TEST_SUITE=CoreTests MYSQL_ADAPTER=MYSQLI
+ env: TEST_SUITE=UnitTests MYSQL_ADAPTER=MYSQLI
- php: 5.6
env: TEST_SUITE=SystemTests MYSQL_ADAPTER=MYSQLI
- php: 5.6
- env: TEST_SUITE=PluginTests MYSQL_ADAPTER=MYSQLI
+ env: TEST_SUITE=IntegrationTests MYSQL_ADAPTER=MYSQLI
- php: 5.6
- env: TEST_SUITE=CoreTests MYSQL_ADAPTER=MYSQLI
+ env: TEST_SUITE=UnitTests MYSQL_ADAPTER=MYSQLI
- php: hhvm
env: TEST_SUITE=SystemTests MYSQL_ADAPTER=MYSQLI
- php: hhvm
- env: TEST_SUITE=PluginTests MYSQL_ADAPTER=MYSQLI
+ env: TEST_SUITE=IntegrationTests MYSQL_ADAPTER=MYSQLI
- php: hhvm
- env: TEST_SUITE=CoreTests MYSQL_ADAPTER=MYSQLI
+ env: TEST_SUITE=UnitTests MYSQL_ADAPTER=MYSQLI
script: $PIWIK_ROOT_DIR/tests/travis/travis.sh