Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: 8f991755 by fendor at 2026-05-26T11:02:52-04:00 Revert prog003 acceptance We thought the commit 286f1adff3e78d775ff325caff71d0cee25d710b fixed the test, but due to changes to ghci, modules loaded during the GHCi session, the test was actually no longer testing what it set out to do, "fixing" the broken test. As modules are added to the `interactive-session` home unit, the object code needs to be compiled with `-this-unit-id interactive-session`, otherwise the object code won't be used. Once this has been fixed in the test, the test fails as expected again. - - - - - 2 changed files: - testsuite/tests/ghci/prog003/prog003.T - testsuite/tests/ghci/prog003/prog003.script Changes: ===================================== testsuite/tests/ghci/prog003/prog003.T ===================================== @@ -5,5 +5,6 @@ test('prog003', [extra_files(['A.hs', 'B.hs', 'C.hs', 'D1.hs', 'D2.hs']), when(opsys('mingw32'), skip), + unless(config.ghc_dynamic, expect_broken(20704)), cmd_prefix('ghciWayFlags=' + config.ghci_way_flags)], ghci_script, ['prog003.script']) ===================================== testsuite/tests/ghci/prog003/prog003.script ===================================== @@ -25,7 +25,7 @@ a 42 putStrLn "Run 3" -- compile D, check that :reload doesn't pick it up -:shell "$HC" $HC_OPTS $ghciWayFlags -c D.hs +:shell "$HC" $HC_OPTS $ghciWayFlags -this-unit-id interactive-session -c D.hs :reload :type (A.a,B.b,C.c,D.d) a 42 @@ -38,21 +38,21 @@ a 42 putStrLn "Run 5" -- D,C compiled -:shell "$HC" $HC_OPTS $ghciWayFlags -c C.hs +:shell "$HC" $HC_OPTS $ghciWayFlags -this-unit-id interactive-session -c C.hs :load A :type (A.a,B.b,C.c,D.d) a 42 putStrLn "Run 6" -- D,C,B compiled -:shell "$HC" $HC_OPTS $ghciWayFlags -c B.hs +:shell "$HC" $HC_OPTS $ghciWayFlags -this-unit-id interactive-session -c B.hs :load A :type (A.a,B.b,C.c,D.d) a 42 putStrLn "Run 7" -- D,C,B,A compiled -:shell "$HC" $HC_OPTS $ghciWayFlags -c A.hs +:shell "$HC" $HC_OPTS $ghciWayFlags -this-unit-id interactive-session -c A.hs :load A :type (A.a,B.b,C.c,D.d) a 42 @@ -80,7 +80,7 @@ a 42 putStrLn "Run 11" -- A,B,C compiled (better not use A.o, B.o, C.o) -:shell "$HC" $HC_OPTS $ghciWayFlags --make -v0 A +:shell "$HC" $HC_OPTS $ghciWayFlags --make -this-unit-id interactive-session -v0 A :shell rm D.o :load A :type (A.a,B.b,C.c,D.d) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/8f9917557a7ef290dfa8b913c3a41462... -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/8f9917557a7ef290dfa8b913c3a41462... You're receiving this email because of your account on gitlab.haskell.org.