diff options
| author | Alexander Vladishev <aleksander.vladishev@zabbix.com> | 2019-10-08 09:50:26 +0300 |
|---|---|---|
| committer | Alexander Vladishev <aleksander.vladishev@zabbix.com> | 2019-10-08 09:58:28 +0300 |
| commit | 8866a6d883d536a0833270cabbdab457279036ed (patch) | |
| tree | 86c5268dc9a1ba895525b5afda56a3ee3a3c015a /build-backend.xml | |
| parent | cfac660b256d766a8bfc6ba69e5d76c8b4e627bd (diff) | |
.......... [ZBXNEXT-686] removed DB creation script from backend tests
(cherry picked from commit 94c675308192804811e10bfff70cd0e3096acb50)
(cherry picked from commit ea9d1bb773eabfcfaf79e9e1923619f09aee2702)
(cherry picked from commit 1a968312ace7d844ceec5510e0223370ecb6275d)
Diffstat (limited to 'build-backend.xml')
| -rw-r--r-- | build-backend.xml | 62 |
1 files changed, 1 insertions, 61 deletions
diff --git a/build-backend.xml b/build-backend.xml index 367ac78208a..f08213c122f 100644 --- a/build-backend.xml +++ b/build-backend.xml @@ -149,66 +149,6 @@ </sequential> </macrodef> - <target name="create-db-mysql" if="${with.mysql}"> - <sequential> - <exec executable="mysql" failonerror="on"> - <arg line="-u${DBUSER}"/> - <arg line="-p${DBPASSWORD}" if:set="DBPASSWORD"/> - <arg line="-e "DROP DATABASE IF EXISTS ${DBNAME}""/> - </exec> - <exec executable="mysql" failonerror="on"> - <arg line="-u ${DBUSER}"/> - <arg line="-p${DBPASSWORD}" if:set="DBPASSWORD"/> - <arg line="-e "CREATE DATABASE IF NOT EXISTS ${DBNAME}""/> - </exec> - <exec executable="mysql" input="database/mysql/schema.sql" failonerror="on"> - <arg line="-u ${DBUSER}"/> - <arg line="-p${DBPASSWORD}" if:set="DBPASSWORD"/> - <arg line="${DBNAME}"/> - </exec> - <exec executable="mysql" input="database/mysql/images.sql" failonerror="on"> - <arg line="-u ${DBUSER}"/> - <arg line="-p${DBPASSWORD}" if:set="DBPASSWORD"/> - <arg line="${DBNAME}"/> - </exec> - <exec executable="mysql" input="database/mysql/data.sql" failonerror="on"> - <arg line="-u ${DBUSER}"/> - <arg line="-p${DBPASSWORD}" if:set="DBPASSWORD"/> - <arg line="${DBNAME}"/> - </exec> - </sequential> - </target> - - <target name="create-db-postgresql" if="${with.postgresql}"> - <sequential> - <exec executable="psql" failonerror="on"> - <arg line="-U ${DBUSER}"/> - <arg line="-c "DROP DATABASE IF EXISTS ${DBNAME};""/> - </exec> - <exec executable="psql" failonerror="on"> - <arg line="-U ${DBUSER}"/> - <arg line="-c "CREATE DATABASE ${DBNAME};""/> - </exec> - <exec executable="psql" failonerror="on"> - <arg line="-U ${DBUSER}"/> - <arg line="-d ${DBNAME}"/> - <arg line="-f database/postgresql/schema.sql"/> - </exec> - <exec executable="psql" failonerror="on"> - <arg line="-U ${DBUSER}"/> - <arg line="-d ${DBNAME}"/> - <arg line="-f database/postgresql/images.sql"/> - </exec> - <exec executable="psql" failonerror="on"> - <arg line="-U ${DBUSER}"/> - <arg line="-d ${DBNAME}"/> - <arg line="-f database/postgresql/data.sql"/> - </exec> - </sequential> - </target> - - <target name="create-db" depends="create-db-mysql,create-db-postgresql"/> - <target name="make-db-mysql" unless="${with.mysql}"> <!-- Build Zabbix with postgresql database --> <sequential> @@ -370,7 +310,7 @@ </for> </target> - <target name="build-dist" depends="create-db,make-gcc,make-db"/> + <target name="build-dist" depends="make-gcc,make-db"/> <target name="make-dist"> <!-- Create & build Zabbix distribution --> |