* Merge YARV

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@11439 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 15 insertions, 0 deletions

diff --git a/test/ripper/test_files.rb b/test/ripper/test_files.rb
index b30ab53fa..e5ccaf4b0 100644
--- a/test/ripper/test_files.rb
+++ b/test/ripper/test_files.rb
@@ -1,3 +1,5 @@
+begin
+
 require 'ripper'
 require 'find'
 require 'test/unit'
@@ -17,3 +19,7 @@ class TestRipper_Generic < Test::Unit::TestCase
     }
   end
 end
+
+rescue LoadError
+end
+  
\ No newline at end of file
diff --git a/test/ripper/test_parser_events.rb b/test/ripper/test_parser_events.rb
index ba24996f4..a5d6a62f6 100644
--- a/test/ripper/test_parser_events.rb
+++ b/test/ripper/test_parser_events.rb
@@ -1,3 +1,5 @@
+begin
+
 require 'dummyparser'
 require 'test/unit'
 
@@ -491,3 +493,6 @@ class TestRipper_ParserEvents < Test::Unit::TestCase
 =end
 
 end
+
+rescue LoadError
+end
\ No newline at end of file
diff --git a/test/ripper/test_scanner_events.rb b/test/ripper/test_scanner_events.rb
index 5847a61b6..644f9edb2 100644
--- a/test/ripper/test_scanner_events.rb
+++ b/test/ripper/test_scanner_events.rb
@@ -1,6 +1,7 @@
 #
 # test_scanner_events.rb
 #
+begin
 
 require 'ripper'
 require 'test/unit'
@@ -801,3 +802,6 @@ class TestRipper_ScannerEvents < Test::Unit::TestCase
   end
 
 end
+
+rescue LoadError
+end