ruby-changes:70639
From: Hiroshi <ko1@a...>
Date: Tue, 28 Dec 2021 21:13:54 +0900 (JST)
Subject: [ruby-changes:70639] 763592d208 (master): Use omit instead of skip: test/-ext-/**/*.rb
https://git.ruby-lang.org/ruby.git/commit/?id=763592d208 From 763592d208883714f3d255eb5fb1bee649e9613b Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA <hsbt@r...> Date: Tue, 28 Dec 2021 21:13:39 +0900 Subject: Use omit instead of skip: test/-ext-/**/*.rb --- test/-ext-/bug_reporter/test_bug_reporter.rb | 2 +- test/-ext-/float/test_nextafter.rb | 2 +- test/-ext-/gvl/test_ubf_async_safe.rb | 2 +- test/-ext-/iseq_load/test_iseq_load.rb | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/-ext-/bug_reporter/test_bug_reporter.rb b/test/-ext-/bug_reporter/test_bug_reporter.rb index 569172d42cb..fc3bea207c1 100644 --- a/test/-ext-/bug_reporter/test_bug_reporter.rb +++ b/test/-ext-/bug_reporter/test_bug_reporter.rb @@ -4,7 +4,7 @@ require 'tmpdir' https://github.com/ruby/ruby/blob/trunk/test/-ext-/bug_reporter/test_bug_reporter.rb#L4 class TestBugReporter < Test::Unit::TestCase def test_bug_reporter_add - skip if ENV['RUBY_ON_BUG'] + omit if ENV['RUBY_ON_BUG'] description = RUBY_DESCRIPTION description = description.sub(/\+MJIT /, '') if defined?(RubyVM::MJIT) && RubyVM::MJIT.enabled? diff --git a/test/-ext-/float/test_nextafter.rb b/test/-ext-/float/test_nextafter.rb index e0a76935b16..ea8d7c7fc70 100644 --- a/test/-ext-/float/test_nextafter.rb +++ b/test/-ext-/float/test_nextafter.rb @@ -52,7 +52,7 @@ class TestFloatExt < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/-ext-/float/test_nextafter.rb#L52 "#{'%a' % v2} = Bug::Float.system_nextafter(#{'%a' % n1}, #{'%a' % n2})") rescue Test::Unit::AssertionFailedError if /aix/ =~ RUBY_PLATFORM - skip "Known bug in nextafter(3) on AIX" + omit "Known bug in nextafter(3) on AIX" end raise $! end diff --git a/test/-ext-/gvl/test_ubf_async_safe.rb b/test/-ext-/gvl/test_ubf_async_safe.rb index fdaa4d418b8..3261b424759 100644 --- a/test/-ext-/gvl/test_ubf_async_safe.rb +++ b/test/-ext-/gvl/test_ubf_async_safe.rb @@ -1,7 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/test/-ext-/gvl/test_ubf_async_safe.rb#L1 # frozen_string_literal: true class TestUbfAsyncSafe < Test::Unit::TestCase def test_ubf_async_safe - skip 'need fork for single-threaded test' unless Process.respond_to?(:fork) + omit 'need fork for single-threaded test' unless Process.respond_to?(:fork) IO.pipe do |r, w| pid = fork do require '-test-/gvl/call_without_gvl' diff --git a/test/-ext-/iseq_load/test_iseq_load.rb b/test/-ext-/iseq_load/test_iseq_load.rb index ffa6541c727..6e5bc8e811b 100644 --- a/test/-ext-/iseq_load/test_iseq_load.rb +++ b/test/-ext-/iseq_load/test_iseq_load.rb @@ -98,7 +98,7 @@ class TestIseqLoad < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/-ext-/iseq_load/test_iseq_load.rb#L98 iseq = ISeq.iseq_load(a) iseq.eval assert_equal false, @next_broke - skip "failing due to stack_max mismatch" + omit "failing due to stack_max mismatch" assert_iseq_roundtrip(src) end @@ -121,7 +121,7 @@ class TestIseqLoad < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/-ext-/iseq_load/test_iseq_load.rb#L121 iseq = ISeq.iseq_load(a) iseq.eval assert_equal false, test_break_ensure_def_method - skip "failing due to exception entry sp mismatch" + omit "failing due to exception entry sp mismatch" assert_iseq_roundtrip(src) end @@ -137,7 +137,7 @@ class TestIseqLoad < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/-ext-/iseq_load/test_iseq_load.rb#L137 # FIXME: still failing def test_require_integration - skip "iseq loader require integration tests still failing" + omit "iseq loader require integration tests still failing" f = File.expand_path(__FILE__) # $(top_srcdir)/test/ruby/test_....rb 3.times { f = File.dirname(f) } -- cgit v1.2.1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/