Skip to content

Commit

Permalink
PS-9145: Revert changes in have_openssl_binary_version.inc
Browse files Browse the repository at this point in the history
https://perconadev.atlassian.net/browse/PS-9145

Remove unused openssl_binary_version_do_not_skip option.
  • Loading branch information
oleksandr-kachan committed Mar 25, 2024
1 parent 1d9985d commit 7f10352
Showing 1 changed file with 10 additions and 19 deletions.
29 changes: 10 additions & 19 deletions mysql-test/include/have_openssl_binary_version.inc
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,8 @@
# The condition has the same form as expressions evaluated by include/eval.inc
# ==== Usage ====
#
# --let $openssl_binary_version = 1\\.1\\..*
# --let $openssl_binary_version_do_not_skip = 1 (optional)
# --let $openssl_binary_version = 1.1.*
# --source include/have_openssl_binary_version.inc
#
# result (if $openssl_binary_version_do_not_skip was set to 1):
# $openssl_binary_version_match = 0 | 1

--disable_query_log
--disable_result_log
Expand Down Expand Up @@ -49,24 +45,19 @@ EOF

--source $OPENSSL_CONFIG_INC

--error 0,1
--remove_file $OPENSSL_VERSION_INFO
--error 0,1
--remove_file $OPENSSL_CONFIG_INC

if ($STATUS_VAR)
{
if (!$openssl_binary_version_do_not_skip)
{
--skip Test requires openssl version to be $openssl_binary_version
}
--let $openssl_binary_version_match = 0
--error 0,1
--remove_file $OPENSSL_VERSION_INFO
--error 0,1
--remove_file $OPENSSL_CONFIG_INC
--skip Test requires openssl version to be $openssl_binary_version
}

if (!$STATUS_VAR)
{
--let $openssl_binary_version_match = 1
}
--error 0,1
--remove_file $OPENSSL_VERSION_INFO
--error 0,1
--remove_file $OPENSSL_CONFIG_INC

--enable_query_log
--enable_result_log
Expand Down

0 comments on commit 7f10352

Please sign in to comment.