diff options
| author | Lukas Larsson <[email protected]> | 2012-11-02 15:20:20 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2012-11-02 15:20:20 +0100 |
| commit | 045319da07722f1dd01af8c07dc1bcc196ffb137 (patch) | |
| tree | 9a824d2e11c4ad43df4cccf4800c772ad74ec3aa /lib/common_test/test/ct_netconfc_SUITE.erl | |
| parent | d5733bc3e34449affde2594d85b905c8ab440d42 (diff) | |
| parent | 58514077ca89015773f62ed327d767fb412a83f0 (diff) | |
| download | otp-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 'lib/common_test/test/ct_netconfc_SUITE.erl')
| -rw-r--r-- | lib/common_test/test/ct_netconfc_SUITE.erl | 7 |
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). |