Use PROG_ARGS instead of SRC_RUNTEST_OPTS

Since morally these flags are for the program and not runtest

gc/cacheprof/Makefile

@@ -2,10 +2,10 @@ TOP = ../..
 include $(TOP)/mk/boilerplate.mk
 
 ifeq "$(HEAP)" "LARGE"
-SRC_RUNTEST_OPTS += +RTS -H16m -RTS
+PROG_ARGS += +RTS -H16m -RTS
 endif
 ifeq "$(HEAP)" "OLD"
-SRC_RUNTEST_OPTS += +RTS -H10m -RTS
+PROG_ARGS += +RTS -H10m -RTS
 endif
 
 include $(TOP)/mk/target.mk

gc/circsim/Makefile

@@ -7,10 +7,10 @@ NORM_OPTS = 8 3000
 SLOW_OPTS = 8 5000
 
 ifeq "$(HEAP)" "LARGE"
-SRC_RUNTEST_OPTS += +RTS -H256m -RTS
+PROG_ARGS += +RTS -H256m -RTS
 endif
 ifeq "$(HEAP)" "OLD"
-SRC_RUNTEST_OPTS += +RTS -H30m -RTS
+PROG_ARGS += +RTS -H30m -RTS
 endif
 
 include $(TOP)/mk/target.mk

gc/constraints/Makefile

@@ -7,10 +7,10 @@ NORM_OPTS = 10
 SLOW_OPTS = 11
 
 ifeq "$(HEAP)" "LARGE"
-SRC_RUNTEST_OPTS += +RTS -H330m -RTS
+PROG_ARGS += +RTS -H330m -RTS
 endif
 ifeq "$(HEAP)" "OLD"
-SRC_RUNTEST_OPTS += +RTS -H10m -RTS
+PROG_ARGS += +RTS -H10m -RTS
 endif
 
 include $(TOP)/mk/target.mk

gc/fibheaps/Makefile

@@ -3,14 +3,14 @@ include $(TOP)/mk/boilerplate.mk
 
 NORM_OPTS = 300000
 
-SRC_RUNTEST_OPTS += +RTS -K64m -RTS
 SRC_DEPS = array
+PROG_ARGS += +RTS -K64m -RTS
 
 ifeq "$(HEAP)" "LARGE"
-SRC_RUNTEST_OPTS += +RTS -H128m -RTS
+PROG_ARGS += +RTS -H128m -RTS
 endif
 ifeq "$(HEAP)" "OLD"
-SRC_RUNTEST_OPTS += +RTS -H10m -RTS
+PROG_ARGS += +RTS -H10m -RTS
 endif
 
 include $(TOP)/mk/target.mk

gc/fulsom/Makefile

@@ -9,10 +9,10 @@ NORM_OPTS = 9
 SLOW_OPTS = 9
 
 ifeq "$(HEAP)" "LARGE"
-SRC_RUNTEST_OPTS += +RTS -H160m -RTS
+PROG_ARGS += +RTS -H160m -RTS
 endif
 ifeq "$(HEAP)" "OLD"
-SRC_RUNTEST_OPTS += +RTS -H10m -RTS
+PROG_ARGS += +RTS -H10m -RTS
 endif
 
 SRC_RUNTEST_OPTS += -stdout-binary

gc/gc_bench/Makefile

@@ -13,7 +13,7 @@ NORM_OPTS = 18 500000 4 19
 SLOW_OPTS = 19 500000 5 22
 
 ifeq "$(HEAP)" "LARGE"
-SRC_RUNTEST_OPTS += +RTS -H180m -RTS
+PROG_ARGS += +RTS -H180m -RTS
 endif
 
 include $(TOP)/mk/target.mk

gc/happy/Makefile

@@ -8,10 +8,10 @@ SRC_DEPS = containers
 EXCLUDED_SRCS += TestInput.hs
 
 ifeq "$(HEAP)" "LARGE"
-SRC_RUNTEST_OPTS += +RTS -H128m -RTS
+PROG_ARGS += +RTS -H128m -RTS
 endif
 ifeq "$(HEAP)" "OLD"
-SRC_RUNTEST_OPTS += +RTS -H10m -RTS
+PROG_ARGS += +RTS -H10m -RTS
 endif
 
 include $(TOP)/mk/target.mk

gc/hash/Makefile

@@ -6,7 +6,7 @@ NORM_OPTS = 5000000
 SLOW_OPTS = 100000000
 
 ifeq "$(HEAP)" "LARGE"
-SRC_RUNTEST_OPTS += +RTS -H430m -RTS
+PROG_ARGS += +RTS -H430m -RTS
 endif
 
 include $(TOP)/mk/target.mk

gc/lcss/Makefile

@@ -6,7 +6,7 @@ NORM_OPTS = 1 2 2000 1000 1001 4000
 SLOW_OPTS = 1 2 4000 1000 1001 4000
 
 ifeq "$(HEAP)" "LARGE"
-SRC_RUNTEST_OPTS += +RTS -H256m -RTS
+PROG_ARGS += +RTS -H256m -RTS
 endif
 
 include $(TOP)/mk/target.mk

