git: a82890065cf4 - main - security/liboqs: fix tests

From: Dmitry Marakasov <amdmi3_at_FreeBSD.org>
Date: Wed, 27 Apr 2022 11:42:26 UTC
The branch main has been updated by amdmi3:

URL: https://cgit.FreeBSD.org/ports/commit/?id=a82890065cf4dd0efd82cb98a802bb1cd0c05a64

commit a82890065cf4dd0efd82cb98a802bb1cd0c05a64
Author:     Dmitry Marakasov <amdmi3@FreeBSD.org>
AuthorDate: 2022-04-26 14:51:24 +0000
Commit:     Dmitry Marakasov <amdmi3@FreeBSD.org>
CommitDate: 2022-04-27 11:42:13 +0000

    security/liboqs: fix tests
    
    - Switch to pytest4
    - Add missing test-dependency on gpg
    - Remove unsupported pytest argument
    
    Reported by:    reprise
    Approved by:    portmgr blanket
---
 security/liboqs/Makefile                         |  3 ++-
 security/liboqs/files/patch-tests_CMakeLists.txt | 11 +++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/security/liboqs/Makefile b/security/liboqs/Makefile
index d13a9dad3084..7f0fa244f1c5 100644
--- a/security/liboqs/Makefile
+++ b/security/liboqs/Makefile
@@ -11,7 +11,8 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 BROKEN_i386=	Unknown or unsupported processor: i386
 BROKEN_powerpc=	Unknown or unsupported processor: powerpc
 
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
 		bash:shells/bash
 
 USES=		cmake python:test shebangfix ssl
diff --git a/security/liboqs/files/patch-tests_CMakeLists.txt b/security/liboqs/files/patch-tests_CMakeLists.txt
new file mode 100644
index 000000000000..e2eeb5dc6623
--- /dev/null
+++ b/security/liboqs/files/patch-tests_CMakeLists.txt
@@ -0,0 +1,11 @@
+--- tests/CMakeLists.txt.orig	2021-12-16 18:34:53 UTC
++++ tests/CMakeLists.txt
+@@ -115,7 +115,7 @@ add_definitions(-DOQS_COMPILE_OPTIONS="[${OQS_COMPILE_
+ # for DLL builds.
+ add_custom_target(
+     run_tests
+-    COMMAND ${CMAKE_COMMAND} -E env OQS_BUILD_DIR=${CMAKE_BINARY_DIR} ${PYTHON3_EXEC} -m pytest --verbose --numprocesses=auto --ignore=scripts/copy_from_upstream/repos
++    COMMAND ${CMAKE_COMMAND} -E env OQS_BUILD_DIR=${CMAKE_BINARY_DIR} ${PYTHON3_EXEC} -m pytest --verbose --ignore=scripts/copy_from_upstream/repos
+     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+     DEPENDS oqs example_kem kat_kem test_kem example_sig kat_sig test_sig test_sig_mem test_kem_mem ${UNIX_TESTS}
+     USES_TERMINAL)