From 2cad2ae30e60e2c9cf4bfe8daeb60aef12ef2447 Mon Sep 17 00:00:00 2001 From: Tomas Mraz Date: Thu, 18 Jan 2024 16:32:33 +0100 Subject: tlsfuzzer.sh: Make it more informative on errors Reviewed-by: Hugo Landau Reviewed-by: Tom Cosgrove (Merged from https://github.com/openssl/openssl/pull/23342) (cherry picked from commit 825b7cb16e0624d81421441949e843e9876c81f9) --- test/recipes/95-test_external_tlsfuzzer_data/tlsfuzzer.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/test/recipes/95-test_external_tlsfuzzer_data/tlsfuzzer.sh b/test/recipes/95-test_external_tlsfuzzer_data/tlsfuzzer.sh index 43b667244e..9c2421f906 100644 --- a/test/recipes/95-test_external_tlsfuzzer_data/tlsfuzzer.sh +++ b/test/recipes/95-test_external_tlsfuzzer_data/tlsfuzzer.sh @@ -11,6 +11,7 @@ # OpenSSL external testing using the TLSFuzzer test suite # set -e +set -x PWD="$(pwd)" @@ -31,12 +32,13 @@ export PATH="$O_EXE:$PATH" export LD_LIBRARY_PATH="$O_LIB:$LD_LIBRARY_PATH" export OPENSSL_ROOT_DIR="$O_LIB" -# Check/Set openssl version -OPENSSL_VERSION=$(${O_EXE}/openssl version | cut -f 2 -d ' ') CLI="${O_EXE}/openssl" SERV="${O_EXE}/openssl" +# Check/Set openssl version +OPENSSL_VERSION=$($CLI version | cut -f 2 -d ' ') + TMPFILE="${PWD}/tls-fuzzer.$$.tmp" PSKFILE="${PWD}/tls-fuzzer.psk.$$.tmp" @@ -51,6 +53,7 @@ echo " BLDTOP: $BLDTOP" echo " OPENSSL_ROOT_DIR: $OPENSSL_ROOT_DIR" echo " Python: $PYTHON" echo " TESTDATADIR: $TESTDATADIR" +echo " OPENSSL_VERSION: $OPENSSL_VERSION" echo "------------------------------------------------------------------" cd "${SRCTOP}/tlsfuzzer" -- cgit v1.2.3