summaryrefslogtreecommitdiff
path: root/test/recipes
diff options
context:
space:
mode:
authorTomas Mraz <tomas@openssl.org>2021-03-03 18:46:34 +0100
committerTomas Mraz <tomas@openssl.org>2021-03-05 14:27:46 +0100
commitb414c8118d954617d0408f9907ad1bfe162ce6e9 (patch)
treee1522fec93190e88860b18204e369d2e502bf258 /test/recipes
parent996d2693e26d98456a2ec4fb1a5dd432ff026225 (diff)
downloadopenssl-new-b414c8118d954617d0408f9907ad1bfe162ce6e9.tar.gz
gost_engine test: Run also perl and tcl tests
Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com> (Merged from https://github.com/openssl/openssl/pull/14416)
Diffstat (limited to 'test/recipes')
-rwxr-xr-xtest/recipes/95-test_external_gost_engine_data/gost_engine.sh35
1 files changed, 23 insertions, 12 deletions
diff --git a/test/recipes/95-test_external_gost_engine_data/gost_engine.sh b/test/recipes/95-test_external_gost_engine_data/gost_engine.sh
index 498825bad7..ee03073a65 100755
--- a/test/recipes/95-test_external_gost_engine_data/gost_engine.sh
+++ b/test/recipes/95-test_external_gost_engine_data/gost_engine.sh
@@ -12,14 +12,23 @@
#
set -e
-O_EXE=`pwd`/$BLDTOP/apps
-O_BINC=`pwd`/$BLDTOP/include
-O_SINC=`pwd`/$SRCTOP/include
-O_LIB=`pwd`/$BLDTOP
+PWD="$(pwd)"
-export PATH=$O_EXE:$PATH
-export LD_LIBRARY_PATH=$O_LIB:$LD_LIBRARY_PATH
-export OPENSSL_ROOT_DIR=$O_LIB
+O_EXE="$PWD/$BLDTOP/apps"
+O_BINC="$PWD/$BLDTOP/include"
+O_SINC="$PWD/$SRCTOP/include"
+O_LIB="$PWD/$BLDTOP"
+
+unset OPENSSL_CONF
+
+if [ "$O_BINC" != "$O_SINC" ] ; then
+ echo "Out of tree builds not supported with gost_engine test!"
+ exit 1
+fi
+
+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=`openssl version | cut -f 2 -d ' '`
@@ -37,9 +46,11 @@ cd $SRCTOP/gost-engine
rm -rf build
mkdir -p build
cd build
-cmake ..
+cmake .. -DOPENSSL_ROOT_DIR="$OPENSSL_ROOT_DIR"
make
-CTEST_OUTPUT_ON_FAILURE=1 HARNESS_OSSL_PREFIX='' OPENSSL_ENGINES=$OPENSSL_ROOT_DIR/gost-engine/build/bin make test
-
-exit 0
-
+export CTEST_OUTPUT_ON_FAILURE=1
+export HARNESS_OSSL_PREFIX=''
+export OPENSSL_ENGINES="$OPENSSL_ROOT_DIR/gost-engine/build/bin"
+export OPENSSL_APP="$O_EXE/openssl"
+make test
+make tcl_tests