gost_engine test: Run also perl and tcl tests

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/14416)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f2fdacce2678110fd7666d6a907e5cd859659c33..eb29080d62325743ba0470f95ae68cc7f89cb45f 100644 (file)
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -166,6 +166,7 @@ jobs:
     - name: make install
       run: make install
       working-directory: ./build
+
   external-tests:
     runs-on: ubuntu-latest
     steps:
@@ -175,7 +176,11 @@ jobs:
     - name: package installs
       run: |
         sudo apt-get update
-        sudo apt-get -yq install bison dejagnu gettext keyutils ldap-utils libldap2-dev libkeyutils-dev python3 python3-paste python3-pyrad slapd tcl-dev tcsh python3-virtualenv virtualenv
+        sudo apt-get -yq install bison dejagnu gettext keyutils ldap-utils libldap2-dev libkeyutils-dev python3 python3-paste python3-pyrad slapd tcl-dev tcl-thread tcsh python3-virtualenv virtualenv
+    - name: install cpanm and Test2::V0 for gost_engine testing
+      uses: perl-actions/install-with-cpanm@v1
+      with:
+        install: Test2::V0
     - name: config
       run: ./config --strict-warnings --debug no-afalgeng enable-rc5 enable-md2 enable-ssl3 enable-ssl3-method enable-weak-ssl-ciphers enable-zlib enable-ec_nistp_64_gcc_128 enable-external-tests && perl configdata.pm --dump
     - name: make

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 498825bad7bad67f0ca3c32f734e45f12352df4e..ee03073a65a9479dca2c8904b706db176da27101 100755 (executable)
--- a/test/recipes/95-test_external_gost_engine_data/gost_engine.sh
+++ b/test/recipes/95-test_external_gost_engine_data/gost_engine.sh
@@ -12,14 +12,23 @@
 #
 set -e
 
-O_EXE=`pwd`/$BLDTOP/apps
-O_BINC=`pwd`/$BLDTOP/include
-O_SINC=`pwd`/$SRCTOP/include
-O_LIB=`pwd`/$BLDTOP
+PWD="$(pwd)"
 
-export PATH=$O_EXE:$PATH
-export LD_LIBRARY_PATH=$O_LIB:$LD_LIBRARY_PATH
-export OPENSSL_ROOT_DIR=$O_LIB
+O_EXE="$PWD/$BLDTOP/apps"
+O_BINC="$PWD/$BLDTOP/include"
+O_SINC="$PWD/$SRCTOP/include"
+O_LIB="$PWD/$BLDTOP"
+
+unset OPENSSL_CONF
+
+if [ "$O_BINC" != "$O_SINC" ] ; then
+    echo "Out of tree builds not supported with gost_engine test!"
+    exit 1
+fi
+
+export PATH="$O_EXE:$PATH"
+export LD_LIBRARY_PATH="$O_LIB:$LD_LIBRARY_PATH"
+export OPENSSL_ROOT_DIR="$O_LIB"
 
 # Check/Set openssl version
 OPENSSL_VERSION=`openssl version | cut -f 2 -d ' '`
@@ -37,9 +46,11 @@ cd $SRCTOP/gost-engine
 rm -rf build
 mkdir -p build
 cd build
-cmake ..
+cmake .. -DOPENSSL_ROOT_DIR="$OPENSSL_ROOT_DIR"
 make
-CTEST_OUTPUT_ON_FAILURE=1 HARNESS_OSSL_PREFIX='' OPENSSL_ENGINES=$OPENSSL_ROOT_DIR/gost-engine/build/bin make test
-
-exit 0
-
+export CTEST_OUTPUT_ON_FAILURE=1
+export HARNESS_OSSL_PREFIX=''
+export OPENSSL_ENGINES="$OPENSSL_ROOT_DIR/gost-engine/build/bin"
+export OPENSSL_APP="$O_EXE/openssl"
+make test
+make tcl_tests