summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Kokubun <takashikkbn@gmail.com>2023-03-16 09:22:42 -0700
committerTakashi Kokubun <takashikkbn@gmail.com>2023-03-16 09:22:42 -0700
commita8e7fee80129b0ba360c2671582117c8e18a6464 (patch)
treebc95c4dbeb9b481f0b8e110a4e2407f2aa04fa3b
parent2f81bb793fd217374054ee78cb5cd595cfacf9fe (diff)
downloadruby-a8e7fee80129b0ba360c2671582117c8e18a6464.tar.gz
Revert "core_assertions.rb: Refine `assert_linear_performance`"
This reverts commit cae4342dd559e34c1ce6219593f77f0ad80286da. This is failing a lot of CIs and nobody is actively looking into fixing it. Let me revert this until we have a solution to it.
-rw-r--r--test/ruby/test_regexp.rb2
-rw-r--r--tool/lib/core_assertions.rb27
2 files changed, 12 insertions, 17 deletions
diff --git a/test/ruby/test_regexp.rb b/test/ruby/test_regexp.rb
index 81dac20648..a2997af106 100644
--- a/test/ruby/test_regexp.rb
+++ b/test/ruby/test_regexp.rb
@@ -1783,7 +1783,7 @@ class TestRegexp < Test::Unit::TestCase
def test_linear_performance
pre = ->(n) {[Regexp.new("a?" * n + "a" * n), "a" * n]}
- assert_linear_performance([10, 29], pre: pre) do |re, s|
+ assert_linear_performance(factor: 29, first: 10, max: 1, pre: pre) do |re, s|
re =~ s
end
end
diff --git a/tool/lib/core_assertions.rb b/tool/lib/core_assertions.rb
index c195c91482..119deccb9f 100644
--- a/tool/lib/core_assertions.rb
+++ b/tool/lib/core_assertions.rb
@@ -738,28 +738,23 @@ eom
end
alias all_assertions_foreach assert_all_assertions_foreach
- # Expect +seq+ to respond to +first+ and +each+ methods, e.g.,
- # Array, Range, Enumerator::ArithmeticSequence and other
- # Enumerable-s, and each elements should be size factors.
- #
- # :yield: each elements of +seq+.
- def assert_linear_performance(seq, rehearsal: nil, pre: ->(n) {n})
- first = seq.first
- *arg = pre.call(first)
- tmax = (0..(rehearsal || first)).map do
+ def assert_linear_performance(factor: 10_000, first: factor, max: 2, rehearsal: first, pre: ->(n) {n})
+ n = first
+ arg = pre.call(n)
+ tmax = (0..rehearsal).map do
st = Process.clock_gettime(Process::CLOCK_MONOTONIC)
- yield(*arg)
+ yield arg
(Process.clock_gettime(Process::CLOCK_MONOTONIC) - st)
end.max
- seq.each do |i|
- next if i == first
- t = tmax * i / first
- *arg = pre.call(i)
- message = "[#{i}]: in #{t}s"
+ (first >= factor ? 2 : 1).upto(max) do |i|
+ n = i * factor
+ t = tmax * factor
+ arg = pre.call(n)
+ message = "[#{i}]: #{n} in #{t}s"
Timeout.timeout(t, nil, message) do
st = Process.clock_gettime(Process::CLOCK_MONOTONIC)
- yield(*arg)
+ yield arg
assert_operator (Process.clock_gettime(Process::CLOCK_MONOTONIC) - st), :<=, t, message
end
end