[commit: ghc] master: Fix a couple of tests for GHCi/-O* (Trac #10052) (2c6a041)

[git at git.haskell.org]

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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/2c6a0411dcd921ea6ec1cbe5eaf93d17adcf33a2/ghc

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

commit 2c6a0411dcd921ea6ec1cbe5eaf93d17adcf33a2
Author: Sergei Trofimovich <siarheit at google.com>
Date:   Sat Jun 20 10:24:40 2015 +0100

    Fix a couple of tests for GHCi/-O* (Trac #10052)
    
    Tests use unboxed types (or optimizer gets to them),
    those can't be handled by ghci. Fixed by using -fobject-code.
    
    Signed-off-by: Sergei Trofimovich <siarheit at google.com>


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

2c6a0411dcd921ea6ec1cbe5eaf93d17adcf33a2
 testsuite/tests/codeGen/should_run/all.T      | 3 ++-
 testsuite/tests/perf/should_run/all.T         | 3 ++-
 testsuite/tests/programs/joao-circular/test.T | 1 +
 testsuite/tests/typecheck/should_run/all.T    | 3 ++-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/testsuite/tests/codeGen/should_run/all.T b/testsuite/tests/codeGen/should_run/all.T
index 59e4dca..9125f0b 100644
--- a/testsuite/tests/codeGen/should_run/all.T
+++ b/testsuite/tests/codeGen/should_run/all.T
@@ -119,7 +119,8 @@ test('CgStaticPointers',
      , when(doing_ghci(), extra_hc_opts('-fobject-code'))
      ],
      compile_and_run, [''])
-test('StaticArraySize', normal, compile_and_run, ['-O2'])
+test('StaticArraySize', [when(doing_ghci(), extra_hc_opts('-fobject-code'))],
+     compile_and_run, ['-O2'])
 test('StaticByteArraySize', normal, compile_and_run, ['-O2'])
 test('CopySmallArray', normal, compile_and_run, [''])
 test('CopySmallArrayStressTest', reqlib('random'), compile_and_run, [''])
diff --git a/testsuite/tests/perf/should_run/all.T b/testsuite/tests/perf/should_run/all.T
index 6302022..43b24f7 100644
--- a/testsuite/tests/perf/should_run/all.T
+++ b/testsuite/tests/perf/should_run/all.T
@@ -39,7 +39,8 @@ test('T4830',
      compile_and_run,
      ['-O2'])
 
-test('T3245', normal, compile_and_run, ['-O'])
+test('T3245', [when(doing_ghci(), extra_hc_opts('-fobject-code'))],
+     compile_and_run, ['-O'])
 
 # Test that bytestring reading/writing isn't over-allocating.  We had
 # a bug in hGetBufNonBlocking in 6.13 that triggered this.
diff --git a/testsuite/tests/programs/joao-circular/test.T b/testsuite/tests/programs/joao-circular/test.T
index 3f229ab..3fbf054 100644
--- a/testsuite/tests/programs/joao-circular/test.T
+++ b/testsuite/tests/programs/joao-circular/test.T
@@ -1,5 +1,6 @@
 test('joao-circular',
      [when(fast(), skip),
+      when(doing_ghci(), extra_hc_opts('-fobject-code')),
       extra_clean(['Data_Lazy.hi',         'Data_Lazy.o',
                    'Funcs_Lexer.hi',       'Funcs_Lexer.o',
                    'Funcs_Parser_Lazy.hi', 'Funcs_Parser_Lazy.o',
diff --git a/testsuite/tests/typecheck/should_run/all.T b/testsuite/tests/typecheck/should_run/all.T
index 9cf7a80..4195ca8 100755
--- a/testsuite/tests/typecheck/should_run/all.T
+++ b/testsuite/tests/typecheck/should_run/all.T
@@ -40,7 +40,8 @@ test('tcrun020', normal, compile_and_run, [''])
 test('tcrun021', normal, compile_and_run, ['-package containers'])
 test('tcrun022', [omit_ways(['ghci']),only_compiler_types(['ghc'])],
      compile_and_run, ['-O'])
-test('tcrun023', normal, compile_and_run, ['-O'])
+test('tcrun023', [when(doing_ghci(), extra_hc_opts('-fobject-code'))],
+     compile_and_run, ['-O'])
 test('tcrun024', normal, compile_and_run, ['-O'])
 test('tcrun025', extra_clean(['TcRun025_B.hi', 'TcRun025_B.o']),
      multimod_compile_and_run, ['tcrun025',''])