[Jikesrvm-commits] SF.net SVN: jikesrvm: [11344] rvmroot/trunk

[<pet...@us...>]

Revision: 11344
          http://svn.sourceforge.net/jikesrvm/?rev=11344&view=rev
Author:   peter_donald
Date:     2007-01-22 19:23:10 -0800 (Mon, 22 Jan 2007)

Log Message:
-----------
* Merge testsets into the actual test configuration so it is easier to manage.
* Rejig sanity tests so that almost all the original configurations are included. The exception being ExtremeAssertionsOptAdaptiveCopyMS as it is failing during bootimage writing
* Rejig sanity tests to include jgf and jgf-threads as jgf-threads fails and this is a regression from a month ago

Modified Paths:
--------------
    rvmroot/trunk/build/testing/sanity.properties
    rvmroot/trunk/testing/build.xml

Removed Paths:
-------------
    rvmroot/trunk/build/testing/testsets.properties

Modified: rvmroot/trunk/build/testing/sanity.properties
===================================================================
--- rvmroot/trunk/build/testing/sanity.properties	2007-01-23 03:08:05 UTC (rev 11343)
+++ rvmroot/trunk/build/testing/sanity.properties	2007-01-23 03:23:10 UTC (rev 11344)
@@ -1,6 +1,12 @@
-# test.runs=prototype prototype-opt development development_Opt_0 development_Opt_1 development_Opt_2 production BaseBaseCopyMS BaseBaseMarkSweep BaseBaseSemiSpace BaseBaseGenCopy BaseBaseCopyMSUP FullAdaptiveCopyMS FullAdaptiveMarkSweep ExtremeAssertionsOptAdaptiveCopyMS
-test.runs=prototype prototype-opt development development_Opt_0 development_Opt_1 development_Opt_2 
+# Performance tests should include SPECjvm98 SPECjbb2005
+test.set.performance=
+test.set.short=basic gctest opttests jBYTEmark CaffeineMark javalex
+# Medium tests should include SPECjbb2000 ipsixql and should exclude jgf jgf-threads
+test.set.medium=${test.set.short} jni xerces soot dacapo ${test.set.performance} jgf jgf-threads
 
+# Should include ExtremeAssertionsOptAdaptiveCopyMS
+test.runs=prototype prototype-opt development development_Opt_0 development_Opt_1 development_Opt_2 production BaseBaseCopyMS BaseBaseMarkSweep BaseBaseSemiSpace BaseBaseGenCopy BaseBaseCopyMSUP FullAdaptiveCopyMS FullAdaptiveMarkSweep
+
 test.run.prototype.tests=${test.set.medium}
 
 test.run.prototype-opt.tests=${test.set.medium}

Deleted: rvmroot/trunk/build/testing/testsets.properties
===================================================================
--- rvmroot/trunk/build/testing/testsets.properties	2007-01-23 03:08:05 UTC (rev 11343)
+++ rvmroot/trunk/build/testing/testsets.properties	2007-01-23 03:23:10 UTC (rev 11344)
@@ -1,6 +0,0 @@
-# Performance tests should include SPECjvm98 SPECjbb2005
-test.set.performance=
-test.set.short=basic gctest opttests jBYTEmark CaffeineMark javalex
-# Medium tests should include SPECjbb2000 ipsixql
-test.set.medium=${test.set.short} jni xerces soot dacapo ${test.set.performance}
-test.set.sanity=${test.set.medium}

Modified: rvmroot/trunk/testing/build.xml
===================================================================
--- rvmroot/trunk/testing/build.xml	2007-01-23 03:08:05 UTC (rev 11343)
+++ rvmroot/trunk/testing/build.xml	2007-01-23 03:23:10 UTC (rev 11344)
@@ -6,7 +6,6 @@
 
   <property name="tests.name" value="sanity"/>
 
-  <property file="${jikesrvm.dir}/build/testing/testsets.properties"/>
   <property file="${jikesrvm.dir}/build/testing/${tests.name}.properties"/>
 
   <property name="driver.scratch.dir" location="${build.dir}/test-driver"/>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.