1.1 --- a/make/build.xml Thu Jul 25 20:10:48 2013 +0530
1.2 +++ b/make/build.xml Fri Jul 26 13:50:52 2013 +0200
1.3 @@ -47,10 +47,10 @@
1.4 <!-- check if testng.jar is avaiable -->
1.5 <available property="testng.available" file="${file.reference.testng.jar}"/>
1.6
1.7 - <!-- enable/disable make code coverage -->
1.8 - <condition property="cc.enabled">
1.9 - <istrue value="${make.code.coverage}" />
1.10 - </condition>
1.11 + <!-- enable/disable make code coverage -->
1.12 + <condition property="cc.enabled">
1.13 + <istrue value="${make.code.coverage}" />
1.14 + </condition>
1.15
1.16 <!-- exclude tests in exclude lists -->
1.17 <condition property="exclude.list" value="./exclude/exclude_list_cc.txt" else="./exclude/exclude_list.txt">
1.18 @@ -60,9 +60,9 @@
1.19
1.20 <target name="init" depends="init-conditions, init-cc">
1.21
1.22 - <!-- extends jvm args -->
1.23 - <property name="run.test.jvmargs" value="${run.test.jvmargs.main} ${run.test.cc.jvmargs}"/>
1.24 - <property name="run.test.jvmargs.octane" value="${run.test.jvmargs.octane.main} ${run.test.cc.jvmargs}" />
1.25 + <!-- extends jvm args -->
1.26 + <property name="run.test.jvmargs" value="${run.test.jvmargs.main} ${run.test.cc.jvmargs}"/>
1.27 + <property name="run.test.jvmargs.octane" value="${run.test.jvmargs.octane.main} ${run.test.cc.jvmargs}" />
1.28
1.29 <echo message="run.test.jvmargs=${run.test.jvmargs}"/>
1.30 <echo message="run.test.jvmargs.octane=${run.test.jvmargs.octane}"/>
1.31 @@ -294,19 +294,6 @@
1.32 </target>
1.33
1.34 <target name="test" depends="jar, check-testng, check-external-tests, compile-test, generate-policy-file" if="testng.available">
1.35 - <java classname="${nashorn.shell.tool}" fork="true" dir="${test.script.dir}/representations" output="${build.dir}/output1.log" error="${build.dir}/err.log">
1.36 - <jvmarg line="${ext.class.path}"/>
1.37 - <jvmarg line="-Dnashorn.fields.dual=true"/>
1.38 - <arg value="NASHORN-592a.js"/>
1.39 - </java>
1.40 - <java classname="${nashorn.shell.tool}" fork="true" dir="${test.script.dir}/representations" output="${build.dir}/output2.log" error="${build.dir}/err.log">
1.41 - <jvmarg line="${ext.class.path}"/>
1.42 - <arg value="NASHORN-592a.js"/>
1.43 - </java>
1.44 - <condition property="representation-ok">
1.45 - <filesmatch file1="${build.dir}/output1.log" file2="${build.dir}/output2.log"/>
1.46 - </condition>
1.47 - <fail unless="representation-ok">Representation test failed - output differs!</fail>
1.48 <fileset id="test.classes" dir="${build.test.classes.dir}">
1.49 <include name="**/api/javaaccess/*Test.class"/>
1.50 <include name="**/api/scripting/*Test.class"/>
