diff options
author | mhaupt <none@none> | 2015-06-02 17:08:13 +0200 |
---|---|---|
committer | mhaupt <none@none> | 2015-06-02 17:08:13 +0200 |
commit | d3e13e0ca362bbfe53dd858b4d14bc3f6fe93ed7 (patch) | |
tree | f97d3d514772b64d281d7d792cafa77ed2a5b485 | |
parent | 557974a9bdb677e447993cc6f69a865ab0530a6b (diff) | |
download | jdk8u_nashorn-d3e13e0ca362bbfe53dd858b4d14bc3f6fe93ed7.tar.gz |
8081696: reduce dependency of Nashorn tests on external components
Reviewed-by: attila, sundar
-rw-r--r-- | make/build.xml | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/make/build.xml b/make/build.xml index 4ad71188..555c3456 100644 --- a/make/build.xml +++ b/make/build.xml @@ -460,7 +460,7 @@ grant codeBase "file:/${basedir}/test/script/markdown.js" { </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..."/> @@ -490,7 +490,7 @@ grant codeBase "file:/${basedir}/test/script/markdown.js" { <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> @@ -518,7 +518,7 @@ grant codeBase "file:/${basedir}/test/script/markdown.js" { </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> @@ -537,7 +537,7 @@ grant codeBase "file:/${basedir}/test/script/markdown.js" { </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> @@ -561,7 +561,7 @@ grant codeBase "file:/${basedir}/test/script/markdown.js" { <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="${ext.class.path}"/> @@ -580,7 +580,7 @@ grant codeBase "file:/${basedir}/test/script/markdown.js" { <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" @@ -721,13 +721,8 @@ grant codeBase "file:/${basedir}/test/script/markdown.js" { <!-- 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> @@ -738,7 +733,8 @@ grant codeBase "file:/${basedir}/test/script/markdown.js" { <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"/> |