diff options
| author | Michael Veksler <Mihails.Vekslers@zabbix.com> | 2019-09-20 10:00:39 +0300 |
|---|---|---|
| committer | Michael Veksler <Mihails.Vekslers@zabbix.com> | 2019-09-20 10:27:04 +0300 |
| commit | f67a0a6af8802c64394c8c2e0077ecd4910a19e9 (patch) | |
| tree | b6d4d34ab561c4b75839d414b2cc9fd2c0288aa4 /build-backend.xml | |
| parent | 5a31f1f3f2eafcd006ae680982bd66980c6e82cf (diff) | |
.......PS. [ZBX-13266] implementation of DBadd_condition_alloc() without BETWEEN logic
* commit '11810c78c9f674e651aea2c6d85ae71927200f9f':
.......PS. [ZBX-13266] added ChangeLog entry
.......PS. [ZBX-13266] introduced new target 'cmocka-ora-tests' of 'build-backend.xml' for cmocka tests with Oracle
.......PS. [ZBX-13266] implementation of 'IN' logic for all db except Oracle
.......PS. [ZBX-13266] debug output of 'in' query size
.......PS. [ZBX-13266] regexp improvement for regular sql case #902501
.......PS. [ZBX-13266] changes of ant script to support cmocka tests of only PROXY
.......PS. [ZBX-13266] cmocka changes of zbxjson/Makefile.am for support PROXY
.......PS. [ZBX-13266] revert changes for cmocka zbxjson/Makefile.am
.......PS. [ZBX-13266] proxy implementation of cmocka test for DBadd_condition_alloc()
.......PS. [ZBX-13266] cmocka test implementation for DBadd_condition_alloc()
.......PS. [ZBX-13266] implementation of DBadd_condition_alloc() without BETWEEN logic
(cherry picked from commit 8933485910490aad25550bffc20cab5537844a43)
(cherry picked from commit bb36e864fa1ccf08c17eb6491d176fae03480891)
Diffstat (limited to 'build-backend.xml')
| -rw-r--r-- | build-backend.xml | 30 |
1 files changed, 29 insertions, 1 deletions
diff --git a/build-backend.xml b/build-backend.xml index 98d26d914c0..367ac78208a 100644 --- a/build-backend.xml +++ b/build-backend.xml @@ -286,7 +286,8 @@ <property name="cmocka-1-default" value="-q CFLAGS='-Wall -Wextra -Wdeclaration-after-statement -Wpointer-arith -Wno-maybe-uninitialized -Wformat -Wmissing-prototypes' --enable-server --enable-agent --enable-proxy --enable-ipv6 --with-mysql --with-libxml2 --with-unixodbc --with-net-snmp --with-ssh2 --with-openipmi --with-libevent --with-mbedtls --with-ldap --with-libcurl --with-iconv --with-libpcre"/> <property name="cmocka-2-agent-only" value="-q --enable-agent"/> <property name="cmocka-3-server-only" value="-q --enable-server --with-mysql"/> - <property name="cmocka-4-sanitizer" value="CC=clang CFLAGS='-Wall -Wextra -Wenum-conversion -g -O2 -fsanitize=leak,address' LDFLAGS='-fsanitize=leak,address' -q --enable-server --enable-agent --enable-proxy --enable-ipv6 --with-mysql --with-libxml2 --with-unixodbc --with-net-snmp --with-ssh2 --with-openipmi --with-libevent --with-mbedtls --with-ldap --with-libcurl --with-iconv --with-libpcre"/> + <property name="cmocka-4-proxy-only" value="-q --enable-proxy --with-sqlite3"/> + <property name="cmocka-5-sanitizer" value="CC=clang CFLAGS='-Wall -Wextra -Wenum-conversion -g -O2 -fsanitize=leak,address' LDFLAGS='-fsanitize=leak,address' -q --enable-server --enable-agent --enable-proxy --enable-ipv6 --with-mysql --with-libxml2 --with-unixodbc --with-net-snmp --with-ssh2 --with-openipmi --with-libevent --with-mbedtls --with-ldap --with-libcurl --with-iconv --with-libpcre"/> </target> <target name="cmocka-tests" depends="init-cmocka-test-conf-options"> @@ -303,6 +304,33 @@ </for> </target> + <target name="init-cmocka-ora-test-conf-options"> + <property name="ORA_INCLUDE" value="/usr/include/oracle/12.1/client64"/> + <property name="ORA_LIB" value="/usr/lib/oracle/12.1/client64/lib"/> + + <!-- Zabbix various configuration parameters for cmocka Oracle tests --> + <!-- Configuration option name must consist of prefix 'cmocka-ora-', configuration order number + and configuration title: cmocka-<number>-<title> --> + <property name="cmocka-ora-1-default" value="-q CFLAGS='-Wall -Wextra -Wdeclaration-after-statement -Wpointer-arith -Wno-maybe-uninitialized -Wformat -Wmissing-prototypes' --enable-server --enable-agent --enable-proxy --enable-ipv6 --with-jabber --with-libxml2 --with-unixodbc --with-net-snmp --with-ssh2 --with-openipmi --with-libevent --with-mbedtls --with-ldap --with-libcurl --with-iconv --with-libpcre --with-oracle --with-oracle-include=${ORA_INCLUDE} --with-oracle-lib=${ORA_LIB}"/> + <property name="cmocka-ora-2-server-only" value="-q --enable-server --with-oracle --with-oracle-include=${ORA_INCLUDE} --with-oracle-lib=${ORA_LIB}"/> + <property name="cmocka-ora-3-proxy-only" value="-q --enable-proxy --with-oracle --with-oracle-include=${ORA_INCLUDE} --with-oracle-lib=${ORA_LIB}"/> + <property name="cmocka-ora-4-sanitizer" value="CC=clang CFLAGS='-Wall -Wextra -Wenum-conversion -g -O2 -fsanitize=leak,address' LDFLAGS='-fsanitize=leak,address' -q --enable-server --enable-agent --enable-proxy --enable-ipv6 --with-jabber --with-libxml2 --with-unixodbc --with-net-snmp --with-ssh2 --with-openipmi --with-libevent --with-mbedtls --with-ldap --with-libcurl --with-iconv --with-libpcre --with-oracle --with-oracle-include=${ORA_INCLUDE} --with-oracle-lib=${ORA_LIB}"/> + </target> + + <target name="cmocka-ora-tests" depends="init-cmocka-ora-test-conf-options"> + <!-- Build Zabbix with cmocka Oracle tests --> + <delete dir="tests_results"/> + <mkdir dir="tests_results"/> + <exec executable="./bootstrap.sh" failonerror="on"/> + <propertyselector property="conf.list" delimiter="," match="cmocka-ora-(.*)" select="\1"/> + <sortlist property="conf.list" delimiter="," value="${conf.list}" override="true"/> + <for list="${conf.list}" param="name" delimiter=","> + <sequential> + <make-tests conf="${cmocka-ora-@{name}}" conf-name="@{name}"/> + </sequential> + </for> + </target> + <target name="gen-test-coverage-report"> <!-- Generate Zabbix cmocka tests coverage report--> <delete dir="tests_results"/> |