aboutsummaryrefslogtreecommitdiffstats
path: root/lib/common_test/test
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2012-11-02 15:22:59 +0100
committerLukas Larsson <[email protected]>2012-11-02 15:22:59 +0100
commit2fac860004a2eece19c62053b3c0fd5210ca7051 (patch)
tree1abdd2c481ee4db7d7ace99746c4f32a57338ea6 /lib/common_test/test
parent985f2a9aa2460e648981bb4538eb446202d25d9d (diff)
parent045319da07722f1dd01af8c07dc1bcc196ffb137 (diff)
downloadotp-2fac860004a2eece19c62053b3c0fd5210ca7051.tar.gz
otp-2fac860004a2eece19c62053b3c0fd5210ca7051.tar.bz2
otp-2fac860004a2eece19c62053b3c0fd5210ca7051.zip
Merge branch 'maint'
* maint: 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 Conflicts: lib/asn1/test/asn1_SUITE.erl lib/kernel/test/interactive_shell_SUITE.erl
Diffstat (limited to 'lib/common_test/test')
-rw-r--r--lib/common_test/test/ct_netconfc_SUITE.erl7
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/common_test/test/ct_netconfc_SUITE.erl b/lib/common_test/test/ct_netconfc_SUITE.erl
index e6e8d5b09c..30084a6228 100644
--- a/lib/common_test/test/ct_netconfc_SUITE.erl
+++ b/lib/common_test/test/ct_netconfc_SUITE.erl
@@ -44,7 +44,12 @@
%%--------------------------------------------------------------------
init_per_suite(Config) ->
Config1 = ct_test_support:init_per_suite(Config),
- Config1.
+ case application:load(crypto) of
+ {error,Reason} ->
+ {skip, Reason};
+ _ ->
+ Config1
+ end.
end_per_suite(Config) ->
ct_test_support:end_per_suite(Config).