Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Wolf2016-01-11 17:54:15 +0000
committerMatthias Sohn2016-01-23 22:25:05 +0000
commit59867e05091568515731909ab4f6120b678fa896 (patch)
tree2f683a7352c5d5344bbe63a1fdebdfffb758dae7
parentd4b3bbf6f76fcf71e231cc2f747c7d6f8216370c (diff)
downloadegit-59867e05091568515731909ab4f6120b678fa896.tar.gz
egit-59867e05091568515731909ab4f6120b678fa896.tar.xz
egit-59867e05091568515731909ab4f6120b678fa896.zip
[test log] Unify pom.xml for tests and configure JVM
- Move the mac and not-mac profiles into the global pom. - Move the coretest.vmargs (empty) and uitest.vmargs (with defaults) there. - Remove the profiles for selecting the target platform. Target platform can be configured directly, e.g.: $ mvn clean install -Dtarget-platform=egit-4.4 - Configure max heap size (1GB) and max perm gen size (150MB). Max values observed by monitoring JVM during Maven build were ~400MB (heap) and ~100MB (permgen). Change-Id: Ia210bad67889cdad9dbf269216a1554af249a9ed Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
-rw-r--r--.mvn/jvm.config1
-rw-r--r--org.eclipse.egit.core.test/pom.xml4
-rw-r--r--org.eclipse.egit.gitflow.test/pom.xml4
-rw-r--r--org.eclipse.egit.mylyn.ui.test/pom.xml24
-rw-r--r--org.eclipse.egit.ui.importer.tests/pom.xml31
-rw-r--r--org.eclipse.egit.ui.test/pom.xml28
-rw-r--r--pom.xml89
7 files changed, 28 insertions, 153 deletions
diff --git a/.mvn/jvm.config b/.mvn/jvm.config
new file mode 100644
index 0000000000..2a7318d6c9
--- /dev/null
+++ b/.mvn/jvm.config
@@ -0,0 +1 @@
+-Xmx1024m -XX:MaxPermSize=150m
diff --git a/org.eclipse.egit.core.test/pom.xml b/org.eclipse.egit.core.test/pom.xml
index dcf6865a77..6a7479ca63 100644
--- a/org.eclipse.egit.core.test/pom.xml
+++ b/org.eclipse.egit.core.test/pom.xml
@@ -24,10 +24,6 @@
<name>EGit Core Test Plug-in</name>
- <properties>
- <coretest.vmparams></coretest.vmparams>
- </properties>
-
<build>
<plugins>
<plugin>
diff --git a/org.eclipse.egit.gitflow.test/pom.xml b/org.eclipse.egit.gitflow.test/pom.xml
index 3f657d25fe..303e5fad62 100644
--- a/org.eclipse.egit.gitflow.test/pom.xml
+++ b/org.eclipse.egit.gitflow.test/pom.xml
@@ -23,10 +23,6 @@
<name>GitFlow Test Plug-in</name>
- <properties>
- <coretest.vmparams></coretest.vmparams>
- </properties>
-
<build>
<plugins>
<plugin>
diff --git a/org.eclipse.egit.mylyn.ui.test/pom.xml b/org.eclipse.egit.mylyn.ui.test/pom.xml
index 3ec7f5139e..98fedb45de 100644
--- a/org.eclipse.egit.mylyn.ui.test/pom.xml
+++ b/org.eclipse.egit.mylyn.ui.test/pom.xml
@@ -40,30 +40,6 @@
<maven.test.skip>true</maven.test.skip>
</properties>
</profile>
- <profile>
- <id>macosx</id>
- <activation>
- <os>
- <name>mac os x</name>
- <family>mac</family>
- </os>
- </activation>
- <properties>
- <ui.test.vmargs>${uitest.vmparams} -XstartOnFirstThread</ui.test.vmargs>
- </properties>
- </profile>
- <profile>
- <id>other-os</id>
- <activation>
- <os>
- <name>not-mac</name>
- <family>!mac</family>
- </os>
- </activation>
- <properties>
- <ui.test.vmargs>${test.vmparams} ${uitest.vmparams}</ui.test.vmargs>
- </properties>
- </profile>
</profiles>
<build>
diff --git a/org.eclipse.egit.ui.importer.tests/pom.xml b/org.eclipse.egit.ui.importer.tests/pom.xml
index f2de87c705..2c4b364eed 100644
--- a/org.eclipse.egit.ui.importer.tests/pom.xml
+++ b/org.eclipse.egit.ui.importer.tests/pom.xml
@@ -12,37 +12,6 @@
<name>Git Team Provider (experimental auto-import wizard, incubation)</name>
- <properties>
- <uitest.vmparams>-Dorg.eclipse.swtbot.search.timeout=30000 -Xmx1024m -XX:MaxPermSize=384m</uitest.vmparams>
- </properties>
-
- <profiles>
- <profile>
- <id>macosx</id>
- <activation>
- <os>
- <name>mac os x</name>
- <family>mac</family>
- </os>
- </activation>
- <properties>
- <ui.test.vmargs>${uitest.vmparams} -XstartOnFirstThread</ui.test.vmargs>
- </properties>
- </profile>
- <profile>
- <id>other-os</id>
- <activation>
- <os>
- <name>not-mac</name>
- <family>!mac</family>
- </os>
- </activation>
- <properties>
- <ui.test.vmargs>${test.vmparams} ${uitest.vmparams}</ui.test.vmargs>
- </properties>
- </profile>
- </profiles>
-
<build>
<plugins>
<plugin>
diff --git a/org.eclipse.egit.ui.test/pom.xml b/org.eclipse.egit.ui.test/pom.xml
index 352347d0ce..49e94955f1 100644
--- a/org.eclipse.egit.ui.test/pom.xml
+++ b/org.eclipse.egit.ui.test/pom.xml
@@ -24,10 +24,6 @@
<name>EGit UI Test Plug-in</name>
- <properties>
- <uitest.vmparams>-Dorg.eclipse.swtbot.search.timeout=30000 -Xmx1024m -XX:MaxPermSize=384m</uitest.vmparams>
- </properties>
-
<profiles>
<profile>
<id>skip-ui-tests</id>
@@ -40,30 +36,6 @@
<maven.test.skip>true</maven.test.skip>
</properties>
</profile>
- <profile>
- <id>macosx</id>
- <activation>
- <os>
- <name>mac os x</name>
- <family>mac</family>
- </os>
- </activation>
- <properties>
- <ui.test.vmargs>${uitest.vmparams} -XstartOnFirstThread</ui.test.vmargs>
- </properties>
- </profile>
- <profile>
- <id>other-os</id>
- <activation>
- <os>
- <name>not-mac</name>
- <family>!mac</family>
- </os>
- </activation>
- <properties>
- <ui.test.vmargs>${test.vmparams} ${uitest.vmparams}</ui.test.vmargs>
- </properties>
- </profile>
</profiles>
<build>
diff --git a/pom.xml b/pom.xml
index 5d2a121ccd..ee804a5362 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,74 +72,15 @@
<license-site>http://download.eclipse.org/cbi/updates/license</license-site>
<signer-input-directory>/home/data/httpd/download-staging.priv/egit</signer-input-directory>
<download-publish-path>/home/data/httpd/download.eclipse.org/egit/updates-nightly</download-publish-path>
- <target-platform>egit-4.3</target-platform>
+ <target-platform>egit-4.5</target-platform>
<tycho.scmUrl>scm:git:https://git.eclipse.org/r/egit/egit.git</tycho.scmUrl>
<test.vmparams></test.vmparams>
+ <coretest.vmparams></coretest.vmparams>
+ <uitest.vmparams>-Dorg.eclipse.swtbot.search.timeout=30000 -Xmx1024m -XX:MaxPermSize=150m</uitest.vmparams>
</properties>
<profiles>
<profile>
- <id>platform-juno</id>
- <activation>
- <property>
- <name>platform-version-name</name>
- <value>juno</value>
- </property>
- </activation>
- <properties>
- <target-platform>egit-4.2</target-platform>
- </properties>
- </profile>
- <profile>
- <id>platform-kepler</id>
- <activation>
- <property>
- <name>platform-version-name</name>
- <value>kepler</value>
- </property>
- </activation>
- <properties>
- <target-platform>egit-4.3</target-platform>
- </properties>
- </profile>
- <profile>
- <id>platform-luna</id>
- <activation>
- <property>
- <name>platform-version-name</name>
- <value>luna</value>
- </property>
- </activation>
- <properties>
- <target-platform>egit-4.4</target-platform>
- </properties>
- </profile>
- <profile>
- <id>platform-mars</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- <property>
- <name>platform-version-name</name>
- <value>mars</value>
- </property>
- </activation>
- <properties>
- <target-platform>egit-4.5</target-platform>
- </properties>
- </profile>
- <profile>
- <id>platform-mars-staging</id>
- <activation>
- <property>
- <name>platform-version-name</name>
- <value>mars-staging</value>
- </property>
- </activation>
- <properties>
- <target-platform>egit-4.5-staging</target-platform>
- </properties>
- </profile>
- <profile>
<id>static-checks</id>
<build>
<plugins>
@@ -277,6 +218,30 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>macosx</id>
+ <activation>
+ <os>
+ <name>mac os x</name>
+ <family>mac</family>
+ </os>
+ </activation>
+ <properties>
+ <ui.test.vmargs>${test.vmparams} ${uitest.vmparams} -XstartOnFirstThread</ui.test.vmargs>
+ </properties>
+ </profile>
+ <profile>
+ <id>other-os</id>
+ <activation>
+ <os>
+ <name>not-mac</name>
+ <family>!mac</family>
+ </os>
+ </activation>
+ <properties>
+ <ui.test.vmargs>${test.vmparams} ${uitest.vmparams}</ui.test.vmargs>
+ </properties>
+ </profile>
</profiles>
<modules>

Back to the top