diff options
author | Peter Andersson <[email protected]> | 2012-08-23 15:39:21 +0200 |
---|---|---|
committer | Peter Andersson <[email protected]> | 2012-08-23 15:39:26 +0200 |
commit | 69c3f5994342bd60ee43402b6c91f87b58f89b8b (patch) | |
tree | 4953a4d0e6ec0987bf5398437afb7eb326eb10b4 /lib/common_test/test/ct_testspec_1_SUITE.erl | |
parent | ca5d326a52449380b25969b4f6e6979f94854f4f (diff) | |
parent | a674521f4030ef6c92da87fbf5bd9cf2a92ddf95 (diff) | |
download | otp-69c3f5994342bd60ee43402b6c91f87b58f89b8b.tar.gz otp-69c3f5994342bd60ee43402b6c91f87b58f89b8b.tar.bz2 otp-69c3f5994342bd60ee43402b6c91f87b58f89b8b.zip |
Merge remote branch 'origin/peppe/common_test/exit_status' into maint
* origin/peppe/common_test/exit_status:
Implement support for returning valid exit status from ct_run
OTP-9865
OTP-10087
Diffstat (limited to 'lib/common_test/test/ct_testspec_1_SUITE.erl')
-rw-r--r-- | lib/common_test/test/ct_testspec_1_SUITE.erl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/common_test/test/ct_testspec_1_SUITE.erl b/lib/common_test/test/ct_testspec_1_SUITE.erl index b6dcf63fdf..693e8c6567 100644 --- a/lib/common_test/test/ct_testspec_1_SUITE.erl +++ b/lib/common_test/test/ct_testspec_1_SUITE.erl @@ -621,7 +621,9 @@ setup_and_execute(TCName, TestSpec, Config) -> ok = ct_test_support:run(Opts, Config), TestSpec1 = [{logdir,proplists:get_value(logdir,Opts)}, {label,proplists:get_value(label,TestTerms)} | TestSpec], - ok = ct_test_support:run(ct, run_testspec, [TestSpec1], Config), + {_Ok,_Failed,{_USkipped,_ASkipped}} = + ct_test_support:run(ct, run_testspec, [TestSpec1], Config), + Events = ct_test_support:get_events(ERPid, Config), ct_test_support:log_events(TCName, |