Attachment #173785 for bug #211751

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




<!--

  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 

	<!-- Setup the location to store the BIRT Reports -->
	<property name="report.publication.location" location="${reportLocation}"/>

	<!-- Set the project property -->
	<property name="tptp.test.project" value="${testProject}" />
	
    <!-- import the tests into the workspace, configure the remote machine, run the tests, and update the test report -->
	<!-- import removed for artifact setup, call it first -->
	<target name="runTests" depends="configureRemoteMachine, runTestSuites, checkResults, publishBVTReport, checkInBVT" />

	<!-- Execute multiple test suites -->
	<target name="runTestSuites">
		<antcall target="time"/>
		<!-- BVT cannot run AGR, see bug 305325 -->
		<!-- Setup the location of the test suites -->
		<property name="project.dir" value="${tptp.test.workspace}/${tptp.test.project}" />
		<!-- <property name="tptp.test.connection" value="tptp:rac://${hostname}:10002" /> -->
		<property name="tptp.test.deployment" value="deployment/BVTDeployment.deploy" />

		<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"/>
				<!-- <file name="BVT/AllBVTGUITests_${targetJRE}.testsuite"/> -->
			</filelist>
		</tptp:execution>
	</target>

	<target name="checkResults">
		<antcall target="time"/>
		<echo message="Checking results"/>
		<condition property="tptp.test.success">
			<tptp:interrogation verdictproperty="tptp.test.verdict">
				<filelist refid="test_results_reference_ID"/>
			</tptp:interrogation>
		</condition>
		<echo message="The test results are: '${tptp.test.verdict}'"/>


	<!-- Publish report -->
	<target name="publishBVTReport">
		<antcall target="time"/>
	    <property name="tptp.publication.service" value="org.eclipse.tptp.test.report.birt.publish-tabular" />
	    <tptp:publication report="${report.publication.location}/${targetJRE}">
			<filelist refid="test_results_reference_ID"/>
			<filelist refid="tptp.test.results"/>
		</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}">

		</tptp:publication>
	</target>

    <!-- Download the drivers, create a local workbench and workspace, and extract the tests from CVS -->
    <target name="setupBVT" depends="getDrivers, setupLocalMachine, extractTests" />
    <target name="setupReport" depends="cleanupWorkspace, extractTests, import" />

	<target name="getDrivers" depends="cleanupDownloads">
		<antcall target="time"/>

		<!-- Create the working directories -->
	    <mkdir dir="${tempDir}" />

		<!-- Download the tptp all in one and update it with the additional dependencies -->
		<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" />
		<mkdir dir="${tempDir}/linuxAllInOne"/>
		<mkdir dir="${tempDir}/winAllInOne"/>
	
		<!-- Download TPTP first so As-Is overwrites empty plug-ins -->
		<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>
		
		<!-- Download the tptp all in one and update it with the additional dependencies -->
		<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}/${monitorReportBirtDriver}" />
		</antcall>
		
		<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="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="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="fetch.unzip">
			<param name="url" value="${dtpUrl}" />
			<param name="driver" value="${dtpDriver}" />
			<param name="srcDir" value="${tempDir}" />
			<param name="destDir" value="${tempDir}/dependencies" />
		</antcall>
		
		<!-- The eclipse project drivers are combined manually since the URL is generic to the project -->
		<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="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="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="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="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>

		<!-- Copy the plug-ins into the All In One -->
		<antcall target="copy">
		    <param name="baseDir" value="${tempDir}" />
		    <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}" />

		</antcall>

		<echo message="Updating Linux All-In-One" />
		
		<!-- Copy the plug-ins into the All In One -->
		    <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/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}" />

		    <param name="srcFolder" value="eclipse" />
		</antcall>

		<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}" />

	</target>

	<target name="setupLocalMachine">
	    <antcall target="time"/>
	    <echo message="Cleaning up Local Machine before setup" />
	    <antcall target="cleanupLocal" />
	    <antcall target="copy">

	            <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">

		<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}/${acDriver}" todir="${user}@${hostname}:${dir}/ac/" 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" />
        <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"/>
        <!-- Remove download directory -->
        <echo message="Removing download directory" />
        <delete dir="${tempDir}" failonerror="false" />
    </target>

    <target name="cleanupLocal" depends="cleanupWorkspace">
        <!-- Remove eclipse -->
        <echo message="Removing eclipse directory" />
        <delete dir="${eclipse.home}" failonerror="false" />

    </target>

	<target name="extractTests">
		<antcall target="time"/>
		<echo message="Extracting Monitor"/>
		<echo message="nothing to extract, skipping" />
		<!-- No monitor tests, if tests are added update import to include this directory -->
		<!--<delete dir="monitor" failonerror="false" />-->
		<!--<cvs command="-d ${cvs.login}:/cvsroot/tptp co -r ${cvsBranch} -d monitor test-results/monitor" reallyquiet="true"/>-->

		<echo message="Extracting Platform" />
		<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" />
		<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" />
		<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="monitor/" /> No monitor tests, if any are checked out, add this back -->
        	<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="Cleaning up extract" />
		<delete dir="monitor" />
		<delete dir="platform" />
		<delete dir="test" />
		<delete dir="trace" />
	</target>

	<target name="import">
		<echo message="Before import into workspace"/>
		<tptp:importExistingProjects>
			<fileset dir="${tptp.test.workspace}">

		<echo message="After import into workspace"/>
	</target>

	<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" />
		<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" />
		<!-- add a test condition based on the result to exit with an error if it is not running -->
		<sshexec host="${hostname}" username="${user}" command="ps -ef | grep ACServer | wc -l" keyfile="${keyfile}" passphrase="" trust="true" />
	        <pathelement location="bin/ganymed-ssh2-build211beta4.jar"/>
	     </classpath>
	     <arg value="${javaLocation}" />
	     <arg value="${acUser}" />
	     <arg value="${acPassword}" />
	     <arg value="${cygwinACPath}" />
	    </java>
	</target>

	<target name="checkInReport">
	    <mkdir dir="${basedir}/${reportCheckinDirectory}" />
	    <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" />

	</target>

	<target name="copyBVTReport">
		<exec executable="bash">
			<arg line="-c \'scp -r -i ${keyfile} ${reportLocation}/* ${reportHost}:${remoteReportLocation}\'" />
		</exec>
	</target>

    <target name="checkInBVT">
		<antcall target="time"/>
		<!-- Look into handling for branches -->
		<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>




