The branch master has been updated via dddec86b763599974ef6f07036b51ee5b3946067 (commit) from c217de2c9b91c88f64ce6940b6c3ef5ef1a0bdae (commit)
- Log ----------------------------------------------------------------- commit dddec86b763599974ef6f07036b51ee5b3946067 Author: Matt Caswell <m...@openssl.org> Date: Wed Feb 5 15:23:46 2020 +0000 Don't run the GOST engine test in a no-deprecated build The GOST engine uses some deprecated symbols. Until that is resolved we don't run the GOST engine test in a no deprecated build. Reviewed-by: Paul Dale <paul.d...@oracle.com> (Merged from https://github.com/openssl/tools/pull/54) ----------------------------------------------------------------------- Summary of changes: run-checker/run-checker.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/run-checker/run-checker.sh b/run-checker/run-checker.sh index f5be229..2617914 100755 --- a/run-checker/run-checker.sh +++ b/run-checker/run-checker.sh @@ -95,6 +95,8 @@ if run-hook prepare; then warnopts="--strict-warnings" optcc="clang" ldcmd="" + gost_engine="$OPENSSL_GOST_ENGINE_SO" + if [ "$opt" == "enable-asan" ]; then # A documented requirement for enable-asan is no-shared expandedopts="enable-asan no-shared -DOPENSSL_SMALL_FOOTPRINT" @@ -113,6 +115,10 @@ if run-hook prepare; then expandedopts="enable-fuzz-libfuzzer --with-fuzzer-include=../../Fuzzer --with-fuzzer-lib=../../Fuzzer/libFuzzer -DPEDANTIC enable-asan enable-ubsan no-shared" elif [ "$opt" == "no-static-engine" ]; then expandedopts="no-static-engine no-shared" + elif [ "$opt" == "no-deprecated" ]; then + #The gost engine uses some deprecated symbols so we don't use it + #in a no-deprecated build + gost_engine="" fi if [ -z "$opt" ]; then @@ -180,7 +186,7 @@ if run-hook prepare; then ) 2> /dev/null & echo " make test" - log-exec make test>>build.log 2>&1 + OPENSSL_GOST_ENGINE_SO="$gost_engine" log-exec make test>>build.log 2>&1 ) ); then echo " PASS"