[commit: ghc] master: Testsuite: add -ignore-dot-ghci to some tests (124f399)
git at git.haskell.org
git at git.haskell.org
Sat Jul 4 13:35:33 UTC 2015
Repository : ssh://git@git.haskell.org/ghc
On branch : master
Link : http://ghc.haskell.org/trac/ghc/changeset/124f3999d78d8ef6b093e4f1bb1dcef87e4283da/ghc
>---------------------------------------------------------------
commit 124f3999d78d8ef6b093e4f1bb1dcef87e4283da
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date: Sat Jul 4 11:57:44 2015 +0200
Testsuite: add -ignore-dot-ghci to some tests
Since T10408A and T10408B would become the same now, delete T10408A and
rename T10408B to T10408. The test without -ignore-dot-ghci (T10408A)
didn't add anything (#10408).
>---------------------------------------------------------------
124f3999d78d8ef6b093e4f1bb1dcef87e4283da
testsuite/tests/driver/Makefile | 12 ++++++------
testsuite/tests/driver/all.T | 2 +-
testsuite/tests/ghci/scripts/Makefile | 11 ++++-------
.../tests/ghci/scripts/{T10408A.stdout => T10408.stdout} | 0
testsuite/tests/ghci/scripts/T10408B.stdout | 2 --
testsuite/tests/ghci/scripts/all.T | 6 ++----
testsuite/tests/th/Makefile | 2 +-
7 files changed, 14 insertions(+), 21 deletions(-)
diff --git a/testsuite/tests/driver/Makefile b/testsuite/tests/driver/Makefile
index d463ebf..d5ce683 100644
--- a/testsuite/tests/driver/Makefile
+++ b/testsuite/tests/driver/Makefile
@@ -434,14 +434,14 @@ T2566::
mode001:
"$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) --make --help | sed '2,$$d'
"$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) --help --make | sed '2,$$d'
- "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) --interactive --help | sed '2,$$d'
- "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) --help --interactive | sed '2,$$d'
+ "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) --interactive --help -ignore-dot-ghci | sed '2,$$d'
+ "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) --help --interactive -ignore-dot-ghci | sed '2,$$d'
"$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) --version --help | sed "s/, version.*//"
"$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) --help --version | sed '2,$$d'
- "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) --interactive --version | sed "s/, version.*//"
- "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) --version --interactive | sed "s/, version.*//"
- "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) --interactive --show-options | grep -- --interactive | sed '2,$$d'
- "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) --show-options --interactive | grep -- --interactive | sed '2,$$d'
+ "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) --interactive --version -ignore-dot-ghci | sed "s/, version.*//"
+ "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) --version --interactive -ignore-dot-ghci | sed "s/, version.*//"
+ "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) --interactive --show-options -ignore-dot-ghci | grep -- --interactive | sed '2,$$d'
+ "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) --show-options --interactive -ignore-dot-ghci | grep -- --interactive | sed '2,$$d'
# Test for building DLLs with ghc -shared, see #2745
shared001:
diff --git a/testsuite/tests/driver/all.T b/testsuite/tests/driver/all.T
index fa9e7b0..3f1ad79 100644
--- a/testsuite/tests/driver/all.T
+++ b/testsuite/tests/driver/all.T
@@ -428,7 +428,7 @@ test('T9938B',
['$MAKE -s --no-print-directory T9938B'])
test('T9963', exit_code(1), run_command,
- ['{compiler} --interactive --print-libdir'])
+ ['{compiler} --interactive -ignore-dot-ghci --print-libdir'])
test('T10219', normal, run_command,
# `-x hspp` in make mode should work.
diff --git a/testsuite/tests/ghci/scripts/Makefile b/testsuite/tests/ghci/scripts/Makefile
index 1c1dadb..730927b 100644
--- a/testsuite/tests/ghci/scripts/Makefile
+++ b/testsuite/tests/ghci/scripts/Makefile
@@ -48,12 +48,9 @@ T9367:
T9762_prep:
'$(TEST_HC)' $(TEST_HC_OPTS) -v0 -O -fhpc -dynamic T9762B.hs
-.PHONY: T10408A
-T10408A:
- '$(TEST_HC)' $(TEST_HC_OPTS) --interactive -v0 \
- -ghci-script T10408A.script -ghci-script T10408B.script < /dev/null
-
-.PHONY: T10408B
-T10408B:
+.PHONY: T10408
+T10408:
+ # `-ghci-script`s should be executed in the order they are specified,
+ # and not be ignored when `-ignore-dot-ghci` is specified.
'$(TEST_HC)' $(TEST_HC_OPTS) --interactive -v0 -ignore-dot-ghci \
-ghci-script T10408A.script -ghci-script T10408B.script < /dev/null
diff --git a/testsuite/tests/ghci/scripts/T10408A.stdout b/testsuite/tests/ghci/scripts/T10408.stdout
similarity index 100%
rename from testsuite/tests/ghci/scripts/T10408A.stdout
rename to testsuite/tests/ghci/scripts/T10408.stdout
diff --git a/testsuite/tests/ghci/scripts/T10408B.stdout b/testsuite/tests/ghci/scripts/T10408B.stdout
deleted file mode 100644
index b13d0a4..0000000
--- a/testsuite/tests/ghci/scripts/T10408B.stdout
+++ /dev/null
@@ -1,2 +0,0 @@
-"T10408A"
-"T10408B"
diff --git a/testsuite/tests/ghci/scripts/all.T b/testsuite/tests/ghci/scripts/all.T
index aecadc4..747e708 100755
--- a/testsuite/tests/ghci/scripts/all.T
+++ b/testsuite/tests/ghci/scripts/all.T
@@ -212,10 +212,8 @@ test('T10122', normal, ghci_script, ['T10122.script'])
test('T10321', normal, ghci_script, ['T10321.script'])
-test('T10408A', normal, run_command,
- ['$MAKE -s --no-print-directory T10408A'])
-test('T10408B', normal, run_command,
- ['$MAKE -s --no-print-directory T10408B'])
+test('T10408', normal, run_command,
+ ['$MAKE -s --no-print-directory T10408'])
test('T10248', normal, ghci_script, ['T10248.script'])
test('T10110', normal, ghci_script, ['T10110.script'])
test('T10322', normal, ghci_script, ['T10322.script'])
diff --git a/testsuite/tests/th/Makefile b/testsuite/tests/th/Makefile
index 031c285..d219e80 100644
--- a/testsuite/tests/th/Makefile
+++ b/testsuite/tests/th/Makefile
@@ -36,7 +36,7 @@ TH_Depends:
T8333:
- '$(TEST_HC)' $(TEST_HC_OPTS) $(ghcThWayFlags) --interactive -v0 -ignore-ghci-script T8333.hs < /dev/null
+ '$(TEST_HC)' $(TEST_HC_OPTS) $(ghcThWayFlags) --interactive -v0 -ignore-dot-ghci T8333.hs < /dev/null
# This was an easy way to re-use the stdout testing
# to check the contents of a generated file.
More information about the ghc-commits
mailing list