From nobody Tue May 21 06:52:58 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+104262+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+104262+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1683542979; cv=none; d=zohomail.com; s=zohoarc; b=QzwQsrKvi7vXErQFzgrlCLQTNafvtdy1/u5VD/3hZc9Joyagwg3AhdP8/CzXH/6dStVfiCjI/RCM1KlUu8b8aOT4Fj2OdG5sR3yfPDp4fP43O9vFXTZv3iaglaH5eWYNvHUfT2qtng6ixt2bs4FLVgQKJbqZvcLCozBXVrdaJgw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683542979; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=G74fO0DTWplObipTZ5aFrM6JSKwQR2DmQqurvldyu+4=; b=BqysyK9CVv78esgEGpu+1Yhvhq//rqsomLXPCdJ1cNQIjhNby/YfQmPDJGcM5YyuuQehNmoq5H1wC13S6QmMr2c7p4LAYu+LURo9td2VS3IxqiEqw8hipiFnzKfSBPiEvJAtuXD3R4MYvmPg5/WFb+y/pTSnV/DE7gHUAn0uq+A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+104262+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1683542979594910.441585048404; Mon, 8 May 2023 03:49:39 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id daZkYY1788612xPImVVtOQQ8; Mon, 08 May 2023 03:49:39 -0700 X-Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by mx.groups.io with SMTP id smtpd.web11.104164.1683542977681307214 for ; Mon, 08 May 2023 03:49:38 -0700 X-IronPort-AV: E=McAfee;i="6600,9927,10703"; a="329235960" X-IronPort-AV: E=Sophos;i="5.99,258,1677571200"; d="scan'208";a="329235960" X-Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 May 2023 03:49:36 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10703"; a="698485905" X-IronPort-AV: E=Sophos;i="5.99,258,1677571200"; d="scan'208";a="698485905" X-Received: from gguo-desk.gar.corp.intel.com ([10.5.215.23]) by orsmga002.jf.intel.com with ESMTP; 08 May 2023 03:49:35 -0700 From: "Guo, Gua" To: devel@edk2.groups.io Cc: Gua Guo , Michael D Kinney , Sean Brogan , Michael Kubacki Subject: [edk2-devel] [PATCH v1] BaseTools/Plugin: Too many execute file will be failure Date: Mon, 8 May 2023 18:49:29 +0800 Message-Id: <20230508104929.604-1-gua.guo@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,gua.guo@intel.com X-Gm-Message-State: 0alR6E78Tf2Mm5mW4dzDZZv4x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1683542979; bh=aSQAQi8IY9z538xbYC2DfNtsaRRDBwqWUYCadwcBEcE=; h=Cc:Date:From:Reply-To:Subject:To; b=usz+s1qkX8sx0oE2aHAmzBwo/4uKu36d8pIeHOLbFgorYEKSj1AtUb2cb1FuhlKQYgk BMTWey+5xmYnvJWwu60/3Cui9KXrXLSbWH2wvjMzvSDxO4x1bnX53LiJM9cYT/PnQeM17 +Bz2Bl7O5HtLX8rfSmIg9dINpmJ3zq4A/24= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1683542981596100001 Content-Type: text/plain; charset="utf-8" From: Gua Guo Windows command prompt have 8191 character limitation, enhance it to make command too long can be resloved. Change-Id: I7f1d8d46274f1c0104572d47253d499900effe76 Cc: Michael D Kinney Cc: Sean Brogan Cc: Michael Kubacki Signed-off-by: Gua Guo --- .../HostBasedUnitTestRunner.py | 31 ++++++++++++++++--- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/BaseTools/Plugin/HostBasedUnitTestRunner/HostBasedUnitTestRunn= er.py b/BaseTools/Plugin/HostBasedUnitTestRunner/HostBasedUnitTestRunner.py index d993de9412..05bb6da50a 100644 --- a/BaseTools/Plugin/HostBasedUnitTestRunner/HostBasedUnitTestRunner.py +++ b/BaseTools/Plugin/HostBasedUnitTestRunner/HostBasedUnitTestRunner.py @@ -209,13 +209,25 @@ class HostBasedUnitTestRunner(IUefiBuildPlugin): coverageFile =3D "" for testFile in testList: ret =3D RunCmd("OpenCppCoverage", f"--source {workspace} --exp= ort_type binary:{testFile}.cov -- {testFile}") - coverageFile +=3D " --input_coverage=3D" + testFile + ".cov" + if ret !=3D 0: + logging.error("UnitTest Coverage: Failed to collect covera= ge data.") + return 1 + + coverageFile =3D f" --input_coverage=3D{testFile}.cov" + if (os.path.isfile(f"{os.path.join(buildOutputBase, 'coverage.= cov')}")): + coverageFile +=3D f" --input_coverage=3D{os.path.join(buil= dOutputBase, 'coverage.cov')}" + ret =3D RunCmd("OpenCppCoverage", f"--export_type binary:{os.p= ath.join(buildOutputBase, 'coverage.cov')} --working_dir=3D{workspace}Build= {coverageFile}") if ret !=3D 0: logging.error("UnitTest Coverage: Failed to collect covera= ge data.") return 1 =20 # Generate and XML file if requested.by each package - ret =3D RunCmd("OpenCppCoverage", f"--export_type cobertura:{os.pa= th.join(buildOutputBase, 'coverage.xml')} --working_dir=3D{workspace}Build = {coverageFile}") + ret =3D RunCmd( + "OpenCppCoverage", + f"--export_type cobertura:{os.path.join(buildOutputBase, 'cove= rage.xml')} " + + f"--working_dir=3D{workspace}Build " + + f"--input_coverage=3D{os.path.join(buildOutputBase, 'coverage.= cov')}" + ) if ret !=3D 0: logging.error("UnitTest Coverage: Failed to generate cobertura= format xml in single package.") return 1 @@ -224,9 +236,20 @@ class HostBasedUnitTestRunner(IUefiBuildPlugin): testCoverageList =3D glob.glob(os.path.join(workspace, "Build", "*= *","*Test*.exe.cov"), recursive=3DTrue) coverageFile =3D "" for testCoverage in testCoverageList: - coverageFile +=3D " --input_coverage=3D" + testCoverage + coverageFile =3D f" --input_coverage=3D{testCoverage}" + if (os.path.isfile(f"{workspace}Build/coverage.cov")): + coverageFile +=3D f" --input_coverage=3D{workspace}Build/c= overage.cov" + ret =3D RunCmd("OpenCppCoverage", f"--export_type binary:{work= space}Build/coverage.cov --working_dir=3D{workspace}Build {coverageFile}") + if ret !=3D 0: + logging.error("UnitTest Coverage: Failed to collect covera= ge data.") + return 1 =20 - ret =3D RunCmd("OpenCppCoverage", f"--export_type cobertura:{works= pace}Build/coverage.xml --working_dir=3D{workspace}Build {coverageFile}") + ret =3D RunCmd( + "OpenCppCoverage", + f"--export_type cobertura:{workspace}Build/coverage.xml " + + f"--working_dir=3D{workspace}Build " + + f"--input_coverage=3D{workspace}Build/coverage.cov" + ) if ret !=3D 0: logging.error("UnitTest Coverage: Failed to generate cobertura= format xml.") return 1 --=20 2.39.2.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#104262): https://edk2.groups.io/g/devel/message/104262 Mute This Topic: https://groups.io/mt/98758306/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-