Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC

Commits:

1 changed file:

Changes:

  • testsuite/driver/junit.py
    ... ... @@ -14,12 +14,13 @@ def junit(t: TestRun) -> ET.ElementTree:
    14 14
                                                  + len(t.unexpected_stat_failures)
    
    15 15
                                                  + len(t.unexpected_passes)),
    
    16 16
                                   errors = str(len(t.framework_failures)),
    
    17
    +                              skipped = str(len(t.fragile_failures)),
    
    17 18
                                   timestamp = datetime.now().isoformat())
    
    18 19
     
    
    19
    -    for res_type, group in [('stat failure', t.unexpected_stat_failures),
    
    20
    -                            ('unexpected failure', t.unexpected_failures),
    
    21
    -                            ('unexpected pass', t.unexpected_passes),
    
    22
    -                            ('fragile failure', t.fragile_failures)]:
    
    20
    +    for kind, res_type, group in [('failure', 'stat failure', t.unexpected_stat_failures),
    
    21
    +                                  ('failure', 'unexpected failure', t.unexpected_failures),
    
    22
    +                                  ('failure', 'unexpected pass', t.unexpected_passes),
    
    23
    +                                  ('skipped', 'fragile failure', t.fragile_failures)]:
    
    23 24
             for tr in group:
    
    24 25
                 testcase = ET.SubElement(testsuite, 'testcase',
    
    25 26
                                          classname = tr.way,
    
    ... ... @@ -30,7 +31,7 @@ def junit(t: TestRun) -> ET.ElementTree:
    30 31
                 if tr.stderr:
    
    31 32
                     message += ['', 'stderr:', '==========', tr.stderr]
    
    32 33
     
    
    33
    -            result = ET.SubElement(testcase, 'failure',
    
    34
    +            result = ET.SubElement(testcase, kind,
    
    34 35
                                        type = res_type,
    
    35 36
                                        message = tr.reason)
    
    36 37
                 result.text = '\n'.join(message)