Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
View | Details | Raw Unified | Return to bug 248793 | Differences between
and this patch

Collapse All | Expand All

(-)eclipse/buildConfigs/sdk.tests/testScripts/test.xml (-9 / +20 lines)
Lines 75-85 Link Here
75
	</target>
75
	</target>
76
76
77
	<target name="unzipderby" if="derby">
77
	<target name="unzipderby" if="derby">
78
		<property name="tmpderby" value="${install}/tmpderby"/>
79
		<mkdir dir="${tmpderby}"/>
78
		<exec dir="." executable="unzip">
80
		<exec dir="." executable="unzip">
79
			<arg line="-o -qq eclipse-junit-tests-*.zip ${derby} -d ${install}" />
81
			<!--			<arg line="-o -qq eclipse-junit-tests-*.zip ${derby} -d ${install}/" />  -->
82
			<arg line="-o eclipse-junit-tests-*.zip ${derby} -d ${tmpderby}" />
80
		</exec>
83
		</exec>
84
		<move todir="${install}/eclipse/dropins/eclipse/plugins/">
85
			<fileset dir="${tmpderby}/eclipse/plugins/db/">
86
				<include name="**"/>
87
			</fileset>
88
		</move>
89
		<delete dir="${tmpderby}"/>
81
	</target>
90
	</target>
82
91
92
83
	<target name="init" depends="setRuntimeArchive">
93
	<target name="init" depends="setRuntimeArchive">
84
94
85
		<mkdir dir="${results}/xml" />
95
		<mkdir dir="${results}/xml" />
Lines 240-249 Link Here
240
	</target>
250
	</target>
241
	<target name="configureTeamTest" if="teamcvs">
251
	<target name="configureTeamTest" if="teamcvs">
242
		<!-- Fill in cvs repository information -->
252
		<!-- Fill in cvs repository information -->
243
		<replace file="${eclipse-home}/dropins/eclipse/plugins/${org.eclipse.team.tests.cvs.core}/repository.properties" token="@user@" value="${cvs_user}" />
253
		<replace file="${eclipse-home}/dropins/eclipse/plugins/${org.eclipse.team.tests.cvs.core}/repository.properties" token="@user@" value="cvstests" />
244
		<replace file="${eclipse-home}/dropins/eclipse/plugins/${org.eclipse.team.tests.cvs.core}/repository.properties" token="@password@" value="${cvs_password}" />
254
		<replace file="${eclipse-home}/dropins/eclipse/plugins/${org.eclipse.team.tests.cvs.core}/repository.properties" token="@password@" value="goteam4e" />
245
		<replace file="${eclipse-home}/dropins/eclipse/plugins/${org.eclipse.team.tests.cvs.core}/repository.properties" token="@host@" value="${cvs_host}" />
255
		<replace file="${eclipse-home}/dropins/eclipse/plugins/${org.eclipse.team.tests.cvs.core}/repository.properties" token="@host@" value="godel" />
246
		<replace file="${eclipse-home}/dropins/eclipse/plugins/${org.eclipse.team.tests.cvs.core}/repository.properties" token="@root@" value="${cvs_root}" />
256
		<replace file="${eclipse-home}/dropins/eclipse/plugins/${org.eclipse.team.tests.cvs.core}/repository.properties" token="@root@" value="/home/sdimitro/repo" />
247
	</target>
257
	</target>
248
258
249
	<target name="configureDeltaPack" if="pdebuild">
259
	<target name="configureDeltaPack" if="pdebuild">
Lines 281-287 Link Here
281
			<property name="library-file" value="${eclipse-home}/dropins/eclipse/plugins/org.eclipse.test/library.xml" />
291
			<property name="library-file" value="${eclipse-home}/dropins/eclipse/plugins/org.eclipse.test/library.xml" />
282
292
283
			<!--install db plug-ins if running performance tests-->
293
			<!--install db plug-ins if running performance tests-->
284
			<condition property="derby" value="eclipse/dropins/eclipse/plugins/db*/* ">
294
			<!-- <condition property="derby" value="eclipse/dropins/eclipse/plugins/db/*"> -->
295
			<condition property="derby" value="eclipse/plugins/db/derby*">
285
				<equals arg1="${test.target}" arg2="performance" />
296
				<equals arg1="${test.target}" arg2="performance" />
286
			</condition>
297
			</condition>
287
			<!--	<property name="derby" value="" /> -->
298
			<!--	<property name="derby" value="" /> -->
Lines 549-555 Link Here
549
		<property name="org.eclipse.equinox.p2.tests.prerequisite.testplugins" value="eclipse/plugins/org.eclipse.equinox.frameworkadmin.test_* eclipse/plugins/org.eclipse.equinox.p2.installer_*"/>
560
		<property name="org.eclipse.equinox.p2.tests.prerequisite.testplugins" value="eclipse/plugins/org.eclipse.equinox.frameworkadmin.test_* eclipse/plugins/org.eclipse.equinox.p2.installer_*"/>
550
		<runTests testPlugin="org.eclipse.equinox.p2.tests"/>
561
		<runTests testPlugin="org.eclipse.equinox.p2.tests"/>
551
	</target>
562
	</target>
552
	
563
553
	<target name="equinoxp2ui" depends="setJVMProperties">
564
	<target name="equinoxp2ui" depends="setJVMProperties">
554
		<property name="jvm" value="${J2SE-5.0}" />
565
		<property name="jvm" value="${J2SE-5.0}" />
555
		<!--only run test if J2SE-5.0 property  set-->
566
		<!--only run test if J2SE-5.0 property  set-->
Lines 560-570 Link Here
560
		</condition>
571
		</condition>
561
		<runTests testPlugin="org.eclipse.equinox.p2.tests.ui"/>
572
		<runTests testPlugin="org.eclipse.equinox.p2.tests.ui"/>
562
	</target>
573
	</target>
563
	
574
564
	<target name="search">
575
	<target name="search">
565
		<runTests testPlugin="org.eclipse.search.tests" />
576
		<runTests testPlugin="org.eclipse.search.tests" />
566
	</target>
577
	</target>
567
		
578
568
	<target name="all">
579
	<target name="all">
569
		<antcall target="jdtcompilertool" />
580
		<antcall target="jdtcompilertool" />
570
		<antcall target="jdtcompilerapt" />
581
		<antcall target="jdtcompilerapt" />

Return to bug 248793