Merge tag 'OTP-19.0' into sverker/19/binary_to_atom-utf8-crash/ERL-474/OTP-14590

1 files changed, 63 insertions, 41 deletions

diff --git a/lib/common_test/test/ct_repeat_testrun_SUITE.erl b/lib/common_test/test/ct_repeat_testrun_SUITE.erl
index 35d67a10f2..f8b6a379f6 100644
--- a/lib/common_test/test/ct_repeat_testrun_SUITE.erl
+++ b/lib/common_test/test/ct_repeat_testrun_SUITE.erl
@@ -1,18 +1,19 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2013. All Rights Reserved.
+%% Copyright Ericsson AB 2013-2016. All Rights Reserved.
 %%
-%% The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); you may not use this file except in
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
 %%
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
 %%
 %% %CopyrightEnd%
 %%
@@ -36,7 +37,7 @@
 
 -define(eh, ct_test_support_eh).
 -define(skip_reason, "Repeated test stopped by force_stop option").
--define(skipped, {skipped, ?skip_reason}).
+-define(skipped, {auto_skipped, ?skip_reason}).
 
 
 %% Timers used in this test.
@@ -65,25 +66,47 @@
 %% there will be clashes with logging processes etc).
 %%--------------------------------------------------------------------
 init_per_suite(Config0) ->
-    Config = ct_test_support:init_per_suite(Config0),
-    DataDir = ?config(data_dir, Config),
-    Suite1 = filename:join([DataDir,"a_test","r1_SUITE"]),
-    Suite2 = filename:join([DataDir,"b_test","r2_SUITE"]),
-    Opts0 = ct_test_support:get_opts(Config),
-    Opts1 = Opts0 ++ [{suite,Suite1},{testcase,tc2},{label,timing1}],
-    Opts2 = Opts0 ++ [{suite,Suite2},{testcase,tc2},{label,timing2}],
-
-    %% Make sure both suites are compiled
-    {1,0,{0,0}} = ct_test_support:run(ct,run_test,[Opts1],Config),
-    {1,0,{0,0}} = ct_test_support:run(ct,run_test,[Opts2],Config),
-
-    %% Time the shortest testcase to use for offset
-    {T0,{1,0,{0,0}}} = timer:tc(ct_test_support,run,[ct,run_test,[Opts1],Config]),
-
-    %% -2 is to ensure we hit inside the target test case and not after
-%    T = round(T0/1000000)-2,
-    T=0,
-    [{offset,T}|Config].
+    TTInfo = {_T,{_Scaled,ScaleVal}} = ct:get_timetrap_info(),
+    ct:pal("Timetrap info = ~w", [TTInfo]),
+    if ScaleVal > 1 ->
+	    {skip,"Skip on systems running e.g. cover or debug!"};
+       ScaleVal =< 1 ->
+	    Config = ct_test_support:init_per_suite(Config0),
+	    DataDir = ?config(data_dir, Config),
+	    Suite1 = filename:join([DataDir,"a_test","r1_SUITE"]),
+	    Suite2 = filename:join([DataDir,"b_test","r2_SUITE"]),
+	    Opts0 = ct_test_support:get_opts(Config),
+	    Opts1 = Opts0 ++ [{suite,Suite1},{testcase,tc2},{label,timing1}],
+	    Opts2 = Opts0 ++ [{suite,Suite2},{testcase,tc2},{label,timing2}],
+
+	    %% Make sure both suites are compiled
+	    {1,0,{0,0}} = ct_test_support:run(ct,run_test,[Opts1],Config),
+	    {1,0,{0,0}} = ct_test_support:run(ct,run_test,[Opts2],Config),
+	    
+	    %% Check if file i/o is too slow for correct measurements
+	    Opts3 = Opts0 ++ [{suite,Suite1},{testcase,tc1},{label,timing3}],
+	    {T,_} = 
+		timer:tc(
+		  fun() ->
+			  {1,0,{0,0}} = ct_test_support:run(ct,run_test,
+							    [Opts3],Config),
+			  {1,0,{0,0}} = ct_test_support:run(ct,run_test,
+							    [Opts3],Config)
+		  end),
+	    %% The time to compare with here must match the timeout value
+	    %% in the test suite. Accept 30% logging overhead (26 sec total).
+	    if T > 26000000 ->
+		    ct:pal("Timing test took ~w sec (< 27 sec expected). "
+			   "Skipping the suite!",
+			   [trunc(T/1000000)]),
+		    ct_test_support:end_per_suite(Config),
+		    {skip,"File I/O too slow for this suite"};
+	       true ->
+		    ct:pal("Timing test took ~w sec. Proceeding...",
+			   [trunc(T/1000000)]),
+		    [{offset,0}|Config]
+	    end
+    end.
 
 end_per_suite(Config) ->
     ct_test_support:end_per_suite(Config).
