summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnthony Dahanne2011-09-19 03:49:41 (EDT)
committerPascal Rapicault2011-09-24 20:56:23 (EDT)
commite6834d282649785c52c058fcdb1ce5e54a84b08f (patch)
tree6351c0bfc6f4149b2cc02278b29068e83b6ee449
parent41e215bfde9dc5d7041c963db1feb366989e34bc (diff)
downloadrt.equinox.p2-e6834d282649785c52c058fcdb1ce5e54a84b08f.zip
rt.equinox.p2-e6834d282649785c52c058fcdb1ce5e54a84b08f.tar.gz
rt.equinox.p2-e6834d282649785c52c058fcdb1ce5e54a84b08f.tar.bz2
Bug 304594 : * configured tycho surefire plugin according to the existing p2 tests launch file in bundles/org.eclipse.equinox.p2.tests/pom.xml * added the module org.eclipse.equinox.p2.tests in the aggregator pom, org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-aggregator/pom.xml * added eclipse indigo repositories to satisfy p2 tests dependencies in the parent : org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent/pom.xmlv20110925-0056
Signed-off-by: Pascal Rapicault <pascal@sonatype.com>
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/pom.xml5
-rw-r--r--org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-aggregator/pom.xml4
-rw-r--r--org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent/pom.xml9
3 files changed, 12 insertions, 6 deletions
diff --git a/bundles/org.eclipse.equinox.p2.tests/pom.xml b/bundles/org.eclipse.equinox.p2.tests/pom.xml
index bf3f6d3..73b19b1 100644
--- a/bundles/org.eclipse.equinox.p2.tests/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.tests/pom.xml
@@ -13,7 +13,7 @@
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.equinox.p2.tests</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
@@ -21,10 +21,11 @@
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire-plugin</artifactId>
+ <version>${tycho-version}</version>
<configuration>
<testSuite>org.eclipse.equinox.p2.tests</testSuite>
<testClass>org.eclipse.equinox.p2.tests.AutomatedTests</testClass>
- <argLine>-Xmx512m</argLine>
+ <argLine>-Xmx512m -Dorg.eclipse.equinox.p2.reconciler.tests.platform.archive=/home/anthony/Téléchargements/eclipse-SDK-3.7-linux-gtk-x86_64.tar.gz -Dorg.eclipse.equinox.p2.reconciler.tests.35.platform.archive=/home/anthony/Téléchargements/eclipse-SDK-3.7-linux-gtk-x86_64.tar.gz -Dorg.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive=/home/anthony/Téléchargements/eclipse-SDK-3.7-linux-gtk-x86_64.tar.gz -Dorg.eclipse.equinox.p2.repository</argLine>
<appArgLine>-consoleLog</appArgLine>
<bundleStartLevel>
<bundle>
diff --git a/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-aggregator/pom.xml b/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-aggregator/pom.xml
index 32655a5..430ff35 100644
--- a/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-aggregator/pom.xml
+++ b/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-aggregator/pom.xml
@@ -46,10 +46,10 @@
<module>../../bundles/org.eclipse.equinox.p2.repository</module>
<module>../../bundles/org.eclipse.equinox.p2.repository.tools</module>
<module>../../bundles/org.eclipse.equinox.p2.sar</module>
-<!-- <module>../../bundles/org.eclipse.equinox.p2.tests</module>-->
+ <module>../../bundles/org.eclipse.equinox.p2.tests</module>
<!-- <module>../../bundles/org.eclipse.equinox.p2.tests.discovery</module>-->
<!-- <module>../../bundles/org.eclipse.equinox.p2.tests.ui</module>-->
-<!-- <module>../../bundles/org.eclipse.equinox.p2.tests.verifier</module>-->
+ <module>../../bundles/org.eclipse.equinox.p2.tests.verifier</module>
<module>../../bundles/org.eclipse.equinox.p2.testserver</module>
<module>../../bundles/org.eclipse.equinox.p2.touchpoint.eclipse</module>
<module>../../bundles/org.eclipse.equinox.p2.touchpoint.natives</module>
diff --git a/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent/pom.xml b/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent/pom.xml
index 481853d..13c5f40 100644
--- a/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent/pom.xml
+++ b/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent/pom.xml
@@ -11,10 +11,15 @@
</properties>
<repositories>
<repository>
- <id>helios</id>
+ <id>indigo</id>
<layout>p2</layout>
<url>http://download.eclipse.org/releases/indigo</url>
</repository>
+ <repository>
+ <id>indigo updates</id>
+ <layout>p2</layout>
+ <url>http://download.eclipse.org/eclipse/updates/3.7</url>
+ </repository>
<!-- <repository>-->
<!-- <id>galileoTest</id>-->
<!-- <layout>p2</layout>-->
@@ -95,4 +100,4 @@
</properties>
</profile>
</profiles>
-</project> \ No newline at end of file
+</project>