SF.net SVN: jikesrvm:[15743] rvmroot/trunk/bin
|
View:
New views
1 Messages
—
Rating Filter:
Alert me
|
 |
SF.net SVN: jikesrvm:[15743] rvmroot/trunk/bin
by rgarner
::
Rate this Message:
Revision: 15743
http://jikesrvm.svn.sourceforge.net/jikesrvm/?rev=15743&view=rev Author: rgarner Date: 2009-07-23 07:41:28 +0000 (Thu, 23 Jul 2009) Log Message: ----------- Minor tweaks Modified Paths: -------------- rvmroot/trunk/bin/test-mmtk rvmroot/trunk/bin/test-mmtk-selected Modified: rvmroot/trunk/bin/test-mmtk =================================================================== --- rvmroot/trunk/bin/test-mmtk 2009-07-23 07:38:54 UTC (rev 15742) +++ rvmroot/trunk/bin/test-mmtk 2009-07-23 07:41:28 UTC (rev 15743) @@ -15,8 +15,29 @@ TEST_DIR=MMTk/harness/test-scripts -plans="org.mmtk.plan.copyms.CopyMS org.mmtk.plan.generational.copying.GenCopy org.mmtk.plan.generational.immix.GenImmix org.mmtk.plan.generational.marksweep.GenMS org.mmtk.plan.immix.Immix org.mmtk.plan.markcompact.MC org.mmtk.plan.marksweep.MS org.mmtk.plan.poisoned.Poisoned org.mmtk.plan.refcount.fullheap.RC org.mmtk.plan.refcount.generational.GenRC org.mmtk.plan.semispace.SS org.mmtk.plan.stickyimmix.StickyImmix org.mmtk.plan.stickyms.StickyMS" +classForPlan() { + local plan=$1 + case $plan in + CopyMS) echo "org.mmtk.plan.copyms.CopyMS";; + GenCopy) echo "org.mmtk.plan.generational.copying.GenCopy";; + GenImmix) echo "org.mmtk.plan.generational.immix.GenImmix";; + GenMS) echo "org.mmtk.plan.generational.marksweep.GenMS";; + Immix) echo "org.mmtk.plan.immix.Immix";; + MC) echo "org.mmtk.plan.markcompact.MC";; + MS) echo "org.mmtk.plan.marksweep.MS";; + Poisoned) echo "org.mmtk.plan.poisoned.Poisoned";; + RC) echo "org.mmtk.plan.refcount.fullheap.RC";; + GenRC) echo "org.mmtk.plan.refcount.generational.GenRC";; + SS) echo "org.mmtk.plan.semispace.SS";; + StickyImmix) echo "org.mmtk.plan.stickyimmix.StickyImmix";; + StickyMS) echo "org.mmtk.plan.stickyms.StickyMS";; + *) echo "Unknown plan" >> /dev/stderr + return 1;; + esac +} +plans="CopyMS GenCopy GenImmix GenMS Immix MC MS Poisoned RC GenRC SS StickyImmix StickyMS" + opts="variableSizeHeap=false" #opts="$opts gcEvery=SAFEPOINT" @@ -39,7 +60,7 @@ -buildonly) buildonly=true;; -clean) clean=true;; -noclean) clean=false;; - -results) results="$2/"; shift;; + -results) results="/$2"; shift;; -stats) stats="true";; -nostats) stats="false";; *) echo "Unknown parameter $1" @@ -55,7 +76,7 @@ shift done -RESULTS=results/${results}mmtk +RESULTS=results/mmtk${results} if [ $build = true ]; then ant clean compile-mmtk mmtk-harness @@ -70,8 +91,8 @@ for plan in $plans do - showplan=`echo $plan | sed -e "s/.*\.//g"` - mkdir -p ${RESULTS}/$showplan + planClass=$(classForPlan $plan) + mkdir -p ${RESULTS}/$plan for script in `ls -1 $TEST_DIR/${scripts}.script` do showscript=`echo $script | sed -e "s/.*[\/]//g" | sed -e "s/\.script$//g"` @@ -82,15 +103,15 @@ fi ( echo /opt/jdk1.6.0/bin/java ${jvm_opts} -jar target/mmtk/mmtk-harness.jar $script plan=$plan $opts $scriptopts; - /opt/jdk1.6.0/bin/java ${jvm_opts} -jar target/mmtk/mmtk-harness.jar $script plan=$plan $opts $scriptopts + /opt/jdk1.6.0/bin/java ${jvm_opts} -jar target/mmtk/mmtk-harness.jar $script plan=$planClass $opts $scriptopts ) &> ${RESULTS}/temp.out if [ $? == 0 ] then - echo "PASSED: ${results%/} $showplan $showscript" - mv ${RESULTS}/temp.out ${RESULTS}/$showplan/$showscript.out.pass + echo "PASSED: ${results#/} $plan $showscript" + mv ${RESULTS}/temp.out ${RESULTS}/$plan/$showscript.out.pass else - echo "FAILED: ${results%/} $showplan $showscript" - mv ${RESULTS}/temp.out ${RESULTS}/$showplan/$showscript.out.fail + echo "FAILED: ${results#/} $plan $showscript" + mv ${RESULTS}/temp.out ${RESULTS}/$plan/$showscript.out.fail fi done done Modified: rvmroot/trunk/bin/test-mmtk-selected =================================================================== --- rvmroot/trunk/bin/test-mmtk-selected 2009-07-23 07:38:54 UTC (rev 15742) +++ rvmroot/trunk/bin/test-mmtk-selected 2009-07-23 07:41:28 UTC (rev 15743) @@ -10,22 +10,9 @@ # BIN=$(dirname $0) -MS=org.mmtk.plan.marksweep.MS -MC=org.mmtk.plan.markcompact.MC -SS=org.mmtk.plan.semispace.SS -RC=org.mmtk.plan.refcount.RC -IMMIX=org.mmtk.plan.immix.Immix -COPYMS=org.mmtk.plan.copyms.CopyMS -GENMS=org.mmtk.plan.generational.marksweep.GenMS -GENCOPY=org.mmtk.plan.generational.semispace.GenCopy -GENIMMIX=org.mmtk.plan.generational.immix.GenImmix -GENRC=org.mmtk.plan.refcount.generational.GenRC -POISONED=org.mmtk.plan.poisoned.Poisoned -STICKYIMMIX=org.mmtk.plan.stickyimmix.StickyImmix -STICKYMS=org.mmtk.plan.stickyms.StickyMS -KEYPLANS="$GENIMMIX $GENMS" -ALLPLANS="$MS $SS $MC $IMMIX $GENMS $GENIMMIX $GENCOPY $POISONED $STICKYIMMIX $STICKYMS $RC $GENRC $COPYMS" +KEYPLANS="GenImmix GenMS" +ALLPLANS="MS SS MC Immix GenMS GenImmix GenCopy Poisoned StickyImmix StickyMS RC GenRC CopyMS" runTests() { @@ -48,7 +35,7 @@ $BIN/test-mmtk -buildonly -clean # Run every script across the most important collectors -runTests allscripts "$GENMS $GENIMMIX" "" +runTests allscripts "$KEYPLANS" "" # Run some scripts across all the collectors runTests allplans "$ALLPLANS" "ReferenceTypes Alignment CyclicGarbage FixedLive HashCode" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------------ _______________________________________________ Jikesrvm-commits mailing list Jikesrvm-commits@... https://lists.sourceforge.net/lists/listinfo/jikesrvm-commits |
| Free embeddable forum powered by Nabble | Forum Help |
