1.1 --- a/make/build.xml Tue Nov 05 09:13:41 2013 +0530 1.2 +++ b/make/build.xml Tue Nov 05 13:09:40 2013 +0400 1.3 @@ -372,6 +372,12 @@ 1.4 1.5 <copy file="${file.reference.jfxrt.jar}" todir="dist"/> 1.6 1.7 + <condition property="jfx.prism.order" value="-Dprism.order=j2d" else=" "> 1.8 + <not> 1.9 + <os family="mac"/> 1.10 + </not> 1.11 + </condition> 1.12 + 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 @@ -380,6 +386,7 @@ 1.17 <propertyref prefix="testjfx-test-sys-prop."/> 1.18 <mapper from="testjfx-test-sys-prop.*" to="*" type="glob"/> 1.19 </propertyset> 1.20 + <sysproperty key="test.fork.jvm.options" value="${testjfx-test-sys-prop.test.fork.jvm.options} ${jfx.prism.order}"/> 1.21 <classpath> 1.22 <pathelement path="${testjfx.run.test.classpath}"/> 1.23 </classpath>