8017585: Exclude two failing tests from Nashorn CC run

Reviewed-by: jlaskey, sundar, attila
This commit is contained in:
Konstantin Shefov 2013-07-16 17:40:15 -03:00 committed by Jim Laskey
parent f6a5b67f14
commit 3485b7bc5c
3 changed files with 16 additions and 0 deletions

View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<excludeList>
</excludeList>

View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<excludeList>
<test id="JDK-8014647.js" />
<test id="javaclassoverrides.js" />
</excludeList>

View File

@ -51,6 +51,11 @@
<condition property="cc.enabled"> <condition property="cc.enabled">
<istrue value="${make.code.coverage}" /> <istrue value="${make.code.coverage}" />
</condition> </condition>
<!-- exclude tests in exclude lists -->
<condition property="exclude.list" value="./exclude/exclude_list_cc.txt" else="./exclude/exclude_list.txt">
<istrue value="${make.code.coverage}" />
</condition>
</target> </target>
<target name="init" depends="init-conditions, init-cc"> <target name="init" depends="init-conditions, init-cc">
@ -316,6 +321,7 @@ grant codeBase "file:/${basedir}/test/script/basic/JDK-8010946-privileged.js" {
<propertyref prefix="test-sys-prop."/> <propertyref prefix="test-sys-prop."/>
<mapper from="test-sys-prop.*" to="*" type="glob"/> <mapper from="test-sys-prop.*" to="*" type="glob"/>
</propertyset> </propertyset>
<sysproperty key="test.js.excludes.file" value="${exclude.list}"/>
<classpath> <classpath>
<pathelement path="${run.test.classpath}"/> <pathelement path="${run.test.classpath}"/>
</classpath> </classpath>