diff options
| author | jlaskey <none@none> | 2013-07-16 17:40:15 -0300 |
|---|---|---|
| committer | jlaskey <none@none> | 2013-07-16 17:40:15 -0300 |
| commit | 46659522994343d3398e97863012f3a85b09eab9 (patch) | |
| tree | 88d3554bbeda0063ff8757a144aab68196470c2d | |
| parent | 076d3176ec7808b93f76e2e174173184db34c587 (diff) | |
| download | jdk8u_nashorn-46659522994343d3398e97863012f3a85b09eab9.tar.gz | |
8017585: Exclude two failing tests from Nashorn CC run
Reviewed-by: jlaskey, sundar, attila
Contributed-by: konstantin.shefov@oracle.com
| -rw-r--r-- | exclude/exclude_list.txt | 4 | ||||
| -rw-r--r-- | exclude/exclude_list_cc.txt | 6 | ||||
| -rw-r--r-- | make/build.xml | 6 |
3 files changed, 16 insertions, 0 deletions
diff --git a/exclude/exclude_list.txt b/exclude/exclude_list.txt new file mode 100644 index 00000000..89618933 --- /dev/null +++ b/exclude/exclude_list.txt @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + +<excludeList> +</excludeList> diff --git a/exclude/exclude_list_cc.txt b/exclude/exclude_list_cc.txt new file mode 100644 index 00000000..a66476b8 --- /dev/null +++ b/exclude/exclude_list_cc.txt @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + +<excludeList> + <test id="JDK-8014647.js" /> + <test id="javaclassoverrides.js" /> +</excludeList> diff --git a/make/build.xml b/make/build.xml index 2bda503f..4aaac75c 100644 --- a/make/build.xml +++ b/make/build.xml @@ -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 @@ grant codeBase "file:/${basedir}/test/script/basic/JDK-8010946-privileged.js" { <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> |