[Jikesrvm-commits] rvm/regression/tests/dacapo Makefile, 1.4, 1.5 TimeLimit.performance, 1.1, NONE TimeLimit.sanity, 1.2, NONE

[Dave G. <dgr...@us...>]

Update of /cvsroot/jikesrvm/rvm/regression/tests/dacapo
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv5357/regression/tests/dacapo

Modified Files:
	Makefile 
Removed Files:
	TimeLimit.performance TimeLimit.sanity 
Log Message:
rework RunSanityTests and supporting files so that the timelimit is applied to each JVM invocation (instead of to an entire test suite).  Allows tighter time bounds on regression tests suites that are composed of a number of test programs (eg dacapo, SPECjvm98, reflect, jni)

--- TimeLimit.performance DELETED ---

Index: Makefile
===================================================================
RCS file: /cvsroot/jikesrvm/rvm/regression/tests/dacapo/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Makefile	13 Apr 2006 12:46:19 -0000	1.4
--- Makefile	26 Jul 2006 20:56:29 -0000	1.5
***************
*** 17,20 ****
--- 17,26 ----
  START_NAME=Harness
  
+ ifeq ($(MODE),PERFORMANCE)
+   TIME_LIMIT=1800
+ else
+   TIME_LIMIT=300
+ endif
+ 
  include		$(JAL_ROOT)/rvm/regression/Make.rules
  
***************
*** 29,44 ****
  	:
  
- $(WORKING)/Makefile:	$(WORKING) $(JAL_ROOT)/rvm/regression/tests/dacapo/Makefile
- ifneq ($(WORKING),.)
- 	cp -f $(JAL_ROOT)/rvm/regression/tests/dacapo/Makefile $(WORKING)/Makefile
- endif
- 
- 
  check:
! 	@ $(JAL_ROOT)/rvm/regression/tests/dacapo/sanity-check2.sh $(OUT) $(START_ARGS)
  
  
! $(TESTS): %: $(WORKING)/Makefile
! 	cd $(WORKING); $(MAKE) START_ARGS="$@" OUT=$(OUT).$@ do-sanity-check-rule
  
  sanity:	$(TESTS)
--- 35,44 ----
  	:
  
  check:
! 	@$(JAL_ROOT)/rvm/regression/tests/dacapo/sanity-check2.sh $(OUT) $(START_ARGS)
  
  
! $(TESTS): %:
! 	@$(MAKE) START_ARGS="$@" OUT=$(OUT).$@ do-sanity-check-rule
  
  sanity:	$(TESTS)

--- TimeLimit.sanity DELETED ---