From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mx.groups.io with SMTP id smtpd.web10.30431.1683754853317195895 for ; Wed, 10 May 2023 14:40:53 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@linux.microsoft.com header.s=default header.b=iEORWYq/; spf=pass (domain: linux.microsoft.com, ip: 13.77.154.182, mailfrom: mikuback@linux.microsoft.com) Received: from [192.168.4.22] (unknown [47.201.8.94]) by linux.microsoft.com (Postfix) with ESMTPSA id 54E1820B92A1; Wed, 10 May 2023 14:40:52 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 54E1820B92A1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1683754852; bh=27QIGrFokrnp4/vMA5kEIXba0B3NH7ZBofKQ8QHz+z4=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=iEORWYq/jsPdJh+xrVOIl3/cSsSx/l1I3cEMaf7oJIBgtqJOcLjxT+tBX/whpLLhM y3egp2e+o6PXxlzSbKdcnARjDAvKqv9P4NnDJgK/ZUqbxtdl+QAilwZzmsOQ3q8Sl+ Ytt/lycSTpID/kMK/y34wnmslduhd1J3V4hDQJd8= Message-ID: <2b81670d-d116-9c34-9704-a19e74a38fea@linux.microsoft.com> Date: Wed, 10 May 2023 17:40:51 -0400 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.10.1 Subject: Re: [edk2-devel] [PATCH v4 1/1] BaseTools/Plugin: Too many execute files cause "cmd too long" failure To: devel@edk2.groups.io, gua.guo@intel.com Cc: Michael D Kinney , Sean Brogan References: <20230510051457.1063-1-gua.guo@intel.com> <20230510051457.1063-2-gua.guo@intel.com> From: "Michael Kubacki" In-Reply-To: <20230510051457.1063-2-gua.guo@intel.com> Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Reviewed-by: Michael Kubacki On 5/10/2023 1:14 AM, Guo, Gua wrote: > From: Gua Guo > > Windows command prompt have 8191 characters limitation, > enhance it to make command too long can be resloved. > > Provide an example, if have too many cov files, it causes to run single > command over the 8191 characters limitation. >> OpenCppCoverage >> --export_type binary:coverage.cov >> --working_dir={workspace}Build >> --input_coverage=AAA.cov >> ... >> --input_coverage=NNN.cov > > The solution is passing many coverage files in single command line to > breaking it up into many command lines with one coverage file per > command line in order to prevent single line is over to 8191 characters. > > - Command Line 1 >> OpenCppCoverage >> --export_type binary:coverage.cov >> --working_dir={workspace}Build >> --input_coverage=AAA.cov >> --input_coverage=coverage.cov > ... > > - Command Line N >> OpenCppCoverage >> --export_type binary:coverage.cov >> --working_dir={workspace}Build >> --input_coverage=NNN.cov >> --input_coverage=coverage.cov > > Cc: Michael D Kinney > Cc: Sean Brogan > Cc: Michael Kubacki > Signed-off-by: Gua Guo > --- > .../HostBasedUnitTestRunner.py | 46 +++++++++++++++++-- > 1 file changed, 41 insertions(+), 5 deletions(-) > > diff --git a/BaseTools/Plugin/HostBasedUnitTestRunner/HostBasedUnitTestRunner.py b/BaseTools/Plugin/HostBasedUnitTestRunner/HostBasedUnitTestRunner.py > index d993de9412..2e5c462cd2 100644 > --- a/BaseTools/Plugin/HostBasedUnitTestRunner/HostBasedUnitTestRunner.py > +++ b/BaseTools/Plugin/HostBasedUnitTestRunner/HostBasedUnitTestRunner.py > @@ -205,28 +205,64 @@ class HostBasedUnitTestRunner(IUefiBuildPlugin): > testList = glob.glob(os.path.join(buildOutputBase, "**","*Test*.exe"), recursive=True) > > workspace = thebuilder.env.GetValue("WORKSPACE") > > workspace = (workspace + os.sep) if workspace[-1] != os.sep else workspace > > + workspaceBuild = os.path.join(workspace, 'Build') > > # Generate coverage file > > coverageFile = "" > > for testFile in testList: > > ret = RunCmd("OpenCppCoverage", f"--source {workspace} --export_type binary:{testFile}.cov -- {testFile}") > > - coverageFile += " --input_coverage=" + testFile + ".cov" > > + if ret != 0: > > + logging.error("UnitTest Coverage: Failed to collect coverage data.") > > + return 1 > > + > > + coverageFile = f" --input_coverage={testFile}.cov" > > + totalCoverageFile = os.path.join(buildOutputBase, 'coverage.cov') > > + if os.path.isfile(totalCoverageFile): > > + coverageFile += f" --input_coverage={totalCoverageFile}" > > + ret = RunCmd( > > + "OpenCppCoverage", > > + f"--export_type binary:{totalCoverageFile} " + > > + f"--working_dir={workspaceBuild} " + > > + f"{coverageFile}" > > + ) > > if ret != 0: > > logging.error("UnitTest Coverage: Failed to collect coverage data.") > > return 1 > > > > # Generate and XML file if requested.by each package > > - ret = RunCmd("OpenCppCoverage", f"--export_type cobertura:{os.path.join(buildOutputBase, 'coverage.xml')} --working_dir={workspace}Build {coverageFile}") > > + ret = RunCmd( > > + "OpenCppCoverage", > > + f"--export_type cobertura:{os.path.join(buildOutputBase, 'coverage.xml')} " + > > + f"--working_dir={workspaceBuild} " + > > + f"--input_coverage={totalCoverageFile} " > > + ) > > if ret != 0: > > logging.error("UnitTest Coverage: Failed to generate cobertura format xml in single package.") > > return 1 > > > > # Generate total report XML file for all package > > - testCoverageList = glob.glob(os.path.join(workspace, "Build", "**","*Test*.exe.cov"), recursive=True) > > + testCoverageList = glob.glob(os.path.join(workspace, "Build", "**", "*Test*.exe.cov"), recursive=True) > > coverageFile = "" > > + totalCoverageFile = os.path.join(workspaceBuild, 'coverage.cov') > > for testCoverage in testCoverageList: > > - coverageFile += " --input_coverage=" + testCoverage > > + coverageFile = f" --input_coverage={testCoverage}" > > + if os.path.isfile(totalCoverageFile): > > + coverageFile += f" --input_coverage={totalCoverageFile}" > > + ret = RunCmd( > > + "OpenCppCoverage", > > + f"--export_type binary:{totalCoverageFile} " + > > + f"--working_dir={workspaceBuild} " + > > + f"{coverageFile}" > > + ) > > + if ret != 0: > > + logging.error("UnitTest Coverage: Failed to collect coverage data.") > > + return 1 > > > > - ret = RunCmd("OpenCppCoverage", f"--export_type cobertura:{workspace}Build/coverage.xml --working_dir={workspace}Build {coverageFile}") > > + ret = RunCmd( > > + "OpenCppCoverage", > > + f"--export_type cobertura:{os.path.join(workspaceBuild, 'coverage.xml')} " + > > + f"--working_dir={workspaceBuild} " + > > + f"--input_coverage={totalCoverageFile}" > > + ) > > if ret != 0: > > logging.error("UnitTest Coverage: Failed to generate cobertura format xml.") > > return 1 >