Merge branch 'maint'

* maint:
  Fix HL timer hard debug implementation
  Fix stack alignment problem in ethread test on arm
  Skip time_SUITE:timestamp on timewarp test

3 files changed, 47 insertions, 12 deletions

diff --git a/erts/emulator/beam/erl_hl_timer.c b/erts/emulator/beam/erl_hl_timer.c
index 734057a12c..491d2f8c84 100644
--- a/erts/emulator/beam/erl_hl_timer.c
+++ b/erts/emulator/beam/erl_hl_timer.c
@@ -1055,6 +1055,8 @@ create_hl_timer(ErtsSchedulerData *esdp,
     erts_aint32_t refc;
     Uint32 roflgs;
 
+    ERTS_HLT_HDBG_CHK_SRV(srv);
+
     check_canceled_queue(esdp, srv);
 
     ERTS_HLT_ASSERT((esdp->no & ~ERTS_TMR_ROFLG_SID_MASK) == 0);
@@ -1179,8 +1181,6 @@ create_hl_timer(ErtsSchedulerData *esdp,
     erts_smp_atomic32_init_nob(&tmr->head.refc, refc);
     erts_smp_atomic32_init_nob(&tmr->state, ERTS_TMR_STATE_ACTIVE);
 
-    ERTS_HLT_HDBG_CHK_SRV(srv);
-
     if (!srv->next_timeout
 	|| tmr->timeout < srv->next_timeout->timeout) {
 	if (srv->next_timeout)
@@ -3093,7 +3093,8 @@ tt_hdbg_func(ErtsHLTimer *tmr, void *vhdbg)
 				& ~ERTS_HLT_PFLGS_MASK);
 	ERTS_HLT_ASSERT(tmr == prnt);
     }
-    ERTS_HLT_ASSERT(btm_rbt_lookup(hdbg->srv->btm_tree, tmr->btm.refn) == tmr);
+    if (tmr->head.roflgs & ERTS_TMR_ROFLG_BIF_TMR)
+	ERTS_HLT_ASSERT(btm_rbt_lookup(hdbg->srv->btm_tree, tmr->btm.refn) == tmr);
     if (tmr->time.tree.same_time) {
 	ErtsHdbgHLT st_hdbg;
 	st_hdbg.srv = hdbg->srv;
diff --git a/erts/emulator/test/time_SUITE.erl b/erts/emulator/test/time_SUITE.erl
index 3bd28a6d20..9bf3b90d91 100644
--- a/erts/emulator/test/time_SUITE.erl
+++ b/erts/emulator/test/time_SUITE.erl
@@ -320,7 +320,41 @@ timestamp(suite) ->
 timestamp(doc) ->
     ["Test that os:timestamp works."];
 timestamp(Config) when is_list(Config) ->
-    repeating_timestamp_check(100000).
+    try
+	repeating_timestamp_check(100000)
+    catch
+	throw : {fail, Failure} ->
+	    %%
+	    %% Our time warping test machines currently warps
+	    %% time every 6:th second. If we get a warp during
+	    %% 10 seconds, assume this is a time warping test
+	    %% and ignore the failure.
+	    %%
+	    case had_time_warp(10) of
+		true ->
+		    {skip, "Seems to be time warp test run..."};
+		false ->
+		    test_server:fail(Failure)
+	    end
+    end.
+
+os_system_time_offset() ->
+    erlang:convert_time_unit(os:system_time() - erlang:monotonic_time(),
+			     native, micro_seconds).
+
+had_time_warp(Secs) ->
+    had_time_warp(os_system_time_offset(), Secs).
+
+had_time_warp(OrigOffs, 0) ->
+    false;
+had_time_warp(OrigOffs, N) ->
+    receive after 1000 -> ok end,
+    case OrigOffs - os_system_time_offset() of
+	Diff when Diff > 500000; Diff < -500000 ->
+	    true;
+	_Diff ->
+	    had_time_warp(OrigOffs, N-1)
+    end.
 
 repeating_timestamp_check(0) ->
     ok;
@@ -346,15 +380,15 @@ repeating_timestamp_check(N) ->
     NSecs = NA*1000000+NB+round(NC/1000000),
     case Secs - NSecs of
 	TooLarge when TooLarge > 3600 ->
-	    test_server:fail(
-	      lists:flatten(
+	    throw({fail,
+	       lists:flatten(
 		io_lib:format("os:timestamp/0 is ~w s more than erlang:now/0",
-			     [TooLarge])));
+			     [TooLarge]))});
 	TooSmall when TooSmall < -3600 ->
-	     test_server:fail(
+	    throw({fail,
 	      lists:flatten(
 		io_lib:format("os:timestamp/0 is ~w s less than erlang:now/0",
-			     [-TooSmall])));
+			     [-TooSmall]))});
 	_ ->
 	    ok
     end,
diff --git a/erts/test/ethread_SUITE_data/ethread_tests.c b/erts/test/ethread_SUITE_data/ethread_tests.c
index 12f7f3db7a..b51771c736 100644
--- a/erts/test/ethread_SUITE_data/ethread_tests.c
+++ b/erts/test/ethread_SUITE_data/ethread_tests.c
@@ -1457,6 +1457,9 @@ do { \
     ASSERT(ethr_ ## A ## _read ## B(&A) == 0x33333333); \
 } while (0)
 
+ethr_atomic32_t atomic32;
+ethr_atomic_t atomic;
+ethr_dw_atomic_t dw_atomic;
 
 static void
 atomic_basic_test(void)
@@ -1465,8 +1468,6 @@ atomic_basic_test(void)
      * Verify that each op does what it is expected
      * to do for at least one input.
      */
-    ethr_atomic32_t atomic32;
-    ethr_atomic_t atomic;
 
     print_line("AT_AINT32_MAX=%d",AT_AINT32_MAX);
     print_line("AT_AINT32_MIN=%d",AT_AINT32_MIN);
@@ -1629,7 +1630,6 @@ atomic_basic_test(void)
 
     /* Double word */
     {
-	ethr_dw_atomic_t dw_atomic;
 	ethr_dw_sint_t dw0, dw1;
 	dw0.sint[0] = 4711;
 	dw0.sint[1] = 4712;