Attachment 172968 Details for Bug 211751 – BVT Report Automation patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] BVT Report Automation patch

BVT_Report_Automation_20100628_patch.txt (text/plain), 57.87 KB, created by Samuel Wu

on 2010-06-28 17:08:15 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Samuel Wu

Created: 2010-06-28 17:08:15 EDT

Size: 57.87 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.tptp.platform.releng.tools
>Index: org/eclipse/tptp/platform/releng/tools/testautomation/build.xml
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.releng.tools/org/eclipse/tptp/platform/releng/tools/testautomation/build.xml,v
>retrieving revision 1.1
>diff -u -r1.1 build.xml
>--- org/eclipse/tptp/platform/releng/tools/testautomation/build.xml	25 Feb 2008 16:43:11 -0000	1.1
>+++ org/eclipse/tptp/platform/releng/tools/testautomation/build.xml	28 Jun 2010 20:53:49 -0000
>@@ -1,6 +1,6 @@
> 
> 	<property name="report.publication.location" location="${reportLocation}"/>
> 
>-	<target name="runTests" depends="runTestSuites, checkResults, publishBVTReport" />
>+	
>+	<property name="tptp.test.project" value="${testProject}" />
>+	
>+    
>+	
>+	<target name="runTests" depends="configureRemoteMachine, runTestSuites, checkResults, publishBVTReport, checkInBVT" />
>+
>+	<target name="setupArtifact">
>+		<copy file="${tptp.test.workspace}/org.eclipse.hyades.tests/resources/org.eclipse.hyades.tests.bvt.local.initializer_1.0.0.jar" todir="${eclipse.home}/eclipse/dropins" overwrite="true" flatten="true" />
>+		<property name="eclipse.home" value="/home/build/BVT/workbench/eclipse"/>
>+	
>+	    
>+	    <copy tofile="${eclipse.home}/eclipse/plugins/org.eclipse.equinox.launcher.jar">
>+	    	<fileset dir="${eclipse.home}/eclipse/plugins" includes="**/org.eclipse.equinox.launcher_*.jar"/>
>+	 	</copy>
>+	
>+	 	
>+	 	<java classpath="${eclipse.home}/eclipse/plugins/org.eclipse.equinox.launcher.jar" classname="org.eclipse.equinox.launcher.Main"/>
>+    
>+	</target>
> 
> 	
> 	<target name="runTestSuites">
>-	    <property name="tptp.test.project" value="${testProject}" />
>+		<antcall target="time"/>
>+		
> 		
> 		<property name="project.dir" value="${tptp.test.workspace}/${tptp.test.project}" />
>-		
> 		<property name="tptp.test.deployment" value="deployment/BVTDeployment.deploy" />
>-		
>-		<tptp:execution resultsrefid="tptp.test.results">
>-			<fileset dir="${project.dir}">
>-				<include name="**/*${testSuite}*.testsuite" />
>-				<exclude name="**/*${excludeTestSuite}*.testsuite" />
>-			</fileset>
>+
>+		<tptp:execution resultsrefid="test_results_reference_ID" overwrite="true" results="BVT_results/">
>+			<filelist dir="${project.dir}" >
>+    				<file name="BVT/AllBVTJUnitTests_${targetJRE}.testsuite"/>
>+				    <file name="BVT/AllBVTJUnitPluginTests_${targetJRE}.testsuite"/>
>+		
>+			</filelist>
> 		</tptp:execution>
> 	</target>
> 
>-	<target name="checkResults" >
>+	<target name="checkResults">
>+		<antcall target="time"/>
> 		<echo message="Checking results"/>
> 		<condition property="tptp.test.success">
> 			<tptp:interrogation verdictproperty="tptp.test.verdict">
>-				<filelist refid="tptp.test.results"/>
>+				<filelist refid="test_results_reference_ID"/>
> 			</tptp:interrogation>
> 		</condition>
> 		<echo message="The test results are: '${tptp.test.verdict}'"/>
>@@ -66,16 +87,15 @@
> 
> 	
> 	<target name="publishBVTReport">
>+		<antcall target="time"/>
> 	    <property name="tptp.publication.service" value="org.eclipse.tptp.test.report.birt.publish-tabular" />
>-	    <property name="tptp.test.project" value="${testProject}" />
>-		<tptp:publication report="${report.publication.location}">
>-			<filelist refid="tptp.test.results"/>
>+	    <tptp:publication report="${report.publication.location}/${targetJRE}">
>+			<filelist refid="test_results_reference_ID"/>
> 		</tptp:publication>
> 	</target>
> 
> 	<target name="publishReport" depends="setPublishEndTime">
> 	    <property name="tptp.publication.service" value="org.eclipse.tptp.test.report.birt.publish-tabular-testsuites" />
>-        <property name="tptp.test.project" value="${testProject}" />
> 		<echo message="Publishing reports ${startTime} ${endTime}" />
> 		<tptp:publication report="${report.publication.location}"
> 		    startDateTime="${startTime}" endDateTime="${endTime}">
>@@ -86,104 +106,116 @@
> 		</tptp:publication>
> 	</target>
> 
>-    <target name="setupBVT" depends="getDrivers, setupLocalMachine, setupRemoteMachine, cleanupDownloads, configureRemoteMachine, extractTests, import" />
>+    
>+    <target name="setupBVT" depends="getDrivers, setupLocalMachine, extractTests" />
>     <target name="setupReport" depends="cleanupWorkspace, extractTests, import" />
> 
>-	<target name="getDrivers">
>+	<target name="getDrivers" depends="cleanupDownloads">
>+		<antcall target="time"/>
> 
>+		
> 	    <mkdir dir="${tempDir}" />
>-
>-		
>-		<get dest="${tempDir}/${tptpWinDriver}" src="${tptpWinUrl}" />
>-		<get dest="${tempDir}/${tptpLinuxDriver}" src="${tptpLinuxUrl}" />
>-		<get dest="${tempDir}/${apiRecFrameworkDriver}" src="${apiRecFrameworkUrl}" />
>-		<get dest="${tempDir}/${agrDriver}" src="${agrUrl}" />
>-		<get dest="${tempDir}/${ltaDriver}" src="${ltaUrl}" />
>-		<get dest="${tempDir}/${testReportBirtDriver}" src="${testReportBirtUrl}" />
>-		<get dest="${tempDir}/${monitorReportBirtDriver}" src="${monitorReportBirtUrl}" />
>-		<get dest="${tempDir}/${traceReportBirtDriver}" src="${traceReportBirtUrl}" />
>-		<get dest="${tempDir}/${platformReportBirtDriver}" src="${platformReportBirtUrl}" />
>-		<get dest="${tempDir}/${perfmonDriver}" src="${perfmonUrl}" />
>-		<get dest="${tempDir}/${codereviewCppDriver}" src="${codereviewCppUrl}" />
>-		<get dest="${tempDir}/${birtDriver}" src="${birtUrl}"/>
>-		<get dest="${tempDir}/${cdtDriver}" src="${cdtUrl}"/>
>-		<get dest="${tempDir}/${dtpDriver}" src="${dtpUrl}"/>
>-		<get dest="${tempDir}/${gefDriver}" src="${gefUrl}"/>
>-		<get dest="${tempDir}/${wtpDriver}" src="${wtpUrl}"/>
>-
> 		<mkdir dir="${tempDir}/dependencies" />
>-		<antcall target="unzip">
>-		    <param name="destDir" value="${tempDir}/dependencies" />
>-		    <param name="srcDir" value="${tempDir}/${apiRecFrameworkDriver}" />
>+		<mkdir dir="${tempDir}/linuxAllInOne"/>
>+		<mkdir dir="${tempDir}/winAllInOne"/>
>+	
>+		
>+		<antcall target="fetch.unzip">
>+			<param name="url" value="${tptpAllUrl}" />
>+			<param name="driver" value="${tptpAllDriver}" />
>+			<param name="srcDir" value="${tempDir}" />
>+			<param name="destDir" value="${tempDir}/dependencies" />
> 		</antcall>
>-		<antcall target="unzip">
>-		    <param name="destDir" value="${tempDir}/dependencies" />
>-		    <param name="srcDir" value="${tempDir}/${agrDriver}" />
>-		</antcall>
>-		<antcall target="unzip">
>-		    <param name="destDir" value="${tempDir}/dependencies" />
>-		    <param name="srcDir" value="${tempDir}/${ltaDriver}" />
>-		</antcall>
>-		<antcall target="unzip">
>-		    <param name="destDir" value="${tempDir}/dependencies" />
>-		    <param name="srcDir" value="${tempDir}/${testReportBirtDriver}" />
>-		</antcall>
>-		<antcall target="unzip">
>-		    <param name="destDir" value="${tempDir}/dependencies" />
>-		    <param name="srcDir" value="${tempDir}/${monitorReportBirtDriver}" />
>+		
>+		
>+		<antcall target="fetch.unzip">
>+			<param name="url" value="${agrUrl}" />
>+			<param name="driver" value="${agrDriver}" />
>+			<param name="srcDir" value="${tempDir}" />
>+			<param name="destDir" value="${tempDir}/dependencies" />
> 		</antcall>
>-		<antcall target="unzip">
>-		    <param name="destDir" value="${tempDir}/dependencies" />
>-		    <param name="srcDir" value="${tempDir}/${traceReportBirtDriver}" />
>+		
>+		<antcall target="fetch.unzip">
>+			<param name="url" value="${testReportBirtUrl}" />
>+			<param name="driver" value="${testReportBirtDriver}" />
>+			<param name="srcDir" value="${tempDir}" />
>+			<param name="destDir" value="${tempDir}/dependencies" />
> 		</antcall>
>-		<antcall target="unzip">
>-		    <param name="destDir" value="${tempDir}/dependencies" />
>-		    <param name="srcDir" value="${tempDir}/${platformReportBirtDriver}" />
>+		
>+		<antcall target="fetch.unzip">
>+			<param name="url" value="${traceReportBirtUrl}" />
>+			<param name="driver" value="${traceReportBirtDriver}" />
>+			<param name="srcDir" value="${tempDir}" />
>+			<param name="destDir" value="${tempDir}/dependencies" />
> 		</antcall>
>-		<antcall target="unzip">
>-		    <param name="destDir" value="${tempDir}/dependencies" />
>-		    <param name="srcDir" value="${tempDir}/${perfmonDriver}" />
>+
>+		<antcall target="fetch.unzip">
>+			<param name="url" value="${birtUrl}" />
>+			<param name="driver" value="${birtDriver}" />
>+			<param name="srcDir" value="${tempDir}" />
>+			<param name="destDir" value="${tempDir}/dependencies" />
> 		</antcall>
>-		<antcall target="unzip">
>-		    <param name="destDir" value="${tempDir}/dependencies" />
>-		    <param name="srcDir" value="${tempDir}/${codereviewCppDriver}" />
>+		
>+		<antcall target="fetch.unzip">
>+			<param name="url" value="${dtpUrl}" />
>+			<param name="driver" value="${dtpDriver}" />
>+			<param name="srcDir" value="${tempDir}" />
>+			<param name="destDir" value="${tempDir}/dependencies" />
> 		</antcall>
>-		<antcall target="unzip">
>-		    <param name="destDir" value="${tempDir}/dependencies" />
>-		    <param name="srcDir" value="${tempDir}/${birtDriver}" />
>+		
>+		
>+		<antcall target="fetch.untar">
>+			<param name="url" value="${eclipseSDKUrl}/${eclipseLinuxSDKDriver}" />
>+			<param name="driver" value="${eclipseLinuxSDKDriver}" />
>+			<param name="srcDir" value="${tempDir}" />
>+			<param name="destDir" value="${tempDir}/linuxAllInOne" />
> 		</antcall>
>-		<antcall target="unzip">
>-		    <param name="destDir" value="${tempDir}/dependencies/eclipse" />
>-		    <param name="srcDir" value="${tempDir}/${cdtDriver}" />
>+		
>+		<antcall target="fetch.unzip">
>+			<param name="url" value="${eclipseSDKUrl}/${eclipseWinSDKDriver}" />
>+			<param name="driver" value="${eclipseWinSDKDriver}" />
>+			<param name="srcDir" value="${tempDir}" />
>+			<param name="destDir" value="${tempDir}/winAllInOne" />
>+		</antcall>
>+			
>+		<antcall target="fetch.unzip">
>+			<param name="url" value="${emfUrl}" />
>+			<param name="driver" value="${emfDriver}" />
>+			<param name="srcDir" value="${tempDir}" />
>+			<param name="destDir" value="${tempDir}/dependencies" />
> 		</antcall>
>-		<antcall target="unzip">
>-		    <param name="destDir" value="${tempDir}/dependencies" />
>-		    <param name="srcDir" value="${tempDir}/${dtpDriver}" />
>+		
>+		<antcall target="fetch.unzip">
>+			<param name="url" value="${xsdUrl}" />
>+			<param name="driver" value="${xsdDriver}" />
>+			<param name="srcDir" value="${tempDir}" />
>+			<param name="destDir" value="${tempDir}/dependencies" />
> 		</antcall>
>-		<antcall target="unzip">
>-		    <param name="destDir" value="${tempDir}/dependencies" />
>-		    <param name="srcDir" value="${tempDir}/${gefDriver}" />
>+		
>+		<antcall target="fetch.unzip">
>+			<param name="url" value="${gefUrl}" />
>+			<param name="driver" value="${gefDriver}" />
>+			<param name="srcDir" value="${tempDir}" />
>+			<param name="destDir" value="${tempDir}/dependencies" />
> 		</antcall>
>-		<antcall target="unzip">
>-		    <param name="destDir" value="${tempDir}/dependencies" />
>-		    <param name="srcDir" value="${tempDir}/${wtpDriver}" />
>+		
>+		<antcall target="fetch.unzip">
>+			<param name="url" value="${wtpUrl}" />
>+			<param name="driver" value="${wtpDriver}" />
>+			<param name="srcDir" value="${tempDir}" />
>+			<param name="destDir" value="${tempDir}/dependencies" />
> 		</antcall>
>-
>+		
>+		
> 		<echo message="Updating Windows All-In-One" />
>-		<mkdir dir="${tempDir}/winAllInOne" />
>-		<antcall target="unzip">
>-		    <param name="destDir" value="${tempDir}/winAllInOne" />
>-		    <param name="srcDir" value="${tempDir}/${tptpWinDriver}" />
>-		</antcall>
> 
>+		
> 		<antcall target="copy">
> 		    <param name="baseDir" value="${tempDir}" />
>-		    <param name="destDir" value="winAllInOne" />
>+		    <param name="destDir" value="winAllInOne/eclipse/dropins" />
> 		    <param name="srcDir" value="dependencies/eclipse" />
> 		</antcall>
> 
>-		<delete file="${tempDir}/${tptpWinDriver}" />
>-
> 		<antcall target="zip">
> 		    <param name="destDir" value="${tempDir}" />
> 		    <param name="zipName" value="${tptpWinDriver}" />
>@@ -192,20 +224,14 @@
> 		</antcall>
> 
> 		<echo message="Updating Linux All-In-One" />
>-		<mkdir dir="${tempDir}/linuxAllInOne" />
>-		<antcall target="unzip">
>-		    <param name="destDir" value="${tempDir}/linuxAllInOne" />
>-		    <param name="srcDir" value="${tempDir}/${tptpLinuxDriver}" />
>-		</antcall>
>-
>+		
>+		
> 		<antcall target="copy">
> 		    <param name="baseDir" value="${tempDir}" />
>-		    <param name="destDir" value="linuxAllInOne" />
>+		    <param name="destDir" value="linuxAllInOne/eclipse/dropins" />
> 		    <param name="srcDir" value="dependencies/eclipse" />
> 		</antcall>
> 
>-		<delete file="${tempDir}/${tptpLinuxDriver}" />
>-
> 		<antcall target="zip">
> 		    <param name="destDir" value="${tempDir}" />
> 		    <param name="zipName" value="${tptpLinuxDriver}" />
>@@ -213,10 +239,33 @@
> 		    <param name="srcFolder" value="eclipse" />
> 		</antcall>
> 
>-		<get dest="${tempDir}/${acwinDriver}" src="${acwinUrl}" />
>+		<get dest="${tempDir}/${acLinuxDriver}" src="${acLinuxUrl}" />
>+		<get dest="${tempDir}/${acWinDriver}" src="${acWinUrl}" />
> 
> 	</target>
> 
>+	<target name="fetch.unzip">
>+		<get dest="${srcDir}/${driver}" src="${url}" />
>+		<antcall target="unzip">
>+			<param name="srcDir" value="${srcDir}/${driver}" />
>+			<param name="destDir" value="${destDir}" />
>+		</antcall>
>+	</target>
>+		
>+	<target name="fetch.untar">
>+		<get dest="${srcDir}/${driver}" src="${url}" />
>+		<antcall target="untar">
>+			<param name="srcDir" value="${srcDir}/${driver}" />
>+			<param name="destDir" value="${destDir}" />
>+		</antcall>
>+	</target>
>+	
>+	<target name="untar">
>+	    <exec executable="tar" dir="${destDir}">
>+		    <arg line="-oxzf ${srcDir}" />
>+		</exec>
>+	</target>
>+		
> 	<target name="unzip">
> 	    <exec executable="unzip" dir="${destDir}">
> 		    <arg line="-oq ${srcDir}" />
>@@ -236,6 +285,7 @@
> 	</target>
> 
> 	<target name="setupLocalMachine">
>+	    <antcall target="time"/>
> 	    <echo message="Cleaning up Local Machine before setup" />
> 	    <antcall target="cleanupLocal" />
> 	    <antcall target="copy">
>@@ -250,6 +300,11 @@
> 	            <include name="org.eclipse.hyades.execution_*/ant-tptp.jar" />
> 	        </fileset>
> 	    </copy>
>+		<copy todir="${ant.home}/lib" overwrite="true" flatten="true">
>+	        <fileset dir="${eclipse.home}/eclipse/dropins/eclipse/plugins">
>+	            <include name="org.eclipse.hyades.execution_*/ant-tptp.jar" />
>+        	</fileset>
>+    	</copy>
> 	</target>
> 
> 	<target name="setupRemoteMachine">
>@@ -259,27 +314,28 @@
> 		<echo message="Copying All-In-One and Agent Controller to Remote Machine" />
> 		<sshexec host="${hostname}" username="${user}" command="mkdir ${dir}/workbench; mkdir ${dir}/ac" keyfile="${keyfile}" passphrase="" trust="true" />
> 		<scp file="${tempDir}/${tptpDriver}" todir="${user}@${hostname}:${dir}/workbench/" keyfile="${keyfile}" passphrase="" trust="true" />
>-		<scp file="${tempDir}/${acwinDriver}" todir="${user}@${hostname}:${dir}/ac/" keyfile="${keyfile}" passphrase="" trust="true" />
>+		<scp file="${tempDir}/${acDriver}" todir="${user}@${hostname}:${dir}/ac/" keyfile="${keyfile}" passphrase="" trust="true" />
> 
>-        <echo message="Extracting All-In-One and Agent Controller on Remote Machine" />
>-		<sshexec host="${hostname}" username="${user}" command="unzip -q ${dir}/ac/${acwinDriver} -d ${dir}/ac; chmod -R +x ${dir}/ac; unzip -q ${dir}/workbench/${tptpDriver} -d ${dir}/workbench; chmod -R +x ${dir}/workbench/eclipse" keyfile="${keyfile}" passphrase="" trust="true" />
>+        <echo message="Extracting Agent Controller on Remote Machine" />
>+		<sshexec host="${hostname}" username="${user}" command="unzip -q ${dir}/ac/${acDriver} -d ${dir}/ac; chmod -R +x ${dir}/ac" keyfile="${keyfile}" passphrase="" trust="true" />
> 
> 	</target>
> 
>     <target name="cleanupRemote">
>         <echo message="Shutting down the agent controller on the remote machine" />
>-        <sshexec host="${hostname}" username="${user}" command="${dir}/ac/bin/acserver -shutdown" keyfile="${keyfile}" passphrase="" trust="true" failonerror="false" />
>+        <sshexec host="${hostname}" username="${user}" command="${dir}/ac/bin/ACServer -shutdown" keyfile="${keyfile}" passphrase="" trust="true" failonerror="false" />
>         <echo message="Removing agent controller and workbench directories on the remote machine" />
>         <sshexec host="${hostname}" username="${user}" command="rm -fr ${dir}/ac; rm -fr ${dir}/workbench" keyfile="${keyfile}" passphrase="" trust="true" failonerror="false"/>
>     </target>
> 
>     <target name="cleanupDownloads">
>+	<antcall target="time"/>
>         
>         <echo message="Removing download directory" />
>         <delete dir="${tempDir}" failonerror="false" />
>     </target>
> 
>-    <target name="cleanupLocal" depends="cleanupWorkspace, cleanupReports">
>+    <target name="cleanupLocal" depends="cleanupWorkspace">
>         
>         <echo message="Removing eclipse directory" />
>         <delete dir="${eclipse.home}" failonerror="false" />
>@@ -298,39 +354,64 @@
>     </target>
> 
> 	<target name="extractTests">
>-		<echo message="Extracting Monitor" />
>-		<cvs command="-d ${cvs.login}:/cvsroot/tptp co -r ${cvsBranch} -d monitor test-results/monitor" reallyquiet="true"/>
>-		
>-		<echo message="Removing org.eclipse.tptp.monitoring.notifications.test" />
>-		<delete dir="monitor/org.eclipse.tptp.monitoring.notifications.test" />
>+		<antcall target="time"/>
>+		<echo message="Extracting Monitor"/>
>+		<echo message="nothing to extract, skipping" />
>+		
>+		
>+		
> 
> 		<echo message="Extracting Platform" />
>-		<cvs command="-d ${cvs.login}:/cvsroot/tptp co -r ${cvsBranch} -d platform test-results/platform" reallyquiet="true"/>
>+		<delete dir="platform" failonerror="false" />
>+		<cvs command="-d ${cvs.login}:/cvsroot/tptp co -r ${cvsBranch} -d platform/org.eclipse.hyades.probekit.tests test-results/platform/org.eclipse.hyades.probekit.tests" reallyquiet="true"/>
>+		<cvs command="-d ${cvs.login}:/cvsroot/tptp co -r ${cvsBranch} -d platform/org.eclipse.hyades.tests test-results/platform/org.eclipse.hyades.tests" reallyquiet="true"/>
>+		<cvs command="-d ${cvs.login}:/cvsroot/tptp co -r ${cvsBranch} -d platform/org.eclipse.hyades.trace.ui.tests test-results/platform/org.eclipse.hyades.trace.ui.tests" reallyquiet="true"/>
>+		<cvs command="-d ${cvs.login}:/cvsroot/tptp co -r ${cvsBranch} -d platform/org.eclipse.hyades.use.cases test-results/platform/org.eclipse.hyades.use.cases" reallyquiet="true"/>
>+		<cvs command="-d ${cvs.login}:/cvsroot/tptp co -r ${cvsBranch} -d platform/org.eclipse.tptp.ac.testautomation test-results/platform/org.eclipse.tptp.ac.testautomation" reallyquiet="true"/>
>+		<cvs command="-d ${cvs.login}:/cvsroot/tptp co -r ${cvsBranch} -d platform/org.eclipse.tptp.platform.common.ui.tests test-results/platform/org.eclipse.tptp.platform.common.ui.tests" reallyquiet="true"/>
>+		<cvs command="-d ${cvs.login}:/cvsroot/tptp co -r ${cvsBranch} -d platform/org.eclipse.tptp.platform.report.tests test-results/platform/org.eclipse.tptp.platform.report.tests" reallyquiet="true"/>
> 
> 		<echo message="Extracting Test" />
>-		<cvs command="-d ${cvs.login}:/cvsroot/tptp co -r ${cvsBranch} -d test test-results/test" reallyquiet="true"/>
>+		<delete dir="test" failonerror="false" />
>+		<cvs command="-d ${cvs.login}:/cvsroot/tptp co -r ${cvsBranch} -d test/org.eclipse.hyades.execution.harness.tests test-results/test/org.eclipse.hyades.execution.harness.tests" reallyquiet="true"/>
>+		<cvs command="-d ${cvs.login}:/cvsroot/tptp co -r ${cvsBranch} -d test/org.eclipse.hyades.test.core.services.tests test-results/test/org.eclipse.hyades.test.core.services.tests" reallyquiet="true"/>
>+		<cvs command="-d ${cvs.login}:/cvsroot/tptp co -r ${cvsBranch} -d test/org.eclipse.hyades.test.core.tests test-results/test/org.eclipse.hyades.test.core.tests" reallyquiet="true"/>
>+		<cvs command="-d ${cvs.login}:/cvsroot/tptp co -r ${cvsBranch} -d test/org.eclipse.hyades.test.java.tests test-results/test/org.eclipse.hyades.test.java.tests" reallyquiet="true"/>
>+		<cvs command="-d ${cvs.login}:/cvsroot/tptp co -r ${cvsBranch} -d test/org.eclipse.hyades.test.tools.core.tests test-results/test/org.eclipse.hyades.test.tools.core.tests" reallyquiet="true"/>
>+		<cvs command="-d ${cvs.login}:/cvsroot/tptp co -r ${cvsBranch} -d test/org.eclipse.hyades.test.ui.datapool.tests test-results/test/org.eclipse.hyades.test.ui.datapool.tests" reallyquiet="true"/>
>+		<cvs command="-d ${cvs.login}:/cvsroot/tptp co -r ${cvsBranch} -d test/org.eclipse.hyades.test.ui.logViewer.tests test-results/test/org.eclipse.hyades.test.ui.logViewer.tests" reallyquiet="true"/>
>+		<cvs command="-d ${cvs.login}:/cvsroot/tptp co -r ${cvsBranch} -d test/org.eclipse.hyades.test.ui.navigator.tests test-results/test/org.eclipse.hyades.test.ui.navigator.tests" reallyquiet="true"/>
>+		<cvs command="-d ${cvs.login}:/cvsroot/tptp co -r ${cvsBranch} -d test/org.eclipse.hyades.test.URLTest.tests test-results/test/org.eclipse.hyades.test.URLTest.tests" reallyquiet="true"/>
>+		<cvs command="-d ${cvs.login}:/cvsroot/tptp co -r ${cvsBranch} -d test/org.eclipse.tptp.test.auto.gui.tests test-results/test/org.eclipse.tptp.test.auto.gui.tests" reallyquiet="true"/>
>+		<cvs command="-d ${cvs.login}:/cvsroot/tptp co -r ${cvsBranch} -d test/org.eclipse.tptp.test.testservices.tests test-results/test/org.eclipse.tptp.test.testservices.tests" reallyquiet="true"/>
> 
> 		<echo message="Extracting Trace" />
>-		<cvs command="-d ${cvs.login}:/cvsroot/tptp co -r ${cvsBranch} -d trace test-results/trace" reallyquiet="true"/>
>-
>-		<mkdir dir="${tptp.test.workspace}" />
>-
>-		<echo message="Moving to Workspace" />
>-		<move todir="${tptp.test.workspace}">
>-            <fileset dir="monitor/" />
>-            <fileset dir="platform/" />
>-            <fileset dir="test/" />
>-            <fileset dir="trace/" />
>-        </move>
>-
>-		<echo message="Cleaning up extract" />
>-		<delete dir="monitor" />
>-		<delete dir="platform" />
>-		<delete dir="test" />
>-		<delete dir="trace" />
>+		<delete dir="trace" failonerror="false" />
>+		<cvs command="-d ${cvs.login}:/cvsroot/tptp co -r ${cvsBranch} -d trace/org.eclipse.tptp.trace.use.cases test-results/trace/org.eclipse.tptp.trace.use.cases" reallyquiet="true"/>
>+		<antcall target="time"/>
> 	</target>
> 
> 	<target name="import">
>+		<antcall target="time"/>
>+		<echo message="Cleanup workspace, if it exists"/>
>+		<delete dir="${tptp.test.workspace}" failonerror="false"/>
>+		<mkdir dir="${tptp.test.workspace}" />
>+		<echo message="Copying extracted tests to workspace" />
>+		<copy todir="${tptp.test.workspace}">
>+           	    
>+           	    <fileset dir="platform/" />
>+            	    <fileset dir="test/" />
>+        	    <fileset dir="trace/" />
>+	        </copy>
>+
>+		<echo message="Updating BVT test results"/>
>+		<delete dir="${tptp.test.workspace}/org.eclipse.hyades.tests/BVT_results" />
>+		<cvs command="-d ${cvs.login}:/cvsroot/tptp co -r ${cvsBranch} -d temp_BVT_results test-results/platform/org.eclipse.hyades.tests/BVT_results" reallyquiet="true"/>
>+		<copy todir="${tptp.test.workspace}/org.eclipse.hyades.tests/BVT_results">
>+                    <fileset dir="temp_BVT_results/" />
>+		</copy>
>+		<delete dir="temp_BVT_results" />
>+
> 		<echo message="Before import into workspace"/>
> 		<tptp:importExistingProjects>
> 			<fileset dir="${tptp.test.workspace}">
>@@ -340,24 +421,30 @@
> 		<echo message="After import into workspace"/>
> 	</target>
> 
>-	<target name="configureRemoteMachine">
>+	<target name="configureRemoteMachine" depends="setupRemoteMachine">
>+		<antcall target="time"/>
>+		<echo message="Cleaning up workbench on Remote Machine" />
>+		<sshexec host="${hostname}" username="${user}" command="rm -rf ${dir}/workbench/eclipse; rm -rf $TEMP/build" keyfile="${keyfile}" passphrase="" trust="true" />
>+		
>+		<echo message="Extracting All-In-One and JRE on Remote Machine" />
>+		<sshexec host="${hostname}" username="${user}" command="unzip -q ${dir}/workbench/${tptpDriver} -d ${dir}/workbench; cp -r ${dir}/jre/${targetJRE}/jre ${dir}/workbench/eclipse; chmod -R +x ${dir}/workbench/eclipse" keyfile="${keyfile}" passphrase="" trust="true" />
>+
>+		<echo message="Configuring Agent Controller on Remote Machine" />
>+		<sshexec host="${hostname}" username="${user}" command="cd ${dir}/ac/bin; ./SetConfig.bat -s JAVA_PATH=${cygwinPath}\\workbench\\eclipse\\jre\\bin\\java.exe TYPE=ALL SECURITY=FALSE" keyfile="${keyfile}" passphrase="" trust="true" />
>+		
>+		<echo message="Shutting down the agent controller on the remote machine" />
>+        	<sshexec host="${hostname}" username="${user}" command="${dir}/ac/bin/ACServer -shutdown" keyfile="${keyfile}" passphrase="" trust="true" failonerror="false" />
>+
> 	    <echo message="Starting Agent Controller on Remote Machine" />
>-	    <java classname="AcConfigMain" fork="true">
>-	     <classpath>
>-	        <pathelement location="bin/AcConfig.jar"/>
>-	        <pathelement location="bin/DialogueUtil-20071120.jar"/>
>-	        <pathelement location="bin/ganymed-ssh2-build211beta4.jar"/>
>-	     </classpath>
>-	     <arg value="${javaLocation}" />
>-	     <arg value="${acUser}" />
>-	     <arg value="${acPassword}" />
>-	     <arg value="${cygwinACPath}" />
>-	    </java>
>+		<echo message="A timeout is set to allow for disconnecting since the AC continues to run"/>
>+		<sshexec host="${hostname}" username="${user}" command="cd ${dir}/ac/bin; ./ACServer.exe &amp;" keyfile="${keyfile}" passphrase="" trust="true" timeout="1000" failonerror="false" />
>+		
>+		<sshexec host="${hostname}" username="${user}" command="ps -ef | grep ACServer | wc -l" keyfile="${keyfile}" passphrase="" trust="true" />
> 	</target>
> 
> 	<target name="checkInReport">
> 	    <mkdir dir="${basedir}/${reportCheckinDirectory}" />
>-	    <cvs command="-d ${cvs.login}:/cvsroot/org.eclipse co -d ${reportCheckinDirectory} www/tptp/test/reports/${reportCheckinDirectory}" reallyquiet="true"/>
>+	    <cvs command="-d ${cvs.login}:/cvsroot/org.eclipse co -r ${cvsBranch} -d ${reportCheckinDirectory} www/tptp/test/reports/${reportCheckinDirectory}" reallyquiet="true"/>
> 
> 	    <delete>
> 	        <fileset dir="${basedir}/${reportCheckinDirectory}" includes="*.html" />
>@@ -377,9 +464,38 @@
> 	</target>
> 
> 	<target name="copyBVTReport">
>-	    <scp todir="${reportUser}@${reportHostname}:/home/data/users/${reportUser}/downloads/tptp/${release}/dev/${driver}/BVT" keyfile="${keyfile}" passphrase="" trust="true">
>-	        <fileset dir="${reportLocation}"/>
>-	    </scp>
>+		<exec executable="bash">
>+			<arg line="-c \'scp -r -i ${keyfile} ${reportLocation}/* ${reportHost}:/home/www/tptp/${release}/dev/${driver}/BVT\'" />
>+		</exec>
> 	</target>
> 
>-</project>
>\ No newline at end of file
>+        <target name="checkInBVT">
>+		<antcall target="time"/>
>+		
>+		<condition property="bvtBranch" value="-r ${cvsBranch}" else="">
>+			<not>
>+				<equals arg1="${cvsBranch}" arg2="HEAD" />
>+			</not>
>+		</condition>
>+		<cvs command="-d ${cvs.login}:/cvsroot/tptp co ${bvtBranch} -d BVT_results test-results/platform/org.eclipse.hyades.tests/BVT_results" reallyquiet="true"/>
>+		<delete>
>+			<fileset dir="${basedir}/BVT_results" includes="*.execution" />
>+            	</delete>
>+		<copy todir="BVT_results" overwrite="true">
>+                	<fileset dir="${tptp.test.workspace}/org.eclipse.hyades.tests/BVT_results">
>+                		<include name="*.execution" />
>+                	</fileset>
>+            	</copy>
>+		<echo message="BVT results for ${tptpAllDriver}" file="${basedir}/commitMessage.txt" />
>+		<exec executable="bash">
>+                	<arg line="-c \'cd ${basedir}/BVT_results; cvs add -kb *; cvs commit -F ${basedir}/commitMessage.txt; cd .. *\' " />
>+            	</exec>
>+		<delete dir="BVT_results" failonerror="false" />
>+	</target>
>+
>+	<target name="time">
>+		<exec executable="date"/>
>+	</target>
>+
>+
>+</project>
>Index: org/eclipse/tptp/platform/releng/tools/testautomation/dependencySetup.sh
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.releng.tools/org/eclipse/tptp/platform/releng/tools/testautomation/dependencySetup.sh,v
>retrieving revision 1.1
>diff -u -r1.1 dependencySetup.sh
>--- org/eclipse/tptp/platform/releng/tools/testautomation/dependencySetup.sh	25 Feb 2008 16:43:11 -0000	1.1
>+++ org/eclipse/tptp/platform/releng/tools/testautomation/dependencySetup.sh	28 Jun 2010 20:53:49 -0000
>@@ -1,6 +1,6 @@
> #!/bin/sh
> ############################################################################### 
>-# Copyright (c) 2008 IBM Corporation and others.
>+# Copyright (c) 2008, 2010 IBM Corporation and others.
> # All rights reserved.   This program and the accompanying materials
> # are made available under the terms of the Eclipse Public License v1.0
> # which accompanies this distribution, and is available at
>@@ -19,16 +19,17 @@
>     exit 1
> fi
> 
>+export baseURL="http://download.eclipse.org"
>+export baseArchiveURL="http://archive.eclipse.org"
> export common=tptp/$tptpRelease/dev/$tptpDriver
>-export tptpDep=http://download.eclipse.org/$common/dependencies.txt
>+export tptpDep=$baseURL/$common/dependencies.txt
> wget --spider $tptpDep -o bvt$tptpDriver.log
> error=`grep -c 404: bvt$tptpDriver.log`
> 
> if [ $error != 0 ]; then
>     export common=tptp/$tptpRelease/$tptpDriver
>-    export tptpDep=http://download.eclipse.org/$common/dependencies.txt
> fi
>-wget -nv $tptpDep
>+wget -nv -O dependencies.txt http://www.eclipse.org/tptp/home/downloads/?buildId=$tptpDriver
> 
> echo "#Driver dependencies" > dependencies.properties
> echo "release=$tptpRelease" >> dependencies.properties
>@@ -37,54 +38,43 @@
> #Download drivers for setup
> echo "Getting TPTP Drivers"
> 
>-#TPTP Linux All-In-One
>-export tptpLinuxUrl=http://fullmoon.torolab.ibm.com/$common/tptp.runtime.allInOne.linux.gtk.x86-$tptpDriver.zip
>-wget --spider $tptpLinuxUrl -o bvt$tptpDriver.log
>+#TPTP Runtime All Plugins
>+export tptpAllUrl=http://fullmoon.torolab.ibm.com/$common/tptp.runtime-$tptpDriver.zip
>+wget --spider $tptpAllUrl -o bvt$tptpDriver.log
> 
> error=`grep -c 404: bvt$tptpDriver.log`
> if [ $error != 0 ]; then
>-    export tptpLinuxUrl=http://download.eclipse.org/$common/tptp.runtime.allInOne.linux.gtk.x86-$tptpDriver.zip
>+    export tptpAllUrl=$baseURL/$common/tptp.runtime-$tptpDriver.zip
> fi
> 
>-echo "tptpLinuxUrl=$tptpLinuxUrl" >> dependencies.properties
>-echo "tptpLinuxDriver=tptp.runtime.allInOne.linux.gtk.x86-$tptpDriver.zip" >> dependencies.properties
>-
>-#TPTP Windows All-In-One
>-export tptpWinUrl=http://fullmoon.torolab.ibm.com/$common/tptp.runtime.allInOne.win32.win32.x86-$tptpDriver.zip
>-wget --spider $tptpWinUrl -o bvt$tptpDriver.log
>-
>-error=`grep -c 404: bvt$tptpDriver.log`
>-if [ $error != 0 ]; then
>-    export tptpWinUrl=http://download.eclipse.org/$common/tptp.runtime.allInOne.win32.win32.x86-$tptpDriver.zip
>-fi
>-
>-echo "tptpWinUrl=$tptpWinUrl" >> dependencies.properties
>-echo "tptpWinDriver=tptp.runtime.allInOne.win32.win32.x86-$tptpDriver.zip" >> dependencies.properties
>-
>+echo "tptpAllUrl=$tptpAllUrl" >> dependencies.properties
>+echo "tptpAllDriver=tptp.runtime-$tptpDriver.zip" >> dependencies.properties
>+echo "tptpLinuxDriver=tptp.runtime.ti.allInOne.linux.gtk.x86-$tptpDriver.zip" >> dependencies.properties
>+echo "tptpWinDriver=tptp.runtime.ti.allInOne.win32.win32.x86-$tptpDriver.zip" >> dependencies.properties
> 
> #Windows Agent Controller
>-export acwinUrl=http://fullmoon.torolab.ibm.com/$common/agntctrl.win_ia32-$tptpDriver.zip
>-wget --spider $acwinUrl -o bvt$tptpDriver.log
>+export acWinUrl=http://fullmoon.torolab.ibm.com/$common/agntctrl.win_ia32-$tptpDriver.zip
>+wget --spider $acWinUrl -o bvt$tptpDriver.log
> 
> error=`grep -c 404: bvt$tptpDriver.log`
> if [ $error != 0 ]; then
>-    export acwinUrl=http://download.eclipse.org/$common/agntctrl.win_ia32-$tptpDriver.zip
>+    export acWinUrl=$baseURL/$common/agntctrl.win_ia32-$tptpDriver.zip
> fi
> 
>-echo "acwinUrl=$acwinUrl" >> dependencies.properties
>-echo "acwinDriver=agntctrl.win_ia32-$tptpDriver.zip" >> dependencies.properties
>+echo "acWinUrl=$acWinUrl" >> dependencies.properties
>+echo "acWinDriver=agntctrl.win_ia32-$tptpDriver.zip" >> dependencies.properties
> 
>-#Api Recorder Framework
>-export apiRecFrameworkUrl=http://fullmoon.torolab.ibm.com/$common/org.eclipse.tptp.test.tools.api-$tptpDriver.zip
>-wget --spider $apiRecFrameworkUrl -o bvt$tptpDriver.log
>+#Linux Agent Controller
>+export acLinuxUrl=http://fullmoon.torolab.ibm.com/$common/agntctrl.linux_ia32-$tptpDriver.zip
>+wget --spider $acLinuxUrl -o bvt$tptpDriver.log
> 
> error=`grep -c 404: bvt$tptpDriver.log`
> if [ $error != 0 ]; then
>-    export apiRecFrameworkUrl=http://download.eclipse.org/$common/org.eclipse.tptp.test.tools.api-$tptpDriver.zip
>+    export acLinuxUrl=$baseURL/$common/agntctrl.linux_ia32-$tptpDriver.zip
> fi
> 
>-echo "apiRecFrameworkUrl=$apiRecFrameworkUrl" >> dependencies.properties
>-echo "apiRecFrameworkDriver=org.eclipse.tptp.test.tools.api-$tptpDriver.zip" >> dependencies.properties
>+echo "acLinuxUrl=$acLinuxUrl" >> dependencies.properties
>+echo "acLinuxDriver=agntctrl.linux_ia32-$tptpDriver.zip" >> dependencies.properties
> 
> #AGR
> export agrUrl=http://fullmoon.torolab.ibm.com/$common/org.eclipse.tptp.test.auto-$tptpDriver.zip
>@@ -92,107 +82,82 @@
> 
> error=`grep -c 404: bvt$tptpDriver.log`
> if [ $error != 0 ]; then
>-    export agrUrl=http://download.eclipse.org/$common/org.eclipse.tptp.test.auto-$tptpDriver.zip
>+    export agrUrl=$baseURL/$common/org.eclipse.tptp.test.auto-$tptpDriver.zip
> fi
> 
> echo "agrUrl=$agrUrl" >> dependencies.properties
> echo "agrDriver=org.eclipse.tptp.test.auto-$tptpDriver.zip" >> dependencies.properties
> 
>-#Log and Trace Analyzer
>-export ltaUrl=http://fullmoon.torolab.ibm.com/$common/tptp.lta.runtime-$tptpDriver.zip
>-wget --spider $ltaUrl -o bvt$tptpDriver.log
>-
>-error=`grep -c 404: bvt$tptpDriver.log`
>-if [ $error != 0 ]; then
>-    export ltaUrl=http://download.eclipse.org/$common/tptp.lta.runtime-$tptpDriver.zip
>-fi
>-
>-echo "ltaUrl=$ltaUrl" >> dependencies.properties
>-echo "ltaDriver=tptp.lta.runtime-$tptpDriver.zip" >> dependencies.properties
>-
> #Test BIRT Reporting
> export testReportBirtUrl=http://fullmoon.torolab.ibm.com/$common/org.eclipse.tptp.test.report.birt-$tptpDriver.zip
> wget --spider $testReportBirtUrl -o bvt$tptpDriver.log
> 
> error=`grep -c 404: bvt$tptpDriver.log`
> if [ $error != 0 ]; then
>-    export testReportBirtUrl=http://download.eclipse.org/$common/org.eclipse.tptp.test.report.birt-$tptpDriver.zip
>+    export testReportBirtUrl=$baseURL/$common/org.eclipse.tptp.test.report.birt-$tptpDriver.zip
> fi
> 
> echo "testReportBirtUrl=$testReportBirtUrl" >> dependencies.properties
> echo "testReportBirtDriver=org.eclipse.tptp.test.report.birt-$tptpDriver.zip" >> dependencies.properties
> 
>-#Monitoring BIRT Reporting
>-export monitorReportBirtUrl=http://fullmoon.torolab.ibm.com/$common/org.eclipse.tptp.monitoring.report.birt-$tptpDriver.zip
>-wget --spider $monitorReportBirtUrl -o bvt$tptpDriver.log
>-
>-error=`grep -c 404: bvt$tptpDriver.log`
>-if [ $error != 0 ]; then
>-    export monitorReportBirtUrl=http://download.eclipse.org/$common/org.eclipse.tptp.monitoring.report.birt-$tptpDriver.zip
>-fi
>-
>-echo "monitorReportBirtUrl=$monitorReportBirtUrl" >> dependencies.properties
>-echo "monitorReportBirtDriver=org.eclipse.tptp.monitoring.report.birt-$tptpDriver.zip" >> dependencies.properties
>-
> #Trace BIRT Reporting
> export traceReportBirtUrl=http://fullmoon.torolab.ibm.com/$common/org.eclipse.tptp.trace.report.birt-$tptpDriver.zip
> wget --spider $traceReportBirtUrl -o bvt$tptpDriver.log
> 
> error=`grep -c 404: bvt$tptpDriver.log`
> if [ $error != 0 ]; then
>-    export traceReportBirtUrl=http://download.eclipse.org/$common/org.eclipse.tptp.trace.report.birt-$tptpDriver.zip
>+    export traceReportBirtUrl=$baseURL/$common/org.eclipse.tptp.trace.report.birt-$tptpDriver.zip
> fi
> 
> echo "traceReportBirtUrl=$traceReportBirtUrl" >> dependencies.properties
> echo "traceReportBirtDriver=org.eclipse.tptp.trace.report.birt-$tptpDriver.zip" >> dependencies.properties
> 
>-#Platform BIRT Reporting
>-export platformReportBirtUrl=http://fullmoon.torolab.ibm.com/$common/org.eclipse.tptp.platform.statistical.report.birt-$tptpDriver.zip
>-wget --spider $platformReportBirtUrl -o bvt$tptpDriver.log
>-
>-error=`grep -c 404: bvt$tptpDriver.log`
>-if [ $error != 0 ]; then
>-    export platformReportBirtUrl=http://download.eclipse.org/$common/org.eclipse.tptp.platform.statistical.report.birt-$tptpDriver.zip
>-fi
>-
>-echo "platformReportBirtUrl=$platformReportBirtUrl" >> dependencies.properties
>-echo "platformReportBirtDriver=org.eclipse.tptp.platform.statistical.report.birt-$tptpDriver.zip" >> dependencies.properties
>-
>-#Perfmon
>-export perfmonUrl=http://fullmoon.torolab.ibm.com/tptp/4.4.0.3/TPTP-4.4.0.3/perfmon.client-TPTP-4.4.0.3.zip
>-wget --spider $perfmonUrl -o bvt$tptpDriver.log
>-
>-error=`grep -c 404: bvt$tptpDriver.log`
>-if [ $error != 0 ]; then
>-    export perfmonUrl=http://download.eclipse.org/tptp/4.4.0.3/TPTP-4.4.0.3/perfmon.client-TPTP-4.4.0.3.zip
>-fi
>-
>-echo "perfmonUrl=$perfmonUrl" >> dependencies.properties
>-echo "perfmonDriver=perfmon.client-TPTP-4.4.0.3.zip" >> dependencies.properties
>-
>-#C/C++ Code Review
>-export codereviewCppUrl=http://fullmoon.torolab.ibm.com/$common/org.eclipse.tptp.platform.analysis.codereview.cpp-$tptpDriver.zip
>-wget --spider $codereviewCppUrl -o bvt$tptpDriver.log
>-
>-error=`grep -c 404: bvt$tptpDriver.log`
>-if [ $error != 0 ]; then
>-    export codereviewCppUrl=http://download.eclipse.org/$common/org.eclipse.tptp.platform.analysis.codereview.cpp-$tptpDriver.zip
>-fi
>-
>-echo "codereviewCppUrl=$codereviewCppUrl" >> dependencies.properties
>-echo "codereviewCppDriver=org.eclipse.tptp.platform.analysis.codereview.cpp-$tptpDriver.zip" >> dependencies.properties
>-
>-
>-sed 's/<br>/\n/g' <dependencies.txt >mydependencies.txt
>-echo "wtpUrl=`grep wtp mydependencies.txt | cut -d\\\" -f2`" >> dependencies.properties
>-echo "wtpDriver=`grep wtp mydependencies.txt | cut -d">" -f2 | cut -d"<" -f1`" >> dependencies.properties
>-echo "birtUrl=`grep birt-report-framework mydependencies.txt | cut -d\\\" -f2`" >> dependencies.properties
>-echo "birtDriver=`grep birt-report-framework mydependencies.txt | cut -d">" -f2 | cut -d"<" -f1`" >> dependencies.properties
>-echo "gefUrl=`grep GEF-runtime mydependencies.txt | cut -d\\\" -f2`" >> dependencies.properties
>-echo "gefDriver=`grep GEF-runtime mydependencies.txt | cut -d">" -f2 | cut -d"<" -f1`" >> dependencies.properties
>-echo "dtpUrl=`grep dtp mydependencies.txt | cut -d\\\" -f2`" >> dependencies.properties
>-echo "dtpDriver=`grep dtp mydependencies.txt | cut -d">" -f2 | cut -d"<" -f1`" >> dependencies.properties
>-echo "cdtUrl=`grep cdt mydependencies.txt | cut -d\\\" -f2`" >> dependencies.properties
>-echo "cdtDriver=`grep cdt mydependencies.txt | cut -d">" -f2 | cut -d"<" -f1`" >> dependencies.properties
>+# Put the url entries on one line
>+sed -i 's/<a/\n/g' dependencies.txt
>+# Make the file to search only on links
>+grep href dependencies.txt >mydependencies.txt
>+
>+eclipseSDKUrl=`grep "Eclipse SDK" mydependencies.txt | cut -d\" -f2`
>+echo "eclipseSDKUrl=$eclipseSDKUrl" >> dependencies.properties
>+
>+
>+eclipseSDKUrl=`grep "Eclipse SDK" mydependencies.txt | cut -d\" -f2`
>+# Conditional statement to account for eclipse Milestone Releases.
>+if ( echo $eclipseSDKUrl | egrep -q "M[0-9]|RC[0-9]|R-[0-9]" ); then
>+        eclipseZip=`echo ${eclipseSDKUrl##*/} | cut -d'-' -f2`
>+else
>+        eclipseZip=`echo ${eclipseSDKUrl##*/}`
>+fi
>+# Check for eclipse maintenance releases, which will have been flagged as an M build above since they also contain an 'M' followed by a number in the URL
>+if ( echo $eclipseSDKUrl | egrep -q "M[0-9][0-9][0-9][0-9]" ); then
>+        eclipseZip=`echo ${eclipseSDKUrl##*/}`
>+fi
>+echo "eclipseSDKUrl=$eclipseSDKUrl" >> dependencies.properties
>+echo "eclipseWinSDKDriver=eclipse-SDK-${eclipseZip}-win32.zip" >> dependencies.properties
>+echo "eclipseLinuxSDKDriver=eclipse-SDK-${eclipseZip}-linux-gtk.tar.gz" >> dependencies.properties
>+
>+emfUrl=$baseURL`grep emf- mydependencies.txt | grep -v 2.2.4 | cut -d\" -f2 | cut -d= -f2`
>+echo "emfUrl=$emfUrl" >> dependencies.properties
>+echo "emfDriver=`echo ${emfUrl##*/}`" >> dependencies.properties
>+
>+xsdUrl=$baseURL`grep xsd mydependencies.txt | grep -v 2.2.4 | cut -d\" -f2 | cut -d= -f2`
>+echo "xsdUrl=$xsdUrl" >> dependencies.properties
>+echo "xsdDriver=`echo ${xsdUrl##*/}`" >> dependencies.properties
>+
>+wtpUrl=$baseURL`grep wtp mydependencies.txt | cut -d\" -f2 | cut -d= -f2`
>+echo "wtpUrl=$wtpUrl" >> dependencies.properties
>+echo "wtpDriver=`echo ${wtpUrl##*/}`" >> dependencies.properties
>+
>+birtUrl=$baseURL`grep birt-report-framework mydependencies.txt | cut -d\" -f2 | cut -d= -f2`
>+echo "birtUrl=$birtUrl" >> dependencies.properties
>+echo "birtDriver=`echo ${birtUrl##*/}`" >> dependencies.properties
>+
>+gefUrl=$baseURL`grep GEF-runtime mydependencies.txt | cut -d\" -f2 | cut -d= -f2`
>+echo "gefUrl=$gefUrl" >> dependencies.properties
>+echo "gefDriver=`echo ${gefUrl##*/}`" >> dependencies.properties
>+
>+dtpUrl=$baseURL`grep dtp mydependencies.txt | cut -d\" -f2 | cut -d= -f2`
>+echo "dtpUrl=$dtpUrl" >> dependencies.properties
>+echo "dtpDriver=`echo ${dtpUrl##*/}`" >> dependencies.properties
> 
>-rm dependencies.txt mydependencies.txt bvt$tptpDriver.log
>\ No newline at end of file
>+rm dependencies.txt mydependencies.txt bvt$tptpDriver.log
>Index: org/eclipse/tptp/platform/releng/tools/testautomation/nightly.sh
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.releng.tools/org/eclipse/tptp/platform/releng/tools/testautomation/nightly.sh,v
>retrieving revision 1.1
>diff -u -r1.1 nightly.sh
>--- org/eclipse/tptp/platform/releng/tools/testautomation/nightly.sh	25 Feb 2008 16:43:11 -0000	1.1
>+++ org/eclipse/tptp/platform/releng/tools/testautomation/nightly.sh	28 Jun 2010 20:53:49 -0000
>@@ -1,6 +1,6 @@
> #!/bin/sh
> ############################################################################### 
>-# Copyright (c) 2008 IBM Corporation and others.
>+# Copyright (c) 2008, 2010 IBM Corporation and others.
> # All rights reserved.   This program and the accompanying materials
> # are made available under the terms of the Eclipse Public License v1.0
> # which accompanies this distribution, and is available at
>@@ -11,45 +11,85 @@
> # IBM - Initial API and implementation
> ###############################################################################
> 
>-export runType=$1
>-export tptpRelease=$2
>-export propertyFile=$3
>-export reportStartTime=$4
>-export reportEndTime=$5
> 
> if [ "$#" -lt 3 ]; then
>-    echo -e "Usage:\n\t$0 <type of run> <release> <property file> [ <report start time> <report end time> ], e.g. $0 bvt|report 4.5.0 `pwd`\test.properties [ \"`date +\"%m/%d/%Y %l:%M %P\"`\"  \"`date +\"%m/%d/%Y %l:%M %P\"`\" ]"
>+    echo -e "Usage:\n\t$0 --runType=<type of run> --tptpRelease=<release> --propertyFile=<property file> \
>+    [ --jreList=<jre list> --reportStartTime=<report start time> --reportEndTime=<report end time> ], \
>+    e.g. $0 --runType=bvt|report --tptpRelease=4.5.0 --propertyFile=`pwd`/test.properties \
>+    [ --jreList=jre1.4,jre1.5 --reportStartTime=\"`date +\"%m/%d/%Y %l:%M %P\"`\" --reportEndTime=\"`date +\"%m/%d/%Y %l:%M %P\"`\" ]"
>     exit 1
> fi
> 
>+# Setup the environment variables, modified from org.eclipse.hyades.releng.builder/master/bash/convert-parameters-into-variables.sf
>+for i in "$@"; do
>+	attr=$( echo "$i" | grep '^--[^=]\+=.\+' | sed -e 's/^--$.*$/\1/')
>+	if [ -n "$attr" ]; then
>+		export "$attr"
>+	fi
>+done
>+
>+# Verify the required variables, modified from org.eclipse.hyades.releng.builder/master/bash/verify-environment-variables.sf
>+for i in "$@"; do
>+	attr=$( echo "$i" | grep '^--[^=]\+=.\+' | sed -e 's/^--$.*$/\1/')
>+	tmp=${runType:?"undefined run type"}
>+	tmp=${tptpRelease:?"undefined TPTP release"}
>+	tmp=${propertyFile:?"undefined property file"}
>+done
>+
> if [ "$runType" = "report" ]; then
>+	# JRE List not required, so reset the values
>     if [ x"$reportStartTime" != x ]; then
>-        ./setup.sh $runType $tptpRelease $propertyFile "$reportStartTime"
>+        ./setup.sh --runType=$runType --tptpRelease=$tptpRelease --propertyFile=$propertyFile --reportStartTime="$reportStartTime"
>     else
>         echo "No start time set"
>         exit 1
>     fi
> elif [ "$runType" = "bvt" ]; then
>-    export currentDate=`date +%Y%m%d`
> 
>-    wget http://www.eclipse.org/tptp/home/downloads/publish_$tptpRelease.txt
>+	# make sure no other bvt is currently running on the machine
>+	if [ -e .busy ]; then echo ".busy file found - a BVT is currently running on the machine"; exit 1; else echo "`date` - BVT Run" > .busy; fi
> 
>-    export tptpDriver=`cat publish_$tptpRelease.txt | grep development | grep $currentDate | head -n1 | cut -d\| -f2`
>+	# Verify the required variables, modified from org.eclipse.hyades.releng.builder/master/bash/verify-environment-variables.sf
>+	for i in "$@"; do
>+		attr=$( echo "$i" | grep '^--[^=]\+=.\+' | sed -e 's/^--$.*$/\1/')
>+		tmp=${jreList:?"undefined run type"}
>+	done
>+
>+    wget http://www.eclipse.org/tptp/home/downloads/$tptpRelease/publish_$tptpRelease.txt
>+
>+    # Find out what the latest dev driver is
>+    export tptpDriver=`cat publish_$tptpRelease.txt | grep development | head -1  | head -n1 | cut -d\| -f2`
>+    # OR comment above line, uncomment below line, and manually set to run on a specific driver specific below
>+    #tptpDriver=TPTP-4.6.2-200910311900
>+    # Set the date
>+    export currentDate=`echo $tptpDriver | cut -d- -f3`
> 
>     rm publish_$tptpRelease.txt
> 
>     if [ x"$tptpDriver" != x ]; then
>-        ssh tptp "cd /home/data/httpd/download.eclipse.org/tptp/$tptpRelease/dev/$tptpDriver; if [ -e .bvt ]; then echo "BVT lock file found"; exit 1; else echo \"`date` - BVT started\" > .bvt; fi"
>+        ssh tptp "if [ ! -e /home/data/httpd/download.eclipse.org/tptp/$tptpRelease/dev/$tptpDriver ]; then echo "Directory does not exist"; exit 1; fi; cd /home/data/httpd/download.eclipse.org/tptp/$tptpRelease/dev/$tptpDriver; if [ -e .bvt ]; then echo "BVT lock file found"; exit 1; else echo \"`date` - BVT started\" > .bvt; fi"
> 
>         if [ $? -eq 1 ]; then
>-            echo "BVT already in progress";
>+            echo "BVT already in progress for driver $tptpDriver";
>+	    rm -f .busy
>             exit 1
>         fi
>-        ./setup.sh $runType $tptpRelease $propertyFile $tptpDriver "$reportStartTime"
>-        ssh tptp "cd /home/data/httpd/download.eclipse.org/tptp/$tptpRelease/dev/$tptpDriver; echo \"`date` - BVT completed\" >> .bvt"
>+        
>+        logFile=$(mktemp bvtlog.XXXXXX)
>+
>+        ./setup.sh --runType=$runType --tptpRelease=$tptpRelease --propertyFile=$propertyFile --tptpDriver=$tptpDriver --jreList=$jreList --reportStartTime="$reportStartTime" > $logFile 2>&1
>+		ssh tptp "cd /home/data/httpd/download.eclipse.org/tptp/$tptpRelease/dev/$tptpDriver; echo \"`date` - BVT completed\" >> .bvt"
>+        # Copy the log
>+
>+	# Workaround: for some reason scp keeps the files permission of the tmp file so it can't be read on the web.
>+	chmod 664 $logFile
>+    scp $logFile tptp:/home/data/httpd/download.eclipse.org/tptp/$tptpRelease/dev/$tptpDriver/BVT/bvtlog.txt
>+	rm $logFile
>+	rm -f .busy
>     else
>         echo "No driver to test"
>+	rm -f .busy
>     fi
> else
>     echo "Invalid argument provided."
>-fi
>\ No newline at end of file
>+fi
>Index: org/eclipse/tptp/platform/releng/tools/testautomation/setup.sh
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.releng.tools/org/eclipse/tptp/platform/releng/tools/testautomation/setup.sh,v
>retrieving revision 1.1
>diff -u -r1.1 setup.sh
>--- org/eclipse/tptp/platform/releng/tools/testautomation/setup.sh	25 Feb 2008 16:43:11 -0000	1.1
>+++ org/eclipse/tptp/platform/releng/tools/testautomation/setup.sh	28 Jun 2010 20:53:49 -0000
>@@ -1,6 +1,6 @@
> #!/bin/sh
> ############################################################################### 
>-# Copyright (c) 2008 IBM Corporation and others.
>+# Copyright (c) 2008, 2010 IBM Corporation and others.
> # All rights reserved.   This program and the accompanying materials
> # are made available under the terms of the Eclipse Public License v1.0
> # which accompanies this distribution, and is available at
>@@ -12,60 +12,112 @@
> ###############################################################################
> 
> #eclipse\plugins\com.jcraft.jsch_*.jar and ant-tptp.jar will be added to your ant's lib folder by the build.xml script during setupLocalMachine for Test Automation
>-export ANT_HOME=/home/build/apache-ant-1.7.0
>-export JAVA_HOME=/opt/ibm/ibm-java2-i386-50
>-export PATH=$JAVA_HOME/bin:$PATH:$ANT_HOME/bin
>+export ANT_HOME=
>+export JAVA_HOME=
> 
>-export runType=$1
>-export tptpRelease=$2
>-export propertyFile=$3
>-export tptpDriver=$4
>-export reportStartTime=$5
>-export reportEndTime=$6
>+if [ x"$ANT_HOME" == x ]; then
>+    echo "Ant home has not been set"
>+    exit 1
>+    
>+elif [ x"$JAVA_HOME" == x ]; then
>+	echo "Java home has not been set"
>+    exit 1
>+fi
> 
>+export PATH=$JAVA_HOME/bin:$PATH:$ANT_HOME/bin
> 
> if [ $# -lt 3 ]; then
>-    echo -e "Usage:\n\t$0 <type of run> <release> <property file> [ <driver> <report start time> <report end time> ], e.g. $0 bvt|report 4.5.0 `pwd`\test.properties [ TPTP-4.5.0-200711050917 \"`date +\"%m/%d/%Y %l:%M %P\"`\" \"`date +\"%m/%d/%Y %l:%M %P\"`\" ]"
>+    echo -e "Usage:\n\t$0 --runType=<type of run> --tptpRelease=<release> --propertyFile=<property file> \
>+    [ --tptpDriver=<driver> --jreList=<JRE list> --reportStartTime=<report start time> --reportEndTime=<report end time> ], \
>+    e.g. $0 --runType=bvt|report --tptpRelease=4.5.0 --propertyFile=`pwd`/test.properties [ --tptpDriver=TPTP-4.5.0-200711050917 \
>+    --jreList=jre1.4,jre1.5 --reportStartTime=\"`date +\"%m/%d/%Y %l:%M %P\"`\" --reportEndTime=\"`date +\"%m/%d/%Y %l:%M %P\"`\" ]"
>     exit 1
> fi
> 
>+# Setup the environment variables, modified from org.eclipse.hyades.releng.builder/master/bash/convert-parameters-into-variables.sf
>+for i in "$@"; do
>+	attr=$( echo "$i" | grep '^--[^=]\+=.\+' | sed -e 's/^--$.*$/\1/')
>+	if [ -n "$attr" ]; then
>+		export "$attr"
>+	fi
>+done
>+
>+# Verify the required variables, modified from org.eclipse.hyades.releng.builder/master/bash/verify-environment-variables.sf
>+for i in "$@"; do
>+	attr=$( echo "$i" | grep '^--[^=]\+=.\+' | sed -e 's/^--$.*$/\1/')
>+	tmp=${runType:?"undefined run type"}
>+	tmp=${tptpRelease:?"undefined TPTP release"}
>+	tmp=${propertyFile:?"undefined property file"}
>+done
>+
> if [ $runType = "bvt" ]; then
>+	for i in "$@"; do
>+		attr=$( echo "$i" | grep '^--[^=]\+=.\+' | sed -e 's/^--$.*$/\1/')
>+		tmp=${tptpDriver:?"undefined TPTP target driver"}
>+		tmp=${jreList:?"undefined JRE list"}
>+	done
>     echo "Setting up the dependencies"
> 
>     ./dependencySetup.sh $tptpRelease $tptpDriver
>+    ant -Dproperty_file=$propertyFile cleanupReports
> 
>-    #Setup the remote host and local hosts
>+    #Setup the local host
>     ant -Dproperty_file=$propertyFile setupBVT
>     if [ $? -ne 0 ]; then
>         echo "Setup failed"
>         exit 1
>     fi
>-    ant -Dproperty_file=$propertyFile runTests
>-    if [ $? -ne 0 ]; then
>-        echo "Test run failed"
>-        exit 1
>-    fi
>+
>+    tptpAllInOne="tptp.runtime.ti.allInOne.win32.win32.x86-$tptpDriver.zip"
>+    
>+    for jre in `echo $jreList |  sed s/,/\\\n/g`; do
>+        # Configure the local and remote machine and run the tests.
>+        ant -Dproperty_file=$propertyFile -DtargetJRE=$jre -DtptpDriver=$tptpAllInOne import
>+	    
>+	    #Setup the artifact, temporary solution for deployment
>+	    #For details see the README.txt in /org.eclipse.hyades.tests/resources/org.eclipse.hyades.tests.bvt.local.initializer_1.0.0.jar
>+	    echo "Setting up the artifacts"
>+	    cp ../workspace/org.eclipse.hyades.tests/resources/org.eclipse.hyades.tests.bvt.local.initializer_1.0.0.jar ../workbench/eclipse/dropins
>+	    ../workbench/eclipse/eclipse -clean -nosplash -application org.eclipse.hyades.tests.bvt.local.initializer.application -data ../workspace -vmargs -Dverbose=true
>+        
>+        ant -Dproperty_file=$propertyFile -DtargetJRE=$jre -DtptpDriver=$tptpAllInOne runTests
>+        if [ $? -ne 0 ]; then
>+            echo "Test run failed"
>+            exit 1
>+        fi
>+    done
> 
>     ant -Dproperty_file=$propertyFile copyBVTReport
>     ant -Dproperty_file=$propertyFile cleanupRemote
>     ant -Dproperty_file=$propertyFile cleanupLocal
>+    ant -Dproperty_file=$propertyFile cleanupDownloads
>     rm dependencies.properties
> elif [ $runType = "report" ]; then
>-    # Driver not required, so reset the values
>-    export reportStartTime=$4
>-    export reportEndTime=$5
>+
>+	# Verify the required variables, modified from org.eclipse.hyades.releng.builder/master/bash/verify-environment-variables.sf
>+	for i in "$@"; do
>+		attr=$( echo "$i" | grep '^--[^=]\+=.\+' | sed -e 's/^--$.*$/\1/')
>+		tmp=${reportStartTime:?"undefined report start time"}
>+		#tmp=${reportEndTime:?"undefined report end time"}
>+		if [ x"$reportEndTime" != x ]; then
>+			tmp=${reportEndTime:?"undefined report end time"}
>+		fi
>+		# tmp=${reportEndTime:?"undefined report end time"}
>+	done
>+    # Driver and jreList not required, so reset the values
>     
>-    if [ x"$reportStartTime" = x ]; then
>-        echo "No start time set"
>-        exit 1
>-    fi
>     ant -Dproperty_file=$propertyFile setupReport
>     if [ $? -ne 0 ]; then
>         echo "Setup failed"
>         ant -Dproperty_file=$propertyFile cleanupWorkspace
>         exit 1
>     fi
>-    ant -DstartTime="$reportStartTime" -Dproperty_file=$propertyFile publishReport
>+    if [ x"$reportEndTime" != x ]; then
>+        ant -DstartTime="$reportStartTime" -DendTime="$reportEndTime" -Dproperty_file=$propertyFile publishReport
>+    else
>+        ant -DstartTime="$reportStartTime" -Dproperty_file=$propertyFile publishReport
>+    fi
>+    #ant -DstartTime="$reportStartTime" -DendTime="$reportEndTime" -Dproperty_file=$propertyFile publishReport
>     if [ $? -ne 0 ]; then
>         echo "Reporting failed"
>         ant -Dproperty_file=$propertyFile cleanupWorkspace
>Index: org/eclipse/tptp/platform/releng/tools/testautomation/test.properties
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.releng.tools/org/eclipse/tptp/platform/releng/tools/testautomation/test.properties,v
>retrieving revision 1.1
>diff -u -r1.1 test.properties
>--- org/eclipse/tptp/platform/releng/tools/testautomation/test.properties	25 Feb 2008 16:43:10 -0000	1.1
>+++ org/eclipse/tptp/platform/releng/tools/testautomation/test.properties	28 Jun 2010 20:53:49 -0000
>@@ -1,5 +1,5 @@
> ############################################################################### 
>-# Copyright (c) 2008 IBM Corporation and others.
>+# Copyright (c) 2008, 2010 IBM Corporation and others.
> # All rights reserved.   This program and the accompanying materials
> # are made available under the terms of the Eclipse Public License v1.0
> # which accompanies this distribution, and is available at
>@@ -15,12 +15,7 @@
> user=
> keyfile=
> dir=
>-
>-# Remote machine AC configuration
>-acUser=
>-acPassword=
>-cygwinACPath=
>-javaLocation=
>+cygwinPath=
> 
> # Report results storage location
> reportLocation=${basedir}/reports
>@@ -30,8 +25,7 @@
> reportCheckinDirectory=
> 
> #BVT Report information for copying the results
>-reportHostname=
>-reportUser=
>+reportHost=
> 
> # Workspace location e.g. /home/user/workspace
> tptp.test.workspace=
>@@ -45,9 +39,10 @@
> 
> # Test driver and project, an exclude must be defined so all tests are not excluded
> # or a non-existant test if only certain tests are to be excluded and the remainder included
>-tptpDriver=${tptpWinDriver}
>+#tptpDriver=${tptpWinDriver}
>+acDriver=${acWinDriver}
> testSuite=
>-excludeTestSuite=Smoke
>+excludeTestSuite=AllBVTxUnit
> testProject=org.eclipse.hyades.tests
> 
> tempDir=${basedir}/temp

Actions: View | Diff

Attachments on bug 211751: 172968 | 173785