diff options
| author | unknown <tonu@x153.internalnet> | 2001-09-01 05:36:06 +0800 |
|---|---|---|
| committer | unknown <tonu@x153.internalnet> | 2001-09-01 05:36:06 +0800 |
| commit | 88cfe762513ba144efed4e1e17d9f6230cd69aaf (patch) | |
| tree | 5a7d17d86b794303f501e87c7cac868c0d934c20 | |
| parent | 5fb52a1901528a0eab2fcb11e21a728eda9a47ae (diff) | |
| download | mariadb-git-88cfe762513ba144efed4e1e17d9f6230cd69aaf.tar.gz | |
OpenSSL tests added
| -rw-r--r-- | mysql-test/include/have_openssl.inc | 2 | ||||
| -rw-r--r-- | mysql-test/r/have_openssl.require | 2 | ||||
| -rw-r--r-- | mysql-test/r/openssl_1.result (renamed from mysql-test/r/ssl.result) | 0 | ||||
| -rw-r--r-- | mysql-test/r/openssl_2.result | 16 | ||||
| -rw-r--r-- | mysql-test/t/openssl_1.test | 5 | ||||
| -rw-r--r-- | mysql-test/t/openssl_2.test | 6 | ||||
| -rw-r--r-- | mysql-test/t/ssl.test | 4 |
7 files changed, 31 insertions, 4 deletions
diff --git a/mysql-test/include/have_openssl.inc b/mysql-test/include/have_openssl.inc new file mode 100644 index 00000000000..f0eded81b59 --- /dev/null +++ b/mysql-test/include/have_openssl.inc @@ -0,0 +1,2 @@ +-- require r/have_ssl.require +show variables like "have_ssl"; diff --git a/mysql-test/r/have_openssl.require b/mysql-test/r/have_openssl.require new file mode 100644 index 00000000000..9bdffdf0c13 --- /dev/null +++ b/mysql-test/r/have_openssl.require @@ -0,0 +1,2 @@ +Variable_name Value +have_ssl YES diff --git a/mysql-test/r/ssl.result b/mysql-test/r/openssl_1.result index 6636a336c45..6636a336c45 100644 --- a/mysql-test/r/ssl.result +++ b/mysql-test/r/openssl_1.result diff --git a/mysql-test/r/openssl_2.result b/mysql-test/r/openssl_2.result new file mode 100644 index 00000000000..6636a336c45 --- /dev/null +++ b/mysql-test/r/openssl_2.result @@ -0,0 +1,16 @@ +Variable_name Value +SSL_CTX_sess_accept 0 +SSL_CTX_sess_accept_good 0 +SSL_CTX_sess_accept_renegotiate 0 +SSL_CTX_sess_cb_hits 0 +SSL_CTX_sess_number 0 +SSL_CTX_get_session_cache_mode SERVER +SSL_CTX_sess_get_cache_size 128 +SSL_CTX_get_verify_mode 7 +SSL_CTX_get_verify_depth 4294967295 +SSL_get_verify_mode 0 +SSL_get_verify_depth 0 +SSL_session_reused 0 +SSL_get_version +SSL_get_cipher +SSL_get_default_timeout 0 diff --git a/mysql-test/t/openssl_1.test b/mysql-test/t/openssl_1.test new file mode 100644 index 00000000000..da87604f45a --- /dev/null +++ b/mysql-test/t/openssl_1.test @@ -0,0 +1,5 @@ +# We test openssl. Result set is optimized to be compiled with --with-openssl but +# SSL is swithced off in some reason + +SHOW STATUS LIKE 'SSL%'; + diff --git a/mysql-test/t/openssl_2.test b/mysql-test/t/openssl_2.test new file mode 100644 index 00000000000..2195d7302e2 --- /dev/null +++ b/mysql-test/t/openssl_2.test @@ -0,0 +1,6 @@ +-- source include/have_openssl.inc + +# We want to test everything with SSL turned on. + +SHOW STATUS LIKE 'SSL%'; + diff --git a/mysql-test/t/ssl.test b/mysql-test/t/ssl.test deleted file mode 100644 index da5e66fc835..00000000000 --- a/mysql-test/t/ssl.test +++ /dev/null @@ -1,4 +0,0 @@ - - -SHOW STATUS LIKE 'SSL%'; - |