From 0b8784860f23395733ce280024f2ffb13e194643 Mon Sep 17 00:00:00 2001 From: Klimov Paul Date: Sun, 1 Dec 2013 18:00:08 +0200 Subject: [PATCH] Moved sphinx source database setup into ".sh" file allowing to use relative file path. --- .travis.yml | 1 - tests/unit/data/travis/sphinx-setup.sh | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3f476f8..11c5e5f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,6 @@ before_script: - composer self-update && composer --version - composer require satooshi/php-coveralls 0.6.* --dev --prefer-dist - mysql -e 'CREATE DATABASE yiitest;'; - - mysql -D yiitest -u travis < /home/travis/build/yiisoft/yii2/tests/unit/data/sphinx/source.sql - psql -U postgres -c 'CREATE DATABASE yiitest;'; - echo 'elasticsearch version ' && curl http://localhost:9200/ - tests/unit/data/travis/apc-setup.sh diff --git a/tests/unit/data/travis/sphinx-setup.sh b/tests/unit/data/travis/sphinx-setup.sh index f0ec75e..c07bd04 100755 --- a/tests/unit/data/travis/sphinx-setup.sh +++ b/tests/unit/data/travis/sphinx-setup.sh @@ -22,6 +22,9 @@ sudo chmod 777 /var/lib/sphinx # ugly (for travis) sudo mkdir /var/run/sphinx sudo chmod 777 /var/run/sphinx # ugly (for travis) +# Setup source database +mysql -D yiitest -u travis < $CWD/../sphinx/source.sql + # setup test Sphinx indexes: indexer --config $CWD/../sphinx/sphinx.conf --all