GitLab

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

Commits:

ac7b737e

by Sylvain Henry at 2025-11-07T17:22:51-05:00

Testsuite: pass ext-interp test way (#26552)

Note that some tests are still marked as broken with the ext-interp way
(see #26552 and #14335)

5 changed files:

libraries/base/tests/all.T
testsuite/driver/testlib.py
testsuite/tests/driver/T20696/all.T
testsuite/tests/driver/fat-iface/all.T
testsuite/tests/splice-imports/all.T

Changes:

libraries/base/tests/all.T

@@ -80,7 +80,7 @@ test('length001',
       # excessive amounts of stack space. So we specifically set a low
       # stack limit and mark it as failing under a few conditions.
       [extra_run_opts('+RTS -K8m -RTS'),
 -     expect_fail_for(['normal', 'threaded1', 'llvm', 'nonmoving', 'nonmoving_thr', 'nonmoving_thr_ghc']),
 +     expect_fail_for(['normal', 'threaded1', 'llvm', 'nonmoving', 'nonmoving_thr', 'nonmoving_thr_ghc', 'ext-interp']),
       # JS doesn't support stack limit so the test sometimes passes just fine. Therefore the test is
       # marked as fragile.
       when(js_arch(), fragile(22921))],

testsuite/driver/testlib.py

@@ -352,6 +352,9 @@ def req_plugins( name, opts ):
      """
      req_interp(name, opts)
 +    # Plugins aren't supported with the external interpreter (#14335)
 +    expect_broken_for(14335,['ext-interp'])(name,opts)
++
      if config.cross:
          opts.skip = True

testsuite/tests/driver/T20696/all.T

  test('T20696', [extra_files(['A.hs', 'B.hs', 'C.hs'])
 +               , expect_broken_for(26552, ['ext-interp'])
                 , unless(ghc_dynamic(), skip)], multimod_compile, ['A', ''])
  test('T20696-static', [extra_files(['A.hs', 'B.hs', 'C.hs'])
                 , 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],
  # Check linking works when using -fbyte-code-and-object-code
  test('fat011', [req_th, extra_files(['FatMain.hs', 'FatTH.hs', 'FatQuote.hs'])], multimod_compile, ['FatMain', '-fbyte-code-and-object-code -fprefer-byte-code'])
  # Check that we use interpreter rather than enable dynamic-too if needed for TH
 -test('fat012', [req_th, unless(ghc_dynamic(), skip), extra_files(['FatTH.hs', 'FatQuote.hs'])], multimod_compile, ['FatTH', '-fprefer-byte-code'])
 +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'])
  # Check that no objects are generated if using -fno-code and -fprefer-byte-code
  test('fat013', [req_th, req_bco, extra_files(['FatTH.hs', 'FatQuote.hs'])], multimod_compile, ['FatTH', '-fno-code -fprefer-byte-code'])
  # When using interpreter should not produce objects
  test('fat014', [req_th, extra_files(['FatTH.hs', 'FatQuote.hs']), extra_run_opts('-fno-code')], ghci_script, ['fat014.script'])
 -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'])
 +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'])
  test('T22807', [req_th, unless(ghc_dynamic(), skip), extra_files(['T22807A.hs', 'T22807B.hs'])]
               , makefile_test, ['T22807'])
  test('T22807_ghci', [req_th, unless(ghc_dynamic(), skip), extra_files(['T22807_ghci.hs'])]

testsuite/tests/splice-imports/all.T

@@ -9,7 +9,7 @@ test('SI03', [extra_files(["SI01A.hs"])], multimod_compile_fail, ['SI03', '-v0']
  test('SI04', [extra_files(["SI01A.hs"])], multimod_compile, ['SI04', '-v0'])
  test('SI05', [extra_files(["SI01A.hs"])], multimod_compile_fail, ['SI05', '-v0'])
  test('SI06', [extra_files(["SI01A.hs"])], multimod_compile, ['SI06', '-v0'])
 -test('SI07', [unless(ghc_dynamic(), skip), extra_files(["SI05A.hs"])], multimod_compile, ['SI07', '-fwrite-interface -fno-code'])
 +test('SI07', [expect_broken_for(26552, ['ext-interp']), unless(ghc_dynamic(), skip), extra_files(["SI05A.hs"])], multimod_compile, ['SI07', '-fwrite-interface -fno-code'])
  # Instance tests
  test('SI08', [extra_files(["ClassA.hs", "InstanceA.hs"])], multimod_compile_fail, ['SI08', '-v0'])
  test('SI09', [extra_files(["ClassA.hs", "InstanceA.hs"])], multimod_compile, ['SI09', '-v0'])