On Feb 13, 2009, at 11:31 AM, Hyrum K. Wright wrote:
> On Feb 13, 2009, at 10:48 AM, Arfrever Frehtes Taifersar Arahesis
> wrote:
>>
>> Author: arfrever
>> Date: Fri Feb 13 08:48:08 2009
>> New Revision: 35852
>>
>> Log:
>> Fix building Ruby bindings with Ruby 1.9.
>>
>> * build/ac-macros/swig.m4
>> (SVN_FIND_SWIG): Use appropriate -I options.
>>
>> * subversion/bindings/swig/core.i: Use RSTRING_LEN() and include
>> svn_md5_h.swg.
>>
>> * subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c
>> (): Include <version.h>.
>> (rb_holder_pop, svn_swig_rb_set_pool,
>> svn_swig_rb_to_apr_array_row_prop,
>> svn_swig_rb_to_apr_array_prop,
>> svn_swig_rb_array_to_apr_array_revision_range,
>> name, read_handler_rbio): Use RARRAY_LEN(), RARRAY_PTR() and
>> RSTRING_LEN().
>> (callback_rescue): Use rb_errinfo() instead of ruby_errinfo when
>> Ruby >=1.9 is used.
>>
>> * subversion/bindings/swig/include/svn_types.swg
>> (_swig_rb_closed): Use RSTRING_LEN().
>>
>> * subversion/bindings/swig/include/svn_string.swg
>> (%typemap(in) svn_stringbuf_t *, %typemap(in) svn_stringbuf_t
>> *node_name,
>> %typemap(in) const svn_string_t * (svn_string_t value)): Use
>> RSTRING_LEN().
>>
>> * subversion/bindings/swig/svn_fs.i:
>> * subversion/bindings/swig/svn_wc.i:
>> * subversion/bindings/swig/svn_delta.i: Include "svn_md5.h".
>>
>> Modified:
>> trunk/build/ac-macros/swig.m4
>> trunk/subversion/bindings/swig/core.i
>> trunk/subversion/bindings/swig/include/svn_string.swg
>> trunk/subversion/bindings/swig/include/svn_types.swg
>> trunk/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c
>> trunk/subversion/bindings/swig/svn_delta.i
>> trunk/subversion/bindings/swig/svn_fs.i
>> trunk/subversion/bindings/swig/svn_wc.i
>
> Good news: The segfaulting ruby test fixes itself after this change.
> Bad news: There is another failing test after this change:
> hwright_at_orac:~/dev/svn-trunk$ make check-swig-rb
> cd /home/hwright/dev/svn-trunk/subversion/bindings/swig/ruby; \
> /usr/bin/ruby -I /home/hwright/dev/svn-trunk/subversion/bindings/
> swig/ruby \
> /home/hwright/dev/svn-trunk/subversion/bindings/swig/ruby/test/
> run-test.rb \
> --verbose=normal
> Loaded suite .
> Started
> .....F
> .....................................................................................................................................................................................................................
> Finished in 527.273193 seconds.
>
> 1) Failure:
> test_authentication(SvnClientTest)
> /home/hwright/dev/svn-trunk/subversion/bindings/swig/ruby/test/
> test_client.rb:1988:in `test_authentication'
> /home/hwright/dev/svn-trunk/subversion/bindings/swig/ruby/svn/
> client.rb:105:in `initialize'
> /home/hwright/dev/svn-trunk/subversion/bindings/swig/ruby/test/
> test_client.rb:1987:in `new'
> /home/hwright/dev/svn-trunk/subversion/bindings/swig/ruby/test/
> test_client.rb:1987:in `test_authentication':
> <Svn::Error::AuthnNoProvider> exception expected but was
> Class: <Svn::Error::RaSvnConnectionClosed>
> Message: <"subversion/libsvn_ra_svn/streams.c:149:
> Svn::Error::RaSvnConnectionClosed: ">
> ---Backtrace---
> /home/hwright/dev/svn-trunk/subversion/bindings/swig/ruby/svn/util.rb:
> 86:in `svn_client_cat2'
> /home/hwright/dev/svn-trunk/subversion/bindings/swig/ruby/svn/util.rb:
> 86:in `cat2'
> /home/hwright/dev/svn-trunk/subversion/bindings/swig/ruby/svn/
> client.rb:419:in `cat'
> /home/hwright/dev/svn-trunk/subversion/bindings/swig/ruby/test/
> test_client.rb:1989:in `test_authentication'
> /home/hwright/dev/svn-trunk/subversion/bindings/swig/ruby/test/
> test_client.rb:1988:in `test_authentication'
> /home/hwright/dev/svn-trunk/subversion/bindings/swig/ruby/svn/
> client.rb:105:in `initialize'
> /home/hwright/dev/svn-trunk/subversion/bindings/swig/ruby/test/
> test_client.rb:1987:in `new'
> /home/hwright/dev/svn-trunk/subversion/bindings/swig/ruby/test/
> test_client.rb:1987:in `test_authentication'
> ---------------
>
> 219 tests, 1489 assertions, 1 failures, 0 errors
> make: *** [check-swig-rb] Error 1
> hwright_at_orac:~/dev/svn-trunk$
Hmm, as of r35858, I can't reproduce this locally, and neither can the
buildbot, apparently. Sorry for the noise.
-Hyrum
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1152414
Received on 2009-02-13 19:33:31 CET