[commit: ghc] ghc-8.0: Add -ignore-dot-ghci to tests that use --interactive (31d8718)
git at git.haskell.org
git at git.haskell.org
Fri Jan 22 12:20:05 UTC 2016
Repository : ssh://git@git.haskell.org/ghc
On branch : ghc-8.0
Link : http://ghc.haskell.org/trac/ghc/changeset/31d871851d77767c28ab28a2a975477572e143c3/ghc
>---------------------------------------------------------------
commit 31d871851d77767c28ab28a2a975477572e143c3
Author: Reid Barton <rwbarton at gmail.com>
Date: Thu Jan 21 13:50:00 2016 -0500
Add -ignore-dot-ghci to tests that use --interactive
(cherry picked from commit 2ffc2606cfc58768ddc6dd53f270ba7088c43f3c)
>---------------------------------------------------------------
31d871851d77767c28ab28a2a975477572e143c3
testsuite/tests/driver/all.T | 4 ++--
testsuite/tests/ghci/linking/dyn/Makefile | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/testsuite/tests/driver/all.T b/testsuite/tests/driver/all.T
index e0022d7..69d18d9 100644
--- a/testsuite/tests/driver/all.T
+++ b/testsuite/tests/driver/all.T
@@ -459,8 +459,8 @@ test('T365',
compile_fail,
[''])
-test('T9360a', normal, run_command, ['{compiler} --interactive -e ""'])
-test('T9360b', normal, run_command, ['{compiler} -e "" --interactive'])
+test('T9360a', normal, run_command, ['{compiler} --interactive -e "" -ignore-dot-ghci'])
+test('T9360b', normal, run_command, ['{compiler} -e "" --interactive -ignore-dot-ghci'])
test('T10970', normal, compile_and_run, ['-hide-all-packages -package base -package containers'])
test('T10970a', normal, compile_and_run, [''])
diff --git a/testsuite/tests/ghci/linking/dyn/Makefile b/testsuite/tests/ghci/linking/dyn/Makefile
index 0f2d6e1..56e27b1 100644
--- a/testsuite/tests/ghci/linking/dyn/Makefile
+++ b/testsuite/tests/ghci/linking/dyn/Makefile
@@ -32,7 +32,7 @@ load_short_name:
mkdir bin_short
'$(TEST_HC)' $(MY_TEST_HC_OPTS) -odir "bin_short" -shared A.c -o "bin_short/$(call DLL,A)"
rm -f bin_short/*.a
- echo ":q" | "$(TEST_HC)" --interactive -L"./bin_short" -lA -v0
+ echo ":q" | "$(TEST_HC)" --interactive -ignore-dot-ghci -L"./bin_short" -lA -v0
.PHONY: compile_libAS
compile_libAS:
More information about the ghc-commits
mailing list