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/inets | |
| 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/inets')
| -rw-r--r-- | lib/inets/test/inets_app_test.erl | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/lib/inets/test/inets_app_test.erl b/lib/inets/test/inets_app_test.erl index db2218f3b6..d32f7e290b 100644 --- a/lib/inets/test/inets_app_test.erl +++ b/lib/inets/test/inets_app_test.erl @@ -35,6 +35,15 @@ init_per_testcase(undef_funcs, Config) -> NewConfig = lists:keydelete(watchdog, 1, Config), Dog = test_server:timetrap(inets_test_lib:minutes(10)), + + %% We need to check if there is a point to run this test. + %% On some platforms, crypto will not build, which in turn + %% causes ssl to not build (at this time, this will + %% change in the future). + %% So, we first check if we can start crypto, and if not, + %% we skip this test case! + ?ENSURE_STARTED(crypto), + [{watchdog, Dog}| NewConfig]; init_per_testcase(_, Config) -> Config. @@ -240,13 +249,6 @@ undef_funcs(suite) -> undef_funcs(doc) -> []; undef_funcs(Config) when is_list(Config) -> - %% We need to check if there is a point to run this test. - %% On some platforms, crypto will not build, which in turn - %% causes ssl to not build (at this time, this will - %% change in the future). - %% So, we first check if we can start crypto, and if not, - %% we skip this test case! - ?ENSURE_STARTED(crypto), App = inets, AppFile = key1search(app_file, Config), Mods = key1search(modules, AppFile), |