Mercurial > jdk8-mips64-public > nashorn / changeset

     1.1 --- a/make/Makefile	Fri Jan 11 18:26:18 2013 +0530
     1.2 +++ b/make/Makefile	Fri Jan 11 20:34:22 2013 +0530
     1.3 @@ -181,16 +181,13 @@
     1.4  endif
     1.5  
     1.6  # Default target and expected 'do everything' target
     1.7 -# comments docs to avoid too many ASM warnings
     1.8 -# all: test docs
     1.9 -
    1.10 -all: test
    1.11 +all: test docs
    1.12  
    1.13  # Standard make clobber target
    1.14  clobber: clean
    1.15  
    1.16  # All ant targets of interest
    1.17 -ANT_TARGETS = clean externals update-externals jar javadoc shelldoc docs test test262 test262parallel # for now
    1.18 +ANT_TARGETS = clean externals update-externals jar javadoc shelldoc docs test test262 test262parallel octane sunspider perf alltests
    1.19  
    1.20  # Create diagnostics log (careful, ant 1.8.0 -diagnostics always does an exit 1)
    1.21  $(OUTPUTDIR)/build/ant-diagnostics.log:

     2.1 --- a/make/build.xml	Fri Jan 11 18:26:18 2013 +0530
     2.2 +++ b/make/build.xml	Fri Jan 11 20:34:22 2013 +0530
     2.3 @@ -37,6 +37,10 @@
     2.4      <condition property="hg.executable" value="/usr/local/bin/hg" else="hg">
     2.5        <available file="/usr/local/bin/hg"/>
     2.6      </condition>
     2.7 +    <!-- check if JDK already has ASM classes -->
     2.8 +    <available property="asm.available" classname="jdk.internal.org.objectweb.asm.Type"/>
     2.9 +    <!-- check if testng.jar is avaiable -->
    2.10 +    <available property="testng.available" file="${file.reference.testng.jar}"/>
    2.11    </target>
    2.12  
    2.13    <target name="prepare" depends="init">
    2.14 @@ -46,10 +50,6 @@
    2.15      <mkdir dir="${build.test.classes.dir}"/>
    2.16      <mkdir dir="${dist.dir}"/>
    2.17      <mkdir dir="${dist.javadoc.dir}"/>
    2.18 -    <!-- check if JDK already has ASM classes -->
    2.19 -    <available property="asm.available" classname="jdk.internal.org.objectweb.asm.Type"/>
    2.20 -    <!-- check if testng.jar is avaiable -->
    2.21 -    <available property="testng.available" file="${file.reference.testng.jar}"/>
    2.22    </target>
    2.23  
    2.24    <target name="clean" depends="init, clean-nasgen">
    2.25 @@ -424,7 +424,7 @@
    2.26    </target>
    2.27  
    2.28    <!-- get all external test scripts -->
    2.29 -  <target name="externals" depends="prepare, check-external-tests, get-test262, get-octane, get-sunspider">
    2.30 +  <target name="externals" depends="init, check-external-tests, get-test262, get-octane, get-sunspider">
    2.31      <!-- make external test dir -->
    2.32      <mkdir dir="${test.external.dir}"/> 
    2.33  
    2.34 @@ -450,6 +450,16 @@
    2.35    </target>
    2.36  
    2.37    <!-- update external test suites that are pulled from source control systems -->
    2.38 -  <target name="update-externals" depends="prepare, check-external-tests, update-test262, update-octane, update-sunspider"/>
    2.39 +  <target name="update-externals" depends="init, check-external-tests, update-test262, update-octane, update-sunspider"/>
    2.40 +
    2.41 +  <!-- run all perf tests -->
    2.42 +  <target name="perf" depends="externals, update-externals, sunspider, octane"/>
    2.43 +
    2.44 +  <!-- run all tests -->
    2.45 +  <target name="exit-if-no-testng" depends="init, check-testng" unless="${testng.available}">
    2.46 +     <fail message="Exiting.."/>
    2.47 +  </target>
    2.48 +
    2.49 +  <target name="alltests" depends="exit-if-no-testng, externals, update-externals, test, test262parallel, perf"/>
    2.50  
    2.51  </project>