diff options
| author | Tristan Sloughter <tristan.sloughter@gmail.com> | 2015-06-26 16:30:55 -0500 |
|---|---|---|
| committer | Tristan Sloughter <tristan.sloughter@gmail.com> | 2015-06-26 16:30:55 -0500 |
| commit | eeb2bf47d0d9b8e503b0cee16ae6345e7e0e45c0 (patch) | |
| tree | 2bef56ccb32df1e49fd2e45fda84829521bb4d7d | |
| parent | 1f334c5e521cf818a2baec0b09bc71443351746a (diff) | |
| parent | f51d7f20482ce026b4066cf66716fa0f6fbaabe7 (diff) | |
Merge pull request #548 from talentdeficit/ct_no_rogue_msgs
add an (almost) unique reference to message sent from the ct provider
| -rw-r--r-- | src/rebar_prv_common_test.erl | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/rebar_prv_common_test.erl b/src/rebar_prv_common_test.erl index 710922a..aab76b4 100644 --- a/src/rebar_prv_common_test.erl +++ b/src/rebar_prv_common_test.erl @@ -105,14 +105,18 @@ run_test_verbose(Opts) -> handle_results(ct:run_test(Opts)). run_test_quiet(Opts) -> Pid = self(), + Ref = erlang:make_ref(), LogDir = proplists:get_value(logdir, Opts), - erlang:spawn_monitor(fun() -> + {_, Monitor} = erlang:spawn_monitor(fun() -> {ok, F} = file:open(filename:join([LogDir, "ct.latest.log"]), [write]), true = group_leader(F, self()), - Pid ! ct:run_test(Opts) + Pid ! {Ref, ct:run_test(Opts)} end), - receive Result -> handle_quiet_results(Opts, Result) end. + receive + {Ref, Result} -> handle_quiet_results(Opts, Result); + {'DOWN', Monitor, _, _, Reason} -> handle_results(?PRV_ERROR(Reason)) + end. handle_results(Results) when is_list(Results) -> Result = lists:foldl(fun sum_results/2, {0, 0, {0,0}}, Results), @@ -132,8 +136,6 @@ sum_results({Passed, Failed, {UserSkipped, AutoSkipped}}, handle_quiet_results(_, {error, _} = Result) -> handle_results(Result); -handle_quiet_results(_, {'DOWN', _, _, _, Reason}) -> - handle_results(?PRV_ERROR(Reason)); handle_quiet_results(CTOpts, Results) when is_list(Results) -> _ = [format_result(Result) || Result <- Results], case handle_results(Results) of |