diff options
| author | Peter Andersson <[email protected]> | 2012-03-14 11:21:58 +0100 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2012-03-14 11:22:04 +0100 |
| commit | cd992c382c60fbb2a4126b4d7407df354e11a3ec (patch) | |
| tree | f38a9d0ace78622a11196651bbc46bcfdb5f5af8 | |
| parent | 00421e6f0dc18f7d6e44100186f5c3b3e38ce2d5 (diff) | |
| parent | f9972d68af0cebef9856690b903255c75f1d1b74 (diff) | |
| download | otp-cd992c382c60fbb2a4126b4d7407df354e11a3ec.tar.gz otp-cd992c382c60fbb2a4126b4d7407df354e11a3ec.tar.bz2 otp-cd992c382c60fbb2a4126b4d7407df354e11a3ec.zip | |
Merge remote branch 'origin/peppe/common_test/otp-9899' into maint
* origin/peppe/common_test/otp-9899:
Fix broken repeat functionality
OTP-9899
| -rw-r--r-- | lib/common_test/src/ct_repeat.erl | 2 | ||||
| -rw-r--r-- | lib/common_test/src/ct_run.erl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/common_test/src/ct_repeat.erl b/lib/common_test/src/ct_repeat.erl index be3c485b75..e6eb135ae8 100644 --- a/lib/common_test/src/ct_repeat.erl +++ b/lib/common_test/src/ct_repeat.erl @@ -116,7 +116,7 @@ spawn_tester(script,Ctrl,Args) -> spawn_tester(func,Ctrl,Opts) -> Tester = fun() -> - case catch ct_run:run_test1(Opts) of + case catch ct_run:run_test2(Opts) of {'EXIT',Reason} -> exit(Reason); Result -> diff --git a/lib/common_test/src/ct_run.erl b/lib/common_test/src/ct_run.erl index b496d2694f..45436392d8 100644 --- a/lib/common_test/src/ct_run.erl +++ b/lib/common_test/src/ct_run.erl @@ -37,7 +37,7 @@ %% Misc internal functions --export([variables_file_name/1,script_start1/2,run_test1/1]). +-export([variables_file_name/1,script_start1/2,run_test2/1]). -include("ct_event.hrl"). -include("ct_util.hrl"). |