headius	2016-03-09 03:38:28 +0900 (Wed, 09 Mar 2016)

  New Revision: 54037

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=54037

  Log:
    * test/ruby/test_require.rb (test_require_with_loaded_features_pop):
      Only remove PATH so threads don't accidentally double-pop.

  Modified files:
    trunk/ChangeLog
    trunk/test/ruby/test_require.rb
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 54036)
+++ ChangeLog	(revision 54037)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Wed Mar  9 03:35:22 2016  Charles Oliver Nutter  <headius@h...>
+
+	* test/ruby/test_require.rb (test_require_with_loaded_features_pop):
+	  Only remove PATH so threads don't accidentally double-pop.
+
 Wed Mar  9 00:29:46 2016  Nobuyoshi Nakada  <nobu@r...>
 
 	* vm_method.c (rb_alias): the original name should be properly
Index: test/ruby/test_require.rb
===================================================================
--- test/ruby/test_require.rb	(revision 54036)
+++ test/ruby/test_require.rb	(revision 54037)
@@ -686,7 +686,7 @@ class TestRequire < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/ruby/test_require.rb#L686
           Thread.new do
             ITERATIONS_PER_THREAD.times do
               require PATH
-              $".pop
+              $".delete_if {|p| Regexp.new(PATH) =~ p}
             end
           end
         }.each(&:join)

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