gc/linear/Makefile

@@ -5,10 +5,10 @@ include $(TOP)/mk/boilerplate.mk
 NORM_OPTS = 14
 
 ifeq "$(HEAP)" "LARGE"
-SRC_RUNTEST_OPTS += +RTS -H8m -RTS
+PROG_ARGS += +RTS -H8m -RTS
 endif
 ifeq "$(HEAP)" "OLD"
-SRC_RUNTEST_OPTS += +RTS -H10m -RTS
+PROG_ARGS += +RTS -H10m -RTS
 endif
 
 include $(TOP)/mk/target.mk

gc/power/Makefile

@@ -8,8 +8,8 @@ NORM_OPTS = 80
 SLOW_OPTS = 90
 
 ifeq "$(HEAP)" "LARGE"
-SRC_RUNTEST_OPTS += +RTS -H16m -RTS
+PROG_ARGS += +RTS -H16m -RTS
 endif
 ifeq "$(HEAP)" "OLD"
-SRC_RUNTEST_OPTS += +RTS -H10m -RTS
+PROG_ARGS += +RTS -H10m -RTS
 endif

gc/spellcheck/Makefile

@@ -11,10 +11,10 @@ SRC_DEPS = containers
 NORM_OPTS = words input
 
 ifeq "$(HEAP)" "LARGE"
-SRC_RUNTEST_OPTS += +RTS -H32m -RTS
+PROG_ARGS += +RTS -H32m -RTS
 endif
 ifeq "$(HEAP)" "OLD"
-SRC_RUNTEST_OPTS += +RTS -H10m -RTS
+PROG_ARGS += +RTS -H10m -RTS
 endif
 
 include $(TOP)/mk/target.mk

gc/treejoin/Makefile

@@ -5,10 +5,10 @@ include $(TOP)/mk/boilerplate.mk
 PROG_ARGS = 27000.1 27000.2
 
 ifeq "$(HEAP)" "LARGE"
-SRC_RUNTEST_OPTS += +RTS -H32m -RTS
+PROG_ARGS += +RTS -H32m -RTS
 endif
 ifeq "$(HEAP)" "OLD"
-SRC_RUNTEST_OPTS += +RTS -H24m -RTS
+PROG_ARGS += +RTS -H24m -RTS
 endif
 
 include $(TOP)/mk/target.mk

imaginary/wheel-sieve2/Makefile

@@ -3,7 +3,7 @@ include $(TOP)/mk/boilerplate.mk
 -include opts.mk
 
 # Seems to be a real memory hog, this one
-SRC_RUNTEST_OPTS += +RTS -M300m -RTS
+PROG_ARGS += +RTS -M300m -RTS
 
 include $(TOP)/mk/target.mk
 

parallel/OLD/par001/Makefile

 TOP = ../..
 include $(TOP)/mk/boilerplate.mk
 
-SRC_RUNTEST_OPTS += 8400
+PROG_ARGS += 8400
 
 include $(TOP)/mk/target.mk
 

parallel/OLD/parfact/Makefile

@@ -4,7 +4,7 @@ include $(TOP)/mk/boilerplate.mk
 
 # Override default SRCS; the default is all source files
 SRCS=parfact.hs
-SRC_RUNTEST_OPTS += 8000000 1000
+PROG_ARGS += 8000000 1000
 SRC_HC_OPTS += -package concurrent
 
 include $(TOP)/mk/target.mk

parallel/OLD/soda7/Makefile

@@ -3,7 +3,7 @@ include $(TOP)/mk/boilerplate.mk
 
 # Override default SRCS; the default is all source files
 SRCS=Main.hs
-SRC_RUNTEST_OPTS += 20
+PROG_ARGS += 20
 SRC_HC_OPTS += -cpp -package concurrent
 
 include $(TOP)/mk/target.mk

parallel/coins/Makefile

@@ -2,10 +2,10 @@ TOP = ../..
 include $(TOP)/mk/boilerplate.mk
 
 # This version just counts the results, and runs in constant space:
-# SRC_RUNTEST_OPTS += 7 1163
+# PROG_ARGS += 7 1163
 
 # This version builds a list of the results, and needs a lot of memory:
-SRC_RUNTEST_OPTS += 3 873
+PROG_ARGS += 3 873
 
 SRC_DEPS = parallel
 

parallel/linsolv/Makefile

@@ -6,7 +6,7 @@ SRC_DEPS = random parallel
 
 # 28 = version
 # 83 = input
-PROG_ARGS = 28 83
+PROG_ARGS += 28 83
 
 include $(TOP)/mk/target.mk
 

parallel/mandel/Makefile

 TOP = ../..
 include $(TOP)/mk/boilerplate.mk
 
-SRC_RUNTEST_OPTS += -2.0 -2.0 2.0 2.0 1024 1024 256
+PROG_ARGS += -2.0 -2.0 2.0 2.0 1024 1024 256
 SRC_RUNTEST_OPTS += -stdout-binary
 SRC_DEPS = parallel