diff options
| -rw-r--r-- | testsuite/tests/ghci/prog002/A.hs | 6 | ||||
| -rw-r--r-- | testsuite/tests/ghci/prog002/prog002.T | 3 | ||||
| -rw-r--r-- | testsuite/tests/ghci/prog003/D.hs | 13 | ||||
| -rw-r--r-- | testsuite/tests/ghci/prog003/prog003.T | 4 | ||||
| -rw-r--r-- | testsuite/tests/ghci/scripts/all.T | 2 | ||||
| -rw-r--r-- | testsuite/tests/ghci/scripts/ghci027.hs | 5 | ||||
| -rw-r--r-- | testsuite/tests/programs/hs-boot/all.T | 2 |
7 files changed, 6 insertions, 29 deletions
diff --git a/testsuite/tests/ghci/prog002/A.hs b/testsuite/tests/ghci/prog002/A.hs deleted file mode 100644 index 6dc493aaa2..0000000000 --- a/testsuite/tests/ghci/prog002/A.hs +++ /dev/null @@ -1,6 +0,0 @@ -module A where - -data T = A Int | B Float deriving Eq - -f :: Int -> Int -f x = x + 3 diff --git a/testsuite/tests/ghci/prog002/prog002.T b/testsuite/tests/ghci/prog002/prog002.T index ea39005f6f..19b90e49c2 100644 --- a/testsuite/tests/ghci/prog002/prog002.T +++ b/testsuite/tests/ghci/prog002/prog002.T @@ -1,2 +1,3 @@ -test('prog002', extra_clean(['A.hi']), ghci_script, ['prog002.script']) +test('prog002', extra_clean(['A.hs', 'A.hi', 'A.o']), + ghci_script, ['prog002.script']) diff --git a/testsuite/tests/ghci/prog003/D.hs b/testsuite/tests/ghci/prog003/D.hs deleted file mode 100644 index a53a8c3da6..0000000000 --- a/testsuite/tests/ghci/prog003/D.hs +++ /dev/null @@ -1,13 +0,0 @@ -module D where - --- data types and an instance -data D a = A Int | B Float deriving Eq -newtype N a = N Double -type T a = (Int,Double) - --- a class -class C a where c :: a -> Int - --- a function -d :: Float -> Float -d x = x / 3 diff --git a/testsuite/tests/ghci/prog003/prog003.T b/testsuite/tests/ghci/prog003/prog003.T index c87bc90597..005811686a 100644 --- a/testsuite/tests/ghci/prog003/prog003.T +++ b/testsuite/tests/ghci/prog003/prog003.T @@ -1,6 +1,6 @@ test('prog003', - extra_clean(['D.hi', 'C.hi', 'C.o', 'B.hi', 'B.o', 'A', 'A.hi', 'A.o', - 'a.out']), + extra_clean(['D.hs', 'D.hi', 'C.hi', 'C.o', 'B.hi', 'B.o', + 'A', 'A.hi', 'A.o', 'a.out']), ghci_script, ['prog003.script']) diff --git a/testsuite/tests/ghci/scripts/all.T b/testsuite/tests/ghci/scripts/all.T index 9baf9edb85..980cb81268 100644 --- a/testsuite/tests/ghci/scripts/all.T +++ b/testsuite/tests/ghci/scripts/all.T @@ -43,7 +43,7 @@ test('ghci024', test('ghci025', normal, ghci_script, ['ghci025.script']) test('ghci026', normal, ghci_script, ['ghci026.script']) -test('ghci027', normal, ghci_script, ['ghci027.script']) +test('ghci027', extra_clean(['ghci027.hs']), ghci_script, ['ghci027.script']) test('ghci028', normal, ghci_script, ['ghci028.script']) test('ghci029', normal, ghci_script, ['ghci029.script']) test('ghci030', normal, ghci_script, ['ghci030.script']) diff --git a/testsuite/tests/ghci/scripts/ghci027.hs b/testsuite/tests/ghci/scripts/ghci027.hs deleted file mode 100644 index df99d7d1c0..0000000000 --- a/testsuite/tests/ghci/scripts/ghci027.hs +++ /dev/null @@ -1,5 +0,0 @@ --- Test for #1617 -module Main where -import Prelude () ---import Control.Monad (mplus) -import qualified Control.Monad (mplus) diff --git a/testsuite/tests/programs/hs-boot/all.T b/testsuite/tests/programs/hs-boot/all.T index eb48087188..dba72877e9 100644 --- a/testsuite/tests/programs/hs-boot/all.T +++ b/testsuite/tests/programs/hs-boot/all.T @@ -4,6 +4,6 @@ test('hs-boot', extra_clean(['A.hi', 'A.hi-boot', 'A.o', 'A.o-boot', 'B.hi', 'B.o', 'C.hi', 'C.o', - 'Main.hi', 'Main.o']), + 'Main', 'Main.exe', 'Main.hi', 'Main.o']), multimod_compile, ['Main -v0', '']) |