Mercurial > hg > openjdk > aarch64-port > nashorn
changeset 454:e1d19f9fd5a9
8017585: Exclude two failing tests from Nashorn CC run
Reviewed-by: jlaskey, sundar, attila
Contributed-by: konstantin.shefov@oracle.com
| author | jlaskey |
|---|---|
| date | Tue, 16 Jul 2013 17:40:15 -0300 |
| parents | 78bdb8a7f1e7 |
| children | 71cfe4e66bcb |
| files | exclude/exclude_list.txt exclude/exclude_list_cc.txt make/build.xml |
| diffstat | 3 files changed, 16 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/exclude/exclude_list.txt Tue Jul 16 17:40:15 2013 -0300 @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + +<excludeList> +</excludeList>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/exclude/exclude_list_cc.txt Tue Jul 16 17:40:15 2013 -0300 @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + +<excludeList> + <test id="JDK-8014647.js" /> + <test id="javaclassoverrides.js" /> +</excludeList>
--- a/make/build.xml Tue Jul 16 17:03:30 2013 +0200 +++ b/make/build.xml Tue Jul 16 17:40:15 2013 -0300 @@ -51,6 +51,11 @@ <condition property="cc.enabled"> <istrue value="${make.code.coverage}" /> </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 name="init" depends="init-conditions, init-cc"> @@ -316,6 +321,7 @@ <propertyref prefix="test-sys-prop."/> <mapper from="test-sys-prop.*" to="*" type="glob"/> </propertyset> + <sysproperty key="test.js.excludes.file" value="${exclude.list}"/> <classpath> <pathelement path="${run.test.classpath}"/> </classpath>