jdk8-mips64-public/nashorn: comparison make/build.xml

-:6ff7a094ba60
+:a136c901f3f5
 <available file="/usr/local/bin/hg"/>
 </condition>
 <condition property="git.executable" value="/usr/local/bin/git" else="git">
 <available file="/usr/local/bin/git"/>
 </condition>
-<!-- check if testng.jar is avaiable -->
+<!-- check if TestNG and dependencies are available, and download them if they aren't -->
-<available property="testng.available" file="${file.reference.testng.jar}"/>
+<antcall target="get-testng"/>
-<!-- check if Jemmy ang testng.jar are avaiable -->
+<condition property="testng.available" value="true">
+<and>
+<available file="${file.reference.testng.jar}"/>
+<available file="${file.reference.jcommander.jar}"/>
+<available file="${file.reference.bsh.jar}"/>
+<available file="${file.reference.snakeyaml.jar}"/>
+</and>
+</condition>
+<!-- check if Jemmy ang TestNG are avaiable -->
 <condition property="jemmy.jfx.testng.available" value="true">
 <and>
 <available file="${file.reference.jemmyfx.jar}"/>
 <available file="${file.reference.jemmycore.jar}"/>
 <available file="${file.reference.jemmyawtinput.jar}"/>
 </target>
 <target name="compile-test" depends="compile, run-nasgen" if="testng.available">
 <!-- testng task -->
 <taskdef name="testng" classname="org.testng.TestNGAntTask"
-classpath="${file.reference.testng.jar}"/>
+classpath="${testng.ant.classpath}"/>
 <javac srcdir="${test.src.dir}"
 destdir="${build.test.classes.dir}"
 classpath="${javac.test.classpath}"
 source="${test.javac.source}"
 };
 grant codeBase "file:/${basedir}/${file.reference.testng.jar}" {
 permission java.security.AllPermission;
 };
+grant codeBase "file:/${basedir}/${file.reference.jcommander.jar}" {
+permission java.security.AllPermission;
+};
+grant codeBase "file:/${basedir}/${file.reference.bsh.jar}" {
+permission java.security.AllPermission;
+};
+grant codeBase "file:/${basedir}/${file.reference.snakeyaml.jar}" {
+permission java.security.AllPermission;
+};
 //// in case of absolute path:
 grant codeBase "file:/${nashorn.internal.tests.jar}" {
 permission java.security.AllPermission;
 };
 grant codeBase "file:/${file.reference.testng.jar}" {
 permission java.security.AllPermission;
 };
+grant codeBase "file:/${file.reference.jcommander.jar}" {
+permission java.security.AllPermission;
+};
+grant codeBase "file:/${file.reference.bsh.jar}" {
+permission java.security.AllPermission;
+};
+grant codeBase "file:/${file.reference.snakeyaml.jar}" {
+permission java.security.AllPermission;
+};
 grant codeBase "file:/${basedir}/test/script/trusted/*" {
 permission java.security.AllPermission;
 };
 <available file="${test.external.dir}/test262" property="test-sys-prop.external.test262"/>
 <available file="${test.external.dir}/showdown" property="test-sys-prop.external.markdown"/>
 </target>
 <target name="check-testng" unless="testng.available">
-<echo message="WARNING: TestNG not available, will not run tests. Please copy testng.jar under ${test.lib} directory."/>
+<echo message="WARNING: TestNG not available, will not run tests. Please copy TestNG and dependency JARs to the ${test.lib} directory."/>
 </target>
 <!-- only to be invoked as dependency of "test" target -->
 <target name="-test-classes-all" depends="jar" unless="test.class">
 <fileset id="test.classes" dir="${build.test.classes.dir}">
 <pathelement path="${run.test.classpath}"/>
 </classpath>
 </testng>
 </target>
-<target name="test" depends="get-testng, javadocnh, test-pessimistic, test-optimistic"/>
+<target name="test" depends="prepare, javadocnh, test-pessimistic, test-optimistic"/>
 <target name="test-optimistic" depends="jar, -test-classes-all,-test-classes-single, check-testng, check-external-tests, compile-test, generate-policy-file" if="testng.available">
 <echo message="Running test suite in OPTIMISTIC mode..."/>
 <antcall target="-test-nosecurity" inheritRefs="true">
 <param name="optimistic" value="true"/>
 <param name="testResultsSubDir" value="pessimistic"/>
 </antcall>
 </target>
 <target name="check-jemmy.jfx.testng" unless="jemmy.jfx.testng.available">
-<echo message="WARNING: Jemmy or JavaFX or TestNG not available, will not run tests. Please copy testng.jar, JemmyCore.jar, JemmyFX.jar, JemmyAWTInput.jar under test${file.separator}lib directory. And make sure you have jfxrt.jar in ${java.home}${file.separator}lib${file.separator}ext dir."/>
+<echo message="WARNING: Jemmy or JavaFX or TestNG not available, will not run tests. Please copy TestNG and dependency JARs, JemmyCore.jar, JemmyFX.jar, JemmyAWTInput.jar to the test${file.separator}lib directory. And make sure you have jfxrt.jar in ${java.home}${file.separator}lib${file.separator}ext dir."/>
 </target>
 <target name="testjfx" depends="jar, get-testng, check-jemmy.jfx.testng, compile-test" if="jemmy.jfx.testng.available">
 <fileset id="test.classes" dir="${build.test.classes.dir}">
 <include name="**/framework/*Test.class"/>
 <!-- run all perf tests -->
 <target name="perf" depends="externals, update-externals, sunspider, octane"/>
 <!-- download and install testng.jar -->
-<target name="get-testng" depends="prepare" unless="testng.available">
+<target name="get-testng">
-<get src="http://testng.org/testng-6.8.zip" dest="${test.lib}" skipexisting="true" ignoreerrors="true"/>
+<get dest="${test.lib}" skipexisting="true">
-<unzip src="${test.lib}${file.separator}testng-6.8.zip" dest="${test.lib}">
+<url url="http://central.maven.org/maven2/org/testng/testng/6.8/testng-6.8.jar"/>
-<patternset>
+<url url="http://central.maven.org/maven2/com/beust/jcommander/1.27/jcommander-1.27.jar"/>
-<include name="testng-6.8/testng-6.8.jar"/>
+<url url="http://central.maven.org/maven2/org/beanshell/bsh/2.0b4/bsh-2.0b4.jar"/>
-</patternset>
+<url url="http://central.maven.org/maven2/org/yaml/snakeyaml/1.6/snakeyaml-1.6.jar"/>
-</unzip>
+</get>
-<move file="${test.lib}${file.separator}testng-6.8${file.separator}testng-6.8.jar" tofile="${test.lib}${file.separator}testng.jar"/>
-<delete dir="${test.lib}${file.separator}testng-6.8"/>
 </target>
 <!-- run all tests -->
 <target name="alltests" depends="get-testng, externals, update-externals, test, test262parallel, testmarkdown, perf"/>

Mercurial > jdk8-mips64-public > nashorn / file comparison

comparison: make/build.xml

make/build.xml