harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smish...@apache.org
Subject svn commit: r486102 - in /harmony/enhanced/buildtest/trunk: README.txt build.xml cc.properties.example config/config-full.xml
Date Tue, 12 Dec 2006 11:39:22 GMT
Author: smishura
Date: Tue Dec 12 03:39:21 2006
New Revision: 486102

URL: http://svn.apache.org/viewvc?view=rev&rev=486102
Log:
Apply modified patch for HARMONY-2595 ([buildtest][cc-update] support for em64t was added

Modified:
    harmony/enhanced/buildtest/trunk/README.txt
    harmony/enhanced/buildtest/trunk/build.xml
    harmony/enhanced/buildtest/trunk/cc.properties.example
    harmony/enhanced/buildtest/trunk/config/config-full.xml

Modified: harmony/enhanced/buildtest/trunk/README.txt
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/README.txt?view=diff&rev=486102&r1=486101&r2=486102
==============================================================================
--- harmony/enhanced/buildtest/trunk/README.txt (original)
+++ harmony/enhanced/buildtest/trunk/README.txt Tue Dec 12 03:39:21 2006
@@ -14,6 +14,7 @@
 CI up and working.
 
 1) Java JDK v5
+   Note, to run it over em64t platform the 64bit JDK should be installed.
 
 2) Apache Ant : http://ant.apache.org/  Please get the 
     latest release (1.6 or better) and install
@@ -73,4 +74,3 @@
 1) Q.: The test runs OK, but no passed/ failed information available. Why?
    A.: This script was tested and works over the sun jdk only. If you run
 it over the BEA jdk it will fail.
-

Modified: harmony/enhanced/buildtest/trunk/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/build.xml?view=diff&rev=486102&r1=486101&r2=486102
==============================================================================
--- harmony/enhanced/buildtest/trunk/build.xml (original)
+++ harmony/enhanced/buildtest/trunk/build.xml Tue Dec 12 03:39:21 2006
@@ -43,7 +43,68 @@
 	<property name="svn.drlvm.url" value="https://svn.apache.org/repos/asf/harmony/enhanced/drlvm/trunk"/>
 
 	<condition property="is.windows">
-        	<os family="Windows" />
+        	<os family="windows" />
+	</condition>
+
+	<condition property="is.unix">
+        	<os family="unix" />
+	</condition>
+
+        <!-- detecting current platform arch: code was copied from classlib/ properties.xml
-->
+	<!-- Conditions for different architectures -->
+	<condition property="is.x86_64">
+        	<or>
+	            <equals arg1="x86_64" arg2="${os.arch}"/>
+        	    <equals arg1="amd64" arg2="${os.arch}"/>
+	        </or>
+	</condition>
+	<condition property="is.x86">
+		<and>
+		    <not>
+        	        <isset property="is.x86_64" />
+	            </not>
+        	    <or>
+                	<equals arg1="x86" arg2="${os.arch}"/>
+	                <equals arg1="i386" arg2="${os.arch}"/>
+        	    </or>
+	        </and>
+	</condition>
+	<condition property="is.ia64">
+	        <equals arg1="ia64" arg2="${os.arch}"/>
+	</condition>
+	<condition property="is.s390x">
+		<equals arg1="${os.arch}" arg2="s390x" />
+	</condition>
+	<condition property="is.s390">
+	        <equals arg1="${os.arch}" arg2="s390" />
+	</condition>
+
+	<condition property="is.64bit">
+        	<or>
+	            <isset property="is.ia64" />
+        	    <isset property="is.x86_64" />
+	            <isset property="is.s390x" />
+        	</or>
+	</condition>
+	<condition property="is.32bit">
+        	<or>
+	            <isset property="is.x86" />
+        	    <isset property="is.s390" /> <!-- 31bit of course -->
+	        </or>
+	</condition>
+	<condition property="hy.bits" value="32">
+        	<isset property="is.32bit" />
+	</condition>
+
+	<!-- Normalized architecture name -->
+	<condition property="build.arch" value="em64t">
+	        <isset property="is.x86_64" />
+	</condition>
+	<condition property="build.arch" value="ia32">
+	        <and>
+        	    <isset property="is.x86" />
+	            <isset property="is.32bit" />
+        	</and>
 	</condition>
 
 	<condition property="need.proxy.port" value="${http-proxy-port}" else="80" >
@@ -164,6 +225,8 @@
 wdir=${target.dir}
 timeout=${cycle_timeout}
 ttimeout=${task_timeout}
