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 103614 | Differences between
and this patch

Collapse All | Expand All

(-)scripts/buildAll.xml (-2 lines)
Lines 387-393 Link Here
387
                                        <jvmarg value="-Dos=${baseos}"/>
387
                                        <jvmarg value="-Dos=${baseos}"/>
388
                                        <jvmarg value="-Darch=${basearch}"/>
388
                                        <jvmarg value="-Darch=${basearch}"/>
389
					                    <jvmarg value="-Dnoclean=true"/>
389
					                    <jvmarg value="-Dnoclean=true"/>
390
					                    <jvmarg value="-Dwtp.quite=true"/>
391
                                <arg value="-propertyfile" />
390
                                <arg value="-propertyfile" />
392
                                <arg value="test.properties" />
391
                                <arg value="test.properties" />
393
                                        <arg value="-application"/>
392
                                        <arg value="-application"/>
Lines 398-404 Link Here
398
                                        <arg value="org.apache.tools.ant.DefaultLogger"/>
397
                                        <arg value="org.apache.tools.ant.DefaultLogger"/>
399
                                        <arg value="${testTarget}"/>
398
                                        <arg value="${testTarget}"/>
400
                                        <sysproperty key="build.home" value="${build.home}"/>
399
                                        <sysproperty key="build.home" value="${build.home}"/>
401
                   						<sysproperty key="wtp.quiet" value="true"/>
402
                                        <sysproperty key="buildDirectory" value="${buildDirectory}"/>
400
                                        <sysproperty key="buildDirectory" value="${buildDirectory}"/>
403
                                        <sysproperty key="baseLocation" value="${baseLocation}"/>
401
                                        <sysproperty key="baseLocation" value="${baseLocation}"/>
404
                                        <sysproperty key="testDir" value="${testDir}"/>
402
                                        <sysproperty key="testDir" value="${testDir}"/>
(-)scripts/testScripts/test.xml (-1 / +14 lines)
Lines 81-95 Link Here
81
	</target>
81
	</target>
82
82
83
	<target name="runtests-normal" unless="runAsPerfApp">
83
	<target name="runtests-normal" unless="runAsPerfApp">
84
		<ant antfile="${eclipse-home}/plugins/${testPlugin}/test.xml" dir="${eclipse-home}"/>
84
		<condition property="extraVMargs" value="">
85
			<not>
86
				<isset property="extraVMargs"/>
87
			</not>
88
		</condition>
89
		<ant antfile="${eclipse-home}/plugins/${testPlugin}/test.xml" dir="${eclipse-home}">
90
			<property name="extraVMargs" value="${extraVMargs} -Dwtp.autotest.noninteractive=true"/>
91
		</ant>
85
		<copy file="${eclipse-home}/${report}.xml" tofile="${results}/xml/${report}_${platform}.xml" failonerror="false" />
92
		<copy file="${eclipse-home}/${report}.xml" tofile="${results}/xml/${report}_${platform}.xml" failonerror="false" />
86
		<antcall target="genHtml" />
93
		<antcall target="genHtml" />
87
	</target>
94
	</target>
88
95
89
	<target name="runtests-runAsPerfApp" if="runAsPerfApp">
96
	<target name="runtests-runAsPerfApp" if="runAsPerfApp">
97
		<condition property="extraVMargs" value="">
98
			<not>
99
				<isset property="extraVMargs"/>
100
			</not>
101
		</condition>
90
		<ant antfile="${eclipse-home}/plugins/${testPlugin}/test.xml" dir="${eclipse-home}">
102
		<ant antfile="${eclipse-home}/plugins/${testPlugin}/test.xml" dir="${eclipse-home}">
91
			<property name="library-file" value="${testDir}/performance-tests.xml"/>
103
			<property name="library-file" value="${testDir}/performance-tests.xml"/>
92
			<property name="runAsPerfApp" value="true"/>
104
			<property name="runAsPerfApp" value="true"/>
105
			<property name="extraVMargs" value="${extraVMargs} -Dwtp.autotest.noninteractive=true"/>
93
		</ant>
106
		</ant>
94
		<copy file="${eclipse-home}/${report}.xml" tofile="${results}/xml/${report}_${platform}.xml" failonerror="false" />
107
		<copy file="${eclipse-home}/${report}.xml" tofile="${results}/xml/${report}_${platform}.xml" failonerror="false" />
95
		<antcall target="genHtml" />
108
		<antcall target="genHtml" />

Return to bug 103614