Move p_run/2 to test_lib

It can be useful for other test suites.

2 files changed, 35 insertions, 35 deletions

diff --git a/lib/compiler/test/compile_SUITE.erl b/lib/compiler/test/compile_SUITE.erl
index 7c3990a855..bba0d3fb48 100644
--- a/lib/compiler/test/compile_SUITE.erl
+++ b/lib/compiler/test/compile_SUITE.erl
@@ -625,7 +625,7 @@ core(Config) when is_list(Config) ->
 				    {raw_abstract_v1,Abstr}}]}} = 
 			     beam_lib:chunks(Beam, [abstract_code]),
 			 {Mod,Abstr} end || Beam <- TestBeams],
-    ?line Res = p_run(fun(F) -> do_core(F, Outdir) end, Abstr),
+    ?line Res = test_lib:p_run(fun(F) -> do_core(F, Outdir) end, Abstr),
     ?line test_server:timetrap_cancel(Dog),
     Res.
 
@@ -661,7 +661,7 @@ asm(Config) when is_list(Config) ->
 
     ?line Wc = filename:join(filename:dirname(code:which(?MODULE)), "*.beam"),
     ?line TestBeams = filelib:wildcard(Wc),
-    ?line Res = p_run(fun(F) -> do_asm(F, Outdir) end, TestBeams),
+    ?line Res = test_lib:p_run(fun(F) -> do_asm(F, Outdir) end, TestBeams),
     ?line test_server:timetrap_cancel(Dog),
     Res.
 
@@ -688,35 +688,3 @@ do_asm(Beam, Outdir) ->
 		      [M,Class,Error,erlang:get_stacktrace()]),
 	    error
     end.
-    
-%% p_run(fun() -> ok|error, List) -> ok
-%%  Will fail the test case if there were any errors.
-
-p_run(Test, List) ->
-    N = erlang:system_info(schedulers) + 1,
-    p_run_loop(Test, List, N, [], 0, 0).
-
-p_run_loop(_, [], _, [], Errors, Ws) ->
-    case Errors of
-	0 ->
-	    case Ws of
-		0 -> ok;
-		1 -> {comment,"1 core_lint failure"};
-		N -> {comment,integer_to_list(N)++" core_lint failures"}
-	    end;
-	N -> ?t:fail({N,errors})
-    end;
-p_run_loop(Test, [H|T], N, Refs, Errors, Ws) when length(Refs) < N ->
-    {_,Ref} = erlang:spawn_monitor(fun() -> exit(Test(H)) end),
-    p_run_loop(Test, T, N, [Ref|Refs], Errors, Ws);
-p_run_loop(Test, List, N, Refs0, Errors0, Ws0) ->
-    receive
-	{'DOWN',Ref,process,_,Res} ->
-	    {Errors,Ws} = case Res of
-			      ok -> {Errors0,Ws0};
-			      error -> {Errors0+1,Ws0};
-			      warning -> {Errors0,Ws0+1}
-			  end,
-	    Refs = Refs0 -- [Ref],
-	    p_run_loop(Test, List, N, Refs, Errors, Ws)
-    end.
diff --git a/lib/compiler/test/test_lib.erl b/lib/compiler/test/test_lib.erl
index 844bbfc4b9..05236ee010 100644
--- a/lib/compiler/test/test_lib.erl
+++ b/lib/compiler/test/test_lib.erl
@@ -20,7 +20,7 @@
 
 -include("test_server.hrl").
 
--export([recompile/1,opt_opts/1,get_data_dir/1,smoke_disasm/1]).
+-export([recompile/1,opt_opts/1,get_data_dir/1,smoke_disasm/1,p_run/2]).
 
 recompile(Mod) when is_atom(Mod) ->
     case whereis(cover_server) of
@@ -72,3 +72,35 @@ get_data_dir(Config) ->
     {ok,Data2,_} = regexp:sub(Data1, "_post_opt_SUITE", "_SUITE"),
     {ok,Data,_} = regexp:sub(Data2, "_inline_SUITE", "_SUITE"),
     Data.
+
+%% p_run(fun(Data) -> ok|error, List) -> ok
+%%  Will fail the test case if there were any errors.
+
+p_run(Test, List) ->
+    N = erlang:system_info(schedulers) + 1,
+    p_run_loop(Test, List, N, [], 0, 0).
+
+p_run_loop(_, [], _, [], Errors, Ws) ->
+    case Errors of
+	0 ->
+	    case Ws of
+		0 -> ok;
+		1 -> {comment,"1 warning"};
+		N -> {comment,integer_to_list(N)++" warnings"}
+	    end;
+	N -> ?t:fail({N,errors})
+    end;
+p_run_loop(Test, [H|T], N, Refs, Errors, Ws) when length(Refs) < N ->
+    {_,Ref} = erlang:spawn_monitor(fun() -> exit(Test(H)) end),
+    p_run_loop(Test, T, N, [Ref|Refs], Errors, Ws);
+p_run_loop(Test, List, N, Refs0, Errors0, Ws0) ->
+    receive
+	{'DOWN',Ref,process,_,Res} ->
+	    {Errors,Ws} = case Res of
+			      ok -> {Errors0,Ws0};
+			      error -> {Errors0+1,Ws0};
+			      warning -> {Errors0,Ws0+1}
+			  end,
+	    Refs = Refs0 -- [Ref],
+	    p_run_loop(Test, List, N, Refs, Errors, Ws)
+    end.