aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn2013-05-13 19:12:19 (EDT)
committerSzymon Brandys2013-05-14 07:30:13 (EDT)
commit34c8b94a7aaabcc0908c73c3013b645ee77670e6 (patch)
treea63c9569446e61f4d19941f097463105432b2b46
parent18842f0d6f63f77eb59aa579ac0a1b5701708e5b (diff)
downloadorg.eclipse.orion.server-34c8b94a7aaabcc0908c73c3013b645ee77670e6.zip
org.eclipse.orion.server-34c8b94a7aaabcc0908c73c3013b645ee77670e6.tar.gz
org.eclipse.orion.server-34c8b94a7aaabcc0908c73c3013b645ee77670e6.tar.bz2
Bug 399023 - Enable running Orion server tests from Tycho
Use the build-helper-maven-plugin to reserve a free port for running the Orion server tests from Tycho. Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
-rw-r--r--pom.xml33
-rw-r--r--tests/org.eclipse.orion.server.tests/pom.xml34
2 files changed, 41 insertions, 26 deletions
diff --git a/pom.xml b/pom.xml
index 951e844..e3b9880 100644
--- a/pom.xml
+++ b/pom.xml
@@ -120,7 +120,7 @@
<module>doc/org.eclipse.orion.doc.isv</module>
<module>doc/org.eclipse.orion.doc.user</module>
- <!-- <module>tests/org.eclipse.orion.server.tests</module> -->
+ <module>tests/org.eclipse.orion.server.tests</module>
<module>features/org.eclipse.orion.base-feature</module>
@@ -129,8 +129,8 @@
<module>features/org.eclipse.orion.server.search-feature</module>
<module>features/org.eclipse.orion.server.ui-feature</module>
<module>features/org.eclipse.orion.client-feature</module>
- <!-- <module>features/org.eclipse.orion.releng.test.master-feature</module>
- <module>features/org.eclipse.orion.server.tests-feature</module> -->
+ <module>features/org.eclipse.orion.releng.test.master-feature</module>
+ <module>features/org.eclipse.orion.server.tests-feature</module>
<module>features/org.eclipse.orion-feature</module>
<module>features/org.eclipse.license</module>
@@ -147,21 +147,6 @@
<build>
<plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <filters>
- <!-- work around Equinox bug 348045 -->
- <filter>
- <type>p2-installable-unit</type>
- <id>org.eclipse.equinox.servletbridge.extensionbundle</id>
- <removeAll />
- </filter>
- </filters>
- </configuration>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
@@ -194,7 +179,15 @@
<version>${tycho-version}</version>
<configuration>
<target>
- <artifact>
+ <filters>
+ <!-- work around Equinox bug 348045 -->
+ <filter>
+ <type>p2-installable-unit</type>
+ <id>org.eclipse.equinox.servletbridge.extensionbundle</id>
+ <removeAll />
+ </filter>
+ </filters>
+ <artifact>
<groupId>org.eclipse.orion</groupId>
<artifactId>org.eclipse.orion.target</artifactId>
<version>${orion-version}</version>
@@ -332,7 +325,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.7</version>
+ <version>1.8</version>
</plugin>
</plugins>
</pluginManagement>
diff --git a/tests/org.eclipse.orion.server.tests/pom.xml b/tests/org.eclipse.orion.server.tests/pom.xml
index 75adc99..7d62da9 100644
--- a/tests/org.eclipse.orion.server.tests/pom.xml
+++ b/tests/org.eclipse.orion.server.tests/pom.xml
@@ -28,14 +28,30 @@
</parent>
<properties>
- <uitest.vmparams>-Declipse.log.level=WARNING\
- -Dorg.eclipse.equinox.http.jetty.http.port=7070\
- -Dorg.eclipse.equinox.http.jetty.autostart=false\
- -Dorion.tests.authtype="Basic"</uitest.vmparams>
+ <uitest.vmparams></uitest.vmparams>
</properties>
<build>
<plugins>
+ <!-- use the build helper plugin to find random, unused TCP/IP ports -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>reserve-network-port</id>
+ <goals>
+ <goal>reserve-network-port</goal>
+ </goals>
+ <phase>process-resources</phase>
+ <configuration>
+ <portNames>
+ <portName>http.port</portName>
+ </portNames>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire-plugin</artifactId>
@@ -46,8 +62,14 @@
<argLine>${ui.test.vmargs}</argLine>
<!-- <product>orion.product</product>
<application>org.eclipse.orion.application</application>-->
- <testSuite>org.eclipse.orion.server.tests</testSuite>
- <testClass>org.eclipse.orion.server.tests.AllServerTests</testClass>
+ <systemProperties>
+ <eclipse.log.level>WARNING</eclipse.log.level>
+ <org.eclipse.equinox.http.jetty.http.port>${http.port}</org.eclipse.equinox.http.jetty.http.port>
+ <org.eclipse.equinox.http.jetty.autostart>false</org.eclipse.equinox.http.jetty.autostart>
+ <orion.tests.authtype>"Basic"</orion.tests.authtype>
+ </systemProperties>
+ <testSuite>org.eclipse.orion.server.tests</testSuite>
+ <testClass>org.eclipse.orion.server.tests.AllServerTests</testClass>
<dependencies>
<dependency>
<type>eclipse-feature</type>