summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tool/lib/core_assertions.rb8
-rw-r--r--version.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/tool/lib/core_assertions.rb b/tool/lib/core_assertions.rb
index 1fdc0a34b8..9842fac8f7 100644
--- a/tool/lib/core_assertions.rb
+++ b/tool/lib/core_assertions.rb
@@ -755,14 +755,14 @@ eom
end
times.compact!
tmin, tmax = times.minmax
- tmax *= tmax / tmin
- tmax = 10**Math.log10(tmax).ceil
+ tbase = 10 ** Math.log10(tmax * ([(tmax / tmin), 2].max ** 2)).ceil
+ info = "(tmin: #{tmin}, tmax: #{tmax}, tbase: #{tbase})"
seq.each do |i|
next if i == first
- t = tmax * i.fdiv(first)
+ t = tbase * i.fdiv(first)
*arg = pre.call(i)
- message = "[#{i}]: in #{t}s"
+ message = "[#{i}]: in #{t}s #{info}"
Timeout.timeout(t, Timeout::Error, message) do
st = Process.clock_gettime(Process::CLOCK_MONOTONIC)
yield(*arg)
diff --git a/version.h b/version.h
index e4c550e381..f18a743990 100644
--- a/version.h
+++ b/version.h
@@ -11,7 +11,7 @@
# define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
#define RUBY_VERSION_TEENY 5
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 214
+#define RUBY_PATCHLEVEL 215
#include "ruby/version.h"
#include "ruby/internal/abi.h"