362 <target name="check-testng" unless="testng.available"> |
362 <target name="check-testng" unless="testng.available"> |
363 <echo message="WARNING: TestNG not available, will not run tests. Please copy testng.jar under test/lib directory."/> |
363 <echo message="WARNING: TestNG not available, will not run tests. Please copy testng.jar under test/lib directory."/> |
364 </target> |
364 </target> |
365 |
365 |
366 <target name="test" depends="jar, check-testng, check-external-tests, compile-test, generate-policy-file" if="testng.available"> |
366 <target name="test" depends="jar, check-testng, check-external-tests, compile-test, generate-policy-file" if="testng.available"> |
|
367 <delete dir="${build.dir}/nashorn_code_cache"/> |
367 <fileset id="test.classes" dir="${build.test.classes.dir}"> |
368 <fileset id="test.classes" dir="${build.test.classes.dir}"> |
368 <include name="**/api/javaaccess/*Test.class"/> |
369 <include name="**/api/javaaccess/*Test.class"/> |
369 <include name="**/api/scripting/*Test.class"/> |
370 <include name="**/api/scripting/*Test.class"/> |
370 <include name="**/codegen/*Test.class"/> |
371 <include name="**/codegen/*Test.class"/> |
371 <include name="**/parser/*Test.class"/> |
372 <include name="**/parser/*Test.class"/> |
372 <include name="**/runtime/*Test.class"/> |
373 <include name="**/runtime/*Test.class"/> |
373 <include name="**/runtime/regexp/*Test.class"/> |
374 <include name="**/runtime/regexp/*Test.class"/> |
374 <include name="**/runtime/regexp/joni/*Test.class"/> |
375 <include name="**/runtime/regexp/joni/*Test.class"/> |
375 <include name="**/framework/*Test.class"/> |
376 <include name="**/framework/*Test.class"/> |
376 <exclude name="jdk/nashorn/internal/runtime/CodeStoreAndPathTest.class"/> |
|
377 </fileset> |
377 </fileset> |
378 |
378 |
379 <fileset id="test.nosecurity.classes" dir="${build.test.classes.dir}"> |
379 <fileset id="test.nosecurity.classes" dir="${build.test.classes.dir}"> |
380 <include name="**/framework/ScriptTest.class"/> |
380 <include name="**/framework/ScriptTest.class"/> |
381 </fileset> |
381 </fileset> |
382 |
|
383 <fileset id="test.nooptimistic.classes" dir="${build.test.classes.dir}"> |
|
384 <include name="jdk/nashorn/internal/runtime/CodeStoreAndPathTest.class"/> |
|
385 </fileset> |
|
386 |
|
387 <testng outputdir="${build.nooptimistic.test.results.dir}" classfilesetref="test.nooptimistic.classes" |
|
388 verbose="${testng.verbose}" haltonfailure="true" useDefaultListeners="false" listeners="${testng.listeners}" workingDir="${basedir}"> |
|
389 <jvmarg line="${ext.class.path}"/> |
|
390 <jvmarg line="${run.test.jvmargs} -Xmx${run.test.xmx} ${run.test.jvmsecurityargs}"/> |
|
391 <sysproperty key="nashorn.optimistic" value="false"/> |
|
392 <propertyset> |
|
393 <propertyref prefix="nashorn."/> |
|
394 </propertyset> |
|
395 <classpath> |
|
396 <pathelement path="${run.test.classpath}"/> |
|
397 </classpath> |
|
398 </testng> |
|
399 |
382 |
400 <testng outputdir="${build.test.results.dir}" classfilesetref="test.classes" |
383 <testng outputdir="${build.test.results.dir}" classfilesetref="test.classes" |
401 verbose="${testng.verbose}" haltonfailure="true" useDefaultListeners="false" listeners="${testng.listeners}" workingDir="${basedir}"> |
384 verbose="${testng.verbose}" haltonfailure="true" useDefaultListeners="false" listeners="${testng.listeners}" workingDir="${basedir}"> |
402 <jvmarg line="${ext.class.path}"/> |
385 <jvmarg line="${ext.class.path}"/> |
403 <jvmarg line="${run.test.jvmargs} -Xmx${run.test.xmx} ${run.test.jvmsecurityargs}"/> |
386 <jvmarg line="${run.test.jvmargs} -Xmx${run.test.xmx} ${run.test.jvmsecurityargs}"/> |