Repository : ssh://darcs.haskell.org//srv/darcs/testsuite On branch : master
http://hackage.haskell.org/trac/ghc/changeset/69c9f915aed9599bed6ffca67632351ff43c22ac >--------------------------------------------------------------- commit 69c9f915aed9599bed6ffca67632351ff43c22ac Author: Simon Marlow <[email protected]> Date: Thu Mar 1 13:49:28 2012 +0000 accept output >--------------------------------------------------------------- tests/driver/437/437.stdout | 7 +++++++ tests/driver/437/Makefile | 6 +++--- tests/driver/recomp005/recomp005.stdout | 4 ++-- tests/driver/recomp006/recomp006.stdout | 2 +- tests/driver/recomp007/recomp007.stdout | 4 ++-- tests/driver/recomp011/recomp011.stdout | 4 ++-- 6 files changed, 17 insertions(+), 10 deletions(-) diff --git a/tests/driver/437/437.stdout b/tests/driver/437/437.stdout index 5c40e57..7508a5f 100644 --- a/tests/driver/437/437.stdout +++ b/tests/driver/437/437.stdout @@ -1,3 +1,10 @@ +[1 of 2] Compiling Test2 ( Test2.hs, Test2.o ) +[2 of 2] Compiling Test ( Test.hs, Test.o ) +Linking Test ... +[1 of 1] Compiling Test2 ( Test2.hs, Test2.o ) [flags changed] +Linking Test2 ... "Test2.doit" "Test2.main" +[1 of 1] Compiling Test2 ( Test2.hs, Test2.o ) [flags changed] +Linking Test2 ... "Test2.doit" diff --git a/tests/driver/437/Makefile b/tests/driver/437/Makefile index 42f7dd4..649d462 100644 --- a/tests/driver/437/Makefile +++ b/tests/driver/437/Makefile @@ -16,12 +16,12 @@ clean: # bug #437 437: clean - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -v0 --make -main-is Test.main Test.hs - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -v0 --make -main-is Test2.main Test2.hs + '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) --make -main-is Test.main Test.hs + '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) --make -main-is Test2.main Test2.hs ./Test ./Test2 sleep 1 # Test that changing the main function name forces recomp of Test2 - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -v0 --make -main-is Test2.doit Test2.hs + '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) --make -main-is Test2.doit Test2.hs ./Test2 diff --git a/tests/driver/recomp005/recomp005.stdout b/tests/driver/recomp005/recomp005.stdout index 720a1ea..ad1ef6d 100644 --- a/tests/driver/recomp005/recomp005.stdout +++ b/tests/driver/recomp005/recomp005.stdout @@ -4,5 +4,5 @@ [4 of 5] Compiling D ( D.hs, D.o ) [5 of 5] Compiling E ( E.hs, E.o ) [3 of 5] Compiling C ( C.hs, C.o ) -[4 of 5] Compiling D ( D.hs, D.o ) -[5 of 5] Compiling E ( E.hs, E.o ) +[4 of 5] Compiling D ( D.hs, D.o ) [C changed] +[5 of 5] Compiling E ( E.hs, E.o ) [D changed] diff --git a/tests/driver/recomp006/recomp006.stdout b/tests/driver/recomp006/recomp006.stdout index f403e40..499b06f 100644 --- a/tests/driver/recomp006/recomp006.stdout +++ b/tests/driver/recomp006/recomp006.stdout @@ -1,2 +1,2 @@ [1 of 2] Compiling B ( B.hs, B.o ) -[2 of 2] Compiling A ( A.hs, A.o ) +[2 of 2] Compiling A ( A.hs, A.o ) [B changed] diff --git a/tests/driver/recomp007/recomp007.stdout b/tests/driver/recomp007/recomp007.stdout index 9f0fe6a..61095aa 100644 --- a/tests/driver/recomp007/recomp007.stdout +++ b/tests/driver/recomp007/recomp007.stdout @@ -1,5 +1,5 @@ Building b-1.0... Preprocessing executable 'test' for b-1.0... -[1 of 2] Compiling B ( B.hs, dist/build/test/test-tmp/B.o ) -[2 of 2] Compiling Main ( Main.hs, dist/build/test/test-tmp/Main.o ) +[1 of 2] Compiling B ( B.hs, dist/build/test/test-tmp/B.o ) [A changed] +[2 of 2] Compiling Main ( Main.hs, dist/build/test/test-tmp/Main.o ) [B changed] Linking dist/build/test/test ... diff --git a/tests/driver/recomp011/recomp011.stdout b/tests/driver/recomp011/recomp011.stdout index e0bfcde..d3e0b92 100644 --- a/tests/driver/recomp011/recomp011.stdout +++ b/tests/driver/recomp011/recomp011.stdout @@ -1,10 +1,10 @@ [1 of 1] Compiling Main ( Main.hs, Main.o ) Linking Main ... 42 -[1 of 1] Compiling Main ( Main.hs, Main.o ) +[1 of 1] Compiling Main ( Main.hs, Main.o ) [B.hsinc changed] Linking Main ... 43 -[1 of 1] Compiling Main ( Main.hs, Main.o ) +[1 of 1] Compiling Main ( Main.hs, Main.o ) [A.hsinc changed] Linking Main ... 4343 4343 _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
