diff options
author | headius <headius@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-03-08 18:38:28 +0000 |
---|---|---|
committer | headius <headius@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-03-08 18:38:28 +0000 |
commit | af1db3f1b337fecb2f59bf6ddcb529b537fd5af3 (patch) | |
tree | c0c5094a7beb86efde656d5ab17ce731e19334c6 | |
parent | 5541561f6a0fc102854abce3554121fb243cdd8d (diff) | |
download | ruby-af1db3f1b337fecb2f59bf6ddcb529b537fd5af3.tar.gz |
* test/ruby/test_require.rb (test_require_with_loaded_features_pop):
Only remove PATH so threads don't accidentally double-pop.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54037 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | test/ruby/test_require.rb | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Wed Mar 9 03:35:22 2016 Charles Oliver Nutter <headius@headius.com> + + * 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@ruby-lang.org> * vm_method.c (rb_alias): the original name should be properly diff --git a/test/ruby/test_require.rb b/test/ruby/test_require.rb index a7db8b93e0..818db4b6d3 100644 --- a/test/ruby/test_require.rb +++ b/test/ruby/test_require.rb @@ -686,7 +686,7 @@ class TestRequire < Test::Unit::TestCase Thread.new do ITERATIONS_PER_THREAD.times do require PATH - $".pop + $".delete_if {|p| Regexp.new(PATH) =~ p} end end }.each(&:join) |