[commit: testsuite] master: Fix ghci058 with dynamic GHC (ef182ab)

Ian Lynagh igloo at earth.li
Sun Mar 17 01:49:51 CET 2013


Repository : ssh://darcs.haskell.org//srv/darcs/testsuite

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/ef182ab021e51b8d4dc7813f1376202c1f42c4c5

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

commit ef182ab021e51b8d4dc7813f1376202c1f42c4c5
Author: Ian Lynagh <ian at well-typed.com>
Date:   Fri Mar 15 00:39:59 2013 +0000

    Fix ghci058 with dynamic GHC

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

 tests/ghci/scripts/all.T          |    3 ++-
 tests/ghci/scripts/ghci058.script |    4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/tests/ghci/scripts/all.T b/tests/ghci/scripts/all.T
index 7af3bf9..12e1850 100755
--- a/tests/ghci/scripts/all.T
+++ b/tests/ghci/scripts/all.T
@@ -137,7 +137,8 @@ test('T6106',
 test('T6105', normal, ghci_script, ['T6105.script'])
 test('T7117', normal, ghci_script, ['T7117.script'])
 test('ghci058',
-     extra_clean(['Ghci058.hs', 'Ghci058.hi', 'Ghci058.o']),
+     [extra_clean(['Ghci058.hs', 'Ghci058.hi', 'Ghci058.o']),
+      cmd_prefix('ghciWayFlags=' + config.ghci_way_flags)],
      ghci_script,
      ['ghci058.script'])
 test('T7587', normal, ghci_script, ['T7587.script'])
diff --git a/tests/ghci/scripts/ghci058.script b/tests/ghci/scripts/ghci058.script
index 03d7a30..a05aa73 100644
--- a/tests/ghci/scripts/ghci058.script
+++ b/tests/ghci/scripts/ghci058.script
@@ -6,12 +6,12 @@
 :set -v1
 
 :shell echo "module Ghci058 where c = 'a'" > Ghci058.hs
-:shell "$HC" $HC_OPTS -fforce-recomp -c Ghci058.hs
+:shell "$HC" $HC_OPTS $ghciWayFlags -fforce-recomp -c Ghci058.hs
 :l Ghci058
 c
 
 :shell echo "module Ghci058 where c = 'b'" > Ghci058.hs
-:shell "$HC" $HC_OPTS -fforce-recomp -c Ghci058.hs
+:shell "$HC" $HC_OPTS $ghciWayFlags -fforce-recomp -c Ghci058.hs
 :l Ghci058
 c
 





More information about the ghc-commits mailing list