#!/bin/sh
############################################################################### 
# 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

    exit 1
fi

export baseURL="http://download.eclipse.org"
export baseArchiveURL="http://archive.eclipse.org"
export common=tptp/$tptpRelease/dev/$tptpDriver
export commonRelease=tptp/$tptpRelease/$tptpDriver
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 -O dependencies.txt http://www.eclipse.org/tptp/home/downloads/?buildId=$tptpDriver

echo "#Driver dependencies" > dependencies.properties
echo "release=$tptpRelease" >> dependencies.properties

#Download drivers for setup
echo "Getting TPTP Drivers"

#TPTP Runtime All Plugins
export tptpAllUrl=$baseURL/$common/tptp.runtime-$tptpDriver.zip
wget --spider $tptpAllUrl -o bvt$tptpDriver.log

error=`grep -c 404: bvt$tptpDriver.log`
if [ $error != 0 ]; then
    export tptpAllUrl=$baseURL/$commonRelease/tptp.runtime-$tptpDriver.zip
fi

echo "tptpAllUrl=$tptpAllUrl" >> dependencies.properties
echo "tptpAllDriver=tptp.runtime-$tptpDriver.zip" >> 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


#Windows Agent Controller
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=$baseURL/$common/agntctrl.win_ia32-$tptpDriver.zip
fi

echo "acWinUrl=$acWinUrl" >> dependencies.properties
echo "acWinDriver=agntctrl.win_ia32-$tptpDriver.zip" >> dependencies.properties

#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 acLinuxUrl=$baseURL/$common/agntctrl.linux_ia32-$tptpDriver.zip
fi

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


error=`grep -c 404: bvt$tptpDriver.log`
if [ $error != 0 ]; then
    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=$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=$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

# 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
echo "cdtDriver=`grep cdt mydependencies.txt | cut -d">" -f2 | cut -d"<" -f1`" >> dependencies.properties

rm dependencies.txt mydependencies.txt bvt$tptpDriver.log

Lines 1-6 Link Here

