Subversion Repositories SmartDukaan

Rev

Rev 1499 | Rev 1511 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 1499 Rev 1505
Line 109... Line 109...
109
				optimize="${compile.optimize}"
109
				optimize="${compile.optimize}"
110
			    source="1.6" target="1.6">
110
			    source="1.6" target="1.6">
111
			<classpath refid="Website.classpath"/>
111
			<classpath refid="Website.classpath"/>
112
		</javac>
112
		</javac>
113
		<javac srcdir="${conf.home}"
113
		<javac srcdir="${conf.home}"
114
						destdir="${build.home}/WEB-INF/classes"
114
			destdir="${build.home}/WEB-INF/classes"
115
						debug="${compile.debug}"
115
			debug="${compile.debug}"
116
						deprecation="${compile.deprecation}"
116
			deprecation="${compile.deprecation}"
117
						optimize="${compile.optimize}"
117
			optimize="${compile.optimize}"
118
					     source="1.6" target="1.6">
118
			source="1.6" target="1.6">
119
			<classpath refid="Website.classpath"/>
119
			<classpath refid="Website.classpath"/>
120
		</javac>
120
		</javac>
121
 
121
 
122
	</target>
122
	</target>
123
 
123
 
Line 207... Line 207...
207
            	<mkdir dir="${jmeter.home}/bin/samples/@{test}"/>
207
            	<mkdir dir="${jmeter.home}/bin/samples/@{test}"/>
208
            	<mkdir dir="/tmp/jmeter"/>
208
            	<mkdir dir="/tmp/jmeter"/>
209
            	<jmeter jmeterhome="${jmeter.home}" resultlogdir="/tmp/jmeter">
209
            	<jmeter jmeterhome="${jmeter.home}" resultlogdir="/tmp/jmeter">
210
            	    <testplans dir="${test.home}/jmeter" includes="@{test}.jmx"/>
210
            	    <testplans dir="${test.home}/jmeter" includes="@{test}.jmx"/>
211
            	</jmeter>
211
            	</jmeter>
212
            	<exec executable="diff">
212
            	<exec executable="diff" resultproperty="jmeter.failure">
213
                    <arg line="-x .svn"/>
213
                    <arg line="-x .svn"/>
214
            	    <arg line="-r"/>
214
            	    <arg line="-r"/>
215
         	    <arg line="--brief"/>
215
         	        <arg line="--brief"/>
216
            	    <arg line="${test.home}/samples/@{test}"/>
216
            	    <arg line="${test.home}/samples/@{test}"/>
217
            	    <arg line="${jmeter.home}/bin/samples/@{test}"/>
217
            	    <arg line="${jmeter.home}/bin/samples/@{test}"/>
218
            	</exec>
218
            	</exec>
-
 
219
            	<touch file="jmeter-sample-diff-result-${jmeter.failure}"/>
219
		    </sequential>
220
		    </sequential>
220
	</macrodef>
221
	</macrodef>
221
 
222
 
222
	<target name="run-tests" >
223
	<target name="run-tests" >
-
 
224
		<delete file="jmeter-sample-diff-result-0"/>
-
 
225
		<delete file="jmeter-sample-diff-result-1"/>
223
		<record name="src/test/log/run-tests.log" action="start"/>
226
		<record name="src/test/log/run-tests.log" action="start"/>
224
		<run-test test="home"/>
227
		<run-test test="home"/>
225
		<run-test test="searching"/>
228
		<run-test test="searching"/>
226
		<run-test test="categorypage"/>
229
		<run-test test="categorypage"/>
227
		<run-test test="register"/>
230
		<run-test test="register"/>
Line 229... Line 232...
229
		<run-test test="product"/>
232
		<run-test test="product"/>
230
		<run-test test="cart"/>
233
		<run-test test="cart"/>
231
		<run-test test="shipping"/>
234
		<run-test test="shipping"/>
232
		<run-test test="myaccount"/>
235
		<run-test test="myaccount"/>
233
		<run-test test="forgotpass"/>
236
		<run-test test="forgotpass"/>
-
 
237
		<antcall target="test-build-failure"/>
234
	</target>
238
	</target>
235
	
239
	
236
	<target name="run-single-test">
240
	<target name="run-single-test">
-
 
241
		<delete file="jmeter-sample-diff-result-0"/>
-
 
242
		<delete file="jmeter-sample-diff-result-1"/>
237
		<record name="src/test/log/run-test-${test.name}.log" action="start"/>
243
		<record name="src/test/log/run-test-${test.name}.log" action="start"/>
238
		<run-test test="${test.name}"/>
244
		<run-test test="${test.name}"/>
-
 
245
		<antcall target="test-build-failure"/>
-
 
246
	</target>
-
 
247
	
-
 
248
	<target name="test-build-failure">
-
 
249
		<available property="jmeter.test.failure" file="jmeter-sample-diff-result-1" />
-
 
250
		<delete file="jmeter-sample-diff-result-0"/>
-
 
251
		<delete file="jmeter-sample-diff-result-1"/>
-
 
252
		<fail message="JMeter tests failed" if="jmeter.test.failure"/>
239
	</target>
253
	</target>
240
</project>
254
</project>