diff options
| author | Enrico Olivelli <eolivelli@apache.org> | 2019-09-09 13:48:05 +0200 |
|---|---|---|
| committer | Norbert Kalmar <nkalmar@apache.org> | 2019-09-09 13:48:05 +0200 |
| commit | 44911cfb3f04af09947d51403d55418d422e5c41 (patch) | |
| tree | 35ed67a4665d211ab8c8608594b29418bd5ae549 | |
| parent | 77496b948f1eec3f8fa243bb8003cc97839982e4 (diff) | |
| download | zookeeper-44911cfb3f04af09947d51403d55418d422e5c41.tar.gz | |
ZOOKEEPER-3539: Fix CI for branch-3.5:
- do not execute findbugs on CI for ant-based tasks
- fix usage of fprintf on C client
Maven + Spotbugs superseded Ant + Findbugs
Author: Enrico Olivelli <eolivelli@apache.org>
Reviewers: Norbert Kalmar <nkalmar@apache.org>
Closes #1082 from eolivelli/fix/fix-ci-35
| -rw-r--r-- | build.xml | 12 | ||||
| -rw-r--r-- | zookeeper-client/zookeeper-client-c/src/zookeeper.c | 8 |
2 files changed, 10 insertions, 10 deletions
@@ -1807,7 +1807,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant"> to Ant on the command-line." /> </target> - <target name="test-patch" depends="patch.check,findbugs.check"> + <target name="test-patch" depends="patch.check"> <exec executable="bash" failonerror="true"> <arg value="${test_patch_sh}"/> <arg value="DEVELOPER"/> @@ -1816,13 +1816,13 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant"> <arg value="${svn.cmd}"/> <arg value="${grep.cmd}"/> <arg value="${patch.cmd}"/> - <arg value="${findbugs.home}"/> + <arg value="${findbugs.home}"/> <!-- no more used --> <arg value="${basedir}"/> <arg value="${java5.home}"/> </exec> </target> - <target name="hudson-test-patch" depends="findbugs.check"> + <target name="hudson-test-patch" > <exec executable="bash" failonerror="true"> <arg value="${test_patch_sh}"/> <arg value="HUDSON"/> @@ -1842,7 +1842,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant"> </exec> </target> - <target name="qa-test-pullrequest" depends="findbugs.check"> + <target name="qa-test-pullrequest" > <exec executable="bash" failonerror="true"> <arg value="${test_pullrequest_sh}"/> <arg value="QABUILD"/> @@ -1853,7 +1853,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant"> <arg value="${git.cmd}"/> <arg value="${grep.cmd}"/> <arg value="${patch.cmd}"/> - <arg value="${findbugs.home}"/> + <arg value="${findbugs.home}"/> <!-- no more used --> <arg value="${basedir}"/> <arg value="${jira.passwd}"/> <arg value="${java5.home}"/> @@ -1863,7 +1863,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant"> <!-- this target runs the hudson trunk build --> - <target name="hudson-test-trunk" depends="tar,findbugs"/> + <target name="hudson-test-trunk" depends="tar"/> <target name="api-xml" depends="ivy-retrieve-jdiff, javadoc, write-null"> <javadoc> diff --git a/zookeeper-client/zookeeper-client-c/src/zookeeper.c b/zookeeper-client/zookeeper-client-c/src/zookeeper.c index 386f2f94a..6e9e8c6de 100644 --- a/zookeeper-client/zookeeper-client-c/src/zookeeper.c +++ b/zookeeper-client/zookeeper-client-c/src/zookeeper.c @@ -2557,18 +2557,18 @@ static __attribute__((unused)) void print_completion_queue(zhandle_t *zh) if(logLevel<ZOO_LOG_LEVEL_DEBUG) return; - fprintf(LOGSTREAM,"Completion queue: "); + LOG_DEBUG(LOGSTREAM,"Completion queue: "); if (zh->sent_requests.head==0) { - fprintf(LOGSTREAM,"empty\n"); + LOG_DEBUG(LOGSTREAM,"empty\n"); return; } cptr=zh->sent_requests.head; while(cptr){ - fprintf(LOGSTREAM,"%d,",cptr->xid); + LOG_DEBUG(LOGSTREAM,"%d,",cptr->xid); cptr=cptr->next; } - fprintf(LOGSTREAM,"end\n"); + LOG_DEBUG(LOGSTREAM,"end\n"); } //#ifdef THREADED |