equal
deleted
inserted
replaced
315 <mapper type="glob" from="test-sys-prop.*" to="*"/> |
315 <mapper type="glob" from="test-sys-prop.*" to="*"/> |
316 </syspropertyset> |
316 </syspropertyset> |
317 </java> |
317 </java> |
318 </target> |
318 </target> |
319 |
319 |
320 <target name="test262" depends="jar, check-testng, check-external-tests, compile-test" if="testng.available"> |
320 <target name="test262" depends="jar, check-testng, check-external-tests, compile-test, generate-policy-file" if="testng.available"> |
321 <fileset id="test.classes" dir="${build.test.classes.dir}"> |
321 <fileset id="test.classes" dir="${build.test.classes.dir}"> |
322 <include name="**/framework/*Test.class"/> |
322 <include name="**/framework/*Test.class"/> |
323 </fileset> |
323 </fileset> |
324 |
324 |
325 <testng outputdir="${build.test.results.dir}" classfilesetref="test.classes" |
325 <testng outputdir="${build.test.results.dir}" classfilesetref="test.classes" |
326 verbose="${testng.verbose}" haltonfailure="true" useDefaultListeners="false" listeners="${testng.listeners}" workingDir="${basedir}"> |
326 verbose="${testng.verbose}" haltonfailure="true" useDefaultListeners="false" listeners="${testng.listeners}" workingDir="${basedir}"> |
327 <jvmarg line="${ext.class.path}"/> |
327 <jvmarg line="${ext.class.path}"/> |
328 <jvmarg line="${run.test.jvmargs}"/> |
328 <jvmarg line="${run.test.jvmargs} ${run.test.jvmsecurityargs}"/> |
329 <propertyset> |
329 <propertyset> |
330 <propertyref prefix="test262-test-sys-prop."/> |
330 <propertyref prefix="test262-test-sys-prop."/> |
331 <mapper from="test262-test-sys-prop.*" to="*" type="glob"/> |
331 <mapper from="test262-test-sys-prop.*" to="*" type="glob"/> |
332 </propertyset> |
332 </propertyset> |
333 <classpath> |
333 <classpath> |
336 </testng> |
336 </testng> |
337 </target> |
337 </target> |
338 |
338 |
339 <target name="test262parallel" depends="test262-parallel"/> |
339 <target name="test262parallel" depends="test262-parallel"/> |
340 |
340 |
341 <target name="test262-parallel" depends="jar, check-testng, check-external-tests, compile-test" if="testng.available"> |
341 <target name="test262-parallel" depends="jar, check-testng, check-external-tests, compile-test, generate-policy-file" if="testng.available"> |
342 <!-- use just build.test.classes.dir to avoid referring to TestNG --> |
342 <!-- use just build.test.classes.dir to avoid referring to TestNG --> |
343 <java classname="${parallel.test.runner}" dir="${basedir}" classpath="${build.test.classes.dir}" fork="true"> |
343 <java classname="${parallel.test.runner}" dir="${basedir}" fork="true"> |
344 <jvmarg line="${ext.class.path}"/> |
344 <jvmarg line="${ext.class.path}"/> |
345 <jvmarg line="${run.test.jvmargs}"/> |
345 <jvmarg line="${run.test.jvmargs} ${run.test.jvmsecurityargs}"/> |
|
346 <classpath> |
|
347 <pathelement path="${run.test.classpath}"/> |
|
348 </classpath> |
346 <syspropertyset> |
349 <syspropertyset> |
347 <propertyref prefix="test262-test-sys-prop."/> |
350 <propertyref prefix="test262-test-sys-prop."/> |
348 <mapper type="glob" from="test262-test-sys-prop.*" to="*"/> |
351 <mapper type="glob" from="test262-test-sys-prop.*" to="*"/> |
349 </syspropertyset> |
352 </syspropertyset> |
350 </java> |
353 </java> |