1.1 --- a/make/build.xml Wed Feb 13 19:59:30 2013 +0530
1.2 +++ b/make/build.xml Thu Feb 14 09:14:31 2013 +0530
1.3 @@ -317,7 +317,7 @@
1.4 </java>
1.5 </target>
1.6
1.7 - <target name="test262" depends="jar, check-testng, check-external-tests, compile-test" if="testng.available">
1.8 + <target name="test262" depends="jar, check-testng, check-external-tests, compile-test, generate-policy-file" if="testng.available">
1.9 <fileset id="test.classes" dir="${build.test.classes.dir}">
1.10 <include name="**/framework/*Test.class"/>
1.11 </fileset>
1.12 @@ -325,7 +325,7 @@
1.13 <testng outputdir="${build.test.results.dir}" classfilesetref="test.classes"
1.14 verbose="${testng.verbose}" haltonfailure="true" useDefaultListeners="false" listeners="${testng.listeners}" workingDir="${basedir}">
1.15 <jvmarg line="${ext.class.path}"/>
1.16 - <jvmarg line="${run.test.jvmargs}"/>
1.17 + <jvmarg line="${run.test.jvmargs} ${run.test.jvmsecurityargs}"/>
1.18 <propertyset>
1.19 <propertyref prefix="test262-test-sys-prop."/>
1.20 <mapper from="test262-test-sys-prop.*" to="*" type="glob"/>
1.21 @@ -338,11 +338,14 @@
1.22
1.23 <target name="test262parallel" depends="test262-parallel"/>
1.24
1.25 - <target name="test262-parallel" depends="jar, check-testng, check-external-tests, compile-test" if="testng.available">
1.26 + <target name="test262-parallel" depends="jar, check-testng, check-external-tests, compile-test, generate-policy-file" if="testng.available">
1.27 <!-- use just build.test.classes.dir to avoid referring to TestNG -->
1.28 - <java classname="${parallel.test.runner}" dir="${basedir}" classpath="${build.test.classes.dir}" fork="true">
1.29 + <java classname="${parallel.test.runner}" dir="${basedir}" fork="true">
1.30 <jvmarg line="${ext.class.path}"/>
1.31 - <jvmarg line="${run.test.jvmargs}"/>
1.32 + <jvmarg line="${run.test.jvmargs} ${run.test.jvmsecurityargs}"/>
1.33 + <classpath>
1.34 + <pathelement path="${run.test.classpath}"/>
1.35 + </classpath>
1.36 <syspropertyset>
1.37 <propertyref prefix="test262-test-sys-prop."/>
1.38 <mapper type="glob" from="test262-test-sys-prop.*" to="*"/>
