aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2014-02-24 11:03:40 +0100
committerSiri Hansen <[email protected]>2014-02-24 11:08:57 +0100
commitcd03c9678083fd348c7778f53f3357f623ad65d5 (patch)
tree15d8ba0ff98109f7be250ce5283a6e440a46b264 /lib/ssl
parent7211dab352a2b5141c260680f2077ca792768b37 (diff)
parentbeae7ae0dab99a34ac6a6471feb8a7b9b2a3ed32 (diff)
downloadotp-cd03c9678083fd348c7778f53f3357f623ad65d5.tar.gz
otp-cd03c9678083fd348c7778f53f3357f623ad65d5.tar.bz2
otp-cd03c9678083fd348c7778f53f3357f623ad65d5.zip
Merge branch 'schlagert/fix_basic_appups'
* schlagert/fix_basic_appups: Dynamically configure typer_SUITE according to environment Disable hipe_SUITE when environment doesn't support it Make hipe non-upgradable by setting appup file empty Fix missing module on hipe app file template Add test suites performing app and appup file checks Introduce appup test utility Fix library application appup files Fix non-library appup files according to issue #240 OTP-11744
Diffstat (limited to 'lib/ssl')
-rw-r--r--lib/ssl/test/ssl_basic_SUITE.erl6
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/ssl/test/ssl_basic_SUITE.erl b/lib/ssl/test/ssl_basic_SUITE.erl
index 3c23369923..523760aba6 100644
--- a/lib/ssl/test/ssl_basic_SUITE.erl
+++ b/lib/ssl/test/ssl_basic_SUITE.erl
@@ -84,6 +84,7 @@ all_versions_groups ()->
basic_tests() ->
[app,
+ appup,
alerts,
send_close,
version_option,
@@ -292,6 +293,11 @@ app() ->
app(Config) when is_list(Config) ->
ok = ?t:app_test(ssl).
%%--------------------------------------------------------------------
+appup() ->
+ [{doc, "Test that the ssl appup file is ok"}].
+appup(Config) when is_list(Config) ->
+ ok = ?t:appup_test(ssl).
+%%--------------------------------------------------------------------
alerts() ->
[{doc, "Test ssl_alert:alert_txt/1"}].
alerts(Config) when is_list(Config) ->