[commit: ghc] master: 2nd attempt to fix T9032 test-case (add6a30)

git at git.haskell.org git at git.haskell.org
Thu Dec 25 22:18:34 UTC 2014


Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/add6a30317ca7307a91563afbbf102c3771ee246/ghc

>---------------------------------------------------------------

commit add6a30317ca7307a91563afbbf102c3771ee246
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Thu Dec 25 23:16:28 2014 +0100

    2nd attempt to fix T9032 test-case
    
    First attempt via 7a2c9dde24b72f wasn't working properly. This attempt
    should work better as it doesn't cause the makefile recipe to fail which
    causes `make` to emit additional varying output.


>---------------------------------------------------------------

add6a30317ca7307a91563afbbf102c3771ee246
 testsuite/tests/rename/should_fail/Makefile     | 2 +-
 testsuite/tests/rename/should_fail/T9032.stderr | 1 -
 testsuite/tests/rename/should_fail/T9032.stdout | 1 -
 testsuite/tests/rename/should_fail/all.T        | 2 +-
 4 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/testsuite/tests/rename/should_fail/Makefile b/testsuite/tests/rename/should_fail/Makefile
index 037694c..b2393f6 100644
--- a/testsuite/tests/rename/should_fail/Makefile
+++ b/testsuite/tests/rename/should_fail/Makefile
@@ -4,5 +4,5 @@ include $(TOP)/mk/test.mk
 
 T9032:
 	'$(TEST_HC)' $(TEST_HC_OPTS) -c -fforce-recomp T9032.hs
-	'$(TEST_HC)' $(TEST_HC_OPTS) -c -fforce-recomp -DERR T9032.hs
+	-'$(TEST_HC)' $(TEST_HC_OPTS) -c -fforce-recomp -DERR T9032.hs
 
diff --git a/testsuite/tests/rename/should_fail/T9032.stderr b/testsuite/tests/rename/should_fail/T9032.stderr
index c02dac8..21af9ac 100644
--- a/testsuite/tests/rename/should_fail/T9032.stderr
+++ b/testsuite/tests/rename/should_fail/T9032.stderr
@@ -1,3 +1,2 @@
 
 T9032.hs:6:1: A module cannot import itself: T9032
-make[3]: *** [T9032] Error 1
diff --git a/testsuite/tests/rename/should_fail/T9032.stdout b/testsuite/tests/rename/should_fail/T9032.stdout
deleted file mode 100644
index 82b486f..0000000
--- a/testsuite/tests/rename/should_fail/T9032.stdout
+++ /dev/null
@@ -1 +0,0 @@
-Makefile:6: recipe for target 'T9032' failed
diff --git a/testsuite/tests/rename/should_fail/all.T b/testsuite/tests/rename/should_fail/all.T
index 8d60ef3..2aeee2f 100644
--- a/testsuite/tests/rename/should_fail/all.T
+++ b/testsuite/tests/rename/should_fail/all.T
@@ -129,6 +129,6 @@ test('T9077', normal, compile_fail, [''])
 test('T9815', normal, compile_fail, [''])
 
 test('T9032',
-     exit_code(2),
+     normal,
      run_command,
      ['$MAKE -s --no-print-directory T9032'])



More information about the ghc-commits mailing list