Don't use the threaded2 way when we don't support SMP
authorIan Lynagh <igloo@earth.li>
Fri, 25 Aug 2006 00:40:42 +0000 (00:40 +0000)
committerIan Lynagh <igloo@earth.li>
Fri, 25 Aug 2006 00:40:42 +0000 (00:40 +0000)
testsuite/config/ghc
testsuite/mk/test.mk

index 6183e26..940013d 100644 (file)
@@ -35,7 +35,8 @@ if (ghc_with_interpreter == 1):
 
 if (ghc_with_threaded_rts == 1):
        config.run_ways.append('threaded1')
-       config.run_ways.append('threaded2')
+       if (ghc_with_smp == 1):
+               config.run_ways.append('threaded2')
 
 config.way_flags = {
        'normal'     : [],
index e270de3..3ec0902 100644 (file)
@@ -76,6 +76,12 @@ else
 RUNTEST_OPTS += -e ghc_with_threaded_rts=0
 endif
 
+ifeq "$(GhcWithSMP)" "YES"
+RUNTEST_OPTS += -e ghc_with_smp=1
+else
+RUNTEST_OPTS += -e ghc_with_smp=0
+endif
+
 ifneq "$(THREADS)" ""
 RUNTEST_OPTS += --thread=$(THREADS)
 endif