Merge remote-tracking branch 'origin/hasse/stdlib/fix_benchmark'

* origin/hasse/stdlib/fix_benchmark:
  stdlib: Make benchmarks more robust

1 files changed, 10 insertions, 6 deletions

diff --git a/lib/stdlib/test/stdlib_bench_SUITE.erl b/lib/stdlib/test/stdlib_bench_SUITE.erl
index 294898a932..2364e8376f 100644
--- a/lib/stdlib/test/stdlib_bench_SUITE.erl
+++ b/lib/stdlib/test/stdlib_bench_SUITE.erl
@@ -348,12 +348,16 @@ do_tests(Test, ParamSet, Config) ->
     {Parallelism, Message} = bench_params(ParamSet),
     Fun = create_clients(Message, ServerMod, Client, Parallelism),
     {TotalLoops, AllPidTime} = run_test(Fun),
-    PerSecond = ?CALLS_PER_LOOP * round((1000 * TotalLoops) / AllPidTime),
-    ct_event:notify(
-      #event{
-         name = benchmark_data,
-         data = [{suite,BenchmarkSuite},{value,PerSecond}]}),
-    PerSecond.
+    try ?CALLS_PER_LOOP * round((1000 * TotalLoops) / AllPidTime) of
+        PerSecond ->
+            ct_event:notify(
+              #event{
+                 name = benchmark_data,
+                 data = [{suite,BenchmarkSuite},{value,PerSecond}]}),
+            PerSecond
+    catch error:badarith ->
+            "Time measurement is not working"
+    end.
 
 -define(COUNTER, n).