summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-10-28 08:21:50 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-10-28 08:21:50 +0000
commit79e0794c920bb2f4beab8b2dec1c79ac76071e0e (patch)
tree9e7d9b1b32ac0d8d2d8a6ed926aefdbeb974980f /test
parentafbed46bb19341526bcd1f24ded1c413b445b778 (diff)
downloadruby-79e0794c920bb2f4beab8b2dec1c79ac76071e0e.tar.gz
ruby-79e0794c920bb2f4beab8b2dec1c79ac76071e0e.tar.xz
ruby-79e0794c920bb2f4beab8b2dec1c79ac76071e0e.zip
merged r19975 and r19978 from ruby_1_9_1 into trunk.
* gem_prelude.rb: considers --program-suffix and prefix configure options. * lib/rubygems/defaults.rb: ditto. * test/rubygems/test_gem.rb (@default_dir_re): ditto. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@19988 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r--test/rubygems/test_gem.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb
index 16260f772..242d0cee6 100644
--- a/test/rubygems/test_gem.rb
+++ b/test/rubygems/test_gem.rb
@@ -11,7 +11,7 @@ class TestGem < RubyGemTestCase
super
@additional = %w[a b].map { |d| File.join @tempdir, d }
- @default_dir_re = %r|/[Rr]uby/[Gg]ems/[0-9.]+|
+ @default_dir_re = %r|/\.*?[Rr]uby.*?/[Gg]ems/[0-9.]+|
end
def test_self_all_load_paths