drbrain	2007-12-25 08:28:35 +0900 (Tue, 25 Dec 2007)

  New Revision: 14638

  Modified files:
    trunk/ChangeLog
    trunk/lib/rubygems.rb
    trunk/test/rubygems/test_gem.rb

  Log:
    Fix some test failures in RubyGems.

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/test/rubygems/test_gem.rb?r1=14638&r2=14637
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=14638&r2=14637
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/lib/rubygems.rb?r1=14638&r2=14637

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 14637)
+++ ChangeLog	(revision 14638)
@@ -1,3 +1,9 @@
+Tue Dec 25 08:27:43 2007  Eric Hodel  <drbrain@s...>
+
+	* lib/rubygems.rb:  Fix test failures.
+
+	* test/rubygems/test_gem.rb:  Fix test failure.
+
 Tue Dec 25 06:23:40 2007  Koichi Sasada  <ko1@a...>
 
 	* bootstraptest/test_knownbug.rb, test_literal.rb: move fixed test.
Index: lib/rubygems.rb
===================================================================
--- lib/rubygems.rb	(revision 14637)
+++ lib/rubygems.rb	(revision 14638)
@@ -345,9 +345,15 @@
       end
 
       sitelibdir = ConfigMap[:sitelibdir]
+      sitelibdir_index = $LOAD_PATH.index sitelibdir
 
-      # gem directories must come after -I and ENV['RUBYLIB']
-      $:.insert($:.index(sitelibdir), *require_paths)
+      if sitelibdir_index then
+        # gem directories must come after -I and ENV['RUBYLIB']
+        $LOAD_PATH.insert(sitelibdir_index, *require_paths)
+      else
+        # we are probably testing in core, -I and RUBYLIB don't apply
+        $LOAD_PATH.unshift(*require_paths)
+      end
 
       # Now autorequire
       if autorequire && spec.autorequire then # DEPRECATED
Index: test/rubygems/test_gem.rb
===================================================================
--- test/rubygems/test_gem.rb	(revision 14637)
+++ test/rubygems/test_gem.rb	(revision 14638)
@@ -280,7 +280,9 @@
 
   def test_self_prefix
     file_name = File.expand_path __FILE__
-    assert_equal File.dirname(File.dirname(file_name)), Gem.prefix
+    expected = File.dirname File.dirname(file_name)
+    expected = File.dirname expected if expected =~ %r|/test| # for Ruby trunk
+    assert_equal expected, Gem.prefix
   end
 
   def test_self_required_location

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml