Mercurial > hg > jdk9-shenandoah > nashorn
changeset 1302:10553f87f3e7
8081696: reduce dependency of Nashorn tests on external components
Reviewed-by: attila, sundar
author | mhaupt |
---|---|
date | Tue, 02 Jun 2015 17:08:13 +0200 |
parents | 14ec7d7af490 |
children | d47ac275fab7 |
files | make/build.xml |
diffstat | 1 files changed, 9 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/make/build.xml Tue Jun 02 14:35:03 2015 +0200 +++ b/make/build.xml Tue Jun 02 17:08:13 2015 +0200 @@ -469,7 +469,7 @@ </testng> </target> - <target name="test" depends="javadoc, test-pessimistic, test-optimistic, testmarkdown"/> + <target name="test" depends="get-testng, javadoc, 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..."/> @@ -499,7 +499,7 @@ <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."/> </target> - <target name="testjfx" depends="jar, check-jemmy.jfx.testng, compile-test" if="jemmy.jfx.testng.available"> + <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"/> </fileset> @@ -527,7 +527,7 @@ </testng> </target> - <target name="testmarkdown" depends="jar, check-testng, check-external-tests, compile-test, generate-policy-file" if="testng.available"> + <target name="testmarkdown" depends="jar, get-testng, check-testng, check-external-tests, compile-test, generate-policy-file" if="testng.available"> <fileset id="test.classes" dir="${build.test.classes.dir}"> <include name="**/framework/*Test.class"/> </fileset> @@ -546,7 +546,7 @@ </testng> </target> - <target name="test262" depends="jar, check-testng, check-external-tests, compile-test, generate-policy-file" if="testng.available"> + <target name="test262" depends="jar, get-testng, check-testng, check-external-tests, compile-test, generate-policy-file" if="testng.available"> <fileset id="test.classes" dir="${build.test.classes.dir}"> <include name="**/framework/*Test.class"/> </fileset> @@ -570,7 +570,7 @@ <target name="test262parallel" depends="test262-parallel"/> - <target name="test262-parallel" depends="jar, check-testng, check-external-tests, compile-test, generate-policy-file" if="testng.available"> + <target name="test262-parallel" depends="jar, get-testng, check-testng, check-external-tests, compile-test, generate-policy-file" if="testng.available"> <!-- use just build.test.classes.dir to avoid referring to TestNG --> <java classname="${parallel.test.runner}" dir="${basedir}" fork="true"> <jvmarg line="${boot.class.path}"/> @@ -589,7 +589,7 @@ <target name="testparallel" depends="test-parallel"/> - <target name="test-parallel" depends="jar, check-testng, check-external-tests, compile-test, generate-policy-file" if="testng.available"> + <target name="test-parallel" depends="jar, get-testng, check-testng, check-external-tests, compile-test, generate-policy-file" if="testng.available"> <!-- use just build.test.classes.dir to avoid referring to TestNG --> <java classname="${parallel.test.runner}" dir="${basedir}" failonerror="true" @@ -730,13 +730,8 @@ <!-- run all perf tests --> <target name="perf" depends="externals, update-externals, sunspider, octane"/> - <!-- run all tests --> - <target name="exit-if-no-testng" depends="init, check-testng" unless="${testng.available}"> - <fail message="Exiting.."/> - </target> - <!-- download and install testng.jar --> - <target name="get-testng" unless="testng.available"> + <target name="get-testng" depends="prepare" unless="testng.available"> <get src="http://testng.org/testng-6.8.zip" dest="${test.lib}" skipexisting="true" ignoreerrors="true"/> <unzip src="${test.lib}${file.separator}testng-6.8.zip" dest="${test.lib}"> <patternset> @@ -747,7 +742,8 @@ <delete dir="${test.lib}${file.separator}testng-6.8"/> </target> - <target name="alltests" depends="exit-if-no-testng, externals, update-externals, test, test262parallel, perf"/> + <!-- run all tests --> + <target name="alltests" depends="get-testng, externals, update-externals, test, test262parallel, testmarkdown, perf"/> <import file="build-benchmark.xml"/>