Revision: 15753
http://jikesrvm.svn.sourceforge.net/jikesrvm/?rev=15753&view=revAuthor: dgrove-oss
Date: 2009-07-30 02:08:30 +0000 (Thu, 30 Jul 2009)
Log Message:
-----------
Soot needs different command lines for different class libraries,
since it needs to be given the library jar files to analyze.
Modify build.xml to make that possible; will finish fixing
command line arguments for harmony in next commit.
Modified Paths:
--------------
rvmroot/trunk/testing/tests/soot/build.xml
Modified: rvmroot/trunk/testing/tests/soot/build.xml
===================================================================
--- rvmroot/trunk/testing/tests/soot/build.xml 2009-07-29 20:51:12 UTC (rev 15752)
+++ rvmroot/trunk/testing/tests/soot/build.xml 2009-07-30 02:08:30 UTC (rev 15753)
@@ -47,6 +47,16 @@
<!-- * * -->
<!-- **************************************************************************** -->
+ <!-- Partially replicated from build.xml. Yuck. -->
+ <!-- The soot test needs to know which class libraries we are using because it impacts the test command line -->
+ <property name="classlib.provider" value="GNU Classpath"/>
+ <condition property="soot.vmlibs" value="${test.rvm.dir}/jksvm.jar:${test.rvm.dir}/rvmrt.jar:${test.rvm.dir}/lib/luni.jar">
+ <equals arg1="${classlib.provider}" arg2="Harmony"/>
+ </condition>
+ <condition property="soot.vmlibs" value="${test.rvm.dir}/jksvm.jar:${test.rvm.dir}/rvmrt.jar">
+ <equals arg1="${classlib.provider}" arg2="GNU Classpath"/>
+ </condition>
+
<target name="test" depends="compile">
<test-property name="external.lib.dir" location="${jikesrvm.dir}/.ant.properties"/>
<test-file name="soot.dir" location="${jikesrvm.dir}/.ant.properties"/>
@@ -62,7 +72,7 @@
<startResults/>
<rvm tag="soot.Main"
class="soot.Main"
- args="-O -time -x org.jikesrvm -x org.mmtk -x org.vmmagic -d ${build.tests.dir} --soot-classpath ${test.rvm.dir}/jksvm.jar:${test.rvm.dir}/rvmrt.jar:${soot.class.path} --app ${soot.class} -f J"/>
+ args="-O -time -x org.jikesrvm -x org.mmtk -x org.vmmagic -d ${build.tests.dir} --soot-classpath ${soot.vmlibs}:${soot.class.path} --app ${soot.class} -f J"/>
<outputSingleStatisticResults tag="soot.Main" key="time" pattern="totalTime:(.*)s \(100.0\%\)"/>
<finishResults/>
</target>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now.
http://p.sf.net/sfu/bobj-july_______________________________________________
Jikesrvm-commits mailing list
Jikesrvm-commits@...
https://lists.sourceforge.net/lists/listinfo/jikesrvm-commits
