aboutsummaryrefslogtreecommitdiff
path: root/make
diff options
context:
space:
mode:
authorkshefov <none@none>2013-11-05 13:09:40 +0400
committerkshefov <none@none>2013-11-05 13:09:40 +0400
commitcdd986289aa05cb78fb2b05e3147352f70f7ec0a (patch)
tree26c4a48b7010e58c71061fe76f3a7fc3a6ef19dc /make
parentca1503592444ba0a720de87f890d758370bf3c96 (diff)
downloadnashorn-cdd986289aa05cb78fb2b05e3147352f70f7ec0a.tar.gz
8027708: NASHORN TEST: Create Nashorn test that draws image step-by-step using JavaFX canvas.
Reviewed-by: jlaskey, lagergren
Diffstat (limited to 'make')
-rw-r--r--make/build.xml7
-rw-r--r--make/project.properties2
2 files changed, 8 insertions, 1 deletions
diff --git a/make/build.xml b/make/build.xml
index c90cdd6f..7d1f42ae 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -372,6 +372,12 @@ grant codeBase "file:/${basedir}/test/script/basic/classloader.js" {
<copy file="${file.reference.jfxrt.jar}" todir="dist"/>
+ <condition property="jfx.prism.order" value="-Dprism.order=j2d" else=" ">
+ <not>
+ <os family="mac"/>
+ </not>
+ </condition>
+
<testng outputdir="${build.test.results.dir}" classfilesetref="test.classes"
verbose="${testng.verbose}" haltonfailure="true" useDefaultListeners="false" listeners="${testng.listeners}" workingDir="${basedir}">
<jvmarg line="${ext.class.path}"/>
@@ -380,6 +386,7 @@ grant codeBase "file:/${basedir}/test/script/basic/classloader.js" {
<propertyref prefix="testjfx-test-sys-prop."/>
<mapper from="testjfx-test-sys-prop.*" to="*" type="glob"/>
</propertyset>
+ <sysproperty key="test.fork.jvm.options" value="${testjfx-test-sys-prop.test.fork.jvm.options} ${jfx.prism.order}"/>
<classpath>
<pathelement path="${testjfx.run.test.classpath}"/>
</classpath>
diff --git a/make/project.properties b/make/project.properties
index 33c94780..c3ffca4e 100644
--- a/make/project.properties
+++ b/make/project.properties
@@ -230,7 +230,7 @@ testjfx.run.test.classpath=\
${file.reference.jemmyawtinput.jar}${path.separator}\
${file.reference.testng.jar}${path.separator}\
${nashorn.internal.tests.jar}${path.separator}\
- ${nashorn.api.tests.jar}
+ ${nashorn.api.tests.jar}
# testjfx VM options for script tests with @fork option
testjfx-test-sys-prop.test.fork.jvm.options=${run.test.jvmargs.main} -Xmx${run.test.xmx} -cp ${testjfx.run.test.classpath}