[project @ 1998-02-19 18:43:18 by sof]

- based on feedback from Olaf Chitil, misc fixes to make the
  compilation and running  of tests `ways' friendly.

mk/opts.mk

@@ -2,7 +2,7 @@
 #
 #			    nofib/mk/opts.mk
 #
-# 	$Id: opts.mk,v 1.1 1997/03/14 08:07:03 simonpj Exp $
+# 	$Id: opts.mk,v 1.2 1998/02/19 18:43:20 sof Exp $
 #
 #################################################################################
 
@@ -12,6 +12,6 @@ SRC_RUNTEST_OPTS += -ghc-timing +RTS -H20m -K10m -RTS
 #-----------------------------------------------------------------------------
 # Setting for Haskell compiler
 #
-SRC_HC_OPTS  += -H32m -K2m
+SRC_HC_OPTS  += -H32m -K2m -hisuf $(way_)hi
 
 

mk/target.mk

@@ -42,9 +42,9 @@ size :: $(NOFIB_PROG)
 runtests :: $(NOFIB_PROG) size
 	@echo ==nofib== $<: time to run $< follows...
 	@$(TIME) $(RUNTEST) ./$< \
-	  $(addprefix -i ,$(wildcard $(NOFIB_PROG).stdin)) \
-	  $(addprefix -o1 ,$(wildcard $(NOFIB_PROG).stdout)) \
-	  $(addprefix -o2 ,$(wildcard $(NOFIB_PROG).stderr)) \
+	  $(addprefix -i ,$(wildcard $(subst $(_way),,$(NOFIB_PROG)).stdin)) \
+	  $(addprefix -o1 ,$(wildcard $(subst $(_way),,$(NOFIB_PROG)).stdout)) \
+	  $(addprefix -o2 ,$(wildcard $(subst $(_way),,$(NOFIB_PROG)).stderr)) \
 	  $(RUNTEST_OPTS)
 else
 size ::