[commit: ghc] master: Don't shadow "result" in JUnit driver (107d2cb)

git at git.haskell.org git at git.haskell.org
Thu May 3 19:01:53 UTC 2018


Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/107d2cb7cc1e9c6d2226c3965e83a1b59d89ed04/ghc

>---------------------------------------------------------------

commit 107d2cb7cc1e9c6d2226c3965e83a1b59d89ed04
Author: Matthew Pickering <matthew.pickering at tweag.io>
Date:   Thu May 3 12:35:07 2018 -0400

    Don't shadow "result" in JUnit driver
    
    Reviewers: bgamari
    
    Reviewed By: bgamari
    
    Subscribers: thomie, carter
    
    GHC Trac Issues: #15093
    
    Differential Revision: https://phabricator.haskell.org/D4645


>---------------------------------------------------------------

107d2cb7cc1e9c6d2226c3965e83a1b59d89ed04
 testsuite/driver/junit.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/testsuite/driver/junit.py b/testsuite/driver/junit.py
index 01a5f47..f2dbebb 100644
--- a/testsuite/driver/junit.py
+++ b/testsuite/driver/junit.py
@@ -11,14 +11,14 @@ def junit(t):
                               errors = str(len(t.framework_failures)),
                               timestamp = datetime.now().isoformat())
 
-    for result, group in [('stat failure', t.unexpected_stat_failures),
+    for res_type, group in [('stat failure', t.unexpected_stat_failures),
                           ('unexpected failure', t.unexpected_failures)]:
         for (directory, testname, reason, way) in group:
             testcase = ET.SubElement(testsuite, 'testcase',
                                      classname = testname,
                                      name = way)
             result = ET.SubElement(testcase, 'failure',
-                                   type = result,
+                                   type = res_type,
                                    message = reason)
 
     for (directory, testname, reason, way) in t.framework_failures:



More information about the ghc-commits mailing list