This change breaks the Ruby test suite with out of tree builds:
[[[
[breser@kong svn-trunk]$ make check-swig-rb
if [ "DYLD_LIBRARY_PATH" = "DYLD_LIBRARY_PATH" ]; then for d in
/Users/breser/wandisco/builds/svn-trunk/subversion/bindings/swig/python/libsvn_swig_rb
/Users/breser/wandisco/builds/svn-trunk/subversion/bindings/swig/python/../../../libsvn_*;
do if [ -n "$DYLD_LIBRARY_PATH" ]; then
DYLD_LIBRARY_PATH="$DYLD_LIBRARY_PATH:$d/.libs"; else
DYLD_LIBRARY_PATH="$d/.libs"; fi; done; export DYLD_LIBRARY_PATH; fi;
\
cd /Users/breser/wandisco/builds/svn-trunk/subversion/bindings/swig/ruby; \
if [ "1" -eq 1 -a "8" -lt 9 ] ; then \
/usr/bin/ruby -I
/Users/breser/wandisco/share-local/wcs/svn-trunk/subversion/bindings/swig/ruby
\
/Users/breser/wandisco/share-local/wcs/svn-trunk/subversion/bindings/swig/ruby/test/run-test.rb
\
--verbose=normal; \
else \
/usr/bin/ruby -I
/Users/breser/wandisco/share-local/wcs/svn-trunk/subversion/bindings/swig/ruby
\
/Users/breser/wandisco/share-local/wcs/svn-trunk/subversion/bindings/swig/ruby/test/run-test.rb;
\
fi
/Users/breser/wandisco/share-local/wcs/svn-trunk/subversion/bindings/swig/ruby/test/util.rb:22:in
`require': no such file to load -- ./svn/util (LoadError)
from
/Users/breser/wandisco/share-local/wcs/svn-trunk/subversion/bindings/swig/ruby/test/util.rb:22
from
/Users/breser/wandisco/share-local/wcs/svn-trunk/subversion/bindings/swig/ruby/test/run-test.rb:37:in
`require'
from
/Users/breser/wandisco/share-local/wcs/svn-trunk/subversion/bindings/swig/ruby/test/run-test.rb:37
make: *** [check-swig-rb] Error 1
]]]
This happens because as you can see above we're cd'ing into the build
tree before running the test and the svn/util.rb file is only in the
source tree.
I really don't understand why this change is necessary at all since as
you can see above the source tree is added to the load path with -I.
On Wed, May 8, 2013 at 8:07 PM, <pbu...@apache.org> wrote:
> Author: pburba
> Date: Wed May 8 19:07:44 2013
> New Revision: 1480412
>
> URL: http://svn.apache.org/r1480412
> Log:
> Ruby 1.9 compatibility fix.
>
> * subversion/bindings/swig/ruby/test/util.rb
> (util.rb): Explicitly state that the cwd should be searched
> when requiring "svn/util". Ruby 1.9 no longer includes the cwd in the
> load path.
>
> Modified:
> subversion/trunk/subversion/bindings/swig/ruby/test/util.rb
>
> Modified: subversion/trunk/subversion/bindings/swig/ruby/test/util.rb
> URL:
> http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/ruby/test/util.rb?rev=1480412&r1=1480411&r2=1480412&view=diff
> ==============================================================================
> --- subversion/trunk/subversion/bindings/swig/ruby/test/util.rb (original)
> +++ subversion/trunk/subversion/bindings/swig/ruby/test/util.rb Wed May 8
> 19:07:44 2013
> @@ -19,7 +19,7 @@
>
> require "fileutils"
> require "pathname"
> -require "svn/util"
> +require "./svn/util"
> require "tmpdir"
>
> require "my-assertions"
>
