diff options
author | Tomas Mraz <tomas@openssl.org> | 2021-03-04 12:33:33 +0100 |
---|---|---|
committer | Tomas Mraz <tomas@openssl.org> | 2021-03-05 14:27:46 +0100 |
commit | ec69d5c9a8b7c0edfbde56b65023ea5088547370 (patch) | |
tree | 85475a0626565697c874fa3417753086bbba0b6d /test | |
parent | b414c8118d954617d0408f9907ad1bfe162ce6e9 (diff) |
gost_engine test: further cleanups and fixes
Allow absolute paths for $SRCTOP and $BLDTOP.
Do not build the gost_engine in tree.
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')
-rwxr-xr-x | test/recipes/95-test_external_gost_engine_data/gost_engine.sh | 25 |
1 files changed, 12 insertions, 13 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 ee03073a65..44810b5936 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 @@ -14,18 +14,21 @@ set -e PWD="$(pwd)" -O_EXE="$PWD/$BLDTOP/apps" -O_BINC="$PWD/$BLDTOP/include" -O_SINC="$PWD/$SRCTOP/include" -O_LIB="$PWD/$BLDTOP" +SRCTOP="$(cd $SRCTOP; pwd)" +BLDTOP="$(cd $BLDTOP; pwd)" -unset OPENSSL_CONF - -if [ "$O_BINC" != "$O_SINC" ] ; then +if [ "$SRCTOP" != "$BLDTOP" ] ; then echo "Out of tree builds not supported with gost_engine test!" exit 1 fi +O_EXE="$BLDTOP/apps" +O_BINC="$BLDTOP/include" +O_SINC="$SRCTOP/include" +O_LIB="$BLDTOP" + +unset OPENSSL_CONF + export PATH="$O_EXE:$PATH" export LD_LIBRARY_PATH="$O_LIB:$LD_LIBRARY_PATH" export OPENSSL_ROOT_DIR="$O_LIB" @@ -42,15 +45,11 @@ echo " OPENSSL_ROOT_DIR: $OPENSSL_ROOT_DIR" echo " OpenSSL version: $OPENSSL_VERSION" echo "------------------------------------------------------------------" -cd $SRCTOP/gost-engine -rm -rf build -mkdir -p build -cd build -cmake .. -DOPENSSL_ROOT_DIR="$OPENSSL_ROOT_DIR" +cmake $SRCTOP/gost-engine -DOPENSSL_ROOT_DIR="$OPENSSL_ROOT_DIR" make export CTEST_OUTPUT_ON_FAILURE=1 export HARNESS_OSSL_PREFIX='' -export OPENSSL_ENGINES="$OPENSSL_ROOT_DIR/gost-engine/build/bin" +export OPENSSL_ENGINES="$PWD/bin" export OPENSSL_APP="$O_EXE/openssl" make test make tcl_tests |