diff options
| author | Siri Hansen <[email protected]> | 2019-04-16 14:41:36 +0200 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2019-04-16 14:41:36 +0200 |
| commit | eb99f4e11ef941f01666689ef50a8a35897b7f0c (patch) | |
| tree | 601b043c7fade6fbd054bf74cf5e65546fe4e27c /lib/common_test/src/test_server_ctrl.erl | |
| parent | 93d7a78772bdf2d888a2fd5a98f6a6b3da9b3828 (diff) | |
| parent | b1eea95392315e3602766af77e80d27b8e8c3af2 (diff) | |
| download | otp-eb99f4e11ef941f01666689ef50a8a35897b7f0c.tar.gz otp-eb99f4e11ef941f01666689ef50a8a35897b7f0c.tar.bz2 otp-eb99f4e11ef941f01666689ef50a8a35897b7f0c.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/common_test/src/test_server_ctrl.erl')
| -rw-r--r-- | lib/common_test/src/test_server_ctrl.erl | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/common_test/src/test_server_ctrl.erl b/lib/common_test/src/test_server_ctrl.erl index 1518c6e8d6..0dca46559f 100644 --- a/lib/common_test/src/test_server_ctrl.erl +++ b/lib/common_test/src/test_server_ctrl.erl @@ -3842,6 +3842,10 @@ run_test_case1(Ref, Num, Mod, Func, Args, RunInit, {died,{timetrap_timeout,TimetrapTimeout}} -> progress(failed, Num, Mod, Func, GrName, Loc, timetrap_timeout, TimetrapTimeout, Comment, Style); + {died,Reason={auto_skip,_Why}} -> + %% died in init_per_testcase or in a hook in this context + progress(skip, Num, Mod, Func, GrName, Loc, Reason, + Time, Comment, Style); {died,{Skip,Reason}} when Skip==skip; Skip==skipped -> %% died in init_per_testcase progress(skip, Num, Mod, Func, GrName, Loc, Reason, |