summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Miedema <thomasmiedema@gmail.com>2016-04-28 17:08:53 +0200
committerThomas Miedema <thomasmiedema@gmail.com>2016-04-28 20:16:20 +0200
commitb0569e881f66c3e987bc1108ad771a706399f5ff (patch)
tree9248fe5a08c1b8c488201db1f502ddd0a3e5f2e7
parent9dc34d31eb50d5aeb93d24cf9a3197f27ecb1687 (diff)
downloadhaskell-b0569e881f66c3e987bc1108ad771a706399f5ff.tar.gz
Testsuite: benign test fixes
-rw-r--r--testsuite/tests/deSugar/should_fail/all.T2
-rw-r--r--testsuite/tests/gadt/gadt-fd.hs5
-rw-r--r--testsuite/tests/gadt/lazypatok.hs2
-rw-r--r--testsuite/tests/parser/unicode/all.T2
-rw-r--r--testsuite/tests/partial-sigs/should_compile/all.T1
-rw-r--r--testsuite/tests/programs/okeefe_neural/test.T8
-rw-r--r--testsuite/tests/rename/should_fail/all.T2
-rw-r--r--testsuite/tests/typecheck/T11824/all.T2
8 files changed, 17 insertions, 7 deletions
diff --git a/testsuite/tests/deSugar/should_fail/all.T b/testsuite/tests/deSugar/should_fail/all.T
index 1a501ba4c3..f403c74435 100644
--- a/testsuite/tests/deSugar/should_fail/all.T
+++ b/testsuite/tests/deSugar/should_fail/all.T
@@ -3,4 +3,4 @@
# extra run flags
# expected process return value, if not zero
-test('DsStrictFail', expect_fail, compile_and_run, [''])
+test('DsStrictFail', exit_code(1), compile_and_run, [''])
diff --git a/testsuite/tests/gadt/gadt-fd.hs b/testsuite/tests/gadt/gadt-fd.hs
index 7efac2288f..7d966c35eb 100644
--- a/testsuite/tests/gadt/gadt-fd.hs
+++ b/testsuite/tests/gadt/gadt-fd.hs
@@ -1,4 +1,9 @@
{-# LANGUAGE GADTs #-}
+{-# LANGUAGE MultiParamTypeClasses #-}
+{-# LANGUAGE KindSignatures #-}
+{-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE FunctionalDependencies #-}
+{-# LANGUAGE UndecidableInstances #-}
-- Trac #345
diff --git a/testsuite/tests/gadt/lazypatok.hs b/testsuite/tests/gadt/lazypatok.hs
index 9903a6653e..44fae2fa10 100644
--- a/testsuite/tests/gadt/lazypatok.hs
+++ b/testsuite/tests/gadt/lazypatok.hs
@@ -1,6 +1,6 @@
{-# LANGUAGE GADTs #-}
--- It's not clear whether this one should succed or fail,
+-- It's not clear whether this one should succeed or fail,
-- Arguably it should succeed because the type refinement on
-- T1 should make (y::Int). Currently, though, it fails.
diff --git a/testsuite/tests/parser/unicode/all.T b/testsuite/tests/parser/unicode/all.T
index 6876fe777c..44adc7d797 100644
--- a/testsuite/tests/parser/unicode/all.T
+++ b/testsuite/tests/parser/unicode/all.T
@@ -27,4 +27,4 @@ test('T7671', normal, compile, [''])
test('T10907', normal, compile, [''])
test('T7650', normal, compile, [''])
-test('arrowsyntax', normal, compile, ['']) \ No newline at end of file
+test('arrowsyntax', normal, compile, [''])
diff --git a/testsuite/tests/partial-sigs/should_compile/all.T b/testsuite/tests/partial-sigs/should_compile/all.T
index ba25a11159..cc8f478e40 100644
--- a/testsuite/tests/partial-sigs/should_compile/all.T
+++ b/testsuite/tests/partial-sigs/should_compile/all.T
@@ -29,7 +29,6 @@ test('HigherRank1', normal, compile, ['-ddump-types -fno-warn-partial-type-signa
test('HigherRank2', normal, compile, ['-ddump-types -fno-warn-partial-type-signatures'])
test('LocalDefinitionBug', normal, compile, ['-ddump-types -fno-warn-partial-type-signatures'])
test('Meltdown', normal, compile, ['-ddump-types -fno-warn-partial-type-signatures'])
-# Bug
test('MonoLocalBinds', normal, compile, ['-ddump-types -fno-warn-partial-type-signatures'])
test('NamedTyVar', normal, compile, ['-ddump-types -fno-warn-partial-type-signatures'])
test('NamedWildcardInDataFamilyInstanceLHS', normal, compile, ['-ddump-types -fno-warn-partial-type-signatures'])
diff --git a/testsuite/tests/programs/okeefe_neural/test.T b/testsuite/tests/programs/okeefe_neural/test.T
index e905ec0b99..e7e1f78c01 100644
--- a/testsuite/tests/programs/okeefe_neural/test.T
+++ b/testsuite/tests/programs/okeefe_neural/test.T
@@ -1,6 +1,12 @@
# this one causes the compiler to run out of heap in the simplifier
+# TODO. What's the purpose of this test? If you give it 100Mb of heap, it
+# compiles fine (though it takes a while). Is that too much?
+# Does the fact that this test is marked expect_fail (instead of expect_broken)
+# mean anything?
+# Is it necessary to also run the resulting program? It doesn't seem to ever
+# complete, at least not in a few minutes. What is the expected output?
def set_opts( name, opts ):
opts.expect = 'fail'
@@ -9,4 +15,4 @@ test('okeefe_neural',
set_opts,
extra_clean(['Main.hi'])],
multimod_compile_and_run,
- ['Main', '-package lang +RTS -M64m -RTS'])
+ ['Main', '+RTS -M64m -RTS'])
diff --git a/testsuite/tests/rename/should_fail/all.T b/testsuite/tests/rename/should_fail/all.T
index 195b7296d9..38106209c3 100644
--- a/testsuite/tests/rename/should_fail/all.T
+++ b/testsuite/tests/rename/should_fail/all.T
@@ -137,4 +137,4 @@ test('T5001b', normal, compile_fail, [''])
test('T10781', normal, compile_fail, [''])
test('T11071', normal, compile_fail, [''])
test('T11071a', normal, compile_fail, [''])
-test('T11663', normal, compile_fail, ['']) \ No newline at end of file
+test('T11663', normal, compile_fail, [''])
diff --git a/testsuite/tests/typecheck/T11824/all.T b/testsuite/tests/typecheck/T11824/all.T
index 90aaa1e8d7..88ce2e82ea 100644
--- a/testsuite/tests/typecheck/T11824/all.T
+++ b/testsuite/tests/typecheck/T11824/all.T
@@ -1 +1 @@
-test('T11824', expect_broken(11824), compile_and_run, ['']) \ No newline at end of file
+test('T11824', expect_broken(11824), compile_and_run, [''])