summaryrefslogtreecommitdiff
path: root/testsuite
diff options
context:
space:
mode:
authorBen Gamari <bgamari.foss@gmail.com>2017-11-06 15:35:19 -0500
committerBen Gamari <ben@smart-cactus.org>2017-11-06 16:38:55 -0500
commit8613e61de62178e76cd0f8915bd1fbe9c200a039 (patch)
treee4360b59ef7c54da0f9f1e3ab005e816de512513 /testsuite
parent35642f434ae9dff0d1bb8b5a6f1e725cd051c726 (diff)
downloadhaskell-8613e61de62178e76cd0f8915bd1fbe9c200a039.tar.gz
DynFlags: Introduce -show-mods-loaded flag
This flag reintroduces the verbose module name output produced by GHCi's :load command behind a new flag, -show-mods-loaded. This was originally removed in D3651 but apparently some tools (e.g. haskell-mode) rely on this output. Addresses #14427. Test Plan: Validate Reviewers: svenpanne Reviewed By: svenpanne Subscribers: rwbarton, thomie Differential Revision: https://phabricator.haskell.org/D4164
Diffstat (limited to 'testsuite')
-rw-r--r--testsuite/tests/driver/T8526/T8526.stdout4
-rw-r--r--testsuite/tests/ghci/scripts/T1914.stdout6
-rw-r--r--testsuite/tests/ghci/scripts/T6105.stdout4
-rw-r--r--testsuite/tests/ghci/scripts/ghci058.stdout4
4 files changed, 9 insertions, 9 deletions
diff --git a/testsuite/tests/driver/T8526/T8526.stdout b/testsuite/tests/driver/T8526/T8526.stdout
index 83b8f9593d..0255fa3b85 100644
--- a/testsuite/tests/driver/T8526/T8526.stdout
+++ b/testsuite/tests/driver/T8526/T8526.stdout
@@ -1,6 +1,6 @@
[1 of 1] Compiling A ( A.hs, interpreted )
-Ok, 1 module loaded.
+Ok, one module loaded.
True
[1 of 1] Compiling A ( A.hs, interpreted )
-Ok, 1 module loaded.
+Ok, one module loaded.
False
diff --git a/testsuite/tests/ghci/scripts/T1914.stdout b/testsuite/tests/ghci/scripts/T1914.stdout
index 2d1a82b275..6612564354 100644
--- a/testsuite/tests/ghci/scripts/T1914.stdout
+++ b/testsuite/tests/ghci/scripts/T1914.stdout
@@ -1,7 +1,7 @@
[1 of 2] Compiling T1914B ( T1914B.hs, interpreted )
[2 of 2] Compiling T1914A ( T1914A.hs, interpreted )
-Ok, 2 modules loaded.
+Ok, two modules loaded.
[2 of 2] Compiling T1914A ( T1914A.hs, interpreted )
-Failed, 1 module loaded.
+Failed, one module loaded.
[2 of 2] Compiling T1914A ( T1914A.hs, interpreted )
-Ok, 2 modules loaded.
+Ok, two modules loaded.
diff --git a/testsuite/tests/ghci/scripts/T6105.stdout b/testsuite/tests/ghci/scripts/T6105.stdout
index 6a846e3f21..9a8190f26c 100644
--- a/testsuite/tests/ghci/scripts/T6105.stdout
+++ b/testsuite/tests/ghci/scripts/T6105.stdout
@@ -1,4 +1,4 @@
[1 of 1] Compiling T6105 ( T6105.hs, interpreted )
-Ok, 1 module loaded.
+Ok, one module loaded.
[1 of 1] Compiling T6105 ( T6105.hs, interpreted )
-Ok, 1 module loaded.
+Ok, one module loaded.
diff --git a/testsuite/tests/ghci/scripts/ghci058.stdout b/testsuite/tests/ghci/scripts/ghci058.stdout
index 2028aee7fa..83c8bbd8cc 100644
--- a/testsuite/tests/ghci/scripts/ghci058.stdout
+++ b/testsuite/tests/ghci/scripts/ghci058.stdout
@@ -1,4 +1,4 @@
-Ok, 1 module loaded.
+Ok, one module loaded.
'a'
-Ok, 1 module loaded.
+Ok, one module loaded.
'b'