diff options
| author | Ingela Anderton Andin <[email protected]> | 2013-06-24 10:16:06 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2013-06-24 10:16:06 +0200 |
| commit | 3c5dc983ac2e6069b1c87310acd84140f590a3da (patch) | |
| tree | 14506356f7b5fe24e3e93bcde23e5d21ba83848f | |
| parent | a053856bc83a3784e9825c4636979cf2ba7026c1 (diff) | |
| parent | 4c3b306184d886678d08949bcbe0186af8f984b1 (diff) | |
| download | otp-3c5dc983ac2e6069b1c87310acd84140f590a3da.tar.gz otp-3c5dc983ac2e6069b1c87310acd84140f590a3da.tar.bz2 otp-3c5dc983ac2e6069b1c87310acd84140f590a3da.zip | |
Merge remote-tracking branch 'upstream/maint'
| -rw-r--r-- | lib/public_key/test/pbe_SUITE.erl | 1 | ||||
| -rw-r--r-- | lib/public_key/test/pkits_SUITE.erl | 1 | ||||
| -rw-r--r-- | lib/public_key/test/public_key_SUITE.erl | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/lib/public_key/test/pbe_SUITE.erl b/lib/public_key/test/pbe_SUITE.erl index 254601b107..2c9b17478d 100644 --- a/lib/public_key/test/pbe_SUITE.erl +++ b/lib/public_key/test/pbe_SUITE.erl @@ -42,6 +42,7 @@ groups() -> %%-------------------------------------------------------------------- init_per_suite(Config) -> + application:stop(crypto), try crypto:start() of ok -> Config diff --git a/lib/public_key/test/pkits_SUITE.erl b/lib/public_key/test/pkits_SUITE.erl index 9180fa968b..699481b20f 100644 --- a/lib/public_key/test/pkits_SUITE.erl +++ b/lib/public_key/test/pkits_SUITE.erl @@ -111,6 +111,7 @@ groups() -> %%-------------------------------------------------------------------- init_per_suite(Config) -> + application:stop(crypto), try crypto:start() of ok -> application:start(asn1), diff --git a/lib/public_key/test/public_key_SUITE.erl b/lib/public_key/test/public_key_SUITE.erl index f2596e3d85..c3aa2e2366 100644 --- a/lib/public_key/test/public_key_SUITE.erl +++ b/lib/public_key/test/public_key_SUITE.erl @@ -56,6 +56,7 @@ groups() -> ]. %%------------------------------------------------------------------- init_per_suite(Config) -> + application:stop(crypto), try crypto:start() of ok -> application:start(asn1), |