Author: stsp
Date: Mon Jun 27 19:31:31 2011
New Revision: 1140289
URL: http://svn.apache.org/viewvc?rev=1140289&view=rev
Log:
Some steps towards allowing the Ruby bindings tests to run with Ruby 1.9.
While make check-swig-rb does not error out, it does not generate
any output for some reason. I'll leave it to someone more compentent
with Ruby to fix this...
* subversion/bindings/swig/ruby/test/test_core.rb: Needs 'coding: utf-8'
marker to avoid a parsing error because of an embedded UTF-8 string.
* subversion/bindings/swig/ruby/test/test_delta.rb,
subversion/bindings/swig/ruby/test/test_fs.rb: Include 'digest/md5' instead
of just 'md5'. Now this code works with either Ruby version.
* subversion/bindings/swig/ruby/test/run-test.rb: Some Test::Unit APIs we
use are part of a separate gem in Ruby 1.9. So try to load the gem but
tolerate failure.
Modified:
subversion/trunk/subversion/bindings/swig/ruby/test/run-test.rb
subversion/trunk/subversion/bindings/swig/ruby/test/test_core.rb
subversion/trunk/subversion/bindings/swig/ruby/test/test_delta.rb
subversion/trunk/subversion/bindings/swig/ruby/test/test_fs.rb
Modified: subversion/trunk/subversion/bindings/swig/ruby/test/run-test.rb
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/ruby/test/run-test.rb?rev=1140289&r1=1140288&r2=1140289&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/swig/ruby/test/run-test.rb (original)
+++ subversion/trunk/subversion/bindings/swig/ruby/test/run-test.rb Mon Jun 27
19:31:31 2011
@@ -19,6 +19,13 @@
# under the License.
# ====================================================================
+# Test::Unit became a separate gem in Ruby-1.9, so we might need to load it
+begin
+ require "rubygems"
+ gem "test-unit"
+rescue NoMethodError
+end
+
require "test/unit"
require "fileutils"
Modified: subversion/trunk/subversion/bindings/swig/ruby/test/test_core.rb
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/ruby/test/test_core.rb?rev=1140289&r1=1140288&r2=1140289&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/swig/ruby/test/test_core.rb (original)
+++ subversion/trunk/subversion/bindings/swig/ruby/test/test_core.rb Mon Jun 27
19:31:31 2011
@@ -1,3 +1,4 @@
+# coding: utf-8
# ====================================================================
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
Modified: subversion/trunk/subversion/bindings/swig/ruby/test/test_delta.rb
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/ruby/test/test_delta.rb?rev=1140289&r1=1140288&r2=1140289&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/swig/ruby/test/test_delta.rb (original)
+++ subversion/trunk/subversion/bindings/swig/ruby/test/test_delta.rb Mon Jun
27 19:31:31 2011
@@ -19,7 +19,7 @@
require "util"
require "stringio"
-require 'md5'
+require "digest/md5"
require 'tempfile'
require "svn/info"
Modified: subversion/trunk/subversion/bindings/swig/ruby/test/test_fs.rb
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/ruby/test/test_fs.rb?rev=1140289&r1=1140288&r2=1140289&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/swig/ruby/test/test_fs.rb (original)
+++ subversion/trunk/subversion/bindings/swig/ruby/test/test_fs.rb Mon Jun 27
19:31:31 2011
@@ -20,7 +20,7 @@
require "my-assertions"
require "util"
require "time"
-require "md5"
+require "digest/md5"
require "svn/core"
require "svn/fs"
