aboutsummaryrefslogtreecommitdiffstats
path: root/erts/test
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2012-11-02 15:20:20 +0100
committerLukas Larsson <[email protected]>2012-11-02 15:20:20 +0100
commit045319da07722f1dd01af8c07dc1bcc196ffb137 (patch)
tree9a824d2e11c4ad43df4cccf4800c772ad74ec3aa /erts/test
parentd5733bc3e34449affde2594d85b905c8ab440d42 (diff)
parent58514077ca89015773f62ed327d767fb412a83f0 (diff)
downloadotp-045319da07722f1dd01af8c07dc1bcc196ffb137.tar.gz
otp-045319da07722f1dd01af8c07dc1bcc196ffb137.tar.bz2
otp-045319da07722f1dd01af8c07dc1bcc196ffb137.zip
Merge branch 'lukas/rcs-ppc-cross-tests/OTP-10265' into maint
* lukas/rcs-ppc-cross-tests/OTP-10265: Skip ct_netconf tests if there is no crypto Migrate timers from test_server to ct interface Update tests to run with an oldshell emulator Move crypto check so that tc is skipped and not failed Update for new version of ppc compilation chain Verify that ebin folder of applications exists
Diffstat (limited to 'erts/test')
-rw-r--r--erts/test/otp_SUITE.erl25
1 files changed, 19 insertions, 6 deletions
diff --git a/erts/test/otp_SUITE.erl b/erts/test/otp_SUITE.erl
index 5f28f22606..7df611e749 100644
--- a/erts/test/otp_SUITE.erl
+++ b/erts/test/otp_SUITE.erl
@@ -150,8 +150,8 @@ is_hipe_module(Mod) ->
end.
ssl_crypto_filter(Undef) ->
- case {code:lib_dir(crypto),code:lib_dir(ssl)} of
- {{error,bad_name},{error,bad_name}} ->
+ case {app_exists(crypto),app_exists(ssl)} of
+ {false,false} ->
filter(fun({_,{ssl,_,_}}) -> false;
({_,{crypto,_,_}}) -> false;
({_,{ssh,_,_}}) -> false;
@@ -175,8 +175,8 @@ eunit_filter(Undef) ->
end, Undef).
dialyzer_filter(Undef) ->
- case code:lib_dir(dialyzer) of
- {error,bad_name} ->
+ case app_exists(dialyzer) of
+ false ->
filter(fun({_,{dialyzer_callgraph,_,_}}) -> false;
({_,{dialyzer_codeserver,_,_}}) -> false;
({_,{dialyzer_contracts,_,_}}) -> false;
@@ -191,8 +191,8 @@ dialyzer_filter(Undef) ->
end.
wx_filter(Undef) ->
- case code:lib_dir(wx) of
- {error,bad_name} ->
+ case app_exists(wx) of
+ false ->
filter(fun({_,{MaybeWxModule,_,_}}) ->
case atom_to_list(MaybeWxModule) of
"wx"++_ -> false;
@@ -338,3 +338,16 @@ open_log(Config, Name) ->
close_log(Fd) ->
ok = file:close(Fd).
+
+app_exists(AppAtom) ->
+ case code:lib_dir(AppAtom) of
+ {error,bad_name} ->
+ false;
+ Path ->
+ case file:read_file_info(filename:join(Path,"ebin")) of
+ {ok,_} ->
+ true;
+ _ ->
+ false
+ end
+ end.