+build_cfg=${build_configuration}
+build_arch=${build.arch}
 cc_webcontent=${target.dir}/webapps/cruisecontrol
 server_addr=${mail_server}
 report_to=${report_failures_to}
@@ -204,16 +267,25 @@
 cmd=build.bat
 cc=msvc
 </echo>
+
+		<replace file="${target.dir}/cruisecontrol.bat" 
+			token="REM set CC_OPTS=-Xms128m -Xmx256m">
+			<replacevalue><![CDATA[set CC_OPTS=-Xmx500m
+set BUILD_CFG=@@@@@
+]]></replacevalue></replace>
+
 		<replace file="${target.dir}/cruisecontrol.bat" 
-			token="REM set CC_OPTS=-Xms128m -Xmx256m"
-			value="set CC_OPTS=-Xmx500m"/>
+			token='@@@@@'
+			value='${build_configuration}'/>
+
 		<replace file="${target.dir}/cruisecontrol.bat" token="%LIBDIR%\ant.jar">
 			<replacevalue><![CDATA[%LIBDIR%\ant.jar
 set CRUISE_PATH=%CRUISE_PATH%;%ANT_HOME%\lib\ant-apache-regexp.jar
 set CRUISE_PATH=%CRUISE_PATH%;%ANT_HOME%\lib\ecj_3.2.jar
 ]]></replacevalue></replace>
 		<exec executable="cmd" dir="${target.dir}/projects/drlvm/trunk/build" >
-			<arg line="/c build.bat ${vm.proxy.h} ${vm.proxy.p} -Dexternal.dep.CLASSLIB.loc=${target.dir}/projects/classlib/trunk
update clean build" />
+			<env key="BUILD_CFG" value="${build_configuration}"/>
+			<arg line="/c build.bat ${vm.proxy.h} ${vm.proxy.p} -Dexternal.dep.CLASSLIB.loc=${target.dir}/projects/classlib/trunk
update clean build"/>
 		</exec>
 	</target>
 		
@@ -225,6 +297,17 @@
 cmd=build.sh
 cc=gcc
 </echo>
+
+		<replace file="${target.dir}/cruisecontrol.sh" 
+			token='# CC_OPTS="-Xms128m -Xmx256m"'>
+			<replacevalue><![CDATA[CC_OPTS="-Xmx500m"
+BUILD_CFG=@@@@@
+]]></replacevalue></replace>
+
+		<replace file="${target.dir}/cruisecontrol.sh" 
+			token='@@@@@'
+			value='${build_configuration}'/>
+
 		<replace file="${target.dir}/cruisecontrol.sh" 
 			token='# CC_OPTS="-Xms128m -Xmx256m"'
 			value='CC_OPTS="-Xmx500m"'/>

Modified: harmony/enhanced/buildtest/trunk/cc.properties.example
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/cc.properties.example?view=diff&rev=486102&r1=486101&r2=486102
==============================================================================
--- harmony/enhanced/buildtest/trunk/cc.properties.example (original)
+++ harmony/enhanced/buildtest/trunk/cc.properties.example Tue Dec 12 03:39:21 2006
@@ -35,6 +35,12 @@
 cycle_timeout=500
 
 ## --------------------------------------------------------------------
+## build configuration
+##   build_configuration=debug or release
+## --------------------------------------------------------------------
+build_configuration=debug
+
+## --------------------------------------------------------------------
 ## mail configuration 
 ##  uncomment and configure to use mail for notification
 ## --------------------------------------------------------------------

Modified: harmony/enhanced/buildtest/trunk/config/config-full.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/config/config-full.xml?view=diff&rev=486102&r1=486101&r2=486102
==============================================================================
--- harmony/enhanced/buildtest/trunk/config/config-full.xml (original)
+++ harmony/enhanced/buildtest/trunk/config/config-full.xml Tue Dec 12 03:39:21 2006
@@ -18,10 +18,10 @@
         
     <!--The cc.property file contains the name and values of properties-->
     <property file="cc.properties" />
