ryan	2013-05-10 09:55:03 +0900 (Fri, 10 May 2013)

  New Revision: 40628

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=40628

  Log:
    Fixed minitest dependency bug by removing env PARALLEL checks (no clue why that was there). Exactly the same minitest code tho.

  Modified files:
    trunk/test/minitest/test_minitest_mock.rb
    trunk/test/minitest/test_minitest_spec.rb
    trunk/test/minitest/test_minitest_unit.rb

Index: test/minitest/test_minitest_mock.rb
===================================================================
--- test/minitest/test_minitest_mock.rb	(revision 40627)
+++ test/minitest/test_minitest_mock.rb	(revision 40628)
@@ -8,7 +8,7 @@ https://github.com/ruby/ruby/blob/trunk/test/minitest/test_minitest_mock.rb#L8
 require 'minitest/autorun'
 
 class TestMiniTestMock < MiniTest::Unit::TestCase
-  parallelize_me! if ENV["PARALLEL"]
+  parallelize_me!
 
   def setup
     @mock = MiniTest::Mock.new.expect(:foo, nil)
@@ -278,7 +278,7 @@ end https://github.com/ruby/ruby/blob/trunk/test/minitest/test_minitest_mock.rb#L278
 require "minitest/metametameta"
 
 class TestMiniTestStub < MiniTest::Unit::TestCase
-  parallelize_me! if ENV["PARALLEL"]
+  parallelize_me!
 
   def setup
     super
Index: test/minitest/test_minitest_spec.rb
===================================================================
--- test/minitest/test_minitest_spec.rb	(revision 40627)
+++ test/minitest/test_minitest_spec.rb	(revision 40628)
@@ -598,7 +598,7 @@ class TestMetaStatic < MiniTest::Unit::T https://github.com/ruby/ruby/blob/trunk/test/minitest/test_minitest_spec.rb#L598
 end
 
 class TestMeta < MiniTest::Unit::TestCase
-  parallelize_me! if ENV["PARALLEL"]
+  parallelize_me!
 
   def util_structure
     x = y = z = nil
Index: test/minitest/test_minitest_unit.rb
===================================================================
--- test/minitest/test_minitest_unit.rb	(revision 40627)
+++ test/minitest/test_minitest_unit.rb	(revision 40628)
@@ -6,15 +6,14 @@ https://github.com/ruby/ruby/blob/trunk/test/minitest/test_minitest_unit.rb#L6
 ######################################################################
 
 require 'pathname'
-require_relative 'metametameta'
-require 'minitest/parallel_each'
+require 'minitest/metametameta'
 
 module MyModule; end
 class AnError < StandardError; include MyModule; end
 class ImmutableString < String; def inspect; super.freeze; end; end
 
 class TestMiniTestUnit < MetaMetaMetaTestCase
-  parallelize_me! if ENV["PARALLEL"]
+  parallelize_me!
 
   pwd = Pathname.new File.expand_path Dir.pwd
   basedir = Pathname.new(File.expand_path "lib/minitest") + 'mini'
@@ -1762,7 +1761,7 @@ class TestMiniTestUnitTestCase < MiniTes https://github.com/ruby/ruby/blob/trunk/test/minitest/test_minitest_unit.rb#L1761
 end
 
 class TestMiniTestGuard < MiniTest::Unit::TestCase
-  parallelize_me! if ENV["PARALLEL"]
+  parallelize_me!
 
   def test_mri_eh
     assert self.class.mri? "ruby blah"

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