diff options
| author | Matthew Pickering <matthewtpickering@gmail.com> | 2022-02-17 15:04:07 +0000 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2022-03-01 16:23:10 -0500 |
| commit | c84dc5065bcf5c87dd3d10421c99aa6941754f57 (patch) | |
| tree | 1cca772e5c8c82140dfe721a7114899f6e77a13c /testsuite/tests/driver/T20030 | |
| parent | 547742682702f08041e518d68d752ef6329843c3 (diff) | |
| download | haskell-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/driver/T20030')
3 files changed, 12 insertions, 11 deletions
diff --git a/testsuite/tests/driver/T20030/test1/T20030_test1.stderr b/testsuite/tests/driver/T20030/test1/T20030_test1.stderr index 81b29def80..8ee2810d59 100644 --- a/testsuite/tests/driver/T20030/test1/T20030_test1.stderr +++ b/testsuite/tests/driver/T20030/test1/T20030_test1.stderr @@ -9,5 +9,5 @@ [ 9 of 13] Compiling E ( E.hs, E.o ) [10 of 13] Compiling I ( I.hs, I.o ) [11 of 13] Compiling J[boot] ( J.hs-boot, J.o-boot ) -[12 of 13] Compiling K ( K.hs, K.o ) -[13 of 13] Compiling J ( J.hs, J.o ) +[12 of 13] Compiling J ( J.hs, J.o ) +[13 of 13] Compiling K ( K.hs, K.o ) diff --git a/testsuite/tests/driver/T20030/test1/T20030_test1j.stderr b/testsuite/tests/driver/T20030/test1/T20030_test1j.stderr index 81b29def80..8ee2810d59 100644 --- a/testsuite/tests/driver/T20030/test1/T20030_test1j.stderr +++ b/testsuite/tests/driver/T20030/test1/T20030_test1j.stderr @@ -9,5 +9,5 @@ [ 9 of 13] Compiling E ( E.hs, E.o ) [10 of 13] Compiling I ( I.hs, I.o ) [11 of 13] Compiling J[boot] ( J.hs-boot, J.o-boot ) -[12 of 13] Compiling K ( K.hs, K.o ) -[13 of 13] Compiling J ( J.hs, J.o ) +[12 of 13] Compiling J ( J.hs, J.o ) +[13 of 13] Compiling K ( K.hs, K.o ) diff --git a/testsuite/tests/driver/T20030/test3/T20030_test3.stderr b/testsuite/tests/driver/T20030/test3/T20030_test3.stderr index 91c3869e70..ffa4f5a95d 100644 --- a/testsuite/tests/driver/T20030/test3/T20030_test3.stderr +++ b/testsuite/tests/driver/T20030/test3/T20030_test3.stderr @@ -1,7 +1,8 @@ -[1 of 7] Compiling L[boot] ( L.hs-boot, L.o-boot ) -[2 of 7] Compiling M[boot] ( M.hs-boot, M.o-boot ) -[3 of 7] Compiling O[boot] ( O.hs-boot, O.o-boot ) -[4 of 7] Compiling O ( O.hs, O.o ) -[5 of 7] Compiling L ( L.hs, L.o ) -[6 of 7] Compiling M ( M.hs, M.o ) -[7 of 7] Compiling N ( N.hs, N.o ) +[1 of 8] Compiling L[boot] ( L.hs-boot, L.o-boot ) +[2 of 8] Compiling M[boot] ( M.hs-boot, M.o-boot ) +[3 of 8] Compiling O[boot] ( O.hs-boot, O.o-boot ) +[4 of 8] Compiling O ( O.hs, O.o ) +[5 of 8] Compiling L ( L.hs, L.o ) +[6 of 8] Compiling M ( M.hs, M.o ) +[7 of 8] Compiling N[boot] ( N.hs-boot, N.o-boot ) +[8 of 8] Compiling N ( N.hs, N.o ) |