mirror of
				https://github.com/cuberite/polarssl.git
				synced 2025-11-04 04:32:24 -05:00 
			
		
		
		
	all.sh: reorganize testing around deprecated features
build_deprecated combined the testing of deprecated features, and testing of the build without deprecated features. Also, it violated the component naming convention by being called build_xxx but running tests. Replace it by: * test_default_no_deprecated: check that you can remove deprecated features from the default build. * test_full_no_deprecated: check that the library builds when deprecated features are disabled (and incidentally that the tests run). * test_no_deprecated_warning: check that there are no warnings when deprecated features are disabled and MBEDTLS_DEPRECATED_WARNING is enabled. * test_deprecated: test the deprecated features. Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
This commit is contained in:
		
							parent
							
								
									3a584aecca
								
							
						
					
					
						commit
						1093d9f9af
					
				@ -897,26 +897,49 @@ component_test_full_cmake_clang () {
 | 
			
		||||
    if_build_succeeded env OPENSSL_CMD="$OPENSSL_NEXT" tests/compat.sh -e '^$' -f 'ARIA\|CHACHA'
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
component_build_deprecated () {
 | 
			
		||||
    msg "build: make, full config + DEPRECATED_WARNING, gcc -O" # ~ 30s
 | 
			
		||||
component_test_default_no_deprecated () {
 | 
			
		||||
    msg "build: make, default + MBEDTLS_DEPRECATED_REMOVED" # ~ 30s
 | 
			
		||||
    scripts/config.py set MBEDTLS_DEPRECATED_REMOVED
 | 
			
		||||
    make CC=gcc CFLAGS='-O -Werror -Wall -Wextra'
 | 
			
		||||
 | 
			
		||||
    msg "test: make, default + MBEDTLS_DEPRECATED_REMOVED" # ~ 5s
 | 
			
		||||
    make test
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
component_test_full_no_deprecated () {
 | 
			
		||||
    msg "build: make, full_non_deprecated config" # ~ 30s
 | 
			
		||||
    scripts/config.py full_non_deprecated
 | 
			
		||||
    make CC=gcc CFLAGS='-O -Werror -Wall -Wextra'
 | 
			
		||||
 | 
			
		||||
    msg "test: make, full_non_deprecated config" # ~ 5s
 | 
			
		||||
    make test
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
component_test_no_deprecated_warning () {
 | 
			
		||||
    msg "build: make, full_non_deprecated config, MBEDTLS_DEPRECATED_WARNING" # ~ 30s
 | 
			
		||||
    scripts/config.py full_non_deprecated
 | 
			
		||||
    scripts/config.py unset MBEDTLS_DEPRECATED_REMOVED
 | 
			
		||||
    scripts/config.py set MBEDTLS_DEPRECATED_WARNING
 | 
			
		||||
    make CC=gcc CFLAGS='-O -Werror -Wall -Wextra'
 | 
			
		||||
 | 
			
		||||
    msg "test: make, full_non_deprecated config, MBEDTLS_DEPRECATED_WARNING" # ~ 5s
 | 
			
		||||
    make test
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
component_test_deprecated () {
 | 
			
		||||
    msg "build: make, full config + MBEDTLS_DEPRECATED_WARNING, expect warnings" # ~ 30s
 | 
			
		||||
    scripts/config.py full
 | 
			
		||||
    scripts/config.py set MBEDTLS_DEPRECATED_WARNING
 | 
			
		||||
    # Build with -O -Wextra to catch a maximum of issues.
 | 
			
		||||
    make CC=gcc CFLAGS='-O -Werror -Wall -Wextra' lib programs
 | 
			
		||||
    make CC=gcc CFLAGS='-O -Werror -Wall -Wextra -Wno-unused-function' tests
 | 
			
		||||
    # Expect warnings from '#warning' directives in check_config.h.
 | 
			
		||||
    make CC=gcc CFLAGS='-O -Werror -Wall -Wextra -Wno-error=cpp' lib programs
 | 
			
		||||
 | 
			
		||||
    msg "test: make, full config + DEPRECATED_WARNING, expect warnings" # ~ 30s
 | 
			
		||||
    make -C tests clean
 | 
			
		||||
    make CC=gcc CFLAGS='-O -Werror -Wall -Wextra -Wno-error=deprecated-declarations -DMBEDTLS_TEST_DEPRECATED' tests
 | 
			
		||||
    msg "build: make tests, full config + MBEDTLS_TEST_DEPRECATED, expect warnings" # ~ 30s
 | 
			
		||||
    # Expect warnings from '#warning' directives in check_config.h and
 | 
			
		||||
    # from the use of deprecated functions in test suites.
 | 
			
		||||
    make CC=gcc CFLAGS='-O -Werror -Wall -Wextra -Wno-error=deprecated-declarations -Wno-error=cpp -DMBEDTLS_TEST_DEPRECATED' tests
 | 
			
		||||
 | 
			
		||||
    msg "build: make, full config + DEPRECATED_REMOVED, clang -O" # ~ 30s
 | 
			
		||||
    # No cleanup, just tweak the configuration and rebuild
 | 
			
		||||
    make clean
 | 
			
		||||
    scripts/config.py unset MBEDTLS_DEPRECATED_WARNING
 | 
			
		||||
    scripts/config.py set MBEDTLS_DEPRECATED_REMOVED
 | 
			
		||||
    # Build with -O -Wextra to catch a maximum of issues.
 | 
			
		||||
    make CC=clang CFLAGS='-O -Werror -Wall -Wextra' lib programs
 | 
			
		||||
    make CC=clang CFLAGS='-O -Werror -Wall -Wextra -Wno-unused-function' tests
 | 
			
		||||
    msg "test: full config + MBEDTLS_TEST_DEPRECATED" # ~ 30s
 | 
			
		||||
    make test
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
# Check that the specified libraries exist and are empty.
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user