Merge branch 'siri/common_test/force_stop-skip_rest/OTP-10856' into maint

* siri/common_test/force_stop-skip_rest/OTP-10856:
  [common_test] Document '-force_stop skip_rest' option to ct_run
  [common_test] Add tests for repeated testruns
  [common_test] Add support for testing repeated testruns
  [common_test] Add -force_stop skip_rest option when repeating tests

5 files changed, 575 insertions, 24 deletions

diff --git a/lib/common_test/test/Makefile b/lib/common_test/test/Makefile
index a9ebd8f1d3..94569fa87f 100644
--- a/lib/common_test/test/Makefile
+++ b/lib/common_test/test/Makefile
@@ -38,6 +38,7 @@ MODULES= \
 	ct_groups_spec_SUITE \
 	ct_sequence_1_SUITE \
 	ct_repeat_1_SUITE \
+	ct_repeat_testrun_SUITE \
 	ct_testspec_1_SUITE \
 	ct_testspec_2_SUITE \
 	ct_testspec_3_SUITE \
diff --git a/lib/common_test/test/ct_repeat_testrun_SUITE.erl b/lib/common_test/test/ct_repeat_testrun_SUITE.erl
new file mode 100644
index 0000000000..7ec384c932
--- /dev/null
+++ b/lib/common_test/test/ct_repeat_testrun_SUITE.erl
@@ -0,0 +1,378 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2013. 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/.
+%%
+%% 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.
+%%
+%% %CopyrightEnd%
+%%
+
+%%%-------------------------------------------------------------------
+%%% File: ct_repeat_test_SUITE
+%%%
+%%% Description:
+%%% Test different options for repeating test runs:
+%%%   -repeat N
+%%%   -duration T [-force_stop [skip_rest]]
+%%%   -until T [-force_stop [skip_rest]]
+%%%
+%%%-------------------------------------------------------------------
+-module(ct_repeat_testrun_SUITE).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+-include_lib("common_test/include/ct_event.hrl").
+
+-define(eh, ct_test_support_eh).
+-define(skip_reason, "Repeated test stopped by force_stop option").
+-define(skipped, {skipped, ?skip_reason}).
+
+
+%% Timers used in this test.
+%% Each test suite consists of
+%%
+%% [tc1,tc2,{group,g,[tc1,tc2]},tc2]
+%%
+%% In r1_SUITE tc1 has a sleep of 10 sec - all other test cases just
+%% return ok.
+%%
+%% => One complete test run of two suites r1_SUITE + r2_SUITE is at
+%% least 20 seconds (10 sec for each r1_SUITE:tc1)
+%%
+-define(t1,30). % time shall expire during second run of r1_SUITE
+-define(t2,6).  % time shall expire during first run of tc1
+-define(t3,16).  % time shall expire during second run of tc1
+
+
+%%--------------------------------------------------------------------
+%% TEST SERVER CALLBACK FUNCTIONS
+%%--------------------------------------------------------------------
+
+%%--------------------------------------------------------------------
+%% Description: Since Common Test starts another Test Server
+%% instance, the tests need to be performed on a separate node (or
+%% 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].
+
+end_per_suite(Config) ->
+    ct_test_support:end_per_suite(Config).
+
+init_per_testcase(TestCase, Config) ->
+    ct_test_support:init_per_testcase(TestCase, Config).
+
+end_per_testcase(TestCase, Config) ->
+    ct_test_support:end_per_testcase(TestCase, Config).
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() ->
+    [
+     repeat_n,
+     duration,
+     duration_force_stop,
+     duration_force_stop_skip_rest,
+     duration_force_stop_skip_rest_group,
+     until,
+     until_force_stop,
+     until_force_stop_skip_rest,
+     until_force_stop_skip_rest_group
+    ].
+
+%%--------------------------------------------------------------------
+%% TEST CASES
+%%--------------------------------------------------------------------
+
+%%%-----------------------------------------------------------------
+%%%
+repeat_n(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    Dirs = filelib:wildcard(filename:join(DataDir,"*")),
+    {Opts,ERPid} = setup([{dir,Dirs},
+			  {label,repeat_n},
+			  {repeat,2}],
+			 Config),
+    ok = execute(repeat_n, Opts, ERPid, Config).
+
+duration(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    Dirs = filelib:wildcard(filename:join(DataDir,"*")),
+    {Opts,ERPid} = setup([{dir,Dirs},
+			  {label,duration},
+			  {duration,duration_str(?t1,2,Config)}],
+			 Config),
+    ok = execute(duration, Opts, ERPid, Config).
+
+duration_force_stop(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    Dirs = filelib:wildcard(filename:join(DataDir,"*")),
+    {Opts,ERPid} = setup([{dir,Dirs},
+			  {label,duration_force_stop},
+			  {duration,duration_str(?t1,2,Config)},
+			  {force_stop,true}],
+			 Config),
+    ok = execute(duration_force_stop, Opts, ERPid, Config).
+
+duration_force_stop_skip_rest(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    Dirs = filelib:wildcard(filename:join(DataDir,"*")),
+    {Opts,ERPid} = setup([{dir,Dirs},
+			  {label,duration_force_stop_skip_rest},
+			  {duration,duration_str(?t2,1,Config)},
+			  {force_stop,skip_rest}],
+			 Config),
+    ok = execute(duration_force_stop_skip_rest, Opts, ERPid, Config).
+
+duration_force_stop_skip_rest_group(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    Dirs = filelib:wildcard(filename:join(DataDir,"*")),
+    {Opts,ERPid} = setup([{dir,Dirs},
+			  {label,duration_force_stop_skip_rest_group},
+			  {duration,duration_str(?t3,1,Config)},
+			  {force_stop,skip_rest}],
+			 Config),
+    ok = execute(duration_force_stop_skip_rest_group, Opts, ERPid, Config).
+
+until(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    Dirs = filelib:wildcard(filename:join(DataDir,"*")),
+    {Opts,ERPid} = setup([{dir,Dirs},
+			  {label,until}],
+			 Config),
+    ExecuteFun =
+	fun() ->
+		[_,_] = ct_test_support:run_ct_run_test(
+			Opts++[{until,until_str(?t1,2,Config)}],Config),
+		0 = ct_test_support:run_ct_script_start(
+		      Opts++[{until,until_str(?t1,2,Config)}],Config)
+	end,
+    ok = execute(ExecuteFun, until, Opts, ERPid, Config).
+
+until_force_stop(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    Dirs = filelib:wildcard(filename:join(DataDir,"*")),
+    {Opts,ERPid} = setup([{dir,Dirs},
+			  {label,until_force_stop},
+			  {force_stop,true}],
+			 Config),
+    ExecuteFun =
+	fun() ->
+		[_,_] = ct_test_support:run_ct_run_test(
+			  Opts++[{until,until_str(?t1,2,Config)}],Config),
+		0 = ct_test_support:run_ct_script_start(
+		      Opts++[{until,until_str(?t1,2,Config)}],Config)
+	end,
+    ok = execute(ExecuteFun, until_force_stop, Opts, ERPid, Config).
+
+until_force_stop_skip_rest(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    Dirs = filelib:wildcard(filename:join(DataDir,"*")),
+    {Opts,ERPid} = setup([{dir,Dirs},
+			  {label,until_force_stop_skip_rest},
+			  {force_stop,skip_rest}],
+			 Config),
+    ExecuteFun =
+	fun() ->
+		[_] = ct_test_support:run_ct_run_test(
+			Opts++[{until,until_str(?t2,1,Config)}],Config),
+		1 = ct_test_support:run_ct_script_start(
+		      Opts++[{until,until_str(?t2,1,Config)}],Config)
+	end,
+    ok = execute(ExecuteFun, until_force_stop_skip_rest,
+		 Opts, ERPid, Config).
+
+until_force_stop_skip_rest_group(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    Dirs = filelib:wildcard(filename:join(DataDir,"*")),
+    {Opts,ERPid} = setup([{dir,Dirs},
+			  {label,until_force_stop_skip_rest_group},
+			  {force_stop,skip_rest}],
+			 Config),
+    ExecuteFun =
+	fun() ->
+		[_] = ct_test_support:run_ct_run_test(
+			Opts++[{until,until_str(?t3,1,Config)}],Config),
+		0 = ct_test_support:run_ct_script_start(
+		      Opts++[{until,until_str(?t3,1,Config)}],Config)
+	end,
+    ok = execute(ExecuteFun,
+		 until_force_stop_skip_rest_group,
+		 Opts, ERPid, Config).
+
+
+%%%-----------------------------------------------------------------
+%%% HELP FUNCTIONS
+%%%-----------------------------------------------------------------
+
+setup(Test, Config) ->
+    Opts0 = ct_test_support:get_opts(Config),
+    Level = ?config(trace_level, Config),
+    EvHArgs = [{cbm,ct_test_support},{trace_level,Level}],
+    Opts = Opts0 ++ [{event_handler,{?eh,EvHArgs}}|Test],
+    ERPid = ct_test_support:start_event_receiver(Config),
+    {Opts,ERPid}.
+
+%% Execute test, first with ct:run_test, then with ct:script_start
+execute(Name, Opts, ERPid, Config) ->
+    ExecuteFun = fun() -> ok = ct_test_support:run(Opts, Config) end,
+    execute(ExecuteFun, Name, Opts, ERPid, Config).
+
+execute(ExecuteFun, Name, Opts, ERPid, Config) ->
+    ExecuteFun(),
+    Events = ct_test_support:get_events(ERPid, Config),
+
+    ct_test_support:log_events(Name,
+			       reformat(Events, ?eh),
+			       ?config(priv_dir, Config),
+			       Opts),
+
+    TestEvents = events_to_check(Name),
+    ct_test_support:verify_events(TestEvents, Events, Config).
+
+reformat(Events, EH) ->
+    ct_test_support:reformat(Events, EH).
+
+%% N is the expected number of repeats
+until_str(Secs0,N,Config) ->
+    Offset = ?config(offset,Config),
+    Secs = Secs0 + N*Offset,
+    Now = calendar:datetime_to_gregorian_seconds(calendar:local_time()),
+    {{Y,Mo,D},{H,M,S}} = calendar:gregorian_seconds_to_datetime(Now+Secs),
+    lists:flatten(io_lib:format("~2..0w~2..0w~2..0w~2..0w~2..0w~2..0w",
+				[Y rem 100, Mo, D, H, M, S])).
+
+%% N is the expected number of repeats
+duration_str(Secs0,N,Config) ->
+    Offset = ?config(offset,Config),
+    Secs = Secs0 + N*Offset,
+    "0000" ++ lists:flatten(io_lib:format("~2..0w",[Secs])).
+
+%%%-----------------------------------------------------------------
+%%% TEST EVENTS
+%%%-----------------------------------------------------------------
+%% 2 tests (ct:run_test + script_start) is default
+events_to_check(C) when C==repeat_n; C==duration; C==until ->
+    dupl(4, start_logging() ++ all_succ() ++ stop_logging());
+events_to_check(C) when C==duration_force_stop; C==until_force_stop ->
+    dupl(2, start_logging() ++
+	     all_succ() ++
+	     stop_logging() ++
+	     start_logging() ++
+	     all_succ(r1_SUITE) ++
+	     stop_logging());
+events_to_check(C) when C==duration_force_stop_skip_rest;
+			C==until_force_stop_skip_rest ->
+    dupl(2, start_logging() ++ skip_first_tc1(r1_SUITE) ++ stop_logging());
+events_to_check(C) when C==duration_force_stop_skip_rest_group;
+			C==until_force_stop_skip_rest_group ->
+    dupl(2, start_logging() ++ skip_tc1_in_group(r1_SUITE) ++ stop_logging()).
+
+dupl(N,List) ->
+    lists:flatten(lists:duplicate(N,List)).
+
+start_logging() ->
+    [{?eh,start_logging,{'DEF','RUNDIR'}}].
+stop_logging() ->
+    [{?eh,stop_logging,[]}].
+
+
+all_succ() ->
+    all_succ(r1_SUITE) ++ all_succ(r2_SUITE).
+
+all_succ(Suite) ->
+    [{?eh,tc_start,{Suite,init_per_suite}},
+     {?eh,tc_done,{Suite,init_per_suite,ok}},
+     {?eh,tc_start,{Suite,tc1}},
+     {?eh,tc_done,{Suite,tc1,ok}},
+     {?eh,test_stats,{'_',0,{0,0}}},
+     {?eh,tc_start,{Suite,tc2}},
+     {?eh,tc_done,{Suite,tc2,ok}},
+     {?eh,test_stats,{'_',0,{0,0}}},
+     [{?eh,tc_start,{Suite,{init_per_group,g,[]}}},
+      {?eh,tc_done,{Suite,{init_per_group,g,[]},ok}},
+      {?eh,tc_start,{Suite,tc1}},
+      {?eh,tc_done,{Suite,tc1,ok}},
+      {?eh,test_stats,{'_',0,{0,0}}},
+      {?eh,tc_start,{Suite,tc2}},
+      {?eh,tc_done,{Suite,tc2,ok}},
+      {?eh,test_stats,{'_',0,{0,0}}},
+      {?eh,tc_start,{Suite,{end_per_group,g,[]}}},
+      {?eh,tc_done,{Suite,{end_per_group,g,[]},ok}}],
+     {?eh,tc_start,{Suite,tc2}},
+     {?eh,tc_done,{Suite,tc2,ok}},
+     {?eh,test_stats,{'_',0,{0,0}}},
+     {?eh,tc_start,{Suite,end_per_suite}},
+     {?eh,tc_done,{Suite,end_per_suite,ok}}].
+
+skip_first_tc1(Suite) ->
+    [{?eh,tc_start,{Suite,init_per_suite}},
+     {?eh,tc_done,{Suite,init_per_suite,ok}},
+     {?eh,tc_start,{Suite,tc1}},
+     {?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,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_done,{Suite,tc2,?skipped}},
+     {?eh,test_stats,{'_',0,{2,2}}},
+     {?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}},
+     {?eh,tc_start,{Suite,tc1}},
+     {?eh,tc_done,{Suite,tc1,ok}},
+     {?eh,test_stats,{'_',0,{0,0}}},
+     {?eh,tc_start,{Suite,tc2}},
+     {?eh,tc_done,{Suite,tc2,ok}},
+     {?eh,test_stats,{'_',0,{0,0}}},
+     [{?eh,tc_start,{Suite,{init_per_group,g,[]}}},
+      {?eh,tc_done,{Suite,{init_per_group,g,[]},ok}},
+      {?eh,tc_start,{Suite,tc1}},
+      {?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,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,tc_start,{Suite,end_per_suite}},
+     {?eh,tc_done,{Suite,end_per_suite,ok}}].
diff --git a/lib/common_test/test/ct_repeat_testrun_SUITE_data/a_test/r1_SUITE.erl b/lib/common_test/test/ct_repeat_testrun_SUITE_data/a_test/r1_SUITE.erl
new file mode 100644
index 0000000000..3fd5943691
--- /dev/null
+++ b/lib/common_test/test/ct_repeat_testrun_SUITE_data/a_test/r1_SUITE.erl
@@ -0,0 +1,75 @@
+%%--------------------------------------------------------------------
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2013. 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/.
+%%
+%% 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.
+%%
+%% %CopyrightEnd%
+%%
+%%----------------------------------------------------------------------
+%% File: r1_SUITE.erl
+%%
+%% Description:
+%%
+%%
+%% @author Support
+%% @doc
+%% @end
+%%----------------------------------------------------------------------
+%%----------------------------------------------------------------------
+-module(r1_SUITE).
+-include_lib("common_test/include/ct.hrl").
+
+-compile(export_all).
+
+%% Default timetrap timeout (set in init_per_testcase).
+-define(default_timeout, ?t:seconds(30)).
+
+all() ->
+    testcases() ++ [{group,g},  tc2].
+
+groups() ->
+    [{g,testcases()}].
+
+testcases() ->
+    [tc1,tc2].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(Config) ->
+    Config.
+
+init_per_group(_, Config) ->
+    Config.
+
+end_per_group(_Group, Config) ->
+    Config.
+
+init_per_testcase(_Case, Config) ->
+    Dog = test_server:timetrap(?default_timeout),
+    [{watchdog, Dog}|Config].
+
+end_per_testcase(_Case, Config) ->
+    Dog=?config(watchdog, Config),
+    test_server:timetrap_cancel(Dog),
+    ok.
+
+%%%-----------------------------------------------------------------
+%%% Test cases
+tc1(_Config) ->
+    timer:sleep(10000),
+    ok.
+
+tc2(_Config) ->
+    ok.
diff --git a/lib/common_test/test/ct_repeat_testrun_SUITE_data/b_test/r2_SUITE.erl b/lib/common_test/test/ct_repeat_testrun_SUITE_data/b_test/r2_SUITE.erl
new file mode 100644
index 0000000000..dc9abc2863
--- /dev/null
+++ b/lib/common_test/test/ct_repeat_testrun_SUITE_data/b_test/r2_SUITE.erl
@@ -0,0 +1,75 @@
+%%--------------------------------------------------------------------
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2013. 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/.
+%%
+%% 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.
+%%
+%% %CopyrightEnd%
+%%
+%%----------------------------------------------------------------------
+%% File: r2_SUITE.erl
+%%
+%% Description:
+%%
+%%
+%% @author Support
+%% @doc
+%% @end
+%%----------------------------------------------------------------------
+%%----------------------------------------------------------------------
+-module(r2_SUITE).
+-include_lib("common_test/include/ct.hrl").
+
+-compile(export_all).
+
+%% Default timetrap timeout (set in init_per_testcase).
+-define(default_timeout, ?t:seconds(30)).
+
+all() ->
+    testcases() ++ [{group,g}, tc2].
+
+groups() ->
+    [{g,testcases()}].
+
+testcases() ->
+    [tc1,tc2].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(Config) ->
+    Config.
+
+init_per_group(_, Config) ->
+    Config.
+
+end_per_group(_Group, Config) ->
+    Config.
+
+init_per_testcase(_Case, Config) ->
+    Dog = test_server:timetrap(?default_timeout),
+    [{watchdog, Dog}|Config].
+
+end_per_testcase(_Case, Config) ->
+    Dog=?config(watchdog, Config),
+    test_server:timetrap_cancel(Dog),
+    ok.
+
+%%%-----------------------------------------------------------------
+%%% Test cases
+tc1(_Config) ->
+    %% timer:sleep(3000),
+    ok.
+
+tc2(_Config) ->
+    ok.
diff --git a/lib/common_test/test/ct_test_support.erl b/lib/common_test/test/ct_test_support.erl
index 5e109e98e9..70dd087358 100644
--- a/lib/common_test/test/ct_test_support.erl
+++ b/lib/common_test/test/ct_test_support.erl
@@ -29,7 +29,8 @@
 -export([init_per_suite/1, init_per_suite/2, end_per_suite/1,
 	 init_per_testcase/2, end_per_testcase/2,
 	 write_testspec/2, write_testspec/3,
-	 run/2, run/3, run/4, get_opts/1, wait_for_ct_stop/1]).
+	 run/2, run/3, run/4, run_ct_run_test/2, run_ct_script_start/2,
+	 get_opts/1, wait_for_ct_stop/1]).
 
 -export([handle_event/2, start_event_receiver/1, get_events/2,
 	 verify_events/3, verify_events/4, reformat/2, log_events/4,
@@ -224,9 +225,15 @@ get_opts(Config) ->
 %%%-----------------------------------------------------------------
 %%% 
 run(Opts, Config) when is_list(Opts) ->
+    %% use ct interface
+    CtRunTestResult=run_ct_run_test(Opts,Config),
+    %% use run_test interface (simulated)
+    ExitStatus=run_ct_script_start(Opts,Config),
+    check_result(CtRunTestResult,ExitStatus,Opts).
+
+run_ct_run_test(Opts,Config) ->
     CTNode = proplists:get_value(ct_node, Config),
     Level = proplists:get_value(trace_level, Config),
-    %% use ct interface
     test_server:format(Level, "~n[RUN #1] Calling ct:run_test(~p) on ~p~n",
 		       [Opts, CTNode]),
     CtRunTestResult = rpc:call(CTNode, ct, run_test, [Opts]),
@@ -242,7 +249,11 @@ run(Opts, Config) when is_list(Opts) ->
 	    timer:sleep(5000),
 	    undefined = rpc:call(CTNode, erlang, whereis, [ct_util_server])
     end,
-    %% use run_test interface (simulated)
+    CtRunTestResult.
+
+run_ct_script_start(Opts, Config) ->
+    CTNode = proplists:get_value(ct_node, Config),
+    Level = proplists:get_value(trace_level, Config),
     Opts1 = [{halt_with,{?MODULE,ct_test_halt}} | Opts],
     test_server:format(Level, "Saving start opts on ~p: ~p~n",
 		       [CTNode, Opts1]),
@@ -253,27 +264,38 @@ run(Opts, Config) when is_list(Opts) ->
     ExitStatus = rpc:call(CTNode, ct_run, script_start, []),
     test_server:format(Level, "[RUN #2] Got exit status value ~p~n",
 		       [ExitStatus]),
-    case {CtRunTestResult,ExitStatus} of
-	{{_Ok,Failed,{_UserSkipped,_AutoSkipped}},1} when Failed > 0 ->
-	    ok;
-	{{_Ok,0,{_UserSkipped,AutoSkipped}},ExitStatus} when AutoSkipped > 0 ->
-	    case proplists:get_value(exit_status, Opts1) of
-		ignore_config when ExitStatus == 1 ->
-		    {error,{wrong_exit_status,ExitStatus}};
-		_ ->
-		    ok
-	    end;
-	{{error,_}=Error,ExitStatus} ->
-	    if ExitStatus /= 2 ->
-		    {error,{wrong_exit_status,ExitStatus}};
-	       ExitStatus == 2 ->
-		    Error
-	    end;
-	{{_Ok,0,{_UserSkipped,_AutoSkipped}},0} ->
-	    ok;
-	Unexpected ->
-	    {error,{unexpected_return_value,Unexpected}}
-    end.
+    ExitStatus.
+
+check_result({_Ok,Failed,{_UserSkipped,_AutoSkipped}},1,_Opts)
+  when Failed > 0 ->
+    ok;
+check_result({_Ok,0,{_UserSkipped,AutoSkipped}},ExitStatus,Opts)
+  when AutoSkipped > 0 ->
+    case proplists:get_value(exit_status, Opts) of
+	ignore_config when ExitStatus == 1 ->
+	    {error,{wrong_exit_status,ExitStatus}};
+	_ ->
+	    ok
+    end;
+check_result({error,_}=Error,2,_Opts) ->
+    Error;
+check_result({error,_},ExitStatus,_Opts) ->
+    {error,{wrong_exit_status,ExitStatus}};
+check_result({_Ok,0,{_UserSkipped,_AutoSkipped}},0,_Opts) ->
+    ok;
+check_result(CtRunTestResult,ExitStatus,Opts)
+  when is_list(CtRunTestResult) -> % repeated testruns
+    try check_result(sum_testruns(CtRunTestResult,0,0,0,0),ExitStatus,Opts)
+    catch _:_ ->
+	    {error,{unexpected_return_value,{CtRunTestResult,ExitStatus}}}
+    end;
+check_result(CtRunTestResult,ExitStatus,_Opts) ->
+    {error,{unexpected_return_value,{CtRunTestResult,ExitStatus}}}.
+
+sum_testruns([{O,F,{US,AS}}|T],Ok,Failed,UserSkipped,AutoSkipped) ->
+    sum_testruns(T,Ok+O,Failed+F,UserSkipped+US,AutoSkipped+AS);
+sum_testruns([],Ok,Failed,UserSkipped,AutoSkipped) ->
+    {Ok,Failed,{UserSkipped,AutoSkipped}}.
 
 run(M, F, A, Config) ->
     run({M,F,A}, [], Config).