Attachment #92092 for bug #208021

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

Lines 70-76 Link Here

(-)eclipse/buildConfigs/sdk.tests/testScripts/test.xml (-9 / +12 lines)
70	eclipse/plugins/org.eclipse.ant.optional.junit_*	70	eclipse/plugins/org.eclipse.ant.optional.junit_*
71	${testPluginsRequired}	71	${testPluginsRequired}
72	-x eclipse/plugins/.source/**	72	-x eclipse/plugins/.source/**
73	-d ${install}" />	73	-d ${install}/eclipse/dropins/" />
74	</exec>	74	</exec>
75	</target>	75	</target>
76		76
Lines 220-229 Link Here
220	</target>	220	</target>
221	<target name="configureTeamTest" if="teamcvs">	221	<target name="configureTeamTest" if="teamcvs">
222	<!-- Fill in cvs repository information -->	222	<!-- Fill in cvs repository information -->
223	<replace file="${eclipse-home}/plugins/${org.eclipse.team.tests.cvs.core}/repository.properties" token="@user@" value="${cvs_user}" />	223	<replace file="${eclipse-home}/dropins/eclipse/plugins/${org.eclipse.team.tests.cvs.core}/repository.properties" token="@user@" value="${cvs_user}" />
224	<replace file="${eclipse-home}/plugins/${org.eclipse.team.tests.cvs.core}/repository.properties" token="@password@" value="${cvs_password}" />	224	<replace file="${eclipse-home}/dropins/eclipse/plugins/${org.eclipse.team.tests.cvs.core}/repository.properties" token="@password@" value="${cvs_password}" />
225	<replace file="${eclipse-home}/plugins/${org.eclipse.team.tests.cvs.core}/repository.properties" token="@host@" value="${cvs_host}" />	225	<replace file="${eclipse-home}/dropins/eclipse/plugins/${org.eclipse.team.tests.cvs.core}/repository.properties" token="@host@" value="${cvs_host}" />
226	<replace file="${eclipse-home}/plugins/${org.eclipse.team.tests.cvs.core}/repository.properties" token="@root@" value="${cvs_root}" />	226	<replace file="${eclipse-home}/dropins/eclipse/plugins/${org.eclipse.team.tests.cvs.core}/repository.properties" token="@root@" value="${cvs_root}" />
227	</target>	227	</target>
228		228
229	<target name="configureDeltaPack" if="pdebuild">	229	<target name="configureDeltaPack" if="pdebuild">
Lines 257-264 Link Here
257	<property name="test.target" value="junit" />	257	<property name="test.target" value="junit" />
258	<property name="report" value="@{testPlugin}" />	258	<property name="report" value="@{testPlugin}" />
259		259
		260	<!--library.xml is now in dropins folder -->
		261	<property name="library-file" value="${eclipse-home}/dropins/eclipse/plugins/org.eclipse.test/library.xml"/>
		262
260	<!--install Cloudscape plug-ins if running performance tests-->	263	<!--install Cloudscape plug-ins if running performance tests-->
261	<condition property="derby" value="eclipse/plugins/Cloudscape/ ">	264	<condition property="derby" value="eclipse/dropins/eclipse/plugins/Cloudscape/ ">
262	<equals arg1="${test.target}" arg2="performance" />	265	<equals arg1="${test.target}" arg2="performance" />
263	</condition>	266	</condition>
264	<property name="derby" value="" />	267	<property name="derby" value="" />
Lines 272-290 Link Here
272		275
273	<target name="junit" unless="skip.test">	276	<target name="junit" unless="skip.test">
274	<antcall target="setup" />	277	<antcall target="setup" />
275	<ant antfile="${eclipse-home}/plugins/${testPlugin}/test.xml" dir="${eclipse-home}" />	278	<ant antfile="${eclipse-home}/dropins/eclipse/plugins/${testPlugin}/test.xml" dir="${eclipse-home}" />
276	<antcall target="genResults" />	279	<antcall target="genResults" />
277	</target>	280	</target>
278		281
279	<target name="performance" if="performance.target.present" unless="skip.test">	282	<target name="performance" if="performance.target.present" unless="skip.test">
280	<antcall target="setup" />	283	<antcall target="setup" />
281	<ant antfile="${eclipse-home}/plugins/${testPlugin}/test.xml" dir="${eclipse-home}" target="performance" />	284	<ant antfile="${eclipse-home}/dropins/eclipse/plugins/${testPlugin}/test.xml" dir="${eclipse-home}" target="performance" />
282	<antcall target="genResults" />	285	<antcall target="genResults" />
283	</target>	286	</target>
284		287
285	<target name="genResults">	288	<target name="genResults">
286	<copy file="${eclipse-home}/${report}.xml" tofile="${results}/xml/${report}_${platform}.xml" failonerror="false" />	289	<copy file="${eclipse-home}/${report}.xml" tofile="${results}/xml/${report}_${platform}.xml" failonerror="false" />
287	<style style="${eclipse-home}/plugins/org.eclipse.test/JUNIT.XSL" basedir="${results}/xml" destdir="${results}/html" />	290	<style style="${eclipse-home}/dropins/eclipse/plugins/org.eclipse.test/JUNIT.XSL" basedir="${results}/xml" destdir="${results}/html" />
288	</target>	291	</target>
289		292
290	<target name="ant">	293	<target name="ant">

Lines 25-31 Link Here

(-)eclipse/buildConfigs/sdk.tests/testScripts/runtests.bat (-1 / +1 lines)
25	REM Install Eclipse if it does not exist	25	REM Install Eclipse if it does not exist
26	REM	26	REM
27	REM ****************************************************************	27	REM ****************************************************************
28	if NOT EXIST eclipse unzip -qq -o eclipse-SDK-.zip && unzip -qq -o -C eclipse-junit-tests.zip /plugins/org.eclipse.test	28	if NOT EXIST eclipse unzip -qq -o eclipse-SDK-.zip && unzip -qq -o -C eclipse-junit-tests.zip /plugins/org.eclipse.test -d eclipse/dropins/
29		29
30		30
31	:processcmdlineargs	31	:processcmdlineargs

Lines 71-77 Link Here

(-)eclipse/buildConfigs/sdk.tests/testScripts/runtests (-1 / +1 lines)
71	if [ ! -r eclipse ]	71	if [ ! -r eclipse ]
72	then	72	then
73	tar -xzf eclipse-SDK-*.tar.gz	73	tar -xzf eclipse-SDK-*.tar.gz
74	unzip -qq -o -C eclipse-junit-tests-.zip /plugins/org.eclipse.test*	74	unzip -qq -o -C eclipse-junit-tests-.zip /plugins/org.eclipse.test* -d eclipse/dropins/
75	fi	75	fi
76		76
77	# run tests	77	# run tests




	  	<!--set default jvm to use for testing-->
	   	<property name="jvm" value="${java.home}/bin/java" />
  	
		<echo message="Initializing test application..."/>

		<java fork="true" dir="." timeout="${timeout}" jvm="${jvm}" logError="true"
			classname="org.eclipse.core.launcher.Main" output="${junit-report-output}/${classname}.txt">

	            	<include name="org.eclipse.equinox.launcher_*.jar"/>
	          	</fileset>
	        </classpath>
		    <arg line="-initialize"/>
		    <arg line="-os ${os}"/>
		    <arg line="-ws ${ws}"/>
		    <arg line="-arch ${arch}"/>
		    <arg line="-consolelog"/>
		    <jvmarg line="${vmargs} ${extraVMargs}"/>
		    <sysproperty key="PLUGIN_PATH" value="${plugin-path}"/> 
		</java>
		
		<echo message="Running ${classname}. Result file: ${junit-report-output}/${classname}.xml."/>
		
		<java fork="true" dir="." timeout="${timeout}" jvm="${jvm}" logError="true"
			classname="org.eclipse.core.launcher.Main" output="${junit-report-output}/${classname}.txt">
	        <classpath>
	    		<fileset dir="${eclipse-home}/plugins">
	            	<include name="org.eclipse.equinox.launcher_*.jar"/>
	          	</fileset>
	        </classpath>
		    <arg line="-application ${application}"/>
		    <arg line="-data ${data-dir}"/>
		    <arg line="formatter=${formatter},${test-output}"/>

			</fileset>
		</junitreport>

		<style style="${eclipse-home}/dropins/eclipse/plugins/org.eclipse.test/JUNIT.XSL"
			basedir="${junit-report-output}"
			includes="${classname}.result.xml"
			destdir="${junit-report-output}" />

Return to bug 208021

Lines 65-71 Link Here

(-)library.xml (-2 / +20 lines)
65	<!--set default jvm to use for testing-->	65	<!--set default jvm to use for testing-->
66	<property name="jvm" value="${java.home}/bin/java" />	66	<property name="jvm" value="${java.home}/bin/java" />
67		67
68	<echo message="Running ${classname}. Result file: ${junit-report-output}/${classname}.xml."/>	68	<echo message="Initializing test application..."/>
69		69
70	<java fork="true" dir="." timeout="${timeout}" jvm="${jvm}" logError="true"	70	<java fork="true" dir="." timeout="${timeout}" jvm="${jvm}" logError="true"
71	classname="org.eclipse.core.launcher.Main" output="${junit-report-output}/${classname}.txt">	71	classname="org.eclipse.core.launcher.Main" output="${junit-report-output}/${classname}.txt">
Lines 74-79 Link Here
74	<include name="org.eclipse.equinox.launcher_*.jar"/>	74	<include name="org.eclipse.equinox.launcher_*.jar"/>
75	</fileset>	75	</fileset>
76	</classpath>	76	</classpath>
		77	<arg line="-initialize"/>
		78	<arg line="-os ${os}"/>
		79	<arg line="-ws ${ws}"/>
		80	<arg line="-arch ${arch}"/>
		81	<arg line="-consolelog"/>
		82	<jvmarg line="${vmargs} ${extraVMargs}"/>
		83	<sysproperty key="PLUGIN_PATH" value="${plugin-path}"/>
		84	</java>
		85
		86	<echo message="Running ${classname}. Result file: ${junit-report-output}/${classname}.xml."/>
		87
		88	<java fork="true" dir="." timeout="${timeout}" jvm="${jvm}" logError="true"
		89	classname="org.eclipse.core.launcher.Main" output="${junit-report-output}/${classname}.txt">
		90	<classpath>
		91	<fileset dir="${eclipse-home}/plugins">
		92	<include name="org.eclipse.equinox.launcher_*.jar"/>
		93	</fileset>
		94	</classpath>
77	<arg line="-application ${application}"/>	95	<arg line="-application ${application}"/>
78	<arg line="-data ${data-dir}"/>	96	<arg line="-data ${data-dir}"/>
79	<arg line="formatter=${formatter},${test-output}"/>	97	<arg line="formatter=${formatter},${test-output}"/>
Lines 138-144 Link Here
138	</fileset>	156	</fileset>
139	</junitreport>	157	</junitreport>
140		158
141	<style style="${eclipse-home}/plugins/org.eclipse.test/JUNIT.XSL"	159	<style style="${eclipse-home}/dropins/eclipse/plugins/org.eclipse.test/JUNIT.XSL"
142	basedir="${junit-report-output}"	160	basedir="${junit-report-output}"
143	includes="${classname}.result.xml"	161	includes="${classname}.result.xml"
144	destdir="${junit-report-output}" />	162	destdir="${junit-report-output}" />