* gc.c (rb_gc_set_params): allow GC parameter configuration by

  environment variables.  based on a patch from funny-falcon at
  https://gist.github.com/856296, but honors safe level.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31044 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 0 insertions, 39 deletions

diff --git a/test/rubygems/test_gem_dependency.rb b/test/rubygems/test_gem_dependency.rb
index b4a21b896c..51b746f555 100644
--- a/test/rubygems/test_gem_dependency.rb
+++ b/test/rubygems/test_gem_dependency.rb
@@ -106,45 +106,6 @@ class TestGemDependency < Gem::TestCase
     refute_equal dep("pkg", :development), dep("pkg", :runtime), "type"
   end
 
-  def test_merge
-    a1 = dep 'a', '~> 1.0'
-    a2 = dep 'a', '= 1.0'
-
-    a3 = a1.merge a2
-
-    assert_equal dep('a', '~> 1.0', '= 1.0'), a3
-  end
-
-  def test_merge_default
-    a1 = dep 'a'
-    a2 = dep 'a', '1'
-
-    a3 = a1.merge a2
-
-    assert_equal dep('a', '1'), a3
-  end
-
-  def test_merge_name_mismatch
-    a = dep 'a'
-    b = dep 'b'
-
-    e = assert_raises ArgumentError do
-      a.merge b
-    end
-
-    assert_equal 'a (>= 0) and b (>= 0) have different names',
-                 e.message
-  end
-
-  def test_merge_other_default
-    a1 = dep 'a', '1'
-    a2 = dep 'a'
-
-    a3 = a1.merge a2
-
-    assert_equal dep('a', '1'), a3
-  end
-
   def test_prerelease_eh
     d = dep "pkg", "= 1"