X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=tcl_tests%2Fruntest.sh;h=abee488e128c2f4f344cdfbd92c84030637d0405;hb=9465f47596fb0ca5db8ea89c69ba07990e682ced;hp=a59c9461cb7abef42598eca349d3d74ee51c9b5e;hpb=3b8ddfe2f303b8931842e52bdb5c07c97042f651;p=openssl-gost%2Fengine.git

diff --git a/tcl_tests/runtest.sh b/tcl_tests/runtest.sh
index a59c946..abee488 100644
--- a/tcl_tests/runtest.sh
+++ b/tcl_tests/runtest.sh
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- coding: cp1251 -*-
 
 # Состав набора тестов
 # 1. Этот скрипт
@@ -24,6 +23,7 @@
 
 CRYPTOPACK_MAIN_VERSION=3
 
+: ${OPENSSL_APP:=$(which openssl 2>/dev/null)}
 if [ -z "$OPENSSL_APP" ]; then
 	if [ "$OS" != "Windows NT" -a "$OS" != "Windows_NT" ]; then
 		if [ -x  /opt/cryptopack$CRYPTOPACK_MAIN_VERSION/bin/openssl ]; then
@@ -44,7 +44,7 @@ else
 	echo "Using $OPENSSL_APP as openssl"
 fi
 
-
+: ${TCLSH:=$(which tclsh)}
 if [ -z "$TCLSH" ]; then
 	for version in "" 8.4 84 8.5 85 8.6 86; do
 		for command in tclsh$version; do
@@ -65,7 +65,16 @@ if [ -z "$TCLSH" ]; then
 else
 	echo "Using $TCLSH as tclsh"
 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`
@@ -86,6 +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 cmstc262019 cmsenc pkcs12 nopath ocsp ts ssl smime_io cms_io smimeenc_io cmsenc_io"
 		OTHER_DIR=`echo $TESTDIR |sed 's/gost/cryptocom/'`
 		;;
 	*)
@@ -103,12 +113,33 @@ OPENSSL_DEBUG_MEMORY=on
 export OPENSSL_DEBUG_MEMORY
 
 fail=0
+if [ "$*" ]; then
+  for t do
+    $TCLSH $t.try || fail=1
+  done
+  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
 
-ALG_LIST="rsa:1024 gost2001:XA gost2012_256:XA gost2012_512:A" OPENSSL_CONF=`pwd`/openssl-gost.cnf $TCLSH ssl.try -clientconf `pwd`/openssl-cryptocom.cnf || fail=1
-ALG_LIST="rsa:1024 gost2001:XA gost2012_256:XA gost2012_512:A" OPENSSL_CONF=`pwd`/openssl-gost.cnf $TCLSH ssl.try -serverconf `pwd`/openssl-cryptocom.cnf || fail=1
+if false; then # ignore some tests for a time
+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
 	
 for t in $PKCS7_COMPATIBILITY_TESTS; do
 	$TCLSH $t.try || fail=1
@@ -146,6 +177,7 @@ if [ -d OtherVersion ] ; then
 			exit 1;
 	esac
 fi	
+fi # false
 $TCLSH calcstat ${TESTDIR}/stats ${TESTDIR}/test.result
 grep "leaked" ${TESTDIR}/*.log
 if [ $fail  -ne 0 ]; then