1. Patchew
  2. EDK2
  3. View series

[edk2-devel] [PATCH v1] BaseTools/Plugin: Too many execute file will be failure

Guo, Gua posted 1 patch 11 months, 4 weeks ago
Failed in applying to current master (apply log)
.../HostBasedUnitTestRunner.py                | 31 ++++++++++++++++---
1 file changed, 27 insertions(+), 4 deletions(-)
[edk2-devel] [PATCH v1] BaseTools/Plugin: Too many execute file will be failure
Posted by Guo, Gua 11 months, 4 weeks ago 
From: Gua Guo <gua.guo@intel.com>

Windows command prompt have 8191 character limitation,
enhance it to make command too long can be resloved.

Change-Id: I7f1d8d46274f1c0104572d47253d499900effe76
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Sean Brogan <sean.brogan@microsoft.com>
Cc: Michael Kubacki <mikuback@linux.microsoft.com>
Signed-off-by: Gua Guo <gua.guo@intel.com>
---
 .../HostBasedUnitTestRunner.py                | 31 ++++++++++++++++---
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/BaseTools/Plugin/HostBasedUnitTestRunner/HostBasedUnitTestRunner.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 = ""
         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"
+            if (os.path.isfile(f"{os.path.join(buildOutputBase, 'coverage.cov')}")):
+                coverageFile += f" --input_coverage={os.path.join(buildOutputBase, 'coverage.cov')}"
+            ret = RunCmd("OpenCppCoverage", f"--export_type binary:{os.path.join(buildOutputBase, 'coverage.cov')} --working_dir={workspace}Build {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={workspace}Build " +
+            f"--input_coverage={os.path.join(buildOutputBase, 'coverage.cov')}"
+            )
         if ret != 0:
             logging.error("UnitTest Coverage: Failed to generate cobertura format xml in single package.")
             return 1
@@ -224,9 +236,20 @@ class HostBasedUnitTestRunner(IUefiBuildPlugin):
         testCoverageList = glob.glob(os.path.join(workspace, "Build", "**","*Test*.exe.cov"), recursive=True)
         coverageFile = ""
         for testCoverage in testCoverageList:
-            coverageFile += " --input_coverage=" + testCoverage
+            coverageFile  = f" --input_coverage={testCoverage}"
+            if (os.path.isfile(f"{workspace}Build/coverage.cov")):
+                coverageFile += f" --input_coverage={workspace}Build/coverage.cov"
+            ret = RunCmd("OpenCppCoverage", f"--export_type binary:{workspace}Build/coverage.cov --working_dir={workspace}Build {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:{workspace}Build/coverage.xml " +
+            f"--working_dir={workspace}Build " +
+            f"--input_coverage={workspace}Build/coverage.cov"
+            )
         if ret != 0:
             logging.error("UnitTest Coverage: Failed to generate cobertura format xml.")
             return 1
-- 
2.39.2.windows.1



-=-=-=-=-=-=-=-=-=-=-=-
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]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH v1] BaseTools/Plugin: Too many execute file will be failure
Posted by Michael D Kinney 11 months, 3 weeks ago 
Hi Gua,

Can you add summary of change made to the commit message?

I think it is changes passing many coverage files in single command line to breaking it up into many command lines with one coverage file per command line.  Right?

Mike

> -----Original Message-----
> From: Guo, Gua <gua.guo@intel.com>
> Sent: Monday, May 8, 2023 3:49 AM
> To: devel@edk2.groups.io
> Cc: Guo, Gua <gua.guo@intel.com>; Kinney, Michael D
> <michael.d.kinney@intel.com>; Sean Brogan <sean.brogan@microsoft.com>;
> Michael Kubacki <mikuback@linux.microsoft.com>
> Subject: [PATCH v1] BaseTools/Plugin: Too many execute file will be failure
> 
> From: Gua Guo <gua.guo@intel.com>
> 
> Windows command prompt have 8191 character limitation,
> enhance it to make command too long can be resloved.
> 
> Change-Id: I7f1d8d46274f1c0104572d47253d499900effe76
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Cc: Sean Brogan <sean.brogan@microsoft.com>
> Cc: Michael Kubacki <mikuback@linux.microsoft.com>
> Signed-off-by: Gua Guo <gua.guo@intel.com>
> ---
>  .../HostBasedUnitTestRunner.py                | 31 ++++++++++++++++---
>  1 file changed, 27 insertions(+), 4 deletions(-)
> 
> diff --git
> a/BaseTools/Plugin/HostBasedUnitTestRunner/HostBasedUnitTestRunner.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 = ""
> 
>          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"
> 
> +            if (os.path.isfile(f"{os.path.join(buildOutputBase, 'coverage.cov')}")):
> 
> +                coverageFile += f" --input_coverage={os.path.join(buildOutputBase,
> 'coverage.cov')}"
> 
> +            ret = RunCmd("OpenCppCoverage", f"--export_type
> binary:{os.path.join(buildOutputBase, 'coverage.cov')} --
> working_dir={workspace}Build {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={workspace}Build " +
> 
> +            f"--input_coverage={os.path.join(buildOutputBase, 'coverage.cov')}"
> 
> +            )
> 
>          if ret != 0:
> 
>              logging.error("UnitTest Coverage: Failed to generate cobertura format
> xml in single package.")
> 
>              return 1
> 
> @@ -224,9 +236,20 @@ class HostBasedUnitTestRunner(IUefiBuildPlugin):
>          testCoverageList = glob.glob(os.path.join(workspace, "Build",
> "**","*Test*.exe.cov"), recursive=True)
> 
>          coverageFile = ""
> 
>          for testCoverage in testCoverageList:
> 
> -            coverageFile += " --input_coverage=" + testCoverage
> 
> +            coverageFile  = f" --input_coverage={testCoverage}"
> 
> +            if (os.path.isfile(f"{workspace}Build/coverage.cov")):
> 
> +                coverageFile += f" --
> input_coverage={workspace}Build/coverage.cov"
> 
> +            ret = RunCmd("OpenCppCoverage", f"--export_type
> binary:{workspace}Build/coverage.cov --working_dir={workspace}Build
> {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:{workspace}Build/coverage.xml " +
> 
> +            f"--working_dir={workspace}Build " +
> 
> +            f"--input_coverage={workspace}Build/coverage.cov"
> 
> +            )
> 
>          if ret != 0:
> 
>              logging.error("UnitTest Coverage: Failed to generate cobertura format
> xml.")
> 
>              return 1
> 
> --
> 2.39.2.windows.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#104281): https://edk2.groups.io/g/devel/message/104281
Mute This Topic: https://groups.io/mt/98758306/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/leave/3901457/1787277/102458076/xyzzy [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.