aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--build.xml21
1 files changed, 13 insertions, 8 deletions
diff --git a/build.xml b/build.xml
index aae076e1..4adf3403 100644
--- a/build.xml
+++ b/build.xml
@@ -34,7 +34,7 @@
34 </exec> 34 </exec>
35 </target> 35 </target>
36 36
37 <target name="db_mysql" description="Run test for MySQL"> 37 <target name="prepare_mysql" description="Run test for MySQL">
38 <delete dir="${basedir}/app/config/parameters.yml"/> 38 <delete dir="${basedir}/app/config/parameters.yml"/>
39 <exec executable="cp"> 39 <exec executable="cp">
40 <arg value="${basedir}/app/config/tests/parameters_test.mysql.yml"/> 40 <arg value="${basedir}/app/config/tests/parameters_test.mysql.yml"/>
@@ -76,7 +76,7 @@
76 </exec> 76 </exec>
77 </target> 77 </target>
78 78
79 <target name="db_sqlite" description="Run test for SQLite"> 79 <target name="prepare_sqlite" description="Run test for SQLite">
80 <delete dir="${basedir}/app/config/parameters.yml"/> 80 <delete dir="${basedir}/app/config/parameters.yml"/>
81 <exec executable="cp"> 81 <exec executable="cp">
82 <arg value="${basedir}/app/config/tests/parameters_test.sqlite.yml"/> 82 <arg value="${basedir}/app/config/tests/parameters_test.sqlite.yml"/>
@@ -118,7 +118,7 @@
118 </exec> 118 </exec>
119 </target> 119 </target>
120 120
121 <target name="db_pgsql" description="Run test for PostgreSQL"> 121 <target name="prepare_pgsql" description="Run test for PostgreSQL">
122 <delete dir="${basedir}/app/config/parameters.yml"/> 122 <delete dir="${basedir}/app/config/parameters.yml"/>
123 <exec executable="cp"> 123 <exec executable="cp">
124 <arg value="${basedir}/app/config/tests/parameters_test.pgsql.yml"/> 124 <arg value="${basedir}/app/config/tests/parameters_test.pgsql.yml"/>
@@ -146,11 +146,16 @@
146 <arg value="data/sql/pgsql_base.sql"/> 146 <arg value="data/sql/pgsql_base.sql"/>
147 <arg value="--env=test"/> 147 <arg value="--env=test"/>
148 </exec> 148 </exec>
149 <exec executable="php"> 149 <exec executable="psql">
150 <arg value="${basedir}/bin/console"/> 150 <!-- psql -h host -d database -U username -f data/sql/pgsql_base.sql -->
151 <arg value="doctrine:migrations:migrate"/> 151 <arg value="-h"/>
152 <arg value="--no-interaction"/> 152 <arg value="localhost"/>
153 <arg value="--env=test"/> 153 <arg value="-d"/>
154 <arg value="wallabag_test"/>
155 <arg value="-U"/>
156 <arg value="travis"/>
157 <arg value="-f"/>
158 <arg value="data/sql/pgsql_base.sql"/>
154 </exec> 159 </exec>
155 <exec executable="php"> 160 <exec executable="php">
156 <arg value="${basedir}/bin/console"/> 161 <arg value="${basedir}/bin/console"/>