Commit 124f3999 authored by thomie's avatar thomie

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).
parent b1d1c652
...@@ -434,14 +434,14 @@ T2566:: ...@@ -434,14 +434,14 @@ T2566::
mode001: mode001:
"$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) --make --help | sed '2,$$d' "$(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) --help --make | sed '2,$$d'
"$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) --interactive --help | 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 | 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) --version --help | sed "s/, version.*//"
"$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) --help --version | sed '2,$$d' "$(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) --interactive --version -ignore-dot-ghci | sed "s/, version.*//"
"$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) --version --interactive | 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 | grep -- --interactive | sed '2,$$d' "$(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 | 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 # Test for building DLLs with ghc -shared, see #2745
shared001: shared001:
......
...@@ -428,7 +428,7 @@ test('T9938B', ...@@ -428,7 +428,7 @@ test('T9938B',
['$MAKE -s --no-print-directory T9938B']) ['$MAKE -s --no-print-directory T9938B'])
test('T9963', exit_code(1), run_command, test('T9963', exit_code(1), run_command,
['{compiler} --interactive --print-libdir']) ['{compiler} --interactive -ignore-dot-ghci --print-libdir'])
test('T10219', normal, run_command, test('T10219', normal, run_command,
# `-x hspp` in make mode should work. # `-x hspp` in make mode should work.
......
...@@ -48,12 +48,9 @@ T9367: ...@@ -48,12 +48,9 @@ T9367:
T9762_prep: T9762_prep:
'$(TEST_HC)' $(TEST_HC_OPTS) -v0 -O -fhpc -dynamic T9762B.hs '$(TEST_HC)' $(TEST_HC_OPTS) -v0 -O -fhpc -dynamic T9762B.hs
.PHONY: T10408A .PHONY: T10408
T10408A: T10408:
'$(TEST_HC)' $(TEST_HC_OPTS) --interactive -v0 \ # `-ghci-script`s should be executed in the order they are specified,
-ghci-script T10408A.script -ghci-script T10408B.script < /dev/null # and not be ignored when `-ignore-dot-ghci` is specified.
.PHONY: T10408B
T10408B:
'$(TEST_HC)' $(TEST_HC_OPTS) --interactive -v0 -ignore-dot-ghci \ '$(TEST_HC)' $(TEST_HC_OPTS) --interactive -v0 -ignore-dot-ghci \
-ghci-script T10408A.script -ghci-script T10408B.script < /dev/null -ghci-script T10408A.script -ghci-script T10408B.script < /dev/null
...@@ -212,10 +212,8 @@ test('T10122', normal, ghci_script, ['T10122.script']) ...@@ -212,10 +212,8 @@ test('T10122', normal, ghci_script, ['T10122.script'])
test('T10321', normal, ghci_script, ['T10321.script']) test('T10321', normal, ghci_script, ['T10321.script'])
test('T10408A', normal, run_command, test('T10408', normal, run_command,
['$MAKE -s --no-print-directory T10408A']) ['$MAKE -s --no-print-directory T10408'])
test('T10408B', normal, run_command,
['$MAKE -s --no-print-directory T10408B'])
test('T10248', normal, ghci_script, ['T10248.script']) test('T10248', normal, ghci_script, ['T10248.script'])
test('T10110', normal, ghci_script, ['T10110.script']) test('T10110', normal, ghci_script, ['T10110.script'])
test('T10322', normal, ghci_script, ['T10322.script']) test('T10322', normal, ghci_script, ['T10322.script'])
......
...@@ -36,7 +36,7 @@ TH_Depends: ...@@ -36,7 +36,7 @@ TH_Depends:
T8333: 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 # This was an easy way to re-use the stdout testing
# to check the contents of a generated file. # to check the contents of a generated file.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment