Mercurial > jdk8-mips64-public > nashorn / changeset

     1.1 --- a/make/build.xml	Tue Oct 14 16:11:07 2014 +0200
     1.2 +++ b/make/build.xml	Tue Oct 14 13:04:56 2014 +0200
     1.3 @@ -407,7 +407,7 @@
     1.4      <fileset id="test.nosecurity.classes" dir="${build.test.classes.dir}">
     1.5        <include name="**/framework/ScriptTest.class"/>
     1.6      </fileset>
     1.7 -    <testng outputdir="${build.nosecurity.test.results.dir}" classfilesetref="test.nosecurity.classes"
     1.8 +    <testng outputdir="${build.nosecurity.test.results.dir}/${testResultsSubDir}" classfilesetref="test.nosecurity.classes"
     1.9         verbose="${testng.verbose}" haltonfailure="true" useDefaultListeners="false" listeners="${testng.listeners}" workingDir="${basedir}">
    1.10        <jvmarg line="${ext.class.path}"/>
    1.11        <jvmarg line="${run.test.jvmargs} -Xmx${run.test.xmx} -Dbuild.dir=${build.dir}"/>
    1.12 @@ -430,7 +430,7 @@
    1.13    <target name="-test-security">
    1.14      <delete dir="${build.dir}/nashorn_code_cache"/>
    1.15      <property name="debug.test.jvmargs" value=""/>
    1.16 -    <testng outputdir="${build.test.results.dir}" classfilesetref="test.classes"
    1.17 +    <testng outputdir="${build.test.results.dir}/${testResultsSubDir}" classfilesetref="test.classes"
    1.18  	    verbose="${testng.verbose}" haltonfailure="true" useDefaultListeners="false" listeners="${testng.listeners}" workingDir="${basedir}">
    1.19        <jvmarg line="${ext.class.path}"/>
    1.20        <jvmarg line="${run.test.jvmargs} -Xmx${run.test.xmx} ${run.test.jvmsecurityargs} -Dbuild.dir=${build.dir}"/>
    1.21 @@ -456,9 +456,11 @@
    1.22      <echo message="Running test suite in OPTIMISTIC mode..."/>
    1.23      <antcall target="-test-nosecurity" inheritRefs="true">
    1.24        <param name="optimistic" value="true"/>
    1.25 +      <param name="testResultsSubDir" value="optimistic"/>
    1.26      </antcall>    
    1.27      <antcall target="-test-security" inheritRefs="true">
    1.28        <param name="optimistic" value="true"/>
    1.29 +      <param name="testResultsSubDir" value="optimistic"/>
    1.30      </antcall>
    1.31    </target>
    1.32  
    1.33 @@ -466,9 +468,11 @@
    1.34      <echo message="Running test suite in PESSIMISTIC mode..."/>
    1.35      <antcall target="-test-nosecurity" inheritRefs="true">
    1.36        <param name="optimistic" value="false"/>
    1.37 +      <param name="testResultsSubDir" value="pessimistic"/>
    1.38      </antcall>    
    1.39      <antcall target="-test-security" inheritRefs="true">
    1.40        <param name="optimistic" value="false"/>
    1.41 +      <param name="testResultsSubDir" value="pessimistic"/>
    1.42      </antcall>
    1.43    </target>
    1.44