svn commit: r1038621 - /subversion/trunk/tools/dev/unix-build/Makefile.svn

[st...@apache.org]

Author: stsp
Date: Wed Nov 24 14:26:45 2010
New Revision: 1038621

URL: http://svn.apache.org/viewvc?rev=1038621&view=rev
Log:
* tools/dev/unix-build/Makefile.svn
  (svn-check-swig-rb): Set up PATH so that the correct svnserve can be found
   and started during ruby bindings tests. Fixes local failures in the ruby
   bindings tests with everything but svn-trunk. Apparently the svnserve
   binary in the PATH was loaded with mismatching Subversion libraries found
   in the LD_LIBRARY_PATH, causing failures all over the place.

Modified:
    subversion/trunk/tools/dev/unix-build/Makefile.svn

Modified: subversion/trunk/tools/dev/unix-build/Makefile.svn
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dev/unix-build/Makefile.svn?rev=1038621&r1=1038620&r2=1038621&view=diff
==============================================================================
--- subversion/trunk/tools/dev/unix-build/Makefile.svn (original)
+++ subversion/trunk/tools/dev/unix-build/Makefile.svn Wed Nov 24 14:26:45 2010
@@ -1069,10 +1069,13 @@ svn-check-swig-py:
 	touch $@
 
 svn-check-swig-rb:
+	# We add the svn prefix to PATH here because the ruby tests
+	# attempt to start an svnserve binary found in PATH.
 	-if [ $(ENABLE_RUBY_BINDINGS) = yes ]; then \
 		cd $(svn_builddir)/subversion/bindings/swig/ruby/test && \
 			env RUBYLIB=$(RUBYLIB) \
 			LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) \
+			PATH=$(SVN_PREFIX)/bin:$$PATH \
 			ruby run-test.rb --verbose=normal; \
 	fi
 	touch $@