X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=tcl_tests%2Fruntest.sh;h=9e0dead1b7abc96194803b2cbd43eb4015badb09;hb=7e6ed644cf97385a95544fcc889e2eb16bcc93ed;hp=0589f78d29818998103602cda96db3c7a69202a0;hpb=10576d5b3387fdb1f014e60a9c2bda97dbe6a593;p=openssl-gost%2Fengine.git

diff --git a/tcl_tests/runtest.sh b/tcl_tests/runtest.sh
index 0589f78..9e0dead 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`
@@ -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