Zubin pushed to branch wip/26552 at Glasgow Haskell Compiler / GHC

Commits:

7 changed files:

Changes:

  • testsuite/tests/driver/T20696/T20696.stderr-ext-interp
    1
    +[1 of 3] Compiling C                ( C.hs, C.o )
    
    2
    +[2 of 3] Compiling B                ( B.hs, B.o )
    
    3
    +[3 of 3] Compiling A                ( A.hs, A.o )

  • testsuite/tests/driver/T20696/all.T
    1 1
     test('T20696', [extra_files(['A.hs', 'B.hs', 'C.hs'])
    
    2
    -               , expect_broken_for(26552, ['ext-interp'])
    
    3 2
                    , unless(ghc_dynamic(), skip)], multimod_compile, ['A', ''])
    
    4 3
     test('T20696-static', [extra_files(['A.hs', 'B.hs', 'C.hs'])
    
    5 4
                    , when(ghc_dynamic(), skip)], multimod_compile, ['A', ''])

  • testsuite/tests/driver/fat-iface/all.T
    ... ... @@ -9,12 +9,12 @@ test('fat010', [req_th,extra_files(['THA.hs', 'THB.hs', 'THC.hs']), copy_files],
    9 9
     # Check linking works when using -fbyte-code-and-object-code
    
    10 10
     test('fat011', [req_th, extra_files(['FatMain.hs', 'FatTH.hs', 'FatQuote.hs'])], multimod_compile, ['FatMain', '-fbyte-code-and-object-code -fprefer-byte-code'])
    
    11 11
     # Check that we use interpreter rather than enable dynamic-too if needed for TH
    
    12
    -test('fat012', [req_th, expect_broken_for(26552, ['ext-interp']), unless(ghc_dynamic(), skip), extra_files(['FatTH.hs', 'FatQuote.hs'])], multimod_compile, ['FatTH', '-fprefer-byte-code'])
    
    12
    +test('fat012', [req_th, unless(ghc_dynamic(), skip), extra_files(['FatTH.hs', 'FatQuote.hs'])], multimod_compile, ['FatTH', '-fprefer-byte-code'])
    
    13 13
     # Check that no objects are generated if using -fno-code and -fprefer-byte-code
    
    14 14
     test('fat013', [req_th, req_bco, extra_files(['FatTH.hs', 'FatQuote.hs'])], multimod_compile, ['FatTH', '-fno-code -fprefer-byte-code'])
    
    15 15
     # When using interpreter should not produce objects
    
    16 16
     test('fat014', [req_th, extra_files(['FatTH.hs', 'FatQuote.hs']), extra_run_opts('-fno-code')], ghci_script, ['fat014.script'])
    
    17
    -test('fat015', [req_th, expect_broken_for(26552, ['ext-interp']), unless(ghc_dynamic(), skip), extra_files(['FatQuote.hs', 'FatQuote1.hs', 'FatQuote2.hs', 'FatTH1.hs', 'FatTH2.hs', 'FatTHTop.hs'])], multimod_compile, ['FatTHTop', '-fno-code -fwrite-interface'])
    
    17
    +test('fat015', [req_th, unless(ghc_dynamic(), skip), extra_files(['FatQuote.hs', 'FatQuote1.hs', 'FatQuote2.hs', 'FatTH1.hs', 'FatTH2.hs', 'FatTHTop.hs'])], multimod_compile, ['FatTHTop', '-fno-code -fwrite-interface'])
    
    18 18
     test('T22807', [req_th, unless(ghc_dynamic(), skip), extra_files(['T22807A.hs', 'T22807B.hs'])]
    
    19 19
                  , makefile_test, ['T22807'])
    
    20 20
     test('T22807_ghci', [req_th, unless(ghc_dynamic(), skip), extra_files(['T22807_ghci.hs'])]
    

  • testsuite/tests/driver/fat-iface/fat012.stderr-ext-interp
    1
    +[1 of 2] Compiling FatQuote         ( FatQuote.hs, FatQuote.o )
    
    2
    +[2 of 2] Compiling FatTH            ( FatTH.hs, FatTH.o )

  • testsuite/tests/driver/fat-iface/fat015.stderr-ext-interp
    1
    +[1 of 6] Compiling FatQuote         ( FatQuote.hs, FatQuote.o, interpreted )
    
    2
    +[2 of 6] Compiling FatQuote1        ( FatQuote1.hs, interpreted )
    
    3
    +[3 of 6] Compiling FatQuote2        ( FatQuote2.hs, FatQuote2.o )
    
    4
    +[4 of 6] Compiling FatTH1           ( FatTH1.hs, nothing )
    
    5
    +[5 of 6] Compiling FatTH2           ( FatTH2.hs, nothing )
    
    6
    +[6 of 6] Compiling FatTHTop         ( FatTHTop.hs, nothing )

  • testsuite/tests/splice-imports/SI07.stderr-ext-interp
    1
    +[1 of 3] Compiling SI05A            ( SI05A.hs, SI05A.o )
    
    2
    +[2 of 3] Compiling SI07A            ( SI07A.hs, nothing )
    
    3
    +[3 of 3] Compiling SI07             ( SI07.hs, nothing )

  • testsuite/tests/splice-imports/all.T
    ... ... @@ -9,7 +9,7 @@ test('SI03', [extra_files(["SI01A.hs"])], multimod_compile_fail, ['SI03', '-v0']
    9 9
     test('SI04', [extra_files(["SI01A.hs"])], multimod_compile, ['SI04', '-v0'])
    
    10 10
     test('SI05', [extra_files(["SI01A.hs"])], multimod_compile_fail, ['SI05', '-v0'])
    
    11 11
     test('SI06', [extra_files(["SI01A.hs"])], multimod_compile, ['SI06', '-v0'])
    
    12
    -test('SI07', [expect_broken_for(26552, ['ext-interp']), unless(ghc_dynamic(), skip), extra_files(["SI05A.hs"])], multimod_compile, ['SI07', '-fwrite-interface -fno-code'])
    
    12
    +test('SI07', [unless(ghc_dynamic(), skip), extra_files(["SI05A.hs"])], multimod_compile, ['SI07', '-fwrite-interface -fno-code'])
    
    13 13
     # Instance tests
    
    14 14
     test('SI08', [extra_files(["ClassA.hs", "InstanceA.hs"])], multimod_compile_fail, ['SI08', '-v0'])
    
    15 15
     test('SI09', [extra_files(["ClassA.hs", "InstanceA.hs"])], multimod_compile, ['SI09', '-v0'])