Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC
Commits:
-
1275d360
by Matthew Pickering at 2025-10-03T06:05:56-04:00
5 changed files:
- testsuite/driver/testglobals.py
- testsuite/driver/testlib.py
- testsuite/tests/ghci/should_run/PackedDataCon/packeddatacon.T
- testsuite/tests/ghci/should_run/UnboxedTuples/unboxedtuples.T
- testsuite/tests/ghci/should_run/UnliftedDataTypeInterp/unlifteddatatypeinterp.T
Changes:
| ... | ... | @@ -136,9 +136,12 @@ class TestConfig: |
| 136 | 136 | # Do we have interpreter support?
|
| 137 | 137 | self.have_interp = False
|
| 138 | 138 | |
| 139 | + # Do we have external interpreter support?
|
|
| 140 | + self.have_ext_interp = False
|
|
| 141 | + |
|
| 139 | 142 | # Are we cross-compiling?
|
| 140 | 143 | self.cross = False
|
| 141 | -
|
|
| 144 | + |
|
| 142 | 145 | # Does the RTS linker only support loading shared libraries?
|
| 143 | 146 | self.interp_force_dyn = False
|
| 144 | 147 |
| ... | ... | @@ -549,10 +549,12 @@ only_ghci = only_ways([WayName('ghci'), WayName('ghci-opt')]) |
| 549 | 549 | # -----
|
| 550 | 550 | |
| 551 | 551 | def valid_way( way: WayName ) -> bool:
|
| 552 | - if way in {'ghci', 'ghci-opt', 'ghci-ext'}:
|
|
| 552 | + if way in {'ghci', 'ghci-opt'}:
|
|
| 553 | 553 | return config.have_RTS_linker
|
| 554 | - if way == 'ghci-ext-prof':
|
|
| 555 | - return config.have_RTS_linker and config.have_profiling
|
|
| 554 | + if way in {'ghci-ext'}:
|
|
| 555 | + return config.have_ext_interp
|
|
| 556 | + if way in {'ghci-ext-prof'}:
|
|
| 557 | + return config.have_ext_interp and config.have_profiling
|
|
| 556 | 558 | return True
|
| 557 | 559 | |
| 558 | 560 | def extra_ways( ways: List[WayName] ):
|
| ... | ... | @@ -2,9 +2,8 @@ test('PackedDataCon', |
| 2 | 2 | [ extra_files(['Obj.hs', 'ByteCode.hs', 'Types.hs', 'Common.hs-incl']),
|
| 3 | 3 | req_interp,
|
| 4 | 4 | req_bco,
|
| 5 | - extra_ways(['ghci']),
|
|
| 6 | - when(config.have_ext_interp, extra_ways(['ghci', 'ghci-ext'])),
|
|
| 7 | - when(config.have_ext_interp and config.have_profiling, extra_ways(['ghci', 'ghci-ext', 'ghci-ext-prof']))
|
|
| 5 | + extra_ways(ghci_ways),
|
|
| 6 | + only_ways(ghci_ways),
|
|
| 8 | 7 | ],
|
| 9 | 8 | compile_and_run,
|
| 10 | 9 | ['']
|
| ... | ... | @@ -2,9 +2,8 @@ test('UnboxedTuples', |
| 2 | 2 | [ extra_files(['Obj.hs', 'ByteCode.hs', 'Common.hs-incl']),
|
| 3 | 3 | req_interp,
|
| 4 | 4 | req_bco,
|
| 5 | - extra_ways(['ghci']),
|
|
| 6 | - when(config.have_ext_interp, extra_ways(['ghci', 'ghci-ext'])),
|
|
| 7 | - when(config.have_ext_interp and config.have_profiling, extra_ways(['ghci', 'ghci-ext', 'ghci-ext-prof']))
|
|
| 5 | + only_ways(ghci_ways),
|
|
| 6 | + extra_ways(ghci_ways),
|
|
| 8 | 7 | ],
|
| 9 | 8 | compile_and_run,
|
| 10 | 9 | ['']
|
| ... | ... | @@ -2,9 +2,8 @@ test('UnliftedDataTypeInterp', |
| 2 | 2 | [ extra_files(['Obj.hs', 'ByteCode.hs', 'Types.hs', 'Common.hs-incl']),
|
| 3 | 3 | req_interp,
|
| 4 | 4 | req_bco,
|
| 5 | - extra_ways(['ghci']),
|
|
| 6 | - when(config.have_ext_interp, extra_ways(['ghci', 'ghci-ext'])),
|
|
| 7 | - when(config.have_ext_interp and config.have_profiling, extra_ways(['ghci', 'ghci-ext', 'ghci-ext-prof']))
|
|
| 5 | + only_ways(ghci_ways),
|
|
| 6 | + extra_ways(ghci_ways),
|
|
| 8 | 7 | ],
|
| 9 | 8 | compile_and_run,
|
| 10 | 9 | ['']
|