You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by ge...@apache.org on 2006/12/11 17:50:07 UTC
svn commit: r485749 - in /harmony/enhanced/drlvm/trunk/build/make:
deploy.xml targets/cunit.test.xml targets/kernel.test.xml
targets/reg.test.run.xml targets/reg.test.xml targets/smoke.test.xml
targets/unit.test.xml
Author: geirm
Date: Mon Dec 11 08:50:03 2006
New Revision: 485749
URL: http://svn.apache.org/viewvc?view=rev&rev=485749
Log:
fix the breakage to testing scripts from my
moving to /jdk structure. Sorry. This is
untested, but I think right. I will be testing
now, but I figure if I got it right, the world
is a better place. I know I can't make it worse
right now
Modified:
harmony/enhanced/drlvm/trunk/build/make/deploy.xml
harmony/enhanced/drlvm/trunk/build/make/targets/cunit.test.xml
harmony/enhanced/drlvm/trunk/build/make/targets/kernel.test.xml
harmony/enhanced/drlvm/trunk/build/make/targets/reg.test.run.xml
harmony/enhanced/drlvm/trunk/build/make/targets/reg.test.xml
harmony/enhanced/drlvm/trunk/build/make/targets/smoke.test.xml
harmony/enhanced/drlvm/trunk/build/make/targets/unit.test.xml
Modified: harmony/enhanced/drlvm/trunk/build/make/deploy.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/deploy.xml?view=diff&rev=485749&r1=485748&r2=485749
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/deploy.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/deploy.xml Mon Dec 11 08:50:03 2006
@@ -73,7 +73,7 @@
<extra>
- <eclipse_script>
+<!-- <eclipse_script>
<select os="win">
<other>bin/default:eclipse.bat</other>
</select>
@@ -82,6 +82,7 @@
<other>bin/default:eclipse.sh</other>
</select>
</eclipse_script>
+-->
<select os="win">
<zlib>
<shared>bin/default:zlib1</shared>
Modified: harmony/enhanced/drlvm/trunk/build/make/targets/cunit.test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/targets/cunit.test.xml?view=diff&rev=485749&r1=485748&r2=485749
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/targets/cunit.test.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/targets/cunit.test.xml Mon Dec 11 08:50:03 2006
@@ -162,14 +162,14 @@
executable="${unit.test.c.workdir}/_bin/${filename}${extention}"
resultproperty="resultproperty"
outputproperty="outputproperty">
- <arg value="-Dorg.apache.harmony.vm.vmdir=${build.deploy.dir}/bin/default"/>
- <arg value="-Djava.home=${build.deploy.dir}"/>
- <env key="JAVA_HOME" value="${build.deploy.dir}" />
+ <arg value="-Dorg.apache.harmony.vm.vmdir=${build.deploy.dir}/jdk/jre/bin/default"/>
+ <arg value="-Djava.home=${build.deploy.dir}/jdk/jre"/>
+ <env key="JAVA_HOME" value="${build.deploy.dir}/jdk/jre" />
<select os="win">
- <env key="Path" path="${build.deploy.dir}/bin/:${build.deploy.dir}/bin/default:${env.Path}" />
+ <env key="Path" path="${build.deploy.dir}/jdk/jre/bin/:${build.deploy.dir}/jdk/jre/bin/default:${env.Path}" />
</select>
<select os="lnx">
- <env key="LD_LIBRARY_PATH" path="${build.deploy.dir}/bin/:${build.deploy.dir}/bin/default" />
+ <env key="LD_LIBRARY_PATH" path="${build.deploy.dir}/jdk/jre/bin/:${build.deploy.dir}/jdk/jre/bin/default" />
</select>
</exec>
<echo file="${unit.test.c.workdir}/report/${filename}.out"
Modified: harmony/enhanced/drlvm/trunk/build/make/targets/kernel.test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/targets/kernel.test.xml?view=diff&rev=485749&r1=485748&r2=485749
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/targets/kernel.test.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/targets/kernel.test.xml Mon Dec 11 08:50:03 2006
@@ -22,7 +22,7 @@
<property name="test.resource.path" location="${kernel.test.dir}/resources"/>
<property name="test.class.path" location="${kernel.test.dir}/classes"/>
- <property name="test.jvm.exe" value="${build.deploy.dir}/bin/java"/>
+ <property name="test.jvm.exe" value="${build.deploy.dir}/jdk/jre/bin/java"/>
<property file="test.properties"/>
<!-- no longer used - leaving here temporarily to be sure people like the change
Modified: harmony/enhanced/drlvm/trunk/build/make/targets/reg.test.run.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/targets/reg.test.run.xml?view=diff&rev=485749&r1=485748&r2=485749
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/targets/reg.test.run.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/targets/reg.test.run.xml Mon Dec 11 08:50:03 2006
@@ -17,8 +17,7 @@
<project name="REGRESSION TESTS RUN">
<property name="reg.test.timeout" value="180000" />
- <!-- property name="jvm.under.test" value="C:/ws/JRockit-1.5.0/bin/java.exe"/-->
- <property name="jvm.under.test" value="${build.deploy.dir}/bin/java"/>
+ <property name="jvm.under.test" value="${build.deploy.dir}/jdk/jre/bin/java"/>
<target name="run-reg-tests">
<echo>
Modified: harmony/enhanced/drlvm/trunk/build/make/targets/reg.test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/targets/reg.test.xml?view=diff&rev=485749&r1=485748&r2=485749
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/targets/reg.test.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/targets/reg.test.xml Mon Dec 11 08:50:03 2006
@@ -124,7 +124,7 @@
link="shared"
outfile="${reg.test.native.path}/${outname}"
objdir="${reg.test.native.path}/_obj">
- <includepath path="${build.deploy.dir}/include" />
+ <includepath path="${build.deploy.dir}jdk/jre/include" />
<select os="lnx">
<linkerarg value="-lstdc++" />
</select>
Modified: harmony/enhanced/drlvm/trunk/build/make/targets/smoke.test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/targets/smoke.test.xml?view=diff&rev=485749&r1=485748&r2=485749
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/targets/smoke.test.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/targets/smoke.test.xml Mon Dec 11 08:50:03 2006
@@ -50,7 +50,7 @@
<mkdir dir="${build.dir}/_smoke.tests/reports" />
<path id="java.class.path">
<pathelement location="${build.dir}/_smoke.tests/classes" />
- <fileset dir="${build.deploy.dir}/lib" includes="*.jar" />
+ <fileset dir="${build.deploy.dir}/jdk/jre/lib" includes="*.jar" />
</path>
<select arch="ia32,em64t">
<antcall target="java_test_smoke_with_jit_or_interpreter">
@@ -139,22 +139,22 @@
<equals arg1="${int.or.jit.arg}" arg2="" />
</not>
<then>
- <java newenvironment="yes" output="${build.dir}/_smoke.tests/reports/${class.name}_${jit.or.interpreter}.out" classname="${class.name}" fork="true" jvm="${build.deploy.dir}/bin/java${executable.postfix}" error="${build.dir}/_smoke.tests/reports/${class.name}_${jit.or.interpreter}.out.err">
+ <java newenvironment="yes" output="${build.dir}/_smoke.tests/reports/${class.name}_${jit.or.interpreter}.out" classname="${class.name}" fork="true" jvm="${build.deploy.dir}/jdk/jre/bin/java${executable.postfix}" error="${build.dir}/_smoke.tests/reports/${class.name}_${jit.or.interpreter}.out.err">
<jvmarg value="-Dvm.assert_dialog=0" />
<jvmarg value="${int.or.jit.arg}" />
<jvmarg value="-classpath" />
<jvmarg value="${build.dir}/_smoke.tests/classes" />
- <env key="JAVA_HOME" value="${build.deploy.dir}" />
- <env key="LD_LIBRARY_PATH" value="${build.deploy.dir}/bin:${env.LD_LIBRARY_PATH}" />
+ <env key="JAVA_HOME" value="${build.deploy.dir}/jdk/jre" />
+ <env key="LD_LIBRARY_PATH" value="${build.deploy.dir}/jdk/jre/bin:${env.LD_LIBRARY_PATH}" />
</java>
</then>
<else>
- <java newenvironment="yes" output="${build.dir}/_smoke.tests/reports/${class.name}_${jit.or.interpreter}.out" classname="${class.name}" fork="true" jvm="${build.deploy.dir}/bin/java${executable.postfix}" error="${build.dir}/_smoke.tests/reports/${class.name}_${jit.or.interpreter}.out.err">
+ <java newenvironment="yes" output="${build.dir}/_smoke.tests/reports/${class.name}_${jit.or.interpreter}.out" classname="${class.name}" fork="true" jvm="${build.deploy.dir}/jdk/jre/bin/java${executable.postfix}" error="${build.dir}/_smoke.tests/reports/${class.name}_${jit.or.interpreter}.out.err">
<jvmarg value="-Dvm.assert_dialog=0" />
<jvmarg value="-classpath" />
<jvmarg value="${build.dir}/_smoke.tests/classes" />
- <env key="JAVA_HOME" value="${build.deploy.dir}" />
- <env key="LD_LIBRARY_PATH" value="${build.deploy.dir}/bin:${env.LD_LIBRARY_PATH}" />
+ <env key="JAVA_HOME" value="${build.deploy.dir}/jdk/jre" />
+ <env key="LD_LIBRARY_PATH" value="${build.deploy.dir}/jdk/jre/bin:${env.LD_LIBRARY_PATH}" />
</java>
</else>
</if>
Modified: harmony/enhanced/drlvm/trunk/build/make/targets/unit.test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/targets/unit.test.xml?view=diff&rev=485749&r1=485748&r2=485749
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/targets/unit.test.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/targets/unit.test.xml Mon Dec 11 08:50:03 2006
@@ -30,13 +30,13 @@
<patternset refid="unit.test.java.pattern" />
<bootclasspath>
<path id="java.classpath">
- <pathelement location="${build.deploy.dir}/lib"/>
+ <pathelement location="${build.deploy.dir}/jdk/jre/lib"/>
</path>
</bootclasspath>
</javac>
<mkdir dir="${build.dir}/_unit.tests/report" />
<junit printsummary="true" haltonfailure="no"
- fork="yes" forkmode="once" jvm="${build.deploy.dir}/bin/java.exe" failureproperty="some.unit.test.is.failed">
+ fork="yes" forkmode="once" jvm="${build.deploy.dir}/jdk/jre/bin/java.exe" failureproperty="some.unit.test.is.failed">
<jvmarg value="-Xbootclasspath/p:${build.dir}/_unit.tests/classes;${build.junit.jar}" />
<formatter type="plain" usefile="true" />
<batchtest todir="${build.dir}/_unit.tests/report">