From nobody Mon Jun 27 17:32:55 2022 X-Original-To: dev-commits-src-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 523608A31F2; Mon, 27 Jun 2022 17:32:56 +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 4LWvvD0HFtz3Dq6; Mon, 27 Jun 2022 17:32:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656351176; 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=lXtsXhTVaGhseWCMLYlDWqLxOUtyu1GxZcmmzofVAmQ=; b=qB5Jf8EEdh7PfPPAmc5Dus4rgxg+mSu42OG1olovP88+fWvzbRPfG3ZkA7eHzSqGiY4APR X+LRB2ye/7QeqeJNDUYS4Glaz8kvZ80BVYRFK59I86DjRrTlyWCT1Yun4DhhqQpexo9b8X KMBSMsF17Wb+yqFtNS/48jSjUl1VNj/nfkqzanssepz4h0ij54jyZLRuatH6i6ly5Dgd3W dh5a7eszkAoN5FQX7hdaYSjkDW6rcwrSgUVHMghs0T1AyvH52aScQ8nOjKPQ/gDLaDDwfV T/RWSgF5DV2ZsoQiBuQ28TekcruPXRdfiv+aFoG/zuobJUQgy/WPeiZ+e4AAEw== 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 CD5804ABB; Mon, 27 Jun 2022 17:32:55 +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 25RHWtwI055359; Mon, 27 Jun 2022 17:32:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25RHWtCa055358; Mon, 27 Jun 2022 17:32:55 GMT (envelope-from git) Date: Mon, 27 Jun 2022 17:32:55 GMT Message-Id: <202206271732.25RHWtCa055358@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: 9c42645a1e4d - main - testing: workaround pytest parser bug in pytest-atf-wrapper. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9c42645a1e4d6695730187aef0f1494394503624 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656351176; 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=lXtsXhTVaGhseWCMLYlDWqLxOUtyu1GxZcmmzofVAmQ=; b=sWV2R3XvzQcbcRnhAhPhLx22QA3mOMogCFDpkh7ekEzmVwLRSdxl05jqMYDeQLC3zC90CW z0OzAXpBsREd7h1BOC0mB/OONBgpfm0aRZ0zol8ACOkaXNFh0GGyOuHRV15wFaE0Rh+iDl UFjTJEVAsJY6nAw0/NeKNOY0CjComd2vDBOfYkRtyOrusGbrbWoIzLVOTGpNLaPTZDOepr 3XpnI/eRyETmlkOJhpXR5fd+leZYbtjtyawHs5GPFO1oxAY6eGndrgPT0IdwGHj7MyyKXC rHHKozFKApaw6qF6UIf0JCDsJvTNt7gsDhTM57qavrZ7MO1yHPdNh2jxJ+v5/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656351176; a=rsa-sha256; cv=none; b=H4qG2jR6BKQl3WbymhpNuLGjxlEu879iZWNnGAAqlTLjj0o6xR468YYkLB4enZsyPaNeru VuDzswhEXNIQ5+BgCrzEubtvOYt/eEPC5q7ydxCTSRSTus8a0nEyplP8XPUldFV1Pjsy78 vPOgc6gINM514IouCDS5INM/hIbTiQihaM2qyN312MenJCbNUrK2rihF76QNTpD/8GsbcS /sWp/tG+fLnYxsGZDRRnHI733I6V3qEnkdaZUhnp8JZjdGGLcz4vrrVfdbw7fiOaUUaT7q AuT+RLhxYOMHwyhltw4pJObmc4SrgaYWJRKVWGhwT+NUdbfnHqWMmFVpEIpRoQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=9c42645a1e4d6695730187aef0f1494394503624 commit 9c42645a1e4d6695730187aef0f1494394503624 Author: Alexander V. Chernikov AuthorDate: 2022-06-27 15:52:25 +0000 Commit: Alexander V. Chernikov CommitDate: 2022-06-27 17:30:53 +0000 testing: workaround pytest parser bug in pytest-atf-wrapper. Reviewed by: lwhsu, kp Differential Revision: https://reviews.freebsd.org/D35614 MFC after: 2 weeks --- libexec/atf/atf-pytest-wrapper/atf_pytest_wrapper.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libexec/atf/atf-pytest-wrapper/atf_pytest_wrapper.cpp b/libexec/atf/atf-pytest-wrapper/atf_pytest_wrapper.cpp index 11fd3c47d507..bc7eec3b851d 100644 --- a/libexec/atf/atf-pytest-wrapper/atf_pytest_wrapper.cpp +++ b/libexec/atf/atf-pytest-wrapper/atf_pytest_wrapper.cpp @@ -137,13 +137,15 @@ class Handler { if (flag_cleanup) { args.push_back("--atf-cleanup"); } + // workaround pytest parser bug: + // https://github.com/pytest-dev/pytest/issues/3097 + // use '--arg=value' format instead of '--arg value' for all + // path-like options if (!src_dir.empty()) { - args.push_back("--atf-source-dir"); - args.push_back(src_dir); + args.push_back("--atf-source-dir=" + src_dir); } if (!dst_file.empty()) { - args.push_back("--atf-file"); - args.push_back(dst_file); + args.push_back("--atf-file=" + dst_file); } for (auto &pair: kv_list) { args.push_back("--atf-var");