diff options
| author | Björn Gustavsson <[email protected]> | 2016-04-27 13:35:58 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2016-04-27 14:43:10 +0200 |
| commit | 929bd552e501ae6b1fe4fc30d093f0949c34bd49 (patch) | |
| tree | f34a7230865f8944b9647dc69220d6530e685aaa /lib/compiler/test | |
| parent | 2b48cb1b253aa090e655508a8e813f913cf32181 (diff) | |
| download | otp-929bd552e501ae6b1fe4fc30d093f0949c34bd49.tar.gz otp-929bd552e501ae6b1fe4fc30d093f0949c34bd49.tar.bz2 otp-929bd552e501ae6b1fe4fc30d093f0949c34bd49.zip | |
Remove support for running tests on a separate Erlang node
It has not been used for ages.
Diffstat (limited to 'lib/compiler/test')
| -rw-r--r-- | lib/compiler/test/compilation_SUITE.erl | 36 |
1 files changed, 4 insertions, 32 deletions
diff --git a/lib/compiler/test/compilation_SUITE.erl b/lib/compiler/test/compilation_SUITE.erl index 62d2e1eecc..9079e14e02 100644 --- a/lib/compiler/test/compilation_SUITE.erl +++ b/lib/compiler/test/compilation_SUITE.erl @@ -171,13 +171,7 @@ check_error_1(Str0) -> -define(TC(Body), tc(fun() -> Body end, ?LINE)). try_it(Module, Conf) -> - %% Change 'false' to 'true' to start a new node for every module. - try_it(false, Module, Conf). - -try_it(StartNode, Module, Conf) -> - try_it(StartNode, Module, {minutes,10}, Conf). - -try_it(StartNode, Module, Timetrap, Conf) -> + Timetrap = {minutes,10}, OtherOpts = [], %Can be changed to [time] if needed Src = filename:join(proplists:get_value(data_dir, Conf), atom_to_list(Module)), @@ -188,16 +182,6 @@ try_it(StartNode, Module, Timetrap, Conf) -> io:format("Result: ~p\n",[CompRc0]), {ok,_Mod} = CompRc0, - Node = case StartNode of - false -> - node(); - true -> - Pa = "-pa " ++ filename:dirname(code:which(?MODULE)), - {ok,Node0} = start_node(compiler, Pa), - Node0 - end, - - ok = rpc:call(Node, ?MODULE, load_and_call, [Out, Module]), load_and_call(Out, Module), ct:timetrap(Timetrap), @@ -208,7 +192,7 @@ try_it(StartNode, Module, Timetrap, Conf) -> io:format("Result: ~p\n",[CompRc1]), {ok,_Mod} = CompRc1, - ok = rpc:call(Node, ?MODULE, load_and_call, [Out, Module]), + load_and_call(Out, Module), ct:timetrap(Timetrap), io:format("Compiling (with old inliner): ~s\n", [Src]), @@ -217,7 +201,7 @@ try_it(StartNode, Module, Timetrap, Conf) -> {inline,1000}|OtherOpts]), io:format("Result: ~p\n",[CompRc2]), {ok,_Mod} = CompRc2, - ok = rpc:call(Node, ?MODULE, load_and_call, [Out, Module]), + load_and_call(Out, Module), ct:timetrap(Timetrap), io:format("Compiling (from assembly): ~s\n", [Src]), @@ -226,12 +210,8 @@ try_it(StartNode, Module, Timetrap, Conf) -> CompRc3 = compile:file(Asm, [from_asm,{outdir,Out},report|OtherOpts]), io:format("Result: ~p\n",[CompRc3]), {ok,_} = CompRc3, - ok = rpc:call(Node, ?MODULE, load_and_call, [Out, Module]), + load_and_call(Out, Module), - case StartNode of - false -> ok; - true -> test_server:stop_node(Node) - end, ok. load_and_call(Out, Module) -> @@ -264,14 +244,6 @@ tc(F, Line) -> io:format("~p: ~p\n", [Line,Diff]), Value. -start_node(Name, Args) -> - case test_server:start_node(Name, slave, [{args, Args}]) of - {ok, Node} -> - {ok, Node}; - Error -> - ct:fail(Error) - end. - from(H, [H | T]) -> T; from(H, [_ | T]) -> from(H, T); from(_, []) -> []. |