summaryrefslogtreecommitdiff
path: root/testsuite/tests/parser
diff options
context:
space:
mode:
authorIan Lynagh <ian@well-typed.com>2013-02-11 15:07:12 +0000
committerIan Lynagh <ian@well-typed.com>2013-02-11 15:07:12 +0000
commit8d34b5c785c56d68765e70e74e73be45be419df8 (patch)
tree1e08c26aad57c6af5559e95a265603ae454acc42 /testsuite/tests/parser
parent7cc907d310b9be716b50279d6545698dee346fb6 (diff)
downloadhaskell-8d34b5c785c56d68765e70e74e73be45be419df8.tar.gz
Convert more helper functions
Diffstat (limited to 'testsuite/tests/parser')
-rw-r--r--testsuite/tests/parser/should_compile/all.T6
-rw-r--r--testsuite/tests/parser/should_fail/all.T6
-rw-r--r--testsuite/tests/parser/should_run/all.T2
3 files changed, 7 insertions, 7 deletions
diff --git a/testsuite/tests/parser/should_compile/all.T b/testsuite/tests/parser/should_compile/all.T
index 9d3b4e698a..b10cd2ccfa 100644
--- a/testsuite/tests/parser/should_compile/all.T
+++ b/testsuite/tests/parser/should_compile/all.T
@@ -45,8 +45,8 @@ test('read029', normal, compile, [''])
test('read030', normal, compile, [''])
test('read031', normal, compile, [''])
test('read032', normal, compile, [''])
-test('read033', if_compiler_type('hugs', expect_fail), compile, [''])
-test('read034', if_compiler_type('hugs', expect_fail), compile, [''])
+test('read033', when(compiler_type('hugs'), expect_fail), compile, [''])
+test('read034', when(compiler_type('hugs'), expect_fail), compile, [''])
test('read036', normal, compile, [''])
test('read037', normal, compile, [''])
test('read038', normal, compile, [''])
@@ -90,7 +90,7 @@ test('NondecreasingIndentation', normal, compile, [''])
test('mc15', normal, compile, [''])
test('mc16', normal, compile, [''])
test('EmptyDecls', normal, compile, [''])
-test('ParserLambdaCase', if_compiler_lt('ghc', '7.5', skip), compile, [''])
+test('ParserLambdaCase', when(compiler_lt('ghc', '7.5'), skip), compile, [''])
test('T5243', extra_clean(['T5243A.hi', 'T5243A.o']),
multimod_compile, ['T5243',''])
diff --git a/testsuite/tests/parser/should_fail/all.T b/testsuite/tests/parser/should_fail/all.T
index 114524affa..a09b76df18 100644
--- a/testsuite/tests/parser/should_fail/all.T
+++ b/testsuite/tests/parser/should_fail/all.T
@@ -23,7 +23,7 @@ test('readFail020', normal, compile_fail, [''])
# empty file (length zero) is not a legal Haskell module. It fails to compile
# because it doesn't contain a definition of Main.main. GHC 5.02 crashed
# on this example.
-test('readFail021', if_compiler_type('hugs', expect_fail), compile_fail, [''])
+test('readFail021', when(compiler_type('hugs'), expect_fail), compile_fail, [''])
test('readFail022', normal, compile_fail, [''])
test('readFail023', normal, compile_fail, [''])
@@ -72,8 +72,8 @@ test('NondecreasingIndentationFail', normal, compile_fail, [''])
test('readFailTraditionalRecords1', normal, compile_fail, [''])
test('readFailTraditionalRecords2', normal, compile_fail, [''])
test('readFailTraditionalRecords3', normal, compile_fail, [''])
-test('ParserNoLambdaCase', if_compiler_lt('ghc', '7.5', skip), compile_fail, [''])
-test('ParserNoMultiWayIf', if_compiler_lt('ghc', '7.5', skip), compile_fail, [''])
+test('ParserNoLambdaCase', when(compiler_lt('ghc', '7.5'), skip), compile_fail, [''])
+test('ParserNoMultiWayIf', when(compiler_lt('ghc', '7.5'), skip), compile_fail, [''])
test('T5425', normal, compile_fail, [''])
test('T984', normal, compile_fail, [''])
diff --git a/testsuite/tests/parser/should_run/all.T b/testsuite/tests/parser/should_run/all.T
index 03951a1edb..eee0330e5e 100644
--- a/testsuite/tests/parser/should_run/all.T
+++ b/testsuite/tests/parser/should_run/all.T
@@ -5,4 +5,4 @@ test('readRun004', normal, compile_and_run, ['-fobject-code'])
test('T1344', normal, compile_and_run, [''])
test('operator', normal, compile_and_run, [''])
test('operator2', normal, compile_and_run, [''])
-test('ParserMultiWayIf', if_compiler_lt('ghc', '7.5', skip), compile_and_run, [''])
+test('ParserMultiWayIf', when(compiler_lt('ghc', '7.5'), skip), compile_and_run, [''])