From 0755c1c8f2aaf83315353f9e99bd13b2d4ff618b Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 14 Feb 2011 01:34:54 +0000
Subject: * lib/test/unit.rb: revert r30863, because it causes too many noise.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30866 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog        |  4 ++++
 lib/test/unit.rb | 16 ++--------------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index dbc06ae4cf..de1c2c29d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Feb 14 10:33:45 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/test/unit.rb: revert r30863, because it causes too many noise.
+
 Mon Feb 14 07:34:55 2011  Tanaka Akira  <akr@fsij.org>
 
 	* ext/curses/curses.c: parenthesize macro arguments.
diff --git a/lib/test/unit.rb b/lib/test/unit.rb
index c9637b97e7..fd50d8100d 100644
--- a/lib/test/unit.rb
+++ b/lib/test/unit.rb
@@ -166,9 +166,6 @@ module Test
     end
 
     module RequireFiles
-      path = File.expand_path('../../rubygems/custom_require.rb', __FILE__)
-      CUSTOM_REQUIRE = /\A#{Regexp.quote(path)}:\d+:in `require'\z/ #'
-
       def non_options(files, options)
         return false if !super
         result = false
@@ -180,17 +177,8 @@ module Test
           begin
             require path
             result = true
-          rescue LoadError => e
-            Class.new(Test::Unit::TestCase) do
-              message = e.message
-              / -- (?<failed>.*)/ =~ message
-              define_singleton_method(:to_s) {failed}
-              backtrace = e.backtrace
-              backtrace.shift while CUSTOM_REQUIRE =~ backtrace.first
-              /(?<file>.*):(?<line>\d+):in\s`/ =~ backtrace.first
-              line = line.to_i
-              define_method(:test_require_failed) {eval "skip(message)", nil, file, line}
-            end
+          rescue LoadError
+            puts "#{f}: #{$!}"
           end
         }
         result
-- 
cgit v1.2.3