(-)org/eclipse/tptp/platform/releng/tools/testautomation/nightly.sh (-18 / +70 lines)
1	#!/bin/sh	1	#!/bin/sh
2	###############################################################################	2	###############################################################################
3	# Copyright (c) 2008 IBM Corporation and others.	3	# Copyright (c) 2008, 2010 IBM Corporation and others.
4	# All rights reserved. This program and the accompanying materials	4	# All rights reserved. This program and the accompanying materials
5	# are made available under the terms of the Eclipse Public License v1.0	5	# are made available under the terms of the Eclipse Public License v1.0
6	# which accompanies this distribution, and is available at	6	# which accompanies this distribution, and is available at
Lines 11-55 Link Here
11	# IBM - Initial API and implementation	11	# IBM - Initial API and implementation
12	###############################################################################	12	###############################################################################
13		13
14	export runType=$1
15	export tptpRelease=$2
16	export propertyFile=$3
17	export reportStartTime=$4
18	export reportEndTime=$5
19
20	if [ "$#" -lt 3 ]; then	14	if [ "$#" -lt 3 ]; then
21	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\"`\" ]"	15	echo -e "Usage:\n\t$0 --runType=<type of run> --tptpRelease=<release> --propertyFile=<property file> \
		16	[ --jreList=<jre list> --reportStartTime=<report start time> --reportEndTime=<report end time> ], \
		17	e.g. $0 --runType=bvt\|report --tptpRelease=4.5.0 --propertyFile=`pwd`/test.properties \
		18	[ --jreList=jre1.4,jre1.5 --reportStartTime=\"`date +\"%m/%d/%Y %l:%M %P\"`\" --reportEndTime=\"`date +\"%m/%d/%Y %l:%M %P\"`\" ]"
22	exit 1	19	exit 1
23	fi	20	fi
24		21
		22	# Setup the environment variables, modified from org.eclipse.hyades.releng.builder/master/bash/convert-parameters-into-variables.sf
		23	for i in "$@"; do
		24	attr=$( echo "$i" \| grep '^--[^=]\+=.\+' \| sed -e 's/^--$.*$/\1/')
		25	if [ -n "$attr" ]; then
		26	export "$attr"
		27	fi
		28	done
		29
		30	# Verify the required variables, modified from org.eclipse.hyades.releng.builder/master/bash/verify-environment-variables.sf
		31	for i in "$@"; do
		32	attr=$( echo "$i" \| grep '^--[^=]\+=.\+' \| sed -e 's/^--$.*$/\1/')
		33	tmp=${runType:?"undefined run type"}
		34	tmp=${tptpRelease:?"undefined TPTP release"}
		35	tmp=${propertyFile:?"undefined property file"}
		36	done
		37
25	if [ "$runType" = "report" ]; then	38	if [ "$runType" = "report" ]; then
		39	# JRE List not required, so reset the values
26	if [ x"$reportStartTime" != x ]; then	40	if [ x"$reportStartTime" != x ]; then
27	./setup.sh $runType $tptpRelease $propertyFile "$reportStartTime"	41	./setup.sh --runType=$runType --tptpRelease=$tptpRelease --propertyFile=$propertyFile --reportStartTime="$reportStartTime"
28	else	42	else
29	echo "No start time set"	43	echo "No start time set"
30	exit 1	44	exit 1
31	fi	45	fi
32	elif [ "$runType" = "bvt" ]; then	46	elif [ "$runType" = "bvt" ]; then
33	export currentDate=`date +%Y%m%d`
34		47
35	wget http://www.eclipse.org/tptp/home/downloads/publish_$tptpRelease.txt	48	# make sure no other bvt is currently running on the machine
		49	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
36		50
37	export tptpDriver=`cat publish_$tptpRelease.txt \| grep development \| grep $currentDate \| head -n1 \| cut -d\\| -f2`	51	# Verify the required variables, modified from org.eclipse.hyades.releng.builder/master/bash/verify-environment-variables.sf
		52	for i in "$@"; do
		53	attr=$( echo "$i" \| grep '^--[^=]\+=.\+' \| sed -e 's/^--$.*$/\1/')
		54	tmp=${jreList:?"undefined run type"}
		55	done
		56
		57	wget http://www.eclipse.org/tptp/home/downloads/$tptpRelease/publish_$tptpRelease.txt
		58
		59	# Find out what the latest dev driver is
		60	export tptpDriver=`cat publish_$tptpRelease.txt \| grep development \| head -1 \| head -n1 \| cut -d\\| -f2`
		61	# OR comment above line, uncomment below line, and manually set to run on a specific driver specific below
		62	#tptpDriver=TPTP-4.6.2-200910311900
		63	# Set the date
		64	export currentDate=`echo $tptpDriver \| cut -d- -f3`
