Andrea Vezzosi pushed to branch wip/romes/async-rpc at Glasgow Haskell Compiler / GHC

Commits:

2 changed files:

Changes:

  • testsuite/tests/plugins/all.T
    ... ... @@ -374,11 +374,17 @@ test('plugins-external',
    374 374
           when(opsys('mingw32') or (opsys('linux') and not ghc_dynamic()), fragile(20706))],
    
    375 375
          makefile_test, [])
    
    376 376
     
    
    377
    +# Scrub the GHC version out of the panic header.
    
    378
    +def normalise_ghc_version(s):
    
    379
    +    import re
    
    380
    +    return re.sub(r'GHC version [^\s:]+', 'GHC version <VERSION>', s)
    
    381
    +
    
    377 382
     test('static-plugin-interp-panic',
    
    378 383
          [extra_files(['static-plugin-interp-panic-module.hs']),
    
    379 384
           unless(config.have_RTS_linker, skip),
    
    380 385
           extra_run_opts('"' + config.libdir + '"'),
    
    381
    -      req_th],
    
    386
    +      req_th,
    
    387
    +      normalise_errmsg_fun(normalise_ghc_version)],
    
    382 388
          compile_and_run,
    
    383 389
          ['-package ghc -j1'])
    
    384 390
     
    

  • testsuite/tests/plugins/static-plugin-interp-panic.stderr
    1 1
     static-plugin-interp-panic-module.hs:12:5: error: [GHC-87897]
    
    2 2
         • Exception when trying to run compile-time code:
    
    3 3
             panic! (the 'impossible' happened)
    
    4
    -  GHC version 10.1.20261027:
    
    4
    +  GHC version <VERSION>:
    
    5 5
     	static-plugin-interp-panic: panic loading GHC.Internal.Real
    
    6 6
     
    
    7 7
     Please report this as a GHC bug:  https://www.haskell.org/ghc/reportabug