# HG changeset patch
# User mhaupt
# Date 1455292854 -3600
# Node ID 148bb1cd62e5567a9b71c9feb4ec767758903130
# Parent 8ca6ec05000c7efe7e9dcca90cf2292156dc6d80
8149744: fix testng.jar delivery in Nashorn build.xml
Reviewed-by: hannesw, sundar
diff -r 8ca6ec05000c -r 148bb1cd62e5 nashorn/.hgignore
--- a/nashorn/.hgignore Thu Feb 11 16:05:22 2016 -0800
+++ b/nashorn/.hgignore Fri Feb 12 17:00:54 2016 +0100
@@ -23,8 +23,7 @@
CC/*
jcov2/*
.idea/*
-test/lib/testng*.zip
-test/lib/testng.jar
+test/lib/*.jar
test/script/external/*
.project
.externalToolBuilders/*
diff -r 8ca6ec05000c -r 148bb1cd62e5 nashorn/make/build.xml
--- a/nashorn/make/build.xml Thu Feb 11 16:05:22 2016 -0800
+++ b/nashorn/make/build.xml Fri Feb 12 17:00:54 2016 +0100
@@ -48,10 +48,16 @@
-
-
+
-
+
+
+
+
+
+
+
+
-
+
@@ -314,7 +320,7 @@
+ classpath="${testng.ant.classpath}"/>
-
+
@@ -569,7 +594,7 @@
-
+
@@ -804,15 +829,13 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff -r 8ca6ec05000c -r 148bb1cd62e5 nashorn/make/project.properties
--- a/nashorn/make/project.properties Thu Feb 11 16:05:22 2016 -0800
+++ b/nashorn/make/project.properties Fri Feb 12 17:00:54 2016 +0100
@@ -84,9 +84,19 @@
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
file.reference.asmtools.jar=${test.lib}${file.separator}asmtools-60.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)
# Actually, this is a lie: you can specify -1 and this will put TestNG in
@@ -114,7 +124,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=${nashorn.module.src.dir}/META-INF
@@ -265,6 +278,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}
@@ -273,6 +289,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}