# HG changeset patch
# User mhaupt
# Date 1455543378 -3600
# Node ID a136c901f3f5397554b73fe525cbd80a4e873b4f
# Parent 6ff7a094ba605949498fbfbf8c68d707aa67508a
8149744: fix testng.jar delivery in Nashorn build.xml
Reviewed-by: hannesw, sundar
diff -r 6ff7a094ba60 -r a136c901f3f5 .hgignore
--- a/.hgignore Fri Feb 12 19:11:54 2016 +0000
+++ b/.hgignore Mon Feb 15 14:36:18 2016 +0100
@@ -22,6 +22,6 @@
CC/*
jcov2/*
.idea/*
-test/lib/testng.jar
+test/lib/*.jar
test/script/external/*
.project
diff -r 6ff7a094ba60 -r a136c901f3f5 make/build.xml
--- a/make/build.xml Fri Feb 12 19:11:54 2016 +0000
+++ b/make/build.xml Mon Feb 15 14:36:18 2016 +0100
@@ -49,9 +49,17 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -275,7 +283,7 @@
+ classpath="${testng.ant.classpath}"/>
-
+
@@ -480,7 +507,7 @@
-
+
@@ -507,7 +534,7 @@
-
+
@@ -742,15 +769,13 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff -r 6ff7a094ba60 -r a136c901f3f5 make/project.properties
--- a/make/project.properties Fri Feb 12 19:11:54 2016 +0000
+++ b/make/project.properties Mon Feb 15 14:36:18 2016 +0100
@@ -83,7 +83,17 @@
test.lib=${basedir}${file.separator}test${file.separator}lib
# jars refererred
-file.reference.testng.jar=${test.lib}${file.separator}testng.jar
+file.reference.testng.jar=${test.lib}${file.separator}testng-6.8.jar
+file.reference.jcommander.jar=${test.lib}${file.separator}jcommander-1.27.jar
+file.reference.bsh.jar=${test.lib}${file.separator}bsh-2.0b4.jar
+file.reference.snakeyaml.jar=${test.lib}${file.separator}snakeyaml-1.6.jar
+
+# TestNG ant task classpath
+testng.ant.classpath=\
+ ${file.reference.testng.jar}${path.separator}\
+ ${file.reference.jcommander.jar}${path.separator}\
+ ${file.reference.bsh.jar}${path.separator}\
+ ${file.reference.snakeyaml.jar}${path.separator}
# Set testng verbose level
# From TestNG docs: "the verbosity level (0 to 10 where 10 is most detailed)
@@ -112,7 +122,10 @@
javac.test.classpath=\
${build.classes.dir}${path.separator}\
${build.test.classes.dir}${path.separator}\
- ${file.reference.testng.jar}
+ ${file.reference.testng.jar}${path.separator}\
+ ${file.reference.jcommander.jar}${path.separator}\
+ ${file.reference.bsh.jar}${path.separator}\
+ ${file.reference.snakeyaml.jar}
meta.inf.dir=${src.dir}/META-INF
@@ -251,6 +264,9 @@
${file.reference.jemmycore.jar}${path.separator}\
${file.reference.jemmyawtinput.jar}${path.separator}\
${file.reference.testng.jar}${path.separator}\
+ ${file.reference.jcommander.jar}${path.separator}\
+ ${file.reference.bsh.jar}${path.separator}\
+ ${file.reference.snakeyaml.jar}${path.separator}\
${nashorn.internal.tests.jar}${path.separator}\
${nashorn.api.tests.jar}
@@ -259,6 +275,9 @@
run.test.classpath=\
${file.reference.testng.jar}${path.separator}\
+ ${file.reference.jcommander.jar}${path.separator}\
+ ${file.reference.bsh.jar}${path.separator}\
+ ${file.reference.snakeyaml.jar}${path.separator}\
${nashorn.internal.tests.jar}${path.separator}\
${nashorn.api.tests.jar}