@@ -222,7 +245,7 @@ until_force_stop_skip_rest_group(Config) when is_list(Config) ->
 	fun() ->
 		[_] = ct_test_support:run_ct_run_test(
 			Opts++[{until,until_str(?t3,1,Config)}],Config),
-		0 = ct_test_support:run_ct_script_start(
+		1 = ct_test_support:run_ct_script_start(
 		      Opts++[{until,until_str(?t3,1,Config)}],Config)
 	end,
     ok = execute(ExecuteFun,
@@ -341,19 +364,18 @@ skip_first_tc1(Suite) ->
      {?eh,tc_done,{Suite,tc1,ok}},
      {?eh,test_stats,{'_',0,{0,0}}},
      {?eh,tc_done,{Suite,tc2,?skipped}},
-     {?eh,test_stats,{'_',0,{1,0}}},
+     {?eh,test_stats,{'_',0,{0,1}}},
      {?eh,tc_done,{Suite,{init_per_group,g,[]},?skipped}},
-     {?eh,tc_auto_skip,{Suite,tc1,?skip_reason}},
-     {?eh,test_stats,{'_',0,{1,1}}},
-     {?eh,tc_auto_skip,{Suite,tc2,?skip_reason}},
-     {?eh,test_stats,{'_',0,{1,2}}},
-     {?eh,tc_auto_skip,{Suite,end_per_group,?skip_reason}},
+     {?eh,tc_auto_skip,{Suite,{tc1,g},?skip_reason}},
+     {?eh,test_stats,{'_',0,{0,2}}},
+     {?eh,tc_auto_skip,{Suite,{tc2,g},?skip_reason}},
+     {?eh,test_stats,{'_',0,{0,3}}},
+     {?eh,tc_auto_skip,{Suite,{end_per_group,g},?skip_reason}},
      {?eh,tc_done,{Suite,tc2,?skipped}},
-     {?eh,test_stats,{'_',0,{2,2}}},
+     {?eh,test_stats,{'_',0,{0,4}}},
      {?eh,tc_start,{Suite,end_per_suite}},
      {?eh,tc_done,{Suite,end_per_suite,ok}}].
 
-
 skip_tc1_in_group(Suite) ->
     [{?eh,tc_start,{Suite,init_per_suite}},
      {?eh,tc_done,{Suite,init_per_suite,ok}},
@@ -369,10 +391,10 @@ skip_tc1_in_group(Suite) ->
       {?eh,tc_done,{Suite,tc1,ok}},
       {?eh,test_stats,{'_',0,{0,0}}},
       {?eh,tc_done,{Suite,tc2,?skipped}},
-      {?eh,test_stats,{'_',0,{1,0}}},
+      {?eh,test_stats,{'_',0,{0,1}}},
       {?eh,tc_start,{Suite,{end_per_group,g,[]}}},
       {?eh,tc_done,{Suite,{end_per_group,g,[]},ok}}],
      {?eh,tc_done,{Suite,tc2,?skipped}},
-     {?eh,test_stats,{'_',0,{2,0}}},
+     {?eh,test_stats,{'_',0,{0,2}}},
      {?eh,tc_start,{Suite,end_per_suite}},
      {?eh,tc_done,{Suite,end_per_suite,ok}}].