equal
deleted
inserted
replaced
133 |
133 |
134 Currently there are some differences between the formats so some edits to the |
134 Currently there are some differences between the formats so some edits to the |
135 XML content are made before using XMLUnit to compare the content. |
135 XML content are made before using XMLUnit to compare the content. |
136 --> |
136 --> |
137 <target name="check-diamonds"> |
137 <target name="check-diamonds"> |
138 <loadfile srcfile="${build.log.dir}/${build.id}_diamonds-log-start.xml" property="diamonds.log.start"> |
138 <loadfile srcfile="${diamonds.build.output.dir}/${build.id}_diamonds-log-start.xml" property="diamonds.log.start"> |
139 <filterchain> |
139 <filterchain> |
140 <tokenfilter> |
140 <tokenfilter> |
141 <filetokenizer /> |
141 <filetokenizer /> |
142 <hlm:prettyprintxml /> |
142 <hlm:prettyprintxml /> |
143 </tokenfilter> |
143 </tokenfilter> |
181 <param name="cmaker.config.dir" location="${qt.dir}/group/cmaker"/> |
181 <param name="cmaker.config.dir" location="${qt.dir}/group/cmaker"/> |
182 </antcall> |
182 </antcall> |
183 </target> |
183 </target> |
184 |
184 |
185 <target name="mini-build-cleanup"> |
185 <target name="mini-build-cleanup"> |
186 <delete verbose="true" includeemptydirs="true"> |
186 <delete verbose="true" includeemptydirs="true" failonerror="false"> |
187 <fileset dir="${build.drive}/" casesensitive="false"> |
187 <fileset dir="${build.drive}/" casesensitive="false"> |
188 <include name="makefile" /> |
188 <include name="makefile" /> |
189 <include name="*.mk" /> |
189 <include name="*.mk" /> |
190 <include name="*.make" /> |
190 <include name="*.make" /> |
191 <include name="ecloud_tmp_*/**" /> |
191 <include name="ecloud_tmp_*/**" /> |
219 <au:assertFileExists file="${temp.build.dir}/run-qmake-build.mk" /> |
219 <au:assertFileExists file="${temp.build.dir}/run-qmake-build.mk" /> |
220 <loadfile property="qmake.build.makefile" srcFile="${temp.build.dir}/run-qmake-build.mk"/> |
220 <loadfile property="qmake.build.makefile" srcFile="${temp.build.dir}/run-qmake-build.mk"/> |
221 <au:assertTrue> |
221 <au:assertTrue> |
222 <and> |
222 <and> |
223 <contains string="${qmake.build.makefile}" substring="qmake -listgen -r src.pro" /> |
223 <contains string="${qmake.build.makefile}" substring="qmake -listgen -r src.pro" /> |
224 <contains string="${qmake.build.makefile}" substring="qmake -listgen -platform symbian-abld -r examples.pro" /> |
224 <contains string="${qmake.build.makefile}" substring="qmake -listgen -r examples.pro" /> |
225 </and> |
225 </and> |
226 </au:assertTrue> |
226 </au:assertTrue> |
227 </then> |
227 </then> |
228 <else> |
228 <else> |
229 <xpathtest xmlfile="${temp.build.dir}/run-qmake-build.ant.xml"> |
229 <xpathtest xmlfile="${temp.build.dir}/run-qmake-build.ant.xml"> |
230 <namespace uri="" prefix=""/> |
230 <namespace uri="" prefix=""/> |
231 <xpath expression="/project/target[@name='all']/parallel/sequential/if/then/exec/arg[@value='-listgen']"/> |
231 <xpath expression="/project/target[@name='all']/parallel/sequential/if/then/exec/arg[@value='-listgen']"/> |
232 <xpath expression="/project/target[@name='all']/parallel/sequential/if/then/exec/arg[@line='-r']"/> |
232 <xpath expression="/project/target[@name='all']/parallel/sequential/if/then/exec/arg[@line='-r']"/> |
233 <xpath expression="/project/target[@name='all']/parallel/sequential/if/then/exec/arg[@line='-platform symbian-abld -r -listgen']"/> |
233 <xpath expression="/project/target[@name='all']/parallel/sequential/if/then/exec/arg[@line='-r -listgen']"/> |
234 </xpathtest> |
234 </xpathtest> |
235 </else> |
235 </else> |
236 </if> |
236 </if> |
237 |
237 |
238 <!-- Check if prep has set some prop correctly... --> |
238 <!-- Check if prep has set some prop correctly... --> |
243 <au:assertFileExists file="${canonical.sysdef.file}" /> |
243 <au:assertFileExists file="${canonical.sysdef.file}" /> |
244 <au:assertFileExists file="${qt.dir}/src/bld.inf" /> |
244 <au:assertFileExists file="${qt.dir}/src/bld.inf" /> |
245 <au:assertFileExists file="${qt.dir}/examples/bld.inf" /> |
245 <au:assertFileExists file="${qt.dir}/examples/bld.inf" /> |
246 <au:assertFileExists file="${build.drive}/epoc32/tools/qmake.bat" /> |
246 <au:assertFileExists file="${build.drive}/epoc32/tools/qmake.bat" /> |
247 <au:assertFileExists file="${build.drive}/epoc32/tools/moc.bat" /> |
247 <au:assertFileExists file="${build.drive}/epoc32/tools/moc.bat" /> |
248 <hlm:assertFileExists file="${build.log.dir}/${build.id}_build.qmake.generated.txt"/> |
248 <hlm:assertFileExists file="${compile.log.dir}/${build.id}_build.qmake.generated.txt"/> |
249 <hlm:assertFileExists file="${build.log.dir}/${build.id}_build_tools.qmake.generated.txt"/> |
249 <hlm:assertFileExists file="${compile.log.dir}/${build.id}_build_tools.qmake.generated.txt"/> |
250 <loadfile srcFile="${build.log.dir}/${build.id}_build.qmake.generated.txt" property="qmake.generated.output"/> |
250 <loadfile srcFile="${compile.log.dir}/${build.id}_build.qmake.generated.txt" property="qmake.generated.output"/> |
251 <au:assertMatches string="${qmake.generated.output}" pattern="[^/]+/+[^/]+" /> |
251 <au:assertMatches string="${qmake.generated.output}" pattern="[^/]+/+[^/]+" /> |
252 |
252 |
253 </target> |
253 </target> |
254 |
254 |
255 <!-- Never fail the build. --> |
255 <!-- Never fail the build. --> |