From: Vitaly Chikunov Date: Sun, 5 Jan 2020 20:14:29 +0000 (+0300) Subject: tcl_tests: Rearrange runtest.sh to run from dirrerent env X-Git-Tag: v3.0.0~239 X-Git-Url: http://wagner.pp.ru/gitweb/?a=commitdiff_plain;h=1d36903aadb45850650e8113c6367893140d40af;p=openssl-gost%2Fengine.git tcl_tests: Rearrange runtest.sh to run from dirrerent env Add more debug output to fix Travis-CI issues. Move definition of OPENSSL_CONF above first tcl test run. Define OPENSSL_ENGINES from ENGINE_DIR by default. --- diff --git a/tcl_tests/runtest.sh b/tcl_tests/runtest.sh index 0589f78..a9714fd 100644 --- a/tcl_tests/runtest.sh +++ b/tcl_tests/runtest.sh @@ -67,6 +67,14 @@ else fi TCLSH="$TCLSH -encoding utf-8" +echo "PWD: $PWD" +: ${OPENSSL_CONF:=$PWD/openssl-gost.cnf} +echo "OPENSSL_CONF: $OPENSSL_CONF" +export OPENSSL_CONF +echo "ENGINE_DIR: $ENGINE_DIR" +: ${OPENSSL_ENGINES:=$ENGINE_DIR} +echo "OPENSSL_ENGINES: $OPENSSL_ENGINES" +export OPENSSL_ENGINES APP_SUFFIX=`basename $OPENSSL_APP .exe|sed s/openssl//` [ -n "$OPENSSL_APP" ]&& export OPENSSL_APP ENGINE_NAME=`$TCLSH getengine.tcl` @@ -116,7 +124,6 @@ for t in $BASE_TESTS; do done if false; then # ignore some tests for a time -: ${OPENSSL_CONF:=$PWD/openssl-gost.cnf} ALG_LIST="rsa:1024 gost2001:XA gost2012_256:XA gost2012_512:A" $TCLSH ssl.try -clientconf $OPENSSL_CONF || fail=1 ALG_LIST="rsa:1024 gost2001:XA gost2012_256:XA gost2012_512:A" $TCLSH ssl.try -serverconf $OPENSSL_CONF || fail=1