diff options
author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2021-04-24 15:55:25 -0500 |
---|---|---|
committer | Pauli <pauli@openssl.org> | 2021-04-27 19:09:03 +1000 |
commit | a938f0045edd74aa4ba1188d6673c075fbd326c3 (patch) | |
tree | b16f4b42e8089b9721a0fb605a690021498f601b | |
parent | a09fb26ba90e46c4f731b5a597051b4d4b9aea3e (diff) |
re-add pyca/cryptography testing
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15018)
-rw-r--r-- | .github/workflows/ci.yml | 31 | ||||
-rwxr-xr-x | test/recipes/95-test_external_pyca_data/cryptography.sh | 16 |
2 files changed, 37 insertions, 10 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ec35e84ff3..4bdf669240 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -231,5 +231,32 @@ jobs: run: make test TESTS="test_external_gost_engine" - name: test external krb5 run: make test TESTS="test_external_krb5" -# - name: test external pyca -# run: make test TESTS="test_external_pyca" + + external-test-pyca: + runs-on: ubuntu-latest + strategy: + matrix: + RUST: + - 1.51.0 + PYTHON: + - 3.9 + steps: + - uses: actions/checkout@v2 + with: + submodules: recursive + - name: Configure OpenSSL + run: ./config --strict-warnings --debug enable-external-tests && perl configdata.pm --dump + - name: make + run: make -s -j4 + - name: Setup Python + uses: actions/setup-python@v2.2.2 + with: + python-version: ${{ matrix.PYTHON }} + - uses: actions-rs/toolchain@v1 + with: + profile: minimal + toolchain: ${{ matrix.RUST }} + override: true + default: true + - name: test external pyca + run: make test TESTS="test_external_pyca" diff --git a/test/recipes/95-test_external_pyca_data/cryptography.sh b/test/recipes/95-test_external_pyca_data/cryptography.sh index 3b48a87ab8..3745f133f7 100755 --- a/test/recipes/95-test_external_pyca_data/cryptography.sh +++ b/test/recipes/95-test_external_pyca_data/cryptography.sh @@ -12,6 +12,7 @@ # OpenSSL external testing using the Python Cryptography module # set -e +set -x O_EXE=`pwd`/$BLDTOP/apps O_BINC=`pwd`/$BLDTOP/include @@ -35,30 +36,29 @@ echo "------------------------------------------------------------------" cd $SRCTOP # Create a python virtual env and activate -rm -rf venv-pycrypto -virtualenv venv-pycrypto -. ./venv-pycrypto/bin/activate +rm -rf venv-cryptography +python -m venv venv-cryptography +. ./venv-cryptography/bin/activate cd pyca-cryptography pip install .[test] +pip install -e vectors echo "------------------------------------------------------------------" echo "Building cryptography" echo "------------------------------------------------------------------" -python ./setup.py clean - -CFLAGS="-I$O_BINC -I$O_SINC -L$O_LIB" python ./setup.py build +CFLAGS="-I$O_BINC -I$O_SINC -L$O_LIB" pip install . echo "------------------------------------------------------------------" echo "Running tests" echo "------------------------------------------------------------------" -CFLAGS="-I$O_BINC -I$O_SINC -L$O_LIB" python ./setup.py test +CFLAGS="-I$O_BINC -I$O_SINC -L$O_LIB" pytest -n auto tests --wycheproof-root=../wycheproof cd ../ deactivate -rm -rf venv-pycrypto +rm -rf venv-cryptography exit 0 |