Commit b30149e4 authored by Ian Lynagh's avatar Ian Lynagh
Browse files

Remove GHC 6.8-only stuff from the testsuite

parent 6b918b14
......@@ -3,12 +3,7 @@ setTestOpts(only_compiler_types(['ghc']))
test('arrowrun001', expect_broken_for(1333, ['ghci']), compile_and_run, [''])
test('arrowrun002', composes([expect_broken_for(1333, ['ghci']),
skip_if_fast,
if_compiler_lt('ghc', '6.9', skip)])
, compile_and_run, [''])
test('arrowrun003',
compose(expect_broken_for(1333, ['ghci']),
if_compiler_lt('ghc', '6.9', skip)),
compile_and_run, [''])
test('arrowrun004', compose(skip_if_fast,
if_compiler_lt('ghc', '6.9', skip))
normal])
, compile_and_run, [''])
test('arrowrun003', expect_broken_for(1333, ['ghci']), compile_and_run, [''])
test('arrowrun004', skip_if_fast, compile_and_run, [''])
setTestOpts(compose(alone,only_compiler_types(['ghc'])))
test('ghcpkg01',
composes([extra_clean(['local01.package.conf',
'local01.package.conf.old']),
if_compiler_lt('ghc', '6.9', skip)]),
extra_clean(['local01.package.conf',
'local01.package.conf.old']),
run_command,
['$MAKE -s --no-print-directory ghcpkg01'])
test('ghcpkg02',
......
......@@ -54,7 +54,7 @@ test('cg054', normal, compile_and_run, [''])
test('cg055', normal, compile_and_run, [''])
test('cg056', normal, compile_and_run, [''])
test('cg057', composes([if_compiler_gt('ghc', '6.9', expect_broken(948)),
test('cg057', composes([expect_broken(948),
only_ways(['prof','profasm']),
extra_run_opts('+RTS -xc')]),
compile_and_run, [''])
......@@ -66,10 +66,7 @@ test('1852', normal, compile_and_run, [''])
test('2080', normal, compile_and_run, [''])
test('cg060',
compose(extra_run_opts('+RTS -K64k -RTS'),
# These stack overflow in at least the 6.8 branch; punting
# on investigating them.
if_compiler_lt('ghc', '6.9', omit_ways(['profasm', 'profc']))),
extra_run_opts('+RTS -K64k -RTS'),
compile_and_run, [''])
test('1861', extra_run_opts('0'), compile_and_run, [''])
......@@ -132,12 +132,10 @@ test('conc059',
compile_and_run,
['conc059_c.c'])
# This test sometimes just exits successfully
# when run the threaded2 way. The problem hasn't been diagnosed yet
test('conc064',
compose(exit_code(1),
# This test sometimes just exits successfully
# when run the threaded2 way. Punting on
# diagnosing/fixing it.
if_compiler_lt('ghc', '6.9', omit_ways(['threaded2']))),
exit_code(1),
compile_and_run, [''])
test('conc065', ignore_output, compile_and_run, [''])
......
......@@ -18,11 +18,11 @@ test('dsrun012', skip_if_fast, compile_and_run, [''])
test('dsrun013', normal, compile_and_run, [''])
test('dsrun014', expect_broken_for(1257, ['ghci']), compile_and_run, [''])
test('dsrun015', expect_broken(1491), compile_and_run, [''])
test('dsrun016', if_compiler_lt('ghc', '6.9', skip), compile_and_run, [''])
test('dsrun017', if_compiler_lt('ghc', '6.9', skip), compile_and_run, [''])
test('dsrun018', if_compiler_lt('ghc', '6.9', skip), compile_and_run, [''])
test('dsrun019', if_compiler_lt('ghc', '6.9', skip), compile_and_run, [''])
test('dsrun020', if_compiler_lt('ghc', '6.9', skip), compile_and_run, [''])
test('dsrun021', if_compiler_lt('ghc', '6.9', skip), compile_and_run, [''])
test('dsrun022', if_compiler_lt('ghc', '6.9', skip), compile_and_run, [''])
test('dsrun023', if_compiler_lt('ghc', '6.9', skip), compile_and_run, [''])
test('dsrun016', normal, compile_and_run, [''])
test('dsrun017', normal, compile_and_run, [''])
test('dsrun018', normal, compile_and_run, [''])
test('dsrun019', normal, compile_and_run, [''])
test('dsrun020', normal, compile_and_run, [''])
test('dsrun021', normal, compile_and_run, [''])
test('dsrun022', normal, compile_and_run, [''])
test('dsrun023', normal, compile_and_run, [''])
drvfail002.hs:15:0:
Ambiguous constraint `X T c'
At least one of the forall'd type variables mentioned by the constraint
must be reachable from the type after the '=>'
In the instance declaration for `Show T'
drvfail002.hs:18:0:
No instance for (X T c)
arising from the 'deriving' clause of a data type declaration
at drvfail002.hs:18:0-25
Possible fix: add an instance declaration for (X T c)
When deriving the instance for (Show S)
test('1372', if_compiler_lt('ghc', '6.9', skip),
test('1372', normal,
run_command, ['$MAKE -s --no-print-directory 1372'])
if default_testopts.cleanup != '':
runCmd('$MAKE -C ' + in_testdir('') + ' clean')
......@@ -182,6 +182,6 @@ test('driver200', normal, run_command,
['$MAKE -s --no-print-directory test200'])
cleanall()
test('pragma001', if_compiler_lt('ghc','6.9',expect_broken(1736)), compile, [''])
test('pragma002', if_compiler_lt('ghc','6.9',expect_broken(1736)), compile, [''])
test('pragma001', normal, compile, [''])
test('pragma002', normal, compile, [''])
Foo.hs:1:0: file name does not match module name `Main'
test('recomp005',
compose(if_compiler_lt('ghc', '6.9', skip), skip_if_fast),
skip_if_fast,
run_command, ['$MAKE -s --no-print-directory recomp005'])
if default_testopts.cleanup != '':
......
......@@ -97,8 +97,7 @@ test('ffi017', normal, compile_and_run, [''])
test('ffi018', [ omit_ways(['ghci']), extra_clean(['ffi018_c.o']) ],
compile_and_run, ['ffi018_c.c'])
test('ffi018', [ if_compiler_lt('ghc', '6.9', skip),
only_ways(['ghci']),
test('ffi018', [ only_ways(['ghci']),
cmd_prefix('$MAKE ffi018_ghci_setup && '),
extra_clean(['ffi018_ghci_c.c', 'ffi018_ghci_c.o']) ],
compile_and_run, ['ffi018_ghci_c.o'])
......
......@@ -27,8 +27,7 @@ test('gadt17',
test('gadt18', normal, compile, [''])
test('gadt19', normal, compile, [''])
test('gadt20', normal, compile, [''])
test('gadt21', if_compiler_lt('ghc','6.9', namebase('gadt21-6.8')),
compile_fail, [''])
test('gadt21', normal, compile_fail, [''])
test('gadt22', normal, compile, [''])
test('gadt23',
......@@ -43,11 +42,11 @@ test('type-rep', skip_if_fast, compile_and_run, [''])
test('equal', normal, compile, [''])
test('nbe', normal, compile, [''])
test('while', normal, compile_and_run, [''])
test('rw', if_compiler_lt('ghc','6.9', namebase('rw-6.8')), compile_fail, [''])
test('rw', normal, compile_fail, [''])
test('lazypat', normal, compile_fail, [''])
test('lazypatok', if_compiler_ge('ghc','6.9', expect_fail), compile, [''])
test('lazypatok', expect_fail, compile, [''])
test('tc', normal, compile_and_run, [''])
test('arrow', if_compiler_lt('ghc', '6.9', skip), compile, [''])
test('arrow', normal, compile, [''])
test('tdpe', normal, compile, [''])
test('Nilsson', skip_if_fast, compile, [''])
......@@ -74,7 +73,7 @@ test('set', normal, compile, [''])
test('scoped', expect_broken(1823), compile, [''])
test('gadt-escape1', if_compiler_lt('ghc', '6.9', skip), compile_fail, [''])
test('gadt-escape1', normal, compile_fail, [''])
# New ones from Dimitrios
......
gadt21.hs:21:59:
Could not deduce (Ord a2) from the context ()
arising from a use of `f' at gadt21.hs:21:59-61
Possible fix:
add (Ord a2) to the context of the constructor `TypeSet'
In the first argument of `Just', namely `(f e)'
In the expression: Just (f e)
In the definition of `withOrdDynExpr':
withOrdDynExpr (DynExpr (e@(Const (TypeSet _) _))) f = Just (f e)
rw.hs:14:32:
Couldn't match expected type `a' against inferred type `Int'
`a' is a rigid type variable bound by
the type signature for `writeInt' at rw.hs:12:13
In the second argument of `writeIORef', namely `(1 :: Int)'
In the expression: writeIORef ref (1 :: Int)
In a case alternative: ~(Li x) -> writeIORef ref (1 :: Int)
rw.hs:19:36:
Couldn't match expected type `a' against inferred type `Bool'
`a' is a rigid type variable bound by
the type signature for `readBool' at rw.hs:16:13
Expected type: a -> Bool
Inferred type: Bool -> Bool
In the second argument of `(.)', namely `not'
In the second argument of `(>>=)', namely `(print . not)'
......@@ -20,13 +20,13 @@ test('print018', normal, ghci_script, ['print018.script'])
test('print019', normal, ghci_script, ['print019.script'])
test('print020', normal, ghci_script, ['print020.script'])
test('print021', normal, ghci_script, ['print021.script'])
test('print022', if_compiler_lt('ghc','6.9', skip), ghci_script, ['print022.script'])
test('print022', normal, ghci_script, ['print022.script'])
test('print023', normal, ghci_script, ['print023.script'])
test('print024', normal, ghci_script, ['print024.script'])
test('print025', normal, ghci_script, ['print025.script'])
test('print026', if_compiler_lt('ghc','6.9', skip), ghci_script, ['print026.script'])
test('print026', normal, ghci_script, ['print026.script'])
test('print027', normal, ghci_script, ['print027.script'])
test('print028', if_compiler_lt('ghc','6.9', namebase('print028-6.8')), ghci_script, ['print028.script'])
test('print028', normal, ghci_script, ['print028.script'])
test('print029', expect_broken(1995), ghci_script, ['print029.script'])
test('print030', expect_broken(1995), ghci_script, ['print030.script'])
test('print031', expect_broken(1995), ghci_script, ['print031.script'])
......@@ -35,7 +35,7 @@ test('print033', normal, ghci_script, ['print033.script'])
test('break001', normal, ghci_script, ['break001.script'])
test('break002', normal, ghci_script, ['break002.script'])
test('break003', if_compiler_lt('ghc','6.9', namebase('break003-6.8')), ghci_script, ['break003.script'])
test('break003', normal, ghci_script, ['break003.script'])
test('break005', normal, ghci_script, ['break005.script'])
test('break006', normal, ghci_script, ['break006.script'])
test('break007', normal, ghci_script, ['break007.script'])
......@@ -52,7 +52,7 @@ test('break017', skip_if_fast, ghci_script, ['break017.script'])
test('break018', normal, ghci_script, ['break018.script'])
test('break019', normal, ghci_script, ['break019.script'])
test('break020', normal, ghci_script, ['break020.script'])
test('break021', if_compiler_lt('ghc','6.9', namebase('break021-6.8')), ghci_script, ['break021.script'])
test('break021', normal, ghci_script, ['break021.script'])
test('break024', expect_broken(2475), ghci_script, ['break024.script'])
test('break025', normal, ghci_script, ['break025.script'])
test('break026', normal, ghci_script, ['break026.script'])
......
<interactive>:1:0:
No instance for (Show (t -> a))
arising from a use of `print' at <interactive>:1:0
Possible fix: add an instance declaration for (Show (t -> a))
In the expression: print it
In a stmt of a 'do' expression: print it
Breakpoint 0 activated at ../Test3.hs:2:17-30
Stopped at ../Test3.hs:2:17-30
_result :: [a] = _
f :: t -> a = _
x :: t = _
xs :: [t] = [_]
Stopped at break020.hs:(9,7)-(15,10)
_result :: IO () = _
8
vv
9 main = do
10 line1 0
11 line2 0
12 in_another_decl 0
13 in_another_module 0
14 line2 1
15 return ()
^^
Stopped at break020.hs:10:2-8
_result :: IO () = _
9 main = do
10 line1 0
^^^^^^^
11 line2 0
Stopped at break020.hs:3:0-18
_result :: IO () = _
2
3 line1 _ = return ()
^^^^^^^^^^^^^^^^^^^
4 line2 _ = return ()
Stopped at break020.hs:3:10-18
_result :: IO () = _
2
3 line1 _ = return ()
^^^^^^^^^
4 line2 _ = return ()
Stopped at break020.hs:11:2-8
_result :: IO () = _
10 line1 0
11 line2 0
^^^^^^^
12 in_another_decl 0
Stopped at break020.hs:4:0-18
_result :: IO () = _
3 line1 _ = return ()
4 line2 _ = return ()
^^^^^^^^^^^^^^^^^^^
5
Stopped at break020.hs:4:10-18
_result :: IO () = _
3 line1 _ = return ()
4 line2 _ = return ()
^^^^^^^^^
5
Stopped at break020.hs:12:2-18
_result :: IO () = _
11 line2 0
12 in_another_decl 0
^^^^^^^^^^^^^^^^^
13 in_another_module 0
Stopped at break020.hs:(6,0)-(7,29)
_result :: t1 () = _
5
vv
6 in_another_decl _ = do line1 0
7 line2 0
^^
8
Stopped at break020.hs:(6,20)-(7,29)
_result :: t1 () = _
5
vv
6 in_another_decl _ = do line1 0
7 line2 0
^^
8
Stopped at break020.hs:6:23-29
_result :: t1 () = _
5
6 in_another_decl _ = do line1 0
^^^^^^^
7 line2 0
Stopped at break020.hs:3:0-18
_result :: t1 () = _
2
3 line1 _ = return ()
^^^^^^^^^^^^^^^^^^^
4 line2 _ = return ()
Stopped at break020.hs:3:10-18
_result :: t1 () = _
2
3 line1 _ = return ()
^^^^^^^^^
4 line2 _ = return ()
Stopped at break020.hs:7:23-29
_result :: t1 () = _
6 in_another_decl _ = do line1 0
7 line2 0
^^^^^^^
8
Stopped at break020.hs:4:0-18
_result :: t1 () = _
3 line1 _ = return ()
4 line2 _ = return ()
^^^^^^^^^^^^^^^^^^^
5
Stopped at break020.hs:4:10-18
_result :: t1 () = _
3 line1 _ = return ()
4 line2 _ = return ()
^^^^^^^^^
5
Stopped at break020.hs:13:2-20
_result :: IO () = _
12 in_another_decl 0
13 in_another_module 0
^^^^^^^^^^^^^^^^^^^
14 line2 1
Stopped at break020.hs:14:2-8
_result :: IO () = _
13 in_another_module 0
14 line2 1
^^^^^^^
15 return ()
Stopped at break020.hs:4:0-18
_result :: IO () = _
3 line1 _ = return ()
4 line2 _ = return ()
^^^^^^^^^^^^^^^^^^^
5
Stopped at break020.hs:4:10-18
_result :: IO () = _
3 line1 _ = return ()
4 line2 _ = return ()
^^^^^^^^^
5
Stopped at break020.hs:15:2-10
_result :: IO () = _
14 line2 1
15 return ()
^^^^^^^^^
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