Merge branch 'rickard/test-cuddle' into maint

* rickard/test-cuddle:
  Fix dirty_nif_SUITE:dirty_call_while_terminated test case
  Adjust process_SUITE:no_priority_inversion2
  Allow larger timeout delay in driver_SUITE
  Ignore long time failures during high CPU utilization
  Cleanup in statistics_SUITE:runtime_update test
  Improve timer tests in driver_SUITE
  Fix statistics_SUITE:scheduler_wall_time test
  Fix scheduler_SUITE:scheduler_suspend test
  Fix scheduler_SUITE:scheduler_threads test
  Fix scheduler_SUITE:update_cpu_info test
  Skip nif_SUITE:consume_timeslice test when debug compiled
  Increase time margin in timer_bif_SUITE:start_timer_1 test

1 files changed, 4 insertions, 4 deletions

diff --git a/erts/emulator/test/driver_SUITE.erl b/erts/emulator/test/driver_SUITE.erl
index f134a197aa..a3df0bb2db 100644
--- a/erts/emulator/test/driver_SUITE.erl
+++ b/erts/emulator/test/driver_SUITE.erl
@@ -114,7 +114,7 @@
 -define(MAX_DATA_SIZE, 16384).
 
 % This is the allowed delay when testing the driver timer functionality
--define(delay, 100).
+-define(delay, 400).
 
 -define(heap_binary_size, 64).
 
@@ -401,7 +401,7 @@ try_timeouts(Port, Timeout) ->
                 true ->
                     try_timeouts(Port, Timeout div 2)
             end
-    after Timeout + ?delay ->
+    after Timeout + 100*?delay ->
               ct:fail("driver failed to timeout")
     end.
 
@@ -437,7 +437,7 @@ try_cancel(Port, Timeout) ->
                           Timeout == 0 -> ok;
                           true -> try_cancel(Port, Timeout div 2)
                       end
-              after ?delay ->
+              after 100*?delay ->
                         ct:fail("No message from driver")
               end
     end.
@@ -505,7 +505,7 @@ try_change_timer(Port, Timeout) ->
                 true ->
                     try_timeouts(Port, Timeout div 2)
             end
-    after Timeout + ?delay ->
+    after Timeout + 100*?delay ->
               ct:fail("driver failed to timeout")
     end.