Mercurial > jdk8-mips64-public > nashorn / file diff

     1.1 --- a/make/build.xml	Wed Feb 06 12:51:09 2013 -0400
     1.2 +++ b/make/build.xml	Thu Feb 07 17:17:29 2013 +0530
     1.3 @@ -198,25 +198,40 @@
     1.4             debug="${javac.debug}"
     1.5             encoding="${javac.encoding}"
     1.6             includeantruntime="false"/>
     1.7 +
     1.8 +    <!-- tests that check nashorn internals and internal API -->
     1.9 +    <jar jarfile="${nashorn.internal.tests.jar}">
    1.10 +      <fileset dir="${build.test.classes.dir}" excludes="**/api/scripting/*"/>
    1.11 +    </jar>
    1.12 +
    1.13 +    <!-- tests that check nashorn script engine (jsr-223) API -->
    1.14 +    <jar jarfile="${nashorn.api.tests.jar}">
    1.15 +      <fileset dir="${build.test.classes.dir}" includes="**/api/scripting/*"/>
    1.16 +    </jar>
    1.17 +
    1.18    </target>
    1.19  
    1.20    <target name="generate-policy-file">
    1.21      <!-- Generating nashorn.policy file -->
    1.22 -    <echo message="grant codeBase &quot;file:/${basedir}/dist/nashorn.jar&quot; {" file="${build.dir}/nashorn.policy"/>
    1.23 +
    1.24 +    <!-- nashorn internal tests jar requires AllPermission -->
    1.25 +    <echo message="grant codeBase &quot;file:/${basedir}/${nashorn.internal.tests.jar}&quot; {" file="${build.dir}/nashorn.policy"/>
    1.26      <echo message="" file="${build.dir}/nashorn.policy" append="true"/>
    1.27 -    <echo message="permission java.security.AllPermission;" file="${build.dir}/nashorn.policy" append="true"/>
    1.28 +    <echo message="    permission java.security.AllPermission;" file="${build.dir}/nashorn.policy" append="true"/>
    1.29      <echo message="" file="${build.dir}/nashorn.policy" append="true"/>
    1.30      <echo message="};" file="${build.dir}/nashorn.policy" append="true"/>
    1.31      <echo message="" file="${build.dir}/nashorn.policy" append="true"/>
    1.32 -
    1.33 -    <echo message="grant codeBase &quot;file:/${basedir}/build/test/classes&quot; {" file="${build.dir}/nashorn.policy" append="true"/>
    1.34 +    
    1.35 +    <!-- TestNG framework jar needs AllPermission -->
    1.36 +    <echo message="grant codeBase &quot;file:/${basedir}/${file.reference.testng.jar}&quot; {" file="${build.dir}/nashorn.policy" append="true"/>
    1.37      <echo message="" file="${build.dir}/nashorn.policy" append="true"/>
    1.38      <echo message="    permission java.security.AllPermission;" file="${build.dir}/nashorn.policy" append="true"/>
    1.39      <echo message="" file="${build.dir}/nashorn.policy" append="true"/>
    1.40      <echo message="};" file="${build.dir}/nashorn.policy" append="true"/>
    1.41      <echo message="" file="${build.dir}/nashorn.policy" append="true"/>
    1.42  
    1.43 -    <echo message="grant codeBase &quot;file:/${basedir}/${file.reference.testng.jar}&quot; {" file="${build.dir}/nashorn.policy" append="true"/>
    1.44 +    <!-- AllPermission to test/script/trusted tests -->
    1.45 +    <echo message="grant codeBase &quot;file:/${basedir}/test/script/trusted/*&quot; {" file="${build.dir}/nashorn.policy" append="true"/>
    1.46      <echo message="" file="${build.dir}/nashorn.policy" append="true"/>
    1.47      <echo message="    permission java.security.AllPermission;" file="${build.dir}/nashorn.policy" append="true"/>
    1.48      <echo message="" file="${build.dir}/nashorn.policy" append="true"/>
    1.49 @@ -225,14 +240,11 @@
    1.50  
    1.51      <echo message="grant codeBase &quot;file:/${basedir}/test/script/basic/*&quot; {" file="${build.dir}/nashorn.policy" append="true"/>
    1.52      <echo message="" file="${build.dir}/nashorn.policy" append="true"/>
    1.53 -    <echo message="    permission java.security.AllPermission;" file="${build.dir}/nashorn.policy" append="true"/>
    1.54 +    <!-- test/script/basic .js scripts load other script tests -->
    1.55 +    <echo message="    permission java.io.FilePermission &quot;${basedir}/test/script/-&quot;, &quot;read&quot;;" file="${build.dir}/nashorn.policy" append="true"/>
    1.56      <echo message="" file="${build.dir}/nashorn.policy" append="true"/>
    1.57 -    <echo message="};" file="${build.dir}/nashorn.policy" append="true"/>
    1.58 -    <echo message="" file="${build.dir}/nashorn.policy" append="true"/>
    1.59 -
    1.60 -    <echo message="grant codeBase &quot;file:/${basedir}/test/perf/*&quot; {" file="${build.dir}/nashorn.policy" append="true"/>
    1.61 -    <echo message="" file="${build.dir}/nashorn.policy" append="true"/>
    1.62 -    <echo message="    permission java.security.AllPermission;" file="${build.dir}/nashorn.policy" append="true"/>
    1.63 +    <!-- test/script/basic .js scripts can read nashorn.test.* properties -->
    1.64 +    <echo message="    permission java.util.PropertyPermission &quot;nashorn.test.*&quot;, &quot;read&quot;;" file="${build.dir}/nashorn.policy" append="true"/>
    1.65      <echo message="" file="${build.dir}/nashorn.policy" append="true"/>
    1.66      <echo message="};" file="${build.dir}/nashorn.policy" append="true"/>
    1.67      <echo message="" file="${build.dir}/nashorn.policy" append="true"/>