aboutsummaryrefslogtreecommitdiffstats
path: root/erts/test/otp_SUITE.erl
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2016-03-02 15:15:55 +0100
committerBjörn Gustavsson <[email protected]>2016-03-02 15:15:55 +0100
commitf2f3093222b37dba42b6eb7e7c4cbecf7655305c (patch)
tree241d91b8d92f5393a2463652d5c0aa32c175be9a /erts/test/otp_SUITE.erl
parent630e42c7a6fcde6acec407653c5d948fdeb1d8d7 (diff)
parent8480526b8fea311d7bca818caeb2687ee615e5dd (diff)
downloadotp-f2f3093222b37dba42b6eb7e7c4cbecf7655305c.tar.gz
otp-f2f3093222b37dba42b6eb7e7c4cbecf7655305c.tar.bz2
otp-f2f3093222b37dba42b6eb7e7c4cbecf7655305c.zip
Merge branch 'bjorn/remove-test_server/OTP-12705'
* bjorn/remove-test_server/OTP-12705: Remove multiple inclusion of ct.hrl otp_SUITE: Remove handling of test_server application Correct common_test.app.src
Diffstat (limited to 'erts/test/otp_SUITE.erl')
-rw-r--r--erts/test/otp_SUITE.erl32
1 files changed, 2 insertions, 30 deletions
diff --git a/erts/test/otp_SUITE.erl b/erts/test/otp_SUITE.erl
index 6777c205b0..2efb5ae200 100644
--- a/erts/test/otp_SUITE.erl
+++ b/erts/test/otp_SUITE.erl
@@ -298,7 +298,7 @@ call_to_now_0(Config) when is_list(Config) ->
Apps = [asn1,common_test,compiler,debugger,dialyzer,
gs,kernel,mnesia,observer,parsetools,reltool,
runtime_tools,sasl,stdlib,syntax_tools,
- test_server,tools],
+ tools],
not_recommended_calls(Config, Apps, {erlang,now,0}).
not_recommended_calls(Config, Apps0, MFA) ->
@@ -459,24 +459,7 @@ runtime_dependencies(Config) ->
end,
{undefined, []},
SAE),
- [] = lists:filter(fun ({missing_runtime_dependency,
- AppFile,
- common_test}) ->
- %% The test_server app is contaminated by
- %% common_test when run in a source tree. It
- %% should however *not* be contaminated
- %% when run in an installation.
- case {filename:basename(AppFile),
- is_run_in_src_tree()} of
- {"test_server.app", true} ->
- false;
- _ ->
- true
- end;
- (_) ->
- true
- end,
- check_apps_deps([AppDep|AppDeps], IgnoreApps)),
+ check_apps_deps([AppDep|AppDeps], IgnoreApps),
case IgnoreApps of
[] ->
ok;
@@ -488,17 +471,6 @@ runtime_dependencies(Config) ->
{comment, Comment}
end.
-is_run_in_src_tree() ->
- %% At least currently run_erl is not present in <code-root>/bin
- %% in the source tree, but present in <code-root>/bin of an
- %% ordinary installation.
- case file:read_file_info(filename:join([code:root_dir(),
- "bin",
- "run_erl"])) of
- {ok, _} -> false;
- {error, _} -> true
- end.
-
have_rdep(_App, [], _Dep) ->
false;
have_rdep(App, [RDep | RDeps], Dep) ->