From c42409820b3b596d0ed45e60927c287080d0eae3 Mon Sep 17 00:00:00 2001 From: Dave Rodgman Date: Tue, 29 Jun 2021 19:53:16 +0100 Subject: [PATCH] Change exceptional case for running negative tests Update maybe_requires_ciphersuite_enabled so that it will not skip the ciphersuite requirement when running a test case where the test expects a ciphersuite mismatch Signed-off-by: Dave Rodgman --- tests/ssl-opt.sh | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/tests/ssl-opt.sh b/tests/ssl-opt.sh index e75ff4b011..2b77037b2d 100755 --- a/tests/ssl-opt.sh +++ b/tests/ssl-opt.sh @@ -257,8 +257,7 @@ requires_ciphersuite_enabled() { # maybe_requires_ciphersuite_enabled CMD [RUN_TEST_OPTION...] # If CMD (call to a TLS client or server program) requires a specific # ciphersuite, arrange to only run the test case if this ciphersuite is -# enabled. As an exception, do run the test case if it expects a ciphersuite -# mismatch. +# enabled. maybe_requires_ciphersuite_enabled() { case "$1" in *\ force_ciphersuite=*) :;; @@ -268,15 +267,7 @@ maybe_requires_ciphersuite_enabled() { ciphersuite="${ciphersuite%%[!-0-9A-Z_a-z]*}" shift - case "$*" in - *"-s SSL - The handshake negotiation failed"*) - # This test case expects a ciphersuite mismatch, so it doesn't - # require the ciphersuite to be enabled. - ;; - *) - requires_ciphersuite_enabled "$ciphersuite" - ;; - esac + requires_ciphersuite_enabled "$ciphersuite" unset ciphersuite }