[commit: ghc] master: Fix ghci-way tests of -XStaticPointers. (70f1ca4)

[git at git.haskell.org]

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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/70f1ca431c948be468f7f9a86892fd81c8f1a64b/ghc

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

commit 70f1ca431c948be468f7f9a86892fd81c8f1a64b
Author: Facundo Domínguez <facundo.dominguez at tweag.io>
Date:   Mon May 25 21:07:54 2015 -0500

    Fix ghci-way tests of -XStaticPointers.
    
    Summary: Add -fobject-code to StaticPointers tests in ghci.
    
    Test Plan: validate
    
    Reviewers: austin
    
    Reviewed By: austin
    
    Subscribers: bgamari, thomie, mboes
    
    Differential Revision: https://phabricator.haskell.org/D905


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

70f1ca431c948be468f7f9a86892fd81c8f1a64b
 testsuite/tests/codeGen/should_run/all.T | 4 +++-
 testsuite/tests/deSugar/should_run/all.T | 5 ++++-
 testsuite/tests/rts/all.T                | 8 ++++++--
 testsuite/tests/th/all.T                 | 4 +++-
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/testsuite/tests/codeGen/should_run/all.T b/testsuite/tests/codeGen/should_run/all.T
index 41d18e5..59e4dca 100644
--- a/testsuite/tests/codeGen/should_run/all.T
+++ b/testsuite/tests/codeGen/should_run/all.T
@@ -115,7 +115,9 @@ test('T7953', reqlib('random'), compile_and_run, [''])
 test('T8256', normal, compile_and_run, ['-dcore-lint -O1'])
 test('T6084',normal, compile_and_run, ['-O2'])
 test('CgStaticPointers',
-     [ when(compiler_lt('ghc', '7.9'), skip) ],
+     [ when(compiler_lt('ghc', '7.9'), skip)
+     , when(doing_ghci(), extra_hc_opts('-fobject-code'))
+     ],
      compile_and_run, [''])
 test('StaticArraySize', normal, compile_and_run, ['-O2'])
 test('StaticByteArraySize', normal, compile_and_run, ['-O2'])
diff --git a/testsuite/tests/deSugar/should_run/all.T b/testsuite/tests/deSugar/should_run/all.T
index 87ebe8e..5787816 100644
--- a/testsuite/tests/deSugar/should_run/all.T
+++ b/testsuite/tests/deSugar/should_run/all.T
@@ -41,6 +41,9 @@ test('T5742', normal, compile_and_run, [''])
 test('DsLambdaCase', when(compiler_lt('ghc', '7.5'), skip), compile_and_run, [''])
 test('DsMultiWayIf', when(compiler_lt('ghc', '7.5'), skip), compile_and_run, [''])
 test('DsStaticPointers',
-     when(compiler_lt('ghc', '7.9'), skip), compile_and_run, [''])
+     [ when(compiler_lt('ghc', '7.9'), skip)
+     , when(doing_ghci(), extra_hc_opts('-fobject-code'))
+     ],
+     compile_and_run, [''])
 test('T8952', normal, compile_and_run, [''])
 test('T9844', normal, compile_and_run, [''])
diff --git a/testsuite/tests/rts/all.T b/testsuite/tests/rts/all.T
index 3965ee4..d823c2b 100644
--- a/testsuite/tests/rts/all.T
+++ b/testsuite/tests/rts/all.T
@@ -255,10 +255,14 @@ test('rdynamic', [ unless(opsys('linux') or opsys('mingw32'), skip)
      compile_and_run, ['-rdynamic -package ghc'])
 
 test('GcStaticPointers',
-     [ when(compiler_lt('ghc', '7.9'), skip) ],
+     [ when(compiler_lt('ghc', '7.9'), skip)
+     , when(doing_ghci(), extra_hc_opts('-fobject-code'))
+     ],
      compile_and_run, [''])
 test('ListStaticPointers',
-     [ when(compiler_lt('ghc', '7.9'), skip) ],
+     [ when(compiler_lt('ghc', '7.9'), skip)
+     , when(doing_ghci(), extra_hc_opts('-fobject-code'))
+     ],
      compile_and_run, [''])
 
 # 251 = RTS exit code for "out of memory"
diff --git a/testsuite/tests/th/all.T b/testsuite/tests/th/all.T
index 43c3e89..084ace5 100644
--- a/testsuite/tests/th/all.T
+++ b/testsuite/tests/th/all.T
@@ -308,7 +308,9 @@ test('T8577',
      ['T8577', '-v0 ' + config.ghc_th_way_flags])
 test('T8625', normal, ghci_script, ['T8625.script'])
 test('TH_StaticPointers',
-     [ when(compiler_lt('ghc', '7.9'), skip) ],
+     [ when(compiler_lt('ghc', '7.9'), skip)
+     , when(doing_ghci(), extra_hc_opts('-fobject-code'))
+     ],
      compile_and_run, [''])
 test('TH_StaticPointers02',
      [ when(compiler_lt('ghc', '7.9'), skip) ],