Use the dynamic way if we have a dynamic RTS
authorIan Lynagh <igloo@earth.li>
Fri, 21 Aug 2009 15:33:55 +0000 (15:33 +0000)
committerIan Lynagh <igloo@earth.li>
Fri, 21 Aug 2009 15:33:55 +0000 (15:33 +0000)
testsuite/config/ghc
testsuite/mk/test.mk

index 11c0262..137c5fd 100644 (file)
@@ -25,7 +25,6 @@ config.run_ways                    = ['normal', 'optc', 'hpc']
 config.other_ways            = ['extcore','optextcore',
                                 'prof_hc_hb','prof_hb',
                                 'prof_hd','prof_hy','prof_hr',
-                                'dyn',
                                 'threaded2_qw']
 
 if (ghc_with_native_codegen == 1):
@@ -50,6 +49,9 @@ if (ghc_with_threaded_rts == 1):
        if (ghc_with_smp == 1):
                config.run_ways.append('threaded2')
 
+if (ghc_with_dynamic_rts == 1):
+       config.run_ways.append('dyn')
+
 if (ghc_with_profiling == 1 and ghc_with_threaded_rts == 1):
         config.run_ways.append('profthreaded')
 
index e8d5c63..47cf2ea 100644 (file)
@@ -57,6 +57,12 @@ else
 RUNTEST_OPTS += -e ghc_with_threaded_rts=0
 endif
 
+ifeq "$(filter dyn, $(GhcRTSWays))" "dyn"
+RUNTEST_OPTS += -e ghc_with_dynamic_rts=1
+else
+RUNTEST_OPTS += -e ghc_with_dynamic_rts=0
+endif
+
 $(eval $(call get-ghc-feature-bool,GhcWithInterpreter,Have interpreter))
 ifeq "$(GhcWithInterpreter)" "YES"
 RUNTEST_OPTS += -e ghc_with_interpreter=1