mirror of
				https://github.com/cuberite/polarssl.git
				synced 2025-11-03 20:22:59 -05:00 
			
		
		
		
	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 <dave.rodgman@arm.com>
This commit is contained in:
		
							parent
							
								
									e5b828cb32
								
							
						
					
					
						commit
						c42409820b
					
				@ -257,8 +257,7 @@ requires_ciphersuite_enabled() {
 | 
				
			|||||||
# maybe_requires_ciphersuite_enabled CMD [RUN_TEST_OPTION...]
 | 
					# maybe_requires_ciphersuite_enabled CMD [RUN_TEST_OPTION...]
 | 
				
			||||||
# If CMD (call to a TLS client or server program) requires a specific
 | 
					# 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
 | 
					# 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
 | 
					# enabled.
 | 
				
			||||||
# mismatch.
 | 
					 | 
				
			||||||
maybe_requires_ciphersuite_enabled() {
 | 
					maybe_requires_ciphersuite_enabled() {
 | 
				
			||||||
    case "$1" in
 | 
					    case "$1" in
 | 
				
			||||||
        *\ force_ciphersuite=*) :;;
 | 
					        *\ force_ciphersuite=*) :;;
 | 
				
			||||||
@ -268,15 +267,7 @@ maybe_requires_ciphersuite_enabled() {
 | 
				
			|||||||
    ciphersuite="${ciphersuite%%[!-0-9A-Z_a-z]*}"
 | 
					    ciphersuite="${ciphersuite%%[!-0-9A-Z_a-z]*}"
 | 
				
			||||||
    shift
 | 
					    shift
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    case "$*" in
 | 
					    requires_ciphersuite_enabled "$ciphersuite"
 | 
				
			||||||
        *"-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
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    unset ciphersuite
 | 
					    unset ciphersuite
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user