Simon Jakobi pushed to branch wip/sjakobi/T16720 at Glasgow Haskell Compiler / GHC

Commits:

1 changed file:

Changes:

  • testsuite/driver/testlib.py
    ... ... @@ -3569,15 +3569,11 @@ def summary(t: TestRun, file: TextIO, color=False, junit_path: Optional[Path]=No
    3569 3569
                 printTestOutputSummary(file, t.unexpected_failures, color, junit_path)
    
    3570 3570
             else:
    
    3571 3571
                 where = '; see {}'.format(junit_path) if junit_path else ''
    
    3572
    -            header = ('Unexpected failures (output omitted, more than {}{}):'
    
    3572
    +            header = ('Unexpected failures (more than {}, output omitted{}):'
    
    3573 3573
                           .format(MAX_SUMMARY_OUTPUT_TESTS, where))
    
    3574 3574
                 file.write(colored_if(color, Color.RED, header) + '\n')
    
    3575 3575
                 printTestInfosSummary(file, t.unexpected_failures)
    
    3576 3576
     
    
    3577
    -    printUnexpectedTests(file,
    
    3578
    -        [t.unexpected_passes, t.unexpected_failures,
    
    3579
    -         t.unexpected_stat_failures, t.framework_failures], color)
    
    3580
    -
    
    3581 3577
         if t.unexpected_passes:
    
    3582 3578
             header = 'Unexpected passes:'
    
    3583 3579
             file.write(colored_if(color, Color.RED, header) + '\n')
    
    ... ... @@ -3602,6 +3598,10 @@ def summary(t: TestRun, file: TextIO, color=False, junit_path: Optional[Path]=No
    3602 3598
             warning = 'WARNING: Testsuite run was terminated early'
    
    3603 3599
             file.write(colored_if(color, Color.YELLOW, warning) + '\n')
    
    3604 3600
     
    
    3601
    +    printUnexpectedTests(file,
    
    3602
    +        [t.unexpected_passes, t.unexpected_failures,
    
    3603
    +         t.unexpected_stat_failures, t.framework_failures], color)
    
    3604
    +
    
    3605 3605
         if len(t.unexpected_failures) > 0 or \
    
    3606 3606
             len(t.unexpected_stat_failures) > 0 or \
    
    3607 3607
             len(t.unexpected_passes) > 0 or \