Ben Gamari pushed to branch wip/bump-win32-tarballs at Glasgow Haskell Compiler / GHC

Commits:

3 changed files:

Changes:

  • testsuite/tests/rts/all.T
    ... ... @@ -426,9 +426,7 @@ test('T10296b', [only_ways(['threaded2'])], compile_and_run, [''])
    426 426
     test('numa001', [ extra_run_opts('8'), unless(unregisterised(), extra_ways(['debug_numa'])), req_ghc_with_threaded_rts ]
    
    427 427
                     , compile_and_run, [''])
    
    428 428
     
    
    429
    -test('T12497', [ unless(opsys('mingw32'), skip), expect_broken(22694)
    
    430
    -               ],
    
    431
    -               makefile_test, ['T12497'])
    
    429
    +test('T12497', normal, makefile_test, ['T12497'])
    
    432 430
     
    
    433 431
     test('T13617', [ unless(opsys('mingw32'), skip)],
    
    434 432
                    makefile_test, ['T13617'])
    

  • testsuite/tests/rts/linker/T11223/T11223_link_order_a_b_2_fail.stderr-ws-32-mingw32
    ... ... @@ -3,7 +3,7 @@ GHC runtime linker: fatal error: I found a duplicate definition for symbol
    3 3
     whilst processing object file
    
    4 4
        E:\ghc-dev\msys64\home\Tamar\ghc\testsuite\tests\rts\T11223\T11223_link_order_a_b_2_fail.run\libfoo_link_lib_3.a
    
    5 5
     The symbol was previously defined in
    
    6
    -   E:\ghc-dev\msys64\home\Tamar\ghc\testsuite\tests\rts\T11223\T11223_link_order_a_b_2_fail.run\libbar_link_lib_3.a(#2:bar_link_lib_3.o)
    
    6
    +   E:\ghc-dev\msys64\home\Tamar\ghc\testsuite\tests\rts\T11223\T11223_link_order_a_b_2_fail.run\libbar_link_lib_3.a(#3:bar_link_lib_3.o)
    
    7 7
     This could be caused by:
    
    8 8
        * Loading two different object files which export the same symbol
    
    9 9
        * Specifying the same object file twice on the GHCi command line
    

  • testsuite/tests/rts/linker/T11223/T11223_link_order_a_b_2_fail.stderr-ws-64-mingw32
    ... ... @@ -3,7 +3,7 @@ GHC runtime linker: fatal error: I found a duplicate definition for symbol
    3 3
     whilst processing object file
    
    4 4
        E:\ghc-dev\msys64\home\Tamar\ghc\testsuite\tests\rts\T11223\T11223_link_order_a_b_2_fail.run\libfoo_link_lib_3.a
    
    5 5
     The symbol was previously defined in
    
    6
    -   E:\ghc-dev\msys64\home\Tamar\ghc\testsuite\tests\rts\T11223\T11223_link_order_a_b_2_fail.run\libbar_link_lib_3.a(#2:bar_link_lib_3.o)
    
    6
    +   E:\ghc-dev\msys64\home\Tamar\ghc\testsuite\tests\rts\T11223\T11223_link_order_a_b_2_fail.run\libbar_link_lib_3.a(#3:bar_link_lib_3.o)
    
    7 7
     This could be caused by:
    
    8 8
        * Loading two different object files which export the same symbol
    
    9 9
        * Specifying the same object file twice on the GHCi command line