From nobody Wed Apr 27 11:42:26 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id B588D19926EC; Wed, 27 Apr 2022 11:42:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KpH0z3JV7z4RXG; Wed, 27 Apr 2022 11:42:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651059747; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EkZcXKV+WssHw5ysxaX5yujsKacEuIKvX1pSV+KrEZ4=; b=GgyRDl3GdFfSmNgXruLFScPv9qYWABl6e8CGDPlLoRadav4TmrmeCsEpqdIoCOfRF7ei5s paQ6WkUbXnpX0ucIviZKjj1+/LTmgKJlVSex4GAAAe2+7XE6yZR8naObZZr8dHRacE/t9d kEYt96aTLd51wOlTUADRwenvVfEmIJo9FnH5QvprnTQEbyLTUAfL2FXmkJ0eMMW4ZqZDME Ppv/R/q49F6UQGa0kP1YyRUD7E4KTdq7bU1wQfQMd+PtA22kA9mPO8zmdnWg1kbhT63hEO hXrZN3qHQBEA9TH0SyU7UsDZSJpvVXs36yyyYWVByTyLHdFyZFGl2PGIZXaq0w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 157DD23491; Wed, 27 Apr 2022 11:42:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23RBgQG9021675; Wed, 27 Apr 2022 11:42:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23RBgQXH021674; Wed, 27 Apr 2022 11:42:26 GMT (envelope-from git) Date: Wed, 27 Apr 2022 11:42:26 GMT Message-Id: <202204271142.23RBgQXH021674@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Marakasov Subject: git: a82890065cf4 - main - security/liboqs: fix tests List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a82890065cf4dd0efd82cb98a802bb1cd0c05a64 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651059747; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EkZcXKV+WssHw5ysxaX5yujsKacEuIKvX1pSV+KrEZ4=; b=p/aUN848S/z8cos49DF9XT+/VSdQYCg9ENUIGpzNORzA8QXQczIHhJwtYHS0saoynviZ+U zQ2MNXx1bjIBPecmlwPb8f4dv+hAaegrEXtBQ633HDOSBwez7mAc4jGLyLtbCE1BnRZkI4 /L4s0nESu8DMVQxa2QW91dPUQLO8DcH8iVwwjxXz2NtwgIDLZbs//ksQ+hXwDdkbSPKIqG QPdrvZo3kMmo7xTrIxspSdbeQOsOM1bdhT1Qy6GMyoE8H87h9NGUxKtbGin2cmh83cawvh 0Jg0ue+TQAjULobFAbQuhEaNinupr9kiuS+6P7ba6DGrmqHDrhhEOqeqBgq30g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651059747; a=rsa-sha256; cv=none; b=sfTKtcnK/jln0w9MklRMYQvg+x3gXXNoKeyvdFkLHuki1mzYnfXZs84pYcDXUeplgG3PQf UbRDo7YklH7eujAng88FT17mcahDbJoKiZNaTkcj8rT7QRM1+GFQsxkuhyOmmdfkq8UCZA sPUjcZIaj+m1olHX+zRD19xwCPhoQ6y/r1L6jFEbCh+5n+pVYPtUGLuhtobsggvLHkfKZy hfuwKoxcXHUnYpm6m1ZQ5pJEyg86RY2+0e2K2eSvYG6H9D043l3fPoRLNXTVG8cHPC4MAl t2CwIBDeJbWwJ9OBwVXSQxqt0ZbaHE2r8RuhxxSsbUswDaw3PyW9ofda9Tirow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=a82890065cf4dd0efd82cb98a802bb1cd0c05a64 commit a82890065cf4dd0efd82cb98a802bb1cd0c05a64 Author: Dmitry Marakasov AuthorDate: 2022-04-26 14:51:24 +0000 Commit: Dmitry Marakasov 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)