Mercurial > jdk8-mips64-public > nashorn / changeset

     1.1 --- a/make/build.xml	Tue Jun 02 14:35:03 2015 +0200
     1.2 +++ b/make/build.xml	Tue Jun 02 17:08:13 2015 +0200
     1.3 @@ -460,7 +460,7 @@
     1.4      </testng>
     1.5    </target>
     1.6  
     1.7 -  <target name="test" depends="javadoc, test-pessimistic, test-optimistic, testmarkdown"/>
     1.8 +  <target name="test" depends="get-testng, javadoc, test-pessimistic, test-optimistic"/>
     1.9  
    1.10    <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">
    1.11      <echo message="Running test suite in OPTIMISTIC mode..."/>
    1.12 @@ -490,7 +490,7 @@
    1.13      <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."/>
    1.14    </target>
    1.15  
    1.16 -  <target name="testjfx" depends="jar, check-jemmy.jfx.testng, compile-test" if="jemmy.jfx.testng.available">
    1.17 +  <target name="testjfx" depends="jar, get-testng, check-jemmy.jfx.testng, compile-test" if="jemmy.jfx.testng.available">
    1.18      <fileset id="test.classes" dir="${build.test.classes.dir}">
    1.19         <include name="**/framework/*Test.class"/>
    1.20      </fileset>
    1.21 @@ -518,7 +518,7 @@
    1.22      </testng>
    1.23    </target>
    1.24  
    1.25 -  <target name="testmarkdown" depends="jar, check-testng, check-external-tests, compile-test, generate-policy-file" if="testng.available">
    1.26 +  <target name="testmarkdown" depends="jar, get-testng, check-testng, check-external-tests, compile-test, generate-policy-file" if="testng.available">
    1.27      <fileset id="test.classes" dir="${build.test.classes.dir}">
    1.28         <include name="**/framework/*Test.class"/>
    1.29      </fileset>
    1.30 @@ -537,7 +537,7 @@
    1.31      </testng>
    1.32    </target>
    1.33  
    1.34 -  <target name="test262" depends="jar, check-testng, check-external-tests, compile-test, generate-policy-file" if="testng.available">
    1.35 +  <target name="test262" depends="jar, get-testng, check-testng, check-external-tests, compile-test, generate-policy-file" if="testng.available">
    1.36      <fileset id="test.classes" dir="${build.test.classes.dir}">
    1.37         <include name="**/framework/*Test.class"/>
    1.38      </fileset>
    1.39 @@ -561,7 +561,7 @@
    1.40  
    1.41    <target name="test262parallel" depends="test262-parallel"/>
    1.42  
    1.43 -  <target name="test262-parallel" depends="jar, check-testng, check-external-tests, compile-test, generate-policy-file" if="testng.available">
    1.44 +  <target name="test262-parallel" depends="jar, get-testng, check-testng, check-external-tests, compile-test, generate-policy-file" if="testng.available">
    1.45      <!-- use just build.test.classes.dir to avoid referring to TestNG -->
    1.46      <java classname="${parallel.test.runner}" dir="${basedir}" fork="true">
    1.47        <jvmarg line="${ext.class.path}"/>
    1.48 @@ -580,7 +580,7 @@
    1.49  
    1.50    <target name="testparallel" depends="test-parallel"/>
    1.51  
    1.52 -  <target name="test-parallel" depends="jar, check-testng, check-external-tests, compile-test, generate-policy-file" if="testng.available">
    1.53 +  <target name="test-parallel" depends="jar, get-testng, check-testng, check-external-tests, compile-test, generate-policy-file" if="testng.available">
    1.54        <!-- use just build.test.classes.dir to avoid referring to TestNG -->
    1.55        <java classname="${parallel.test.runner}" dir="${basedir}"
    1.56          failonerror="true"
    1.57 @@ -721,13 +721,8 @@
    1.58    <!-- run all perf tests -->
    1.59    <target name="perf" depends="externals, update-externals, sunspider, octane"/>
    1.60  
    1.61 -  <!-- run all tests -->
    1.62 -  <target name="exit-if-no-testng" depends="init, check-testng" unless="${testng.available}">
    1.63 -     <fail message="Exiting.."/>
    1.64 -  </target>
    1.65 -
    1.66    <!-- download and install testng.jar -->
    1.67 -  <target name="get-testng" unless="testng.available">
    1.68 +  <target name="get-testng" depends="prepare" unless="testng.available">
    1.69      <get src="http://testng.org/testng-6.8.zip" dest="${test.lib}" skipexisting="true" ignoreerrors="true"/>
    1.70      <unzip src="${test.lib}${file.separator}testng-6.8.zip" dest="${test.lib}">
    1.71        <patternset>
    1.72 @@ -738,7 +733,8 @@
    1.73      <delete dir="${test.lib}${file.separator}testng-6.8"/>
    1.74    </target>
    1.75  
    1.76 -  <target name="alltests" depends="exit-if-no-testng, externals, update-externals, test, test262parallel, perf"/>
    1.77 +  <!-- run all tests -->
    1.78 +  <target name="alltests" depends="get-testng, externals, update-externals, test, test262parallel, testmarkdown, perf"/>
    1.79  
    1.80    <import file="build-benchmark.xml"/>
    1.81