diff options
| author | Peter Andersson <[email protected]> | 2010-08-11 12:07:03 +0200 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2010-09-02 14:44:55 +0200 |
| commit | 346a1fc0f0ecbaeafe2570102211a3145e66656b (patch) | |
| tree | 9f02e325570fdca631c3b9172fe5d9ccfa1745a1 /lib/test_server | |
| parent | 69efc617a8c8c0df15c8c87b8c739940408e208b (diff) | |
| download | otp-346a1fc0f0ecbaeafe2570102211a3145e66656b.tar.gz otp-346a1fc0f0ecbaeafe2570102211a3145e66656b.tar.bz2 otp-346a1fc0f0ecbaeafe2570102211a3145e66656b.zip | |
Fix error in handling of sequence groups
Diffstat (limited to 'lib/test_server')
| -rw-r--r-- | lib/test_server/src/test_server_ctrl.erl | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/lib/test_server/src/test_server_ctrl.erl b/lib/test_server/src/test_server_ctrl.erl index 89ce03232d..9ab526a26b 100644 --- a/lib/test_server/src/test_server_ctrl.erl +++ b/lib/test_server/src/test_server_ctrl.erl @@ -2269,10 +2269,6 @@ maybe_get_privdir() -> run_test_cases_loop([{auto_skip_case,{Type,Ref,Case,Comment},SkipMode}|Cases], Config, TimetrapData, Mode, Status) when Type==conf; Type==make -> - - %%! --- Fri Aug 6 13:26:19 2010 --- peppe was here! - io:format(user, "## {auto_skip,~p,~p,~p}: ~n~p~n~p~n", [get_name(Mode),Ref,Case,Mode,Status]), - file:set_cwd(filename:dirname(get(test_server_dir))), CurrIOHandler = get(test_server_common_io_handler), ParentMode = tl(Mode), @@ -2410,10 +2406,6 @@ run_test_cases_loop([{skip_case,{Case,Comment}}|Cases], %% a start *or* end conf case, wrapping test cases or other conf cases run_test_cases_loop([{conf,Ref,Props,{Mod,Func}}|_Cases]=Cs0, Config, TimetrapData, Mode0, Status) -> - -%%! --- Fri Aug 6 13:26:19 2010 --- peppe was here! -io:format(user, "## {conf,~p,~p,~p}: ~p~n", [proplists:get_value(name,Props),Ref,Func,Status]), - CurrIOHandler = get(test_server_common_io_handler), %% check and update the mode for test case execution and io msg handling {StartConf,Mode,IOHandler,ConfTime,Status1} = @@ -2667,7 +2659,7 @@ io:format(user, "## {conf,~p,~p,~p}: ~p~n", [proplists:get_value(name,Props),Ref Reason = {failed,{Mod,Func,Fail}}, {skip_cases_upto(Ref, Cases, Reason, conf, CurrMode), Config, - update_status(failed, group_result, get_name(Mode0), + update_status(failed, group_result, get_name(Mode), delete_status(Ref, Status2))}; not StartConf -> ReportRepeatStop(), @@ -2676,10 +2668,6 @@ io:format(user, "## {conf,~p,~p,~p}: ~p~n", [proplists:get_value(name,Props),Ref end, set_io_buffering(IOHandler), stop_minor_log_file(), - - %%! --- Fri Aug 6 13:25:35 2010 --- peppe was here! - io:format(user, "## {~p,~p,~p}: Status = ~p~n", [get_name(Mode0),Ref,Func,Status3]), - run_test_cases_loop(Cases2, Config1, TimetrapData, Mode, Status3); {died,Why,_} when Func == init_per_suite -> print(minor, "~n*** Unexpected exit during init_per_suite.~n", []), |