Enabling TC26 CMS tests

[openssl-gost/engine.git] / tcl_tests / runtest.sh

diff --git a/tcl_tests/runtest.sh b/tcl_tests/runtest.sh
index 0589f78d29818998103602cda96db3c7a69202a0..abee488e128c2f4f344cdfbd92c84030637d0405 100644 (file)
--- 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`
@@ -87,7 +95,7 @@ case "$ENGINE_NAME" in
                OTHER_DIR=`echo $TESTDIR |sed 's/cryptocom/gost/'`
                ;;
        gost)
-               BASE_TESTS="engine dgst mac pkcs8 enc req-genpkey req-newkey ca smime smime2 smimeenc cms cms2 cmsenc pkcs12 nopath ocsp ts ssl smime_io cms_io smimeenc_io cmsenc_io"
+               BASE_TESTS="engine dgst mac pkcs8 enc req-genpkey req-newkey ca smime smime2 smimeenc cms cms2 cmstc262019 cmsenc pkcs12 nopath ocsp ts ssl smime_io cms_io smimeenc_io cmsenc_io"
                OTHER_DIR=`echo $TESTDIR |sed 's/gost/cryptocom/'`
                ;;
        *)
@@ -112,11 +120,24 @@ if [ "$*" ]; then
   exit $fail
 fi
 for t in $BASE_TESTS; do
-       $TCLSH $t.try || fail=1
+       if [ "$CI" ]; then
+               if $TCLSH $t.try > $TESTDIR/$t.out 2>&1; then
+                       head -1 $TESTDIR/$t.out
+               else
+                       fail=1
+                       cat $TESTDIR/$t.out
+                       echo "=== Output failures of $TESTDIR/$t.log ==="
+                       awk "/ ends failed/" RS= ORS='\n\n' $TESTDIR/$t.log |
+                               sed 's/^/\t/'
+                       echo "=== End of $TESTDIR/$t.log ==="
+                       exit 1
+               fi
+       else
+               $TCLSH $t.try || fail=1
+       fi
 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