|
Lines 70-76
Link Here
|
| 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"> |
