[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

[patch] Make Ruby Windows bindings tests sqlite3 aware.

From: Joe Swatosh <joe.swatosh_at_gmail.com>
Date: 2007-03-23 19:58:29 CET

[[
Ruby windows bindings depend on sqlite3 and make sure the path doesn't get any
\n's.

* subversion/bindings/swig/ruby/test/windows_util.rb
 (SvnTestUtil::Windows::Svnserve#setup_svnserve): Add sqlite3.dll to the
 targets needed to start svnserve.
 (SvnTestUtil::Windows::SetupEnvironment#add_apr_dll_path_to_dll_wrapper_util):
 chomp the lines from gen-make.opt so no \n's make it onto the path
]]

Index: subversion/bindings/swig/ruby/test/windows_util.rb
===================================================================
--- subversion/bindings/swig/ruby/test/windows_util.rb (revision 24047)
+++ subversion/bindings/swig/ruby/test/windows_util.rb (working copy)
@@ -50,7 +50,7 @@
           end
           targets = %w(svnserve.exe libsvn_subr-1.dll libsvn_repos-1.dll
                        libsvn_fs-1.dll libsvn_delta-1.dll
- libaprutil.dll libapr.dll)
+ libaprutil.dll libapr.dll sqlite3.dll)
           ENV["PATH"].split(";").each do |path|
             found_targets = []
             targets.each do |target|
@@ -160,7 +160,7 @@
         lines = File.read(gen_make_opts).to_a if File.exists?(gen_make_opts)
         config = {}
         lines.each do |line|
- name, value = line.split(/\s*=\s*/, 2)
+ name, value = line.chomp.split(/\s*=\s*/, 2)
           config[name] = value if value
         end

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Mar 23 19:58:43 2007

This is an archived mail posted to the Subversion Dev mailing list.