[commit: ghc] master: Testsuite: delete expect_fail setups for hugs (43ebe24)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/43ebe24aed3bfb4decd958ca91313ab2773abd51/ghc

>---------------------------------------------------------------

commit 43ebe24aed3bfb4decd958ca91313ab2773abd51
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date:   Wed Jun 3 14:48:23 2015 +0200

    Testsuite: delete expect_fail setups for hugs
    
    This makes it easier to grep for expect_fail in the tests directory.
    
    Differential Revision: https://phabricator.haskell.org/D964


>---------------------------------------------------------------

43ebe24aed3bfb4decd958ca91313ab2773abd51
 libraries/base/tests/IO/all.T                   | 13 +++----------
 testsuite/tests/module/all.T                    |  2 +-
 testsuite/tests/parser/should_compile/all.T     |  4 ++--
 testsuite/tests/parser/should_fail/all.T        |  2 +-
 testsuite/tests/programs/life_space_leak/test.T |  3 +--
 testsuite/tests/typecheck/should_compile/all.T  |  4 ++--
 testsuite/tests/typecheck/should_fail/all.T     |  2 +-
 7 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/libraries/base/tests/IO/all.T b/libraries/base/tests/IO/all.T
index e15c84d..f6c8cc9 100644
--- a/libraries/base/tests/IO/all.T
+++ b/libraries/base/tests/IO/all.T
@@ -72,21 +72,14 @@ test('openFile001',  normal, compile_and_run, [''])
 test('openFile002',  exit_code(1), compile_and_run, [''])
 test('openFile003',  extra_clean(['openFile003Dir']), compile_and_run, [''])
 test('openFile004',  extra_clean(['openFile004.out']), compile_and_run, [''])
-test('openFile005',
-     [when(compiler_type('hugs'), expect_fail),
-      extra_clean(['openFile005.out1', 'openFile005.out2'])],
+test('openFile005',  extra_clean(['openFile005.out1', 'openFile005.out2']),
      compile_and_run, [''])
 test('openFile006', extra_clean(['openFile006.out']), compile_and_run, [''])
-test('openFile007',
-     [when(compiler_type('hugs'), expect_fail),
-      extra_clean(['openFile007.out'])],
-     compile_and_run, [''])
+test('openFile007', extra_clean(['openFile007.out']), compile_and_run, [''])
 test('openFile008', cmd_prefix('ulimit -n 1024; '), compile_and_run, [''])
 
 test('putStr001',    normal, compile_and_run, [''])
-test('readFile001',
-     [when(compiler_type('hugs'), expect_fail),
-      extra_clean(['readFile001.out'])],
+test('readFile001',  extra_clean(['readFile001.out']),
      compile_and_run, [''])
 test('readwrite001',
      extra_clean(['readwrite001.inout']),
diff --git a/testsuite/tests/module/all.T b/testsuite/tests/module/all.T
index d0b37aa..cd1bdac 100644
--- a/testsuite/tests/module/all.T
+++ b/testsuite/tests/module/all.T
@@ -260,7 +260,7 @@ test('mod150', normal, compile_fail, [''])
 test('mod151', normal, compile_fail, [''])
 test('mod152', normal, compile_fail, [''])
 test('mod153', normal, compile_fail, [''])
-test('mod154', when(compiler_type('hugs'), expect_fail), compile, [''])
+test('mod154', normal, compile, [''])
 test('mod155', normal, compile_fail, [''])
 test('mod156', normal, compile, [''])
 test('mod157', 
diff --git a/testsuite/tests/parser/should_compile/all.T b/testsuite/tests/parser/should_compile/all.T
index 9e7612c..eec0a12 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', when(compiler_type('hugs'), expect_fail), compile, [''])
-test('read034', when(compiler_type('hugs'), expect_fail), compile, [''])
+test('read033', normal, compile, [''])
+test('read034', normal, compile, [''])
 test('read036', normal, compile, [''])
 test('read037', normal, compile, [''])
 test('read038', normal, compile, [''])
diff --git a/testsuite/tests/parser/should_fail/all.T b/testsuite/tests/parser/should_fail/all.T
index 0352235..cc59a14 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', when(compiler_type('hugs'), expect_fail), compile_fail, [''])
+test('readFail021', normal, compile_fail, [''])
 
 test('readFail022', normal, compile_fail, [''])
 test('readFail023', normal, compile_fail, [''])
diff --git a/testsuite/tests/programs/life_space_leak/test.T b/testsuite/tests/programs/life_space_leak/test.T
index 11f73e0..4483137 100644
--- a/testsuite/tests/programs/life_space_leak/test.T
+++ b/testsuite/tests/programs/life_space_leak/test.T
@@ -1,8 +1,7 @@
 # exhausts Hugs's heap (CAF leak)
 test('life_space_leak',
      [when(fast(), skip),
-      extra_clean(['Main.hi', 'Main.o']),
-      when(compiler_type('hugs'), expect_fail)],
+      extra_clean(['Main.hi', 'Main.o'])],
      multimod_compile_and_run,
      ['Main', ''])
 
diff --git a/testsuite/tests/typecheck/should_compile/all.T b/testsuite/tests/typecheck/should_compile/all.T
index dbd6328..bd87afb 100644
--- a/testsuite/tests/typecheck/should_compile/all.T
+++ b/testsuite/tests/typecheck/should_compile/all.T
@@ -84,7 +84,7 @@ test('tc079', normal, compile, [''])
 test('tc080', normal, compile, [''])
 test('tc081', normal, compile, [''])
 test('tc082', normal, compile, [''])
-test('tc084', when(compiler_type('hugs'), expect_fail), compile, [''])
+test('tc084', normal, compile, [''])
 test('tc085', only_compiler_types(['ghc']), compile, [''])
 test('tc086', normal, compile, [''])
 test('tc087', normal, compile, [''])
@@ -96,7 +96,7 @@ test('tc092', normal, compile, [''])
 test('tc093', normal, compile, [''])
 test('tc094', normal, compile, [''])
 test('tc095', normal, compile, [''])
-test('tc096', when(compiler_type('hugs'), expect_fail), compile, [''])
+test('tc096', normal, compile, [''])
 test('tc097', normal, compile, [''])
 test('tc098', normal, compile, [''])
 test('tc099', normal, compile, [''])
diff --git a/testsuite/tests/typecheck/should_fail/all.T b/testsuite/tests/typecheck/should_fail/all.T
index b9c7d5a..4dfc220 100644
--- a/testsuite/tests/typecheck/should_fail/all.T
+++ b/testsuite/tests/typecheck/should_fail/all.T
@@ -24,7 +24,7 @@ test('tcfail023', normal, compile_fail, [''])
 test('tcfail027', normal, compile_fail, [''])
 test('tcfail028', normal, compile_fail, [''])
 test('tcfail029', normal, compile_fail, [''])
-test('tcfail030', when(compiler_type('hugs'), expect_fail), compile_fail, [''])
+test('tcfail030', normal, compile_fail, [''])
 test('tcfail031', normal, compile_fail, [''])
 test('tcfail032', normal, compile_fail, [''])
 test('tcfail033', normal, compile_fail, [''])