diff options
author | Peter Andersson <[email protected]> | 2012-03-13 10:49:44 +0100 |
---|---|---|
committer | Peter Andersson <[email protected]> | 2012-03-13 10:50:16 +0100 |
commit | 4e73ac6e7339e965c17ad732350275b5650ce5c4 (patch) | |
tree | 7ae78c04d0ed359975dbbc1af2b48eeb156b7365 /lib/common_test | |
parent | bcf19f1d079720272198ba1a6b36a8718e6f2303 (diff) | |
parent | b94cf464b0d07ea54087716954e723a1fe2c7b46 (diff) | |
download | otp-4e73ac6e7339e965c17ad732350275b5650ce5c4.tar.gz otp-4e73ac6e7339e965c17ad732350275b5650ce5c4.tar.bz2 otp-4e73ac6e7339e965c17ad732350275b5650ce5c4.zip |
Merge remote branch 'origin/peppe/common_test/otp-9958' into maint
* origin/peppe/common_test/otp-9958:
Fix problem with dropped suite- and test case names
OTP-9958
Diffstat (limited to 'lib/common_test')
-rw-r--r-- | lib/common_test/test/ct_error_SUITE.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/common_test/test/ct_error_SUITE.erl b/lib/common_test/test/ct_error_SUITE.erl index bd218dc05f..053edba846 100644 --- a/lib/common_test/test/ct_error_SUITE.erl +++ b/lib/common_test/test/ct_error_SUITE.erl @@ -946,10 +946,10 @@ test_events(misc_errors) -> {failed,{error,{suite_failed,this_is_expected}}}}}, {?eh,test_stats,{0,5,{0,0}}}, {?eh,tc_start,{misc_error_1_SUITE,killed_by_signal_1}}, - {?eh,tc_done,{undefined,undefined,i_die_now}}, + {?eh,tc_done,{misc_error_1_SUITE,killed_by_signal_1,i_die_now}}, {?eh,test_stats,{0,6,{0,0}}}, {?eh,tc_start,{misc_error_1_SUITE,killed_by_signal_2}}, - {?eh,tc_done,{undefined,undefined, + {?eh,tc_done,{misc_error_1_SUITE,killed_by_signal_2, {failed,testcase_aborted_or_killed}}}, {?eh,test_stats,{0,7,{0,0}}}, {?eh,test_done,{'DEF','STOP_TIME'}}, |