You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by gs...@apache.org on 2007/03/09 16:26:32 UTC
svn commit: r516430 - in /harmony/enhanced/drlvm/trunk/build/make: build.xml
targets/jvmti.test.xml targets/reg.test.xml targets/smoke.test.xml
Author: gshimansky
Date: Fri Mar 9 07:26:31 2007
New Revision: 516430
URL: http://svn.apache.org/viewvc?view=rev&rev=516430
Log:
Applied HARMONY-3302 [drlvm][winx64][build][test] All "build test" targets which uses native executables require manifests to be embedded
Modified:
harmony/enhanced/drlvm/trunk/build/make/build.xml
harmony/enhanced/drlvm/trunk/build/make/targets/jvmti.test.xml
harmony/enhanced/drlvm/trunk/build/make/targets/reg.test.xml
harmony/enhanced/drlvm/trunk/build/make/targets/smoke.test.xml
Modified: harmony/enhanced/drlvm/trunk/build/make/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/build.xml?view=diff&rev=516430&r1=516429&r2=516430
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/build.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/build.xml Fri Mar 9 07:26:31 2007
@@ -426,16 +426,16 @@
<!-- Main target to run jvmti tests /-->
<target name="jvmti.test" depends="setup, init">
- <if>
+ <!-- <if>
<equals arg1="${build.arch}" arg2="ia32" />
- <then>
+ <then> -->
<property name="target" value="jvmti.test" />
<subant buildpath="." antfile="build_component.xml" target="build" inheritall="true" failonerror="true">
<property name="_component" value="vm" />
<property name="_target" value="${target}" />
</subant>
- </then>
- </if>
+ <!-- </then>
+ </if> -->
</target>
<!-- Main target to run regression test /-->
Modified: harmony/enhanced/drlvm/trunk/build/make/targets/jvmti.test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/targets/jvmti.test.xml?view=diff&rev=516430&r1=516429&r2=516430
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/targets/jvmti.test.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/targets/jvmti.test.xml Fri Mar 9 07:26:31 2007
@@ -87,10 +87,29 @@
<include name="**/*.cpp" />
</fileset>
</cc>
+
+ <condition property="add.manifest">
+ <and>
+ <os family="windows" />
+ <available file="${jvmti.test.native.path}/${outputdir}/${outputdir}${shlib.suffix}${manifest.suffix}" />
+ </and>
+ </condition>
+
+ <antcall target="embed.manifest" />
</sequential>
</for>
</target>
+ <target name="embed.manifest" if="add.manifest">
+ <echo message="Adding manifest to ${jvmti.test.native.path}/${outputdir}/${outputdir}${shlib.suffix}" />
+ <exec executable="mt.exe">
+ <arg value="-nologo" />
+ <arg value="-manifest" />
+ <arg value="${jvmti.test.native.path}/${outputdir}/${outputdir}${shlib.suffix}${manifest.suffix}" />
+ <arg value="-outputresource:${jvmti.test.native.path}/${outputdir}/${outputdir}${shlib.suffix};#2" />
+ </exec>
+ </target>
+
<target name="pre-jvmti-test" depends="compile-jvmti-tests-java,
compile-jvmti-tests-native">
<condition property="junit.jar" value="${junit.home}/junit.jar">
@@ -190,19 +209,22 @@
<target name="jvmti.test" depends="pre-jvmti-test">
<delete file="${build.semi.dir}/jvmti.test.failed" failonerror="false" />
- <if>
- <equals arg1="${build.arch}" arg2="ia32" />
- <then>
- <for list="${test.mode}" param="mode" trim="true">
- <sequential>
+ <for list="${test.mode}" param="mode" trim="true">
+ <sequential>
+ <if>
+ <or>
+ <equals arg1="@{mode}" arg2="int" />
+ <equals arg1="${build.arch}" arg2="ia32" />
+ </or>
+ <then>
<antcall target="run-jvmti-tests" >
<param name="jvmti.tests.mode" value="@{mode}" />
</antcall>
- </sequential>
- </for>
- </then>
- </if>
-
+ </then>
+ </if>
+ </sequential>
+ </for>
+
<available property="test.failed" file="${build.semi.dir}/jvmti.test.failed" />
<fail unless="run.all.tests" if="test.failed" message="Some tests failed"/>
</target>
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=516430&r1=516429&r2=516430
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/targets/reg.test.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/targets/reg.test.xml Fri Mar 9 07:26:31 2007
@@ -168,8 +168,26 @@
</select-->
<fileset file="@{nativefile}"/>
</cc>
+ <condition property="add.manifest">
+ <and>
+ <os family="windows" />
+ <available file="${reg.test.native.path}/${outfile}${shlib.suffix}${manifest.suffix}" />
+ </and>
+ </condition>
+
+ <antcall target="embed.manifest" />
</sequential>
</for>
+ </target>
+
+ <target name="embed.manifest" if="add.manifest">
+ <echo message="Adding manifest to ${reg.test.native.path}/${outfile}${shlib.suffix}" />
+ <exec executable="mt.exe">
+ <arg value="-nologo" />
+ <arg value="-manifest" />
+ <arg value="${reg.test.native.path}/${outfile}${shlib.suffix}${manifest.suffix}" />
+ <arg value="-outputresource:${reg.test.native.path}/${outfile}${shlib.suffix};#2" />
+ </exec>
</target>
<target name="pre-reg-test" depends="compile-reg-tests-java, compile-reg-tests-native">
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=516430&r1=516429&r2=516430
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/targets/smoke.test.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/targets/smoke.test.xml Fri Mar 9 07:26:31 2007
@@ -82,6 +82,7 @@
<mkdir dir="${smoke.test.native.path}/${outputdir}" />
+ <echo message="Compiling ${smoke.test.native.path}/${outputdir}/${outputfile}" />
<cc name="${build.cxx}"
debug="true"
runtime="dynamic"
@@ -94,8 +95,27 @@
</select>
<fileset file="@{full.file.path}" />
</cc>
+
+ <condition property="add.manifest">
+ <and>
+ <os family="windows" />
+ <available file="${smoke.test.native.path}/${outputdir}/${outputfile}${shlib.suffix}${manifest.suffix}" />
+ </and>
+ </condition>
+
+ <antcall target="embed.manifest" />
</sequential>
</for>
+ </target>
+
+ <target name="embed.manifest" if="add.manifest">
+ <echo message="Adding manifest to ${smoke.test.native.path}/${outputdir}/${outputfile}${shlib.suffix}" />
+ <exec executable="mt.exe">
+ <arg value="-nologo" />
+ <arg value="-manifest" />
+ <arg value="${smoke.test.native.path}/${outputdir}/${outputfile}${shlib.suffix}${manifest.suffix}" />
+ <arg value="-outputresource:${smoke.test.native.path}/${outputdir}/${outputfile}${shlib.suffix};#2" />
+ </exec>
</target>
<target name="jar.smoke.tests" depends="compile.smoke.test">