The org.junit bits are in my junit-4.10.jar. I have no idea why the Windows bot doesn't run javah for the new module, but I recall seeing that before and suspect it's a bug in the bot's build script. On 14 Aug 2013 16:58, "Bert Huijben" <[email protected]> wrote:
> > > > -----Original Message----- > > From: [email protected] [mailto:[email protected]] > > Sent: vrijdag 9 augustus 2013 17:53 > > To: [email protected] > > Subject: svn commit: r1512354 - in /subversion/trunk: ./ > > subversion/bindings/javahl/native/ > > subversion/bindings/javahl/src/org/apache/subversion/javahl/ > > subversion/bindings/javahl/src/org/apache/subversion/javahl/util/ > > subversion/bindings/javahl/tests/org/apach... > > > > Author: brane > > Date: Fri Aug 9 15:52:34 2013 > > New Revision: 1512354 > > > > URL: http://svn.apache.org/r1512354 > > Log: > > Expose utility functions in JavaHL. Start by providing a file-based > merge tool. > > > > * build.conf (private-built-includes): > > Add org_apache_subversion_javahl_util_DiffLib.h. > > (javahl-java): Add ...javahl/util and reorder modules alphabetically. > > (javahl-callback-javah, javahl-remote-javah, javahl-callback-javah): > > Reorder modules alphabetically. > > (javahl-util-javah): New module. > > > > * Makefile.in (javahl): Add javahl-remote-javah and javahl-util-javah. > > (doc-javahl): Add org.apache.subversion.javahl.util. > > > > [in subversion/bindings/javahl/src/org/apache/subversion/javahl] > > * SVNUtil.java: New Java class SVNUtil. > > (SVNUtil.DiffOptions): New nested class. > > (SVNUtil.ConflictDisplayStyle): New nested enumeration. > > (SVNUtil.FileMerge): New static methods. > > * util/DiffLib.java: New Java class util.DiffLib. > > > > [in subversion/bindings/javahl/native] > > * org_apache_subversion_javahl_util_DiffLib.cpp: > > Native method wrappers for the util.DiffLib class. > > (Java_org_apache_subversion_javahl_util_DiffLib_nativeFileMerge): > > Native implementation of util.DiffLib.FileMerge. > > > > [in subversion/bindings/javahl/tests/org/apache/subversion/javahl] > > * UtilTests.java: New test suite for the SVNUtil class. > > (UtilTests.testFileMerge): New test case. > > * RunTests.java: Add UtilTests to the test suite list. > > This patch causes compilation failures on the Ubuntu gcc buildbot > [[ > /var/lib/buildbot/svn-buildslave/svn-x64-ubuntu/build/subversion/bindings/javahl/tests/org/apache/subversion/javahl/UtilTests.java:31: > error: package org.junit does not exist > import org.junit.Assert; > ^ > /var/lib/buildbot/svn-buildslave/svn-x64-ubuntu/build/subversion/bindings/javahl/tests/org/apache/subversion/javahl/UtilTests.java:110: > error: cannot find symbol > Assert.assertArrayEquals(expected, result.toByteArray()); > ^ > symbol: variable Assert > location: class UtilTests > ]] > > And on the Windows buildbot: > [[ > "D:\svn-w2k3-local\slik-w2k3-x64-local\build\subversion_vcnet.sln" > (__JAVAHL__;__JAVAHL_TESTS__;__SWIG_PERL__;__SWIG_RUBY__ target) (1) -> > (Libraries\libsvnjavahl target) -> > > > ..\..\..\subversion\bindings\javahl\native\org_apache_subversion_javahl_util_DiffLib.cpp(27): > fatal error C1083: Cannot open include file: > '../include/org_apache_subversion_javahl_util_DiffLib.h': No such file or > directory > ]] > > Bert > >