38		65
39	rm publish_$tptpRelease.txt	66	rm publish_$tptpRelease.txt
40		67
41	if [ x"$tptpDriver" != x ]; then	68	if [ x"$tptpDriver" != x ]; then
42	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"	69	ssh tptp "if [ ! -e /home/data/httpd/download.eclipse.org/tptp/$tptpRelease/dev/$tptpDriver ]; then echo "Driver does not exist under dev directory"; exit 1; fi;
43		70	cd /home/data/httpd/download.eclipse.org/tptp/$tptpRelease/dev/$tptpDriver; if [ -e .bvt ]; then echo "BVT lock file found"; exit 2; else echo \"`date` - BVT started\" > .bvt; fi"
		71	export common=tptp/$tptpRelease/dev/$tptpDriver
44	if [ $? -eq 1 ]; then	72	if [ $? -eq 1 ]; then
45	echo "BVT already in progress";	73	ssh tptp "if [ ! -e /home/data/httpd/download.eclipse.org/tptp/$tptpRelease/$tptpDriver ]; then echo "Driver does not exist at all"; exit 3; fi;
		74	cd /home/data/httpd/download.eclipse.org/tptp/$tptpRelease/$tptpDriver; if [ -e .bvt ]; then echo "BVT lock file found"; exit 2; else echo \"`date` - BVT started\" > .bvt; fi"
		75	export common=tptp/$tptpRelease/$tptpDriver
		76	fi
		77
		78	if [ $? -eq 3 ]; then
		79	echo "No tptpDriver is found";
		80	rm -f .busy
46	exit 1	81	exit 1
47	fi	82	fi
48	./setup.sh $runType $tptpRelease $propertyFile $tptpDriver "$reportStartTime"	83
49	ssh tptp "cd /home/data/httpd/download.eclipse.org/tptp/$tptpRelease/dev/$tptpDriver; echo \"`date` - BVT completed\" >> .bvt"	84	if [ $? -eq 2 ]; then
		85	echo "BVT already in progress for driver $tptpDriver";
		86	rm -f .busy
		87	exit 1
		88	fi
		89
		90	logFile=$(mktemp bvtlog.XXXXXX)
		91
		92	./setup.sh --runType=$runType --tptpRelease=$tptpRelease --propertyFile=$propertyFile --tptpDriver=$tptpDriver --jreList=$jreList --reportStartTime="$reportStartTime" > $logFile 2>&1
		93	ssh tptp "cd /home/data/httpd/download.eclipse.org/$common; echo \"`date` - BVT completed\" >> .bvt"
		94	# Copy the log
		95
		96	# Workaround: for some reason scp keeps the files permission of the tmp file so it can't be read on the web.
		97	chmod 664 $logFile
		98	scp $logFile tptp:/home/data/httpd/download.eclipse.org/$common/BVT/bvtlog.txt
		99	rm $logFile
		100	rm -f .busy
50	else	101	else
51	echo "No driver to test"	102	echo "No driver to test"
		103	rm -f .busy
52	fi	104	fi
53	else	105	else
54	echo "Invalid argument provided."	106	echo "Invalid argument provided."
55	fi	107	fi

Lines 142-147 Link Here

(-)org/eclipse/tptp/platform/releng/tools/testautomation/readme.html (+1 lines)
142	<b>reportDirectory=TP1</b><sup>2</sup> - The containing directory within the project where the test suites are located.<br/>	142	<b>reportDirectory=TP1</b><sup>2</sup> - The containing directory within the project where the test suites are located.<br/>
143	<b>reportCheckinDirectory</b><sup>2</sup> - The containing directory to store the reports for check-in.<br/>	143	<b>reportCheckinDirectory</b><sup>2</sup> - The containing directory to store the reports for check-in.<br/>
144	<b>reportHost</b><sup>1</sup> - The hostname of the machine to copy the test automation reports to.<br/>	144	<b>reportHost</b><sup>1</sup> - The hostname of the machine to copy the test automation reports to.<br/>
		145	<b>remoteReportLocation</b><sup>1</sup> - Copy the results to the remote web server, for example, /home/user/www/${driverPath}/BVT.<br/>