-    <property name="cl.prefix" value="[build-test alert] BUILD FAILED ${os} ${cc} debug:
classlib "/>
-    <property name="vm.prefix" value="[build-test alert] BUILD FAILED ${os} ${cc} debug:
drlvm"/>
-    <property name="cl.prefix.ok" value="[build-test alert] BUILD FIXED ${os} ${cc} debug:
classlib "/>
-    <property name="vm.prefix.ok" value="[build-test alert] BUILD FIXED ${os} ${cc} debug:
drlvm"/>
+    <property name="cl.prefix" value="[build-test alert] BUILD FAILED ${os} ${cc} ${build_cfg}:
classlib "/>
+    <property name="vm.prefix" value="[build-test alert] BUILD FAILED ${os} ${cc} ${build_cfg}:
drlvm"/>
+    <property name="cl.prefix.ok" value="[build-test alert] BUILD SUCCEEDED ${os} ${cc}
${build_cfg}: classlib "/>
+    <property name="vm.prefix.ok" value="[build-test alert] BUILD SUCCEEDED ${os} ${cc}
${build_cfg}: drlvm"/>
 
 
     <project name="classlib">
@@ -48,9 +48,9 @@
                 </ant>
         </schedule>
 
-        <log dir="logs/${project.name}">
+        <!--log dir="logs/${project.name}">
             <merge dir="projects/${project.name}/trunk/build/test_report" pattern="TEST-*.xml"
/>
-        </log>
+        </log-->
 
         <publishers>
             <!--antpublisher   
@@ -110,7 +110,7 @@
         </modificationset>
 
         <schedule interval="${timeout}">
-                <exec command="${sh}" args="${cmd.prefix} ${cmd} -D${proxy.host.vm}=${proxy.value}
-D${proxy.port.vm}=${port.value} -Dexternal.dep.CLASSLIB.loc=${wdir}/projects/classlib/trunk
update clean build" workingdir="projects/${project.name}/trunk/build" timeout="${ttimeout}"/>
+                <exec command="${sh}" args="${cmd.prefix} ${cmd} -D${proxy.host.vm}=${proxy.value}
-D${proxy.port.vm}=${port.value} -Dexternal.dep.CLASSLIB.loc=${wdir}/projects/classlib/trunk
update clean build" workingdir="projects/${project.name}/trunk/build" timeout="${ttimeout}"
errorstr="FAILED"/>
         </schedule>
 
         <publishers>
@@ -166,9 +166,9 @@
         </schedule>
 
         <log dir="logs/${project.name}">
-            <merge dir="projects/drlvm/trunk/build/${os}_ia32_${cc}_debug/semis/kernel.tests/reports/jet.mode"
pattern="TEST-*.xml" />
-            <merge dir="projects/drlvm/trunk/build/${os}_ia32_${cc}_debug/semis/kernel.tests/reports/opt.mode"
pattern="TEST-*.xml" />
-            <merge dir="projects/drlvm/trunk/build/${os}_ia32_${cc}_debug/semis/kernel.tests/reports/int.mode"
pattern="TEST-*.xml" />
+            <merge dir="projects/drlvm/trunk/build/${os}_${build_arch}_${cc}_${build_cfg}/semis/kernel.tests/reports/jet.mode"
pattern="TEST-*.xml" />
+            <merge dir="projects/drlvm/trunk/build/${os}_${build_arch}_${cc}_${build_cfg}/semis/kernel.tests/reports/opt.mode"
pattern="TEST-*.xml" />
+            <merge dir="projects/drlvm/trunk/build/${os}_${build_arch}_${cc}_${build_cfg}/semis/kernel.tests/reports/int.mode"
pattern="TEST-*.xml" />
         </log>
 
         <publishers>
@@ -178,7 +178,7 @@
                  uselogger="true"  
                  usedebug="false"  
                  target="copy.vm.res"> 
-                <property name="BUILD" value="${os}_ia32_${cc}_debug"/> 
+                <property name="BUILD" value="${os}_${build_arch}_${cc}_${build_cfg}"/>

             </antpublisher> 
 
             <onfailure>
@@ -234,8 +234,8 @@
 
         <schedule interval="${timeout}">
                 <ant target="test" antWorkingDir="projects/classlib/trunk" timeout="${ttimeout}"
usedebug="false">
-                    <jvmarg arg="-Dtest.jre.home=${wdir}/projects/drlvm/trunk/build/${os}_ia32_${cc}_debug/deploy/jre"
/>
-                    <jvmarg arg="-Dhy.test.forkmode=perTest" />
+                    <jvmarg arg="-Dtest.jre.home=${wdir}/projects/drlvm/trunk/build/${os}_${build_arch}_${cc}_${build_cfg}/deploy/jdk/jre"
/>
+                    <!--jvmarg arg="-Dhy.test.forkmode=perTest" /-->
                     <jvmarg arg="-Dhy.test.vm.name=drl" />
                     <jvmarg arg="-Xms200M" />
                     <jvmarg arg="-Xmx700M" />



Mime
View raw message