From 996d2693e26d98456a2ec4fb1a5dd432ff026225 Mon Sep 17 00:00:00 2001 From: Tomas Mraz Date: Wed, 3 Mar 2021 18:26:22 +0100 Subject: [PATCH] CI: add job with external tests Update gost-engine submodule. Update pyca-cryptography submodule. Fix condition for skipping krb5 test. Reviewed-by: Richard Levitte Reviewed-by: Dmitry Belyavskiy (Merged from https://github.com/openssl/openssl/pull/14416) --- .github/workflows/ci.yml | 16 ++++++++++++++++ gost-engine | 2 +- pyca-cryptography | 2 +- test/ossl_shim/include/openssl/base.h | 3 +++ test/recipes/95-test_external_krb5.t | 2 +- 5 files changed, 22 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 67ec2541b3..f2fdacce26 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -166,3 +166,19 @@ jobs: - name: make install run: make install working-directory: ./build + external-tests: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + submodules: recursive + - 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 + - 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 + run: make -s -j4 + - name: make test + run: BORING_RUNNER_DIR=$(pwd)/boringssl/ssl/test/runner make test TESTS="test_external*" diff --git a/gost-engine b/gost-engine index b008f2a0ff..28a0a19354 160000 --- a/gost-engine +++ b/gost-engine @@ -1 +1 @@ -Subproject commit b008f2a0ffa1797943c3d08c3b3eee31229a56d3 +Subproject commit 28a0a193549a9b778a14fade0219b9daa0e7c5db diff --git a/pyca-cryptography b/pyca-cryptography index 09403100de..e09cd90f77 160000 --- a/pyca-cryptography +++ b/pyca-cryptography @@ -1 +1 @@ -Subproject commit 09403100de2f6f1cdd0d484dcb8e620f1c335c8f +Subproject commit e09cd90f77a31832bdde1d3652c115be282cced9 diff --git a/test/ossl_shim/include/openssl/base.h b/test/ossl_shim/include/openssl/base.h index 92e3648e1c..84918289c0 100644 --- a/test/ossl_shim/include/openssl/base.h +++ b/test/ossl_shim/include/openssl/base.h @@ -10,6 +10,9 @@ #ifndef OSSL_TEST_SHIM_INCLUDE_OPENSSL_BASE_H #define OSSL_TEST_SHIM_INCLUDE_OPENSSL_BASE_H +/* Needed for DH functions */ +#include "internal/deprecated.h" + /* Needed for BORINGSSL_MAKE_DELETER */ # include # include diff --git a/test/recipes/95-test_external_krb5.t b/test/recipes/95-test_external_krb5.t index ad262da2d9..9d6824cb6f 100644 --- a/test/recipes/95-test_external_krb5.t +++ b/test/recipes/95-test_external_krb5.t @@ -17,7 +17,7 @@ setup("test_external_krb5"); plan skip_all => "No external tests in this configuration" if disabled("external-tests"); plan skip_all => "krb5 not available" - if ! -f srctop_file("krb5", "data.txt"); + if ! -f srctop_file("krb5", "src", "configure.in"); plan tests => 1; -- 2.34.1