harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From var...@apache.org
Subject svn commit: r606771 - in /harmony/enhanced: classlib/trunk/make/ drlvm/trunk/build/make/targets/
Date Tue, 25 Dec 2007 07:59:43 GMT
Author: varlax
Date: Mon Dec 24 23:59:43 2007
New Revision: 606771

URL: http://svn.apache.org/viewvc?rev=606771&view=rev
Log:
Allow using both package and filepath formats for selecting smoke tests;
other minor enhancements.

Modified:
    harmony/enhanced/classlib/trunk/make/properties.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
    harmony/enhanced/drlvm/trunk/build/make/targets/test.common.xml

Modified: harmony/enhanced/classlib/trunk/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/properties.xml?rev=606771&r1=606770&r2=606771&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/properties.xml (original)
+++ harmony/enhanced/classlib/trunk/make/properties.xml Mon Dec 24 23:59:43 2007
@@ -210,6 +210,11 @@
         <isset property="is.windows" />
     </condition>
 
+    <condition property="object.suffix" value=".obj">
+        <isset property="is.windows" />
+    </condition>
+    <property name="object.suffix" value=".o" />
+
     <condition property="linklib.suffix" value=".lib">
         <isset property="is.windows"/>
     </condition>
@@ -220,6 +225,10 @@
         <isset property="is.macosx"/>
     </condition>
     <property name="linklib.suffix" value=".so" />
+    
+    <condition property="shlib.is.linklib">
+        <equals arg1="${shlib.suffix}" arg2="${linklib.suffix}"/>
+    </condition>
 
     <property name="manifest.suffix" value=".manifest" />
 
@@ -494,14 +503,23 @@
     <!-- To use with -Dtest.case=... option                   -->
     <!-- if ${test.case} is provided in package+class form    -->
     <!-- it is converted to dir+filename form                 -->
-    <pathconvert property="converted.tc" >
-        <path path="${test.case}"/>
-        <compositemapper>
-            <unpackagemapper from="${basedir}${file.separator}*Test" to="*Test.java" />
-            <globmapper from="${basedir}${file.separator}*.java" to="*.java" />
-        </compositemapper>
-    </pathconvert>
-
+    <macrodef name="convert-test">
+        <attribute name="from"/>
+        <attribute name="to"/>
+        <sequential>
+            <pathconvert property="@{to}" setonempty="no">
+                <path path="${@{from}}"/>
+                <chainedmapper>
+                    <filtermapper>
+                        <replaceregex pattern="\.java$$"/>
+                    </filtermapper>
+                    <unpackagemapper from="${basedir}${file.separator}*" to="*.java"/>
+                </chainedmapper>
+            </pathconvert>
+        </sequential>
+    </macrodef>
+    <convert-test from="test.case" to="converted.tc" />
+    
     <!-- Concatenate several exclude lists into single list -->
     <macrodef name="prepare-exclude-list">
        <attribute name="moduleName"/>

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?rev=606771&r1=606770&r2=606771&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/targets/jvmti.test.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/targets/jvmti.test.xml Mon Dec 24 23:59:43 2007
@@ -65,20 +65,9 @@
                     </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="jvmti.embed.manifest" />
+                <embed-manifest lib="${jvmti.test.native.path}/${outputdir}/${outputdir}${shlib.suffix}"
/>
             </sequential>
         </for>
-    </target>
-
-    <target name="jvmti.embed.manifest" if="add.manifest">
-        <embed-manifest lib="${jvmti.test.native.path}/${outputdir}/${outputdir}${shlib.suffix}"
/>
     </target>
 
     <target name="pre-jvmti-test" depends="compile-jvmti-tests-java,

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?rev=606771&r1=606770&r2=606771&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/targets/reg.test.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/targets/reg.test.xml Mon Dec 24 23:59:43 2007
@@ -164,20 +164,9 @@
                     <!--linkerarg value="-lstdc++" if="is.linux"/-->
                     <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="reg.embed.manifest" />
+                <embed-manifest lib="${reg.test.native.path}/${outfile}${shlib.suffix}"
/>
             </sequential>
         </for>
-    </target>
-
-    <target name="reg.embed.manifest" if="add.manifest">
-        <embed-manifest lib="${reg.test.native.path}/${outfile}${shlib.suffix}" />
     </target>
 
     <target name="reg.test" depends="compile-reg-tests-java, 

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?rev=606771&r1=606770&r2=606771&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/targets/smoke.test.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/targets/smoke.test.xml Mon Dec 24 23:59:43 2007
@@ -79,22 +79,11 @@
                     <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="smoke.embed.manifest" />
+                <embed-manifest lib="${smoke.test.native.path}/${outputdir}/${outputfile}${shlib.suffix}"
/>
             </sequential>
         </for>
     </target>
 
-    <target name="smoke.embed.manifest" if="add.manifest">
-        <embed-manifest lib="${smoke.test.native.path}/${outputdir}/${outputfile}${shlib.suffix}"
/>
-    </target>
-    
     <target name="java_test_smoke">
         <mkdir dir="${smoke.test.dir}/reports" />
         <path id="java.class.path">
@@ -139,13 +128,11 @@
         
         <take-xlist name="exclude.file" file="./excludes/exclude.drlvm_smoke.${hy.platform}.${mode.id}"/>
 
-        <!-- TODO: to allow using package name for test.case, need to convert it to path
-        <propertyregex property="test.file" override="yes" global="true"
-            input="${test.case}" regexp="(\.|\\)" replace="/"/-->
+        <convert-test from="test.case" to="test.file"/>
         
         <fileset dir="${smoke.test.src}" id="smoke.run.set">
             <include name="**/*.java" unless="test.case"/>
-            <include name="${test.case}" if="test.case"/>
+            <include name="${test.file}" if="test.case"/>
             <excludesfile name="${exclude.file}" if="exclude.file" />
         </fileset>
         <pathconvert property="smoke.run.list" setonempty="no" refid="smoke.run.set"/>

Modified: harmony/enhanced/drlvm/trunk/build/make/targets/test.common.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/targets/test.common.xml?rev=606771&r1=606770&r2=606771&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/targets/test.common.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/targets/test.common.xml Mon Dec 24 23:59:43 2007
@@ -52,15 +52,32 @@
     <macrodef name="embed-manifest">
         <attribute name="lib"/>
         <sequential>
-	        <echo message="Adding manifest to @{lib}" />
-	        <exec executable="mt.exe">
-	            <arg value="-nologo" />
-	            <arg value="-manifest" />
-	            <arg value="@{lib}${manifest.suffix}" />
-	            <arg value="-outputresource:@{lib};#2" />
-	        </exec>
+            <condition property="@{lib}.embed.manifest">
+                <and>
+                    <os family="windows" />
+                    <available file="@{lib}${manifest.suffix}" />
+                </and>
+            </condition>
+
+            <antcall target="-embed-manifest" >
+                <param name="lib" value="@{lib}"/>
+                <propertyset>
+                  <propertyref name="@{lib}.embed.manifest"/>
+                  <globmapper from="@{lib}.*" to="*"/>
+                </propertyset>
+            </antcall>
         </sequential>
     </macrodef>
+    
+    <target name="-embed-manifest" if="embed.manifest">
+        <echo message="Adding manifest to ${lib}" />
+        <exec executable="mt.exe">
+            <arg value="-nologo" />
+            <arg value="-manifest" />
+            <arg value="${lib}${manifest.suffix}" />
+            <arg value="-outputresource:${lib};#2" />
+        </exec>
+    </target>
 
     <macrodef name="ensure-resource">
         <attribute name="name"/>



Mime
View raw message