aboutsummaryrefslogtreecommitdiffstats
path: root/lib/public_key/test
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2013-06-10 14:53:12 +0200
committerIngela Anderton Andin <[email protected]>2013-06-10 14:53:12 +0200
commit56e08cb2d1faa279961413729e48ef1f3275a575 (patch)
treed3bea204f76c2202090f1b500c9d47c4fca661ed /lib/public_key/test
parentc095c23a9d0e07ecde8c1ca7ad24ffb9f2ca3182 (diff)
parent6166867da5cbfe97b09cddf2e079178a2e959c44 (diff)
downloadotp-56e08cb2d1faa279961413729e48ef1f3275a575.tar.gz
otp-56e08cb2d1faa279961413729e48ef1f3275a575.tar.bz2
otp-56e08cb2d1faa279961413729e48ef1f3275a575.zip
Merge branch 'ia/public_key/crypto/prepare-for-release' into maint
* ia/public_key/crypto/prepare-for-release: public_key & ssl: Add ASN-1 dependency crypto & public_key: prepare for release
Diffstat (limited to 'lib/public_key/test')
-rw-r--r--lib/public_key/test/pkits_SUITE.erl2
-rw-r--r--lib/public_key/test/public_key_SUITE.erl2
2 files changed, 4 insertions, 0 deletions
diff --git a/lib/public_key/test/pkits_SUITE.erl b/lib/public_key/test/pkits_SUITE.erl
index c490493e13..9180fa968b 100644
--- a/lib/public_key/test/pkits_SUITE.erl
+++ b/lib/public_key/test/pkits_SUITE.erl
@@ -113,12 +113,14 @@ groups() ->
init_per_suite(Config) ->
try crypto:start() of
ok ->
+ application:start(asn1),
crypto_support_check(Config)
catch _:_ ->
{skip, "Crypto did not start"}
end.
end_per_suite(_Config) ->
+ application:stop(asn1),
application:stop(crypto).
%%--------------------------------------------------------------------
diff --git a/lib/public_key/test/public_key_SUITE.erl b/lib/public_key/test/public_key_SUITE.erl
index 5a64140c67..f2596e3d85 100644
--- a/lib/public_key/test/public_key_SUITE.erl
+++ b/lib/public_key/test/public_key_SUITE.erl
@@ -58,12 +58,14 @@ groups() ->
init_per_suite(Config) ->
try crypto:start() of
ok ->
+ application:start(asn1),
Config
catch _:_ ->
{skip, "Crypto did not start"}
end.
end_per_suite(_Config) ->
+ application:stop(asn1),
application:stop(crypto).
%%-------------------------------------------------------------------