summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Moir2012-01-20 15:29:41 (EST)
committerKim Moir2012-01-20 15:29:41 (EST)
commit4ec717de24f21a9064839e37c6dfa52d76ff38b5 (patch)
tree851840c443c31fc15daa91e2d8909952a9e27eae
parent20c2f52135017ea2df1762d8f6cd1c864f6b78f1 (diff)
downloadeclipse.platform.releng-4ec717de24f21a9064839e37c6dfa52d76ff38b5.zip
eclipse.platform.releng-4ec717de24f21a9064839e37c6dfa52d76ff38b5.tar.gz
eclipse.platform.releng-4ec717de24f21a9064839e37c6dfa52d76ff38b5.tar.bz2
Bug 342460 - Run SDK tests against Oracle Java 7 JREv20120120-2029
-rw-r--r--bundles/org.eclipse.test/library.xml8
1 files changed, 4 insertions, 4 deletions
diff --git a/bundles/org.eclipse.test/library.xml b/bundles/org.eclipse.test/library.xml
index dc4de72..2d70a40 100644
--- a/bundles/org.eclipse.test/library.xml
+++ b/bundles/org.eclipse.test/library.xml
@@ -44,10 +44,10 @@
<echo message="basedir = ${basedir}" />
<condition property="extraVMargs" value="-javaagent:${basedir}/plugins/org.eclipse.test_${org.eclipse.test}/lib/jacocoagent.jar=destfile=${coverage-output}/jacoco${classname}${NOW.DSTAMP}_${NOW.TSTAMP}.exec">
<not>
- <and>
- <equals arg1="${test.target}" arg2="performance" />
- <os family="windows" />
- </and>
+ <or>
+ <equals arg1="${test.target}" arg2="performance" />
+ <os family="windows" />
+ </or>
</not>
</condition>
<property name="extraVMargs" value="" />