diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-11-19 01:14:32 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-11-19 01:14:32 +0000 |
| commit | 74eb4cab63025f098902a7a1419830d301801f50 (patch) | |
| tree | 86cdaf64328cf4534b980d7edf1120b1fde0588e /test | |
| parent | f79eaf199cc5c5ff1cc5c7774cab13af2a05a18e (diff) | |
merge revision(s) 51445: [Backport #11404] [Backport #11481]
envutil.rb: -w for assert_separately
* test/lib/envutil.rb (assert_separately): always add -w option
for warnings.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@52661 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
| -rw-r--r-- | test/lib/envutil.rb | 2 | ||||
| -rw-r--r-- | test/ruby/test_require.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test/lib/envutil.rb b/test/lib/envutil.rb index 1193a1a525..4a48ee6ae6 100644 --- a/test/lib/envutil.rb +++ b/test/lib/envutil.rb @@ -372,7 +372,7 @@ module Test end eom args = args.dup - args.insert((Hash === args.first ? 1 : 0), "--disable=gems", *$:.map {|l| "-I#{l}"}) + args.insert((Hash === args.first ? 1 : 0), "-w", "--disable=gems", *$:.map {|l| "-I#{l}"}) stdout, stderr, status = EnvUtil.invoke_ruby(args, src, true, true, **opt) abort = status.coredump? || (status.signaled? && ABORT_SIGNALS.include?(status.termsig)) assert(!abort, FailDesc[status, nil, stderr]) diff --git a/test/ruby/test_require.rb b/test/ruby/test_require.rb index 1b87246e4e..dcc8ece79d 100644 --- a/test/ruby/test_require.rb +++ b/test/ruby/test_require.rb @@ -721,7 +721,7 @@ class TestRequire < Test::Unit::TestCase assert_throw(:blah) do x = Thread.current - y = Thread.start { + Thread.start { sleep 0.00001 x.raise Error.new } |