145	<br/>	146	<br/>
146		147
147	<b>tptp.test.workspace</b><sup>1,2</sup> - The location to create the workspace on the local machine.<br/>	148	<b>tptp.test.workspace</b><sup>1,2</sup> - The location to create the workspace on the local machine.<br/>




#!/bin/sh
############################################################################### 
# 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

###############################################################################

#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=
export JAVA_HOME=
export PATH=$JAVA_HOME/bin:$PATH:$ANT_HOME/bin

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 --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 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.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
        ssh tptp "if [ -e /home/data/httpd/download.eclipse.org/tptp/$tptpRelease/dev/$tptpDriver ]; then exit 1; fi"
        if [ $? -eq 1 ]; then
         	export common=tptp/$tptpRelease/dev/$tptpDriver; 
		else
			export common=tptp/$tptpRelease/$tptpDriver;
		fi
                   
  
    ant -Dproperty_file=$propertyFile -DdriverPath=$common copyBVTReport
    ant -Dproperty_file=$propertyFile cleanupRemote
    ant -Dproperty_file=$propertyFile cleanupLocal
    ant -Dproperty_file=$propertyFile cleanupDownloads
    rm dependencies.properties
elif [ $runType = "report" ]; then

	# 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
    if [ x"$reportEndTime" != x ]; then
        ant -DstartTime="$reportStartTime" -DendTime="$reportEndTime" -Dproperty_file=$propertyFile publishReport
    else
        ant -DstartTime="$reportStartTime" -Dproperty_file=$propertyFile publishReport
    fi
    if [ $? -ne 0 ]; then
        echo "Reporting failed"
        ant -Dproperty_file=$propertyFile cleanupWorkspace

Lines 1-5 Link Here

(-)org/eclipse/tptp/platform/releng/tools/testautomation/test.properties (-11 / +9 lines)
1	###############################################################################	1	###############################################################################
2	# Copyright (c) 2008 IBM Corporation and others.	2	# Copyright (c) 2008, 2010 IBM Corporation and others.
3	# All rights reserved. This program and the accompanying materials	3	# All rights reserved. This program and the accompanying materials
4	# are made available under the terms of the Eclipse Public License v1.0	4	# are made available under the terms of the Eclipse Public License v1.0
5	# which accompanies this distribution, and is available at	5	# which accompanies this distribution, and is available at
Lines 15-26 Link Here
15	user=	15	user=
16	keyfile=	16	keyfile=
17	dir=	17	dir=
18		18	cygwinPath=
19	# Remote machine AC configuration
20	acUser=
21	acPassword=
22	cygwinACPath=
23	javaLocation=
24		19
25	# Report results storage location	20	# Report results storage location
26	reportLocation=${basedir}/reports	21	reportLocation=${basedir}/reports
Lines 30-37 Link Here
30	reportCheckinDirectory=	25	reportCheckinDirectory=
31		26
32	#BVT Report information for copying the results	27	#BVT Report information for copying the results
33	reportHostname=	28	reportHost=
34	reportUser=	29
		30	#Copy the results to the remote web server, for example, /home/user/www/${driverPath}/BVT
		31	remoteReportLocation=
35		32
36	# Workspace location e.g. /home/user/workspace	33	# Workspace location e.g. /home/user/workspace
37	tptp.test.workspace=	34	tptp.test.workspace=
Lines 45-53 Link Here
45		42
46	# Test driver and project, an exclude must be defined so all tests are not excluded	43	# Test driver and project, an exclude must be defined so all tests are not excluded
47	# or a non-existant test if only certain tests are to be excluded and the remainder included	44	# or a non-existant test if only certain tests are to be excluded and the remainder included
48	tptpDriver=${tptpWinDriver}	45	#tptpDriver=${tptpWinDriver}
		46	acDriver=${acWinDriver}
49	testSuite=	47	testSuite=
50	excludeTestSuite=Smoke	48	excludeTestSuite=AllBVTxUnit
51	testProject=org.eclipse.hyades.tests	49	testProject=org.eclipse.hyades.tests
52		50
53	tempDir=${basedir}/temp	51	tempDir=${basedir}/temp

Return to bug 211751