Skip to content

Commit 94af4c0

Browse files
committed
Bug#29994326 REMOVE HAVE_SSL.INC AND HAVE_OPENSSL.INC FROM THE TESTSUITE
It is no longer possible to compile the server without SSL support. Also, going forward in 8.0, we only support OpenSSL. Hence it makes no sense for tests to skip if SSL support is not present or to try and determine if we are running with OpenSSL or not. This patch removes the relevant include files (have_ssl.inc, have_openssl.inc, not_openssl.inc) from the source and adjusts the tests as necessary. Change-Id: I89ee3e891b3818414400f06a6314004bfd0efb87
1 parent 45c1dea commit 94af4c0

File tree

142 files changed

+20
-212
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

142 files changed

+20
-212
lines changed

mysql-test/include/excludenoskip.list

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,7 @@ have_mecab.inc
100100
fix_priv_tables.test
101101

102102
# 4.4
103-
have_openssl.inc
104103
have_openssl_binary.inc
105-
have_ssl.inc
106-
have_ssl_crypto_functs.inc
107-
not_openssl.inc
108104
check_openssl_version.inc
109105
have_tlsv13.inc
110106
not_have_tlsv13.inc

mysql-test/include/have_ssl.inc

Lines changed: 0 additions & 6 deletions
This file was deleted.

mysql-test/include/have_ssl_crypto_functs.inc

Lines changed: 0 additions & 8 deletions
This file was deleted.

mysql-test/include/not_openssl.inc

Lines changed: 0 additions & 5 deletions
This file was deleted.

mysql-test/include/test_ssl_verify_identity.inc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
# be 1.0.2+. For older versions of openssl, the test will be skipped.
3636

3737
--source include/have_openssl_binary.inc
38-
--source include/have_openssl.inc
3938
--source include/check_openssl_version.inc
4039

4140
--echo ### Trying to connect with ssl-mode as DISABLED. This should establish an unencrypted connection.

mysql-test/lib/mtr_cases.pm

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1495,7 +1495,6 @@ my @tags = (
14951495

14961496
[ "include/ndb_master-slave.inc", "ndb_test", 1 ],
14971497
[ "federated.inc", "federated_test", 1 ],
1498-
[ "include/have_ssl.inc", "need_ssl", 1 ],
14991498
[ "include/not_windows.inc", "not_windows", 1 ],
15001499
[ "include/not_parallel.inc", "not_parallel", 1 ],
15011500

mysql-test/mysql-test-run.dox

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2217,13 +2217,7 @@
22172217
@page PAGE_INCLUDE_FILES Using Include Files to Simplify Test Cases
22182218

22192219
The <b>include</b> directory contains many files intended for
2220-
inclusion into test case files. For example, if a test case needs to
2221-
verify that the server supports <b>SSL</b> connections, use this
2222-
line in the test case file:
2223-
2224-
@verbatim
2225-
--source include/have_ssl.inc
2226-
@endverbatim
2220+
inclusion into test case files.
22272221

22282222
These include files serve many purposes, but in general, they
22292223
encapsulate operations of varying complexity into single files so

mysql-test/suite/auth_sec/include/have_openssl.inc

Lines changed: 0 additions & 5 deletions
This file was deleted.

mysql-test/suite/auth_sec/t/access_credential_control.test

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414
# #
1515
###############################################################################
1616

17-
--source include/have_ssl.inc
18-
--source include/have_openssl.inc
1917
--source include/mysql_upgrade_preparation.inc
2018

2119
# This test will intentionally generate errors in the server error log

mysql-test/suite/auth_sec/t/cert_verify.test

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# Want to skip this test from Valgrind execution
22
--source include/no_valgrind_without_big.inc
3-
-- source include/have_ssl.inc
43
# Save the initial number of concurrent sessions
54
--source include/count_sessions.inc
65

0 commit comments

Comments
 (0)