summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHerbert Valerio Riedel <hvr@gnu.org>2014-12-25 23:16:28 +0100
committerHerbert Valerio Riedel <hvr@gnu.org>2014-12-25 23:16:28 +0100
commitadd6a30317ca7307a91563afbbf102c3771ee246 (patch)
treec41a4c810b295ba49737c29cf7fad46b9a69c5e0
parent3e3aa9258b521d362d3a51cb48969df3eeab4981 (diff)
downloadhaskell-add6a30317ca7307a91563afbbf102c3771ee246.tar.gz
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.
-rw-r--r--testsuite/tests/rename/should_fail/Makefile2
-rw-r--r--testsuite/tests/rename/should_fail/T9032.stderr1
-rw-r--r--testsuite/tests/rename/should_fail/T9032.stdout1
-rw-r--r--testsuite/tests/rename/should_fail/all.T2
4 files changed, 2 insertions, 4 deletions
diff --git a/testsuite/tests/rename/should_fail/Makefile b/testsuite/tests/rename/should_fail/Makefile
index 037694c044..b2393f6cf0 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 c02dac8cb7..21af9ac713 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 82b486f1c6..0000000000
--- 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 8d60ef3b27..2aeee2f6fc 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'])