aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDawid Pakuła2014-01-21 12:30:18 (EST)
committerDawid Pakuła2014-01-21 12:30:18 (EST)
commit6fea403c64659ade75758a4e39b8ec6a02dc5473 (patch)
tree47897a2a9ae2be73ca47b485aeb94ac1042d3faa
parent579b8d82d4bc73797aeb3b963fd5cdbcf8310eb7 (diff)
downloadorg.eclipse.pdt-6fea403c64659ade75758a4e39b8ec6a02dc5473.zip
org.eclipse.pdt-6fea403c64659ade75758a4e39b8ec6a02dc5473.tar.gz
org.eclipse.pdt-6fea403c64659ade75758a4e39b8ec6a02dc5473.tar.bz2
Bug 426063 - It's not possible to use releng tools (mvn clean verify) on OSXrefs/changes/91/20891/1
Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=426063 Change-Id: Ieeda009670abc5976232f49565e9faa02eb9cb4b Signed-off-by: Dawid Pakuła <zulus@w3des.net>
-rw-r--r--org.eclipse.pdt.releng/pom.xml15
-rw-r--r--tests/org.eclipse.php.core.tests/pom.xml39
-rw-r--r--tests/org.eclipse.php.formatter.core.tests/pom.xml2
-rw-r--r--tests/org.eclipse.php.ui.tests/pom.xml30
4 files changed, 38 insertions, 48 deletions
diff --git a/org.eclipse.pdt.releng/pom.xml b/org.eclipse.pdt.releng/pom.xml
index 3a18d35..1a3759c 100644
--- a/org.eclipse.pdt.releng/pom.xml
+++ b/org.eclipse.pdt.releng/pom.xml
@@ -13,8 +13,21 @@
<tycho-version>0.14.0</tycho-version>
<antrun-version>1.6</antrun-version>
<maven.test.failure.ignore>true</maven.test.failure.ignore>
+ <test.vmargs />
</properties>
-
+ <profiles>
+ <profile>
+ <id>macosx</id>
+ <activation>
+ <os>
+ <family>mac</family>
+ </os>
+ </activation>
+ <properties>
+ <test.vmargs>-XstartOnFirstThread</test.vmargs>
+ </properties>
+ </profile>
+ </profiles>
<build>
<plugins>
<plugin>
diff --git a/tests/org.eclipse.php.core.tests/pom.xml b/tests/org.eclipse.php.core.tests/pom.xml
index fc69787..01f9416 100644
--- a/tests/org.eclipse.php.core.tests/pom.xml
+++ b/tests/org.eclipse.php.core.tests/pom.xml
@@ -13,25 +13,26 @@
<artifactId>org.eclipse.php.core.tests</artifactId>
<version>3.2.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
-
-
+
+
<build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-surefire-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <testSuite>org.eclipse.php.core.tests</testSuite>
- <testClass>org.eclipse.php.core.tests.AllTests</testClass>
- <dependencies>
- <dependency>
- <type>p2-installable-unit</type>
- <artifactId>org.eclipse.dltk.core.index.sql.h2</artifactId>
- </dependency>
- </dependencies>
- </configuration>
- </plugin>
- </plugins>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <testSuite>org.eclipse.php.core.tests</testSuite>
+ <testClass>org.eclipse.php.core.tests.AllTests</testClass>
+ <dependencies>
+ <dependency>
+ <type>p2-installable-unit</type>
+ <artifactId>org.eclipse.dltk.core.index.sql.h2</artifactId>
+ </dependency>
+ </dependencies>
+ <testFailureIgnore>false</testFailureIgnore>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
</project>
diff --git a/tests/org.eclipse.php.formatter.core.tests/pom.xml b/tests/org.eclipse.php.formatter.core.tests/pom.xml
index ea6d49b..651b6de 100644
--- a/tests/org.eclipse.php.formatter.core.tests/pom.xml
+++ b/tests/org.eclipse.php.formatter.core.tests/pom.xml
@@ -21,7 +21,7 @@
<configuration>
<useUIHarness>true</useUIHarness>
<useUIThread>false</useUIThread>
- <argLine>-Xmx512m -XX:MaxPermSize=256m</argLine>
+ <argLine>-Xmx512m -XX:MaxPermSize=256m ${test.vmargs}</argLine>
<bundleStartLevel>
<bundle>
<id>org.eclipse.equinox.ds</id>
diff --git a/tests/org.eclipse.php.ui.tests/pom.xml b/tests/org.eclipse.php.ui.tests/pom.xml
index 7be71d6..e51d862 100644
--- a/tests/org.eclipse.php.ui.tests/pom.xml
+++ b/tests/org.eclipse.php.ui.tests/pom.xml
@@ -14,31 +14,6 @@
<version>3.2.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
- <profiles>
- <profile>
- <id>macosx</id>
- <activation>
- <os>
- <family>mac</family>
- </os>
- </activation>
- <properties>
- <test.vmargs>-Xmx512m -XX:MaxPermSize=256m -XstartOnFirstThread</test.vmargs>
- </properties>
- </profile>
- <profile>
- <id>other-os</id>
- <activation>
- <os>
- <family>!mac</family>
- </os>
- </activation>
- <properties>
- <test.vmargs>-Xmx512m -XX:MaxPermSize=256m</test.vmargs>
- </properties>
- </profile>
- </profiles>
-
<build>
<plugins>
<plugin>
@@ -49,14 +24,15 @@
<testSuite>org.eclipse.php.ui.tests</testSuite>
<testClass>org.eclipse.php.ui.tests.AllTests</testClass>
<useUIHarness>true</useUIHarness>
- <useUIThread>true</useUIThread>
- <argLine>${test.vmargs}</argLine>
+ <useUIThread>true</useUIThread>
+ <argLine>-Xmx512m -XX:MaxPermSize=256m ${test.vmargs}</argLine>
<dependencies>
<dependency>
<type>p2-installable-unit</type>
<artifactId>org.eclipse.dltk.core.index.sql.h2</artifactId>
</dependency>
</dependencies>
+ <testFailureIgnore>false</testFailureIgnore>
</configuration>
</plugin>
</plugins>