[commit: testsuite] master: Fix annrun01 with dynamic GHC (b525448)

Ian Lynagh igloo at earth.li
Sun Jun 16 21:44:34 CEST 2013


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

On branch  : master

https://github.com/ghc/testsuite/commit/b525448c5fcbb09b42059489143702ccf182667a

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

commit b525448c5fcbb09b42059489143702ccf182667a
Author: Ian Lynagh <ian at well-typed.com>
Date:   Sun Jun 16 17:12:58 2013 +0100

    Fix annrun01 with dynamic GHC

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

 tests/annotations/should_run/all.T |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/annotations/should_run/all.T b/tests/annotations/should_run/all.T
index 444ac30..db01b25 100644
--- a/tests/annotations/should_run/all.T
+++ b/tests/annotations/should_run/all.T
@@ -5,7 +5,8 @@ setTestOpts(when(fast(), skip))
 # Annotations, like Template Haskell, require runtime evaluation.  In
 # order for this to work with profiling, we would have to build the
 # program twice and use -osuf p_o (see the TH_splitE5_prof test).  For
-# now, just disable the profiling and dynamic ways.
+# now, just disable the profiling and dynamic ways, and use
+# config.ghc_th_way_flags.
 test('annrun01',
      [extra_clean(['Annrun01_Help.hi', 'Annrun01_Help.o',
                     'annrun01.hi', 'annrun01.o',
@@ -13,7 +14,7 @@ test('annrun01',
       pre_cmd('$MAKE -s --no-print-directory config'),
       omit_ways(['profasm','profthreaded', 'dyn'])],
       multimod_compile_and_run,
-      ['annrun01', '-package ghc']
+      ['annrun01', '-package ghc ' + config.ghc_th_way_flags]
     )
 
 """"





More information about the ghc-commits mailing list