summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteffen Kriese2011-05-31 02:51:36 (EDT)
committerSteffen Kriese2011-05-31 02:51:36 (EDT)
commit14aa2bf88a87f173f8a7f03b6061c73264e28f6b (patch)
tree05bb87239be3643f3692f77c780999313a755547
parent920a0ea8c74a9ac138beeb792a1cfb332b42fcd6 (diff)
downloadorg.eclipse.riena-14aa2bf88a87f173f8a7f03b6061c73264e28f6b.zip
org.eclipse.riena-14aa2bf88a87f173f8a7f03b6061c73264e28f6b.tar.gz
org.eclipse.riena-14aa2bf88a87f173f8a7f03b6061c73264e28f6b.tar.bz2
fixed testexecution with tycho
-rw-r--r--org.eclipse.riena.tests/pom.xml170
1 files changed, 41 insertions, 129 deletions
diff --git a/org.eclipse.riena.tests/pom.xml b/org.eclipse.riena.tests/pom.xml
index 8e4d984..b2137a9 100644
--- a/org.eclipse.riena.tests/pom.xml
+++ b/org.eclipse.riena.tests/pom.xml
@@ -1,131 +1,43 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.eclipse.riena</groupId>
- <artifactId>org.eclipse.riena.build.tycho</artifactId>
- <version>3.0.0-SNAPSHOT</version>
- <relativePath>../org.eclipse.riena.build.tycho</relativePath>
- </parent>
- <artifactId>org.eclipse.riena.tests</artifactId>
- <packaging>eclipse-plugin</packaging>
-
- <properties>
- <local-riena-site>file:/${basedir}/../org.eclipse.riena.build.updatesite/target/site</local-riena-site>
- </properties>
-
- <repositories>
- <repository>
- <id>local-riena</id>
- <layout>p2</layout>
- <url>${local-riena-site}</url>
- </repository>
- </repositories>
-
- <profiles>
- <profile>
- <id>skip-ui-tests</id>
- <activation>
- <property>
- <name>skip-ui-tests</name>
- </property>
- </activation>
- <properties>
- <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>-Xmx512m -XX:MaxPermSize=256m -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>-Xmx512m -XX:MaxPermSize=256m</ui.test.vmargs>
- </properties>
- </profile>
- </profiles>
-
- <!--build>
- <plugins>
- <plugin>
- <groupId>org.sonatype.tycho</groupId>
- <artifactId>maven-osgi-test-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <testSuite>org.eclipse.riena.tests</testSuite>
- <testClass>org.eclipse.riena.AllTests</testClass>
- <useUIHarness>true</useUIHarness>
- <useUIThread>false</useUIThread>
- <product>org.eclipse.sdk.ide</product>
- <argLine>${ui.test.vmargs}</argLine>
- <application>org.eclipse.ui.ide.workbench</application>
- <dependencies>
- <dependency>
- <type>p2-installable-unit</type>
- <artifactId>org.eclipse.riena.build.feature.core.sdk</artifactId>
- <version>3.0.0</version>
- </dependency>
- <dependency>
- <type>p2-installable-unit</type>
- <artifactId>org.eclipse.riena.build.feature.samples.sdk</artifactId>
- <version>3.0.0</version>
- </dependency>
- <dependency>
- <type>p2-installable-unit</type>
- <artifactId>org.eclipse.pde.feature.group</artifactId>
- <version>${platform-version}</version>
- </dependency>
- <dependency>
- <type>p2-installable-unit</type>
- <artifactId>org.eclipse.cvs.feature.group</artifactId>
- <version>[1.1.2,2.0.0)</version>
- </dependency>
- </dependencies>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.7.2</version>
- <executions>
- <execution>
- <phase>test</phase>
- <configuration>
- <testClassesDirectory>${project.build.outputDirectory}</testClassesDirectory>
- <includes>
- <include>**/AllJUnitTests.java</include>
- </includes>
- </configuration>
- <goals>
- <goal>test</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build-->
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>org.eclipse.riena.tests</artifactId>
+ <packaging>eclipse-test-plugin</packaging>
+ <parent>
+ <groupId>org.eclipse.riena</groupId>
+ <artifactId>org.eclipse.riena.build.tycho</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <relativePath>../org.eclipse.riena.build.tycho</relativePath>
+ </parent>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.sonatype.tycho</groupId>
+ <artifactId>maven-osgi-test-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <testSuite>org.eclipse.riena.tests</testSuite>
+ <testClass>org.eclipse.riena.AllTests</testClass>
+ <showEclipseLog>true</showEclipseLog>
+ <useUIHarness>true</useUIHarness>
+ <useUIThread>false</useUIThread>
+ <product>org.eclipse.sdk.ide</product>
+ <argLine>${ui.test.vmargs}</argLine>
+ <application>org.eclipse.ui.ide.workbench</application>
+ </configuration>
+ </plugin>
+
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
</project>