1 files changed, 23 insertions, 18 deletions

diff --git a/src/rebar_prv_common_test.erl b/src/rebar_prv_common_test.erl
index 710922a..2b024cf 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
@@ -345,23 +347,26 @@ reduce_path([_|Acc], [".."|Rest])  -> reduce_path(Acc, Rest);
 reduce_path([], [".."|Rest])       -> reduce_path([], Rest);
 reduce_path(Acc, [Component|Rest]) -> reduce_path([Component|Acc], Rest).
 
-remove_links(Path) ->
-    case ec_file:is_dir(Path) of
-        false -> ok;
-        true  -> remove_links1(Path)
-    end.
 
-remove_links1(Path) ->
+remove_links(Path) ->
+    IsDir = ec_file:is_dir(Path),
     case ec_file:is_symlink(Path) of
-        true  ->
-            file:delete(Path);
-        false ->
-            lists:foreach(fun(ChildPath) ->
-                                  remove_links(ChildPath)
-                          end, sub_dirs(Path))
+        true when IsDir ->
+            delete_dir_link(Path);
+        false when IsDir ->
+                lists:foreach(fun(ChildPath) ->
+                                      remove_links(ChildPath)
+                              end, dir_entries(Path));
+        _ -> file:delete(Path)
     end.
 
-sub_dirs(Path) ->
+delete_dir_link(Path) ->
+	case os:type() of
+		{unix, _} -> file:delete(Path);
+		{win32, _} -> file:del_dir(Path)
+	end.
+
+dir_entries(Path) ->
     {ok, SubDirs} = file:list_dir(Path),
     [filename:join(Path, SubDir) || SubDir <- SubDirs].