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:
authordiosmosis <benakamoorthi@fastmail.fm>2014-02-21 08:32:46 +0400
committerdiosmosis <benakamoorthi@fastmail.fm>2014-02-21 08:32:46 +0400
commitb07647d3345f26a3de9042a8647fd32f0d44ef0e (patch)
treeb8ab60ff38470305ffab542751c74472fa07b45c /tests/travis
parent2c2869155ba7998bb4b035c0d46c067b2f4d484b (diff)
Fixing build for branch (only use persisted fixtures for UI tests).
Diffstat (limited to 'tests/travis')
-rwxr-xr-xtests/travis/prepare.sh9
1 files changed, 8 insertions, 1 deletions
diff --git a/tests/travis/prepare.sh b/tests/travis/prepare.sh
index 013e771d5b..6c34aacfd6 100755
--- a/tests/travis/prepare.sh
+++ b/tests/travis/prepare.sh
@@ -13,7 +13,14 @@ fi
# Copy Piwik configuration
echo "Install config.ini.php"
-sed "s/PDO_MYSQL/${MYSQL_ADAPTER}/g" ./tests/PHPUnit/config.ini.travis.php > ./config/config.ini.php
+
+TRAVIS_CONFIG_FILE=config.ini.travis.php
+if [ "$TEST_DIR" = "UI" ];
+then
+ TRAVIS_CONFIG_FILE=config.ini.travis.ui.php
+fi
+
+sed "s/PDO_MYSQL/${MYSQL_ADAPTER}/g" ./tests/PHPUnit/$TRAVIS_CONFIG_FILE > ./config/config.ini.php
# Prepare phpunit.xml
echo "Adjusting phpunit.xml"