Tue, 16 Jul 2013 17:40:15 -0300
8017585: Exclude two failing tests from Nashorn CC run
Reviewed-by: jlaskey, sundar, attila
Contributed-by: konstantin.shefov@oracle.com
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/exclude/exclude_list.txt Tue Jul 16 17:40:15 2013 -0300 1.3 @@ -0,0 +1,4 @@ 1.4 +<?xml version="1.0" encoding="ISO-8859-1"?> 1.5 + 1.6 +<excludeList> 1.7 +</excludeList>
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 2.2 +++ b/exclude/exclude_list_cc.txt Tue Jul 16 17:40:15 2013 -0300 2.3 @@ -0,0 +1,6 @@ 2.4 +<?xml version="1.0" encoding="ISO-8859-1"?> 2.5 + 2.6 +<excludeList> 2.7 + <test id="JDK-8014647.js" /> 2.8 + <test id="javaclassoverrides.js" /> 2.9 +</excludeList>
3.1 --- a/make/build.xml Tue Jul 16 17:03:30 2013 +0200 3.2 +++ b/make/build.xml Tue Jul 16 17:40:15 2013 -0300 3.3 @@ -51,6 +51,11 @@ 3.4 <condition property="cc.enabled"> 3.5 <istrue value="${make.code.coverage}" /> 3.6 </condition> 3.7 + 3.8 + <!-- exclude tests in exclude lists --> 3.9 + <condition property="exclude.list" value="./exclude/exclude_list_cc.txt" else="./exclude/exclude_list.txt"> 3.10 + <istrue value="${make.code.coverage}" /> 3.11 + </condition> 3.12 </target> 3.13 3.14 <target name="init" depends="init-conditions, init-cc"> 3.15 @@ -316,6 +321,7 @@ 3.16 <propertyref prefix="test-sys-prop."/> 3.17 <mapper from="test-sys-prop.*" to="*" type="glob"/> 3.18 </propertyset> 3.19 + <sysproperty key="test.js.excludes.file" value="${exclude.list}"/> 3.20 <classpath> 3.21 <pathelement path="${run.test.classpath}"/> 3.22 </classpath>