summaryrefslogtreecommitdiff
path: root/testsuite/tests/ghci
diff options
context:
space:
mode:
authorMatthew Pickering <matthewtpickering@gmail.com>2022-02-17 15:04:07 +0000
committerMarge Bot <ben+marge-bot@smart-cactus.org>2022-03-01 16:23:10 -0500
commitc84dc5065bcf5c87dd3d10421c99aa6941754f57 (patch)
tree1cca772e5c8c82140dfe721a7114899f6e77a13c /testsuite/tests/ghci
parent547742682702f08041e518d68d752ef6329843c3 (diff)
downloadhaskell-c84dc5065bcf5c87dd3d10421c99aa6941754f57.tar.gz
driver: Properly add an edge between a .hs and its hs-boot file
As noted in #21071 we were missing adding this edge so there were situations where the .hs file would get compiled before the .hs-boot file which leads to issues with -j. I fixed this properly by adding the edge in downsweep so the definition of nodeDependencies can be simplified to avoid adding this dummy edge in. There are plenty of tests which seem to have these redundant boot files anyway so no new test. #21094 tracks the more general issue of identifying redundant hs-boot and SOURCE imports.
Diffstat (limited to 'testsuite/tests/ghci')
-rw-r--r--testsuite/tests/ghci/T11827/all.T2
-rw-r--r--testsuite/tests/ghci/scripts/T20217.stdout4
2 files changed, 3 insertions, 3 deletions
diff --git a/testsuite/tests/ghci/T11827/all.T b/testsuite/tests/ghci/T11827/all.T
index eee5b8849d..d29c6de795 100644
--- a/testsuite/tests/ghci/T11827/all.T
+++ b/testsuite/tests/ghci/T11827/all.T
@@ -1,2 +1,2 @@
test('T11827', [extra_files(['A.hs', 'A.hs-boot', 'B.hs']),
- expect_broken(11827)], ghci_script, ['T11827.script'])
+ ], ghci_script, ['T11827.script'])
diff --git a/testsuite/tests/ghci/scripts/T20217.stdout b/testsuite/tests/ghci/scripts/T20217.stdout
index fa229321bf..49a5244c5f 100644
--- a/testsuite/tests/ghci/scripts/T20217.stdout
+++ b/testsuite/tests/ghci/scripts/T20217.stdout
@@ -1,5 +1,5 @@
[1 of 3] Compiling T20217A[boot] ( T20217A.hs-boot, nothing )
-[2 of 3] Compiling T20217 ( T20217.hs, nothing )
-[3 of 3] Compiling T20217A ( T20217A.hs, nothing )
+[2 of 3] Compiling T20217A ( T20217A.hs, nothing )
+[3 of 3] Compiling T20217 ( T20217.hs, nothing )
Ok, three modules loaded.
Ok, three modules loaded.