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

Commits:

2 changed files:

Changes:

  • testsuite/driver/testlib.py
    ... ... @@ -3043,6 +3043,12 @@ def normalise_errmsg(s: str) -> str:
    3043 3043
         # Old emcc warns when we export HEAP8 but new one requires it (see #26290)
    
    3044 3044
         s = s.replace('warning: invalid item in EXPORTED_RUNTIME_METHODS: HEAP8\nwarning: invalid item in EXPORTED_RUNTIME_METHODS: HEAPU8\nemcc: warning: warnings in JS library compilation [-Wjs-compiler]\n','')
    
    3045 3045
     
    
    3046
    +    # on newer versions of MacOS X, the shipped ranlib warns about object files with no symbols,
    
    3047
    +    # however, these are completely benign stubs.
    
    3048
    +    # See https://gitlab.haskell.org/ghc/ghc/-/issues/27116
    
    3049
    +    if opsys('darwin'):
    
    3050
    +        s = modify_lines(s, lambda l: re.sub(r'.*ranlib:.*has no symbols', '', l))
    
    3051
    +
    
    3046 3052
         return s
    
    3047 3053
     
    
    3048 3054
     # normalise a .prof file, so that we can reasonably compare it against
    

  • testsuite/tests/driver/all.T
    ... ... @@ -120,9 +120,7 @@ if config.os == 'darwin':
    120 120
     else:
    
    121 121
       only_darwin = skip
    
    122 122
     
    
    123
    -test('static001', [extra_files(['Static001.hs']),
    
    124
    -                   only_darwin,
    
    125
    -                   when(arch('x86_64'), expect_broken(8127))],
    
    123
    +test('static001', [extra_files(['Static001.hs']), only_darwin],
    
    126 124
          makefile_test, ['static001'])
    
    127 125
     
    
    128 126
     test('dynHelloWorld',