aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjlaskey <none@none>2013-07-16 17:40:15 -0300
committerjlaskey <none@none>2013-07-16 17:40:15 -0300
commitb2c944dbb9aac004e16add9be5305d02023e4c74 (patch)
tree88d3554bbeda0063ff8757a144aab68196470c2d
parent1769f7504373cc0364d318086c9901f6fe7a001c (diff)
downloadnashorn-b2c944dbb9aac004e16add9be5305d02023e4c74.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.txt4
-rw-r--r--exclude/exclude_list_cc.txt6
-rw-r--r--make/build.xml6
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>