diff options
| author | Mickael Istria | 2021-04-26 07:40:42 +0000 |
|---|---|---|
| committer | Mickael Istria | 2021-04-26 10:55:11 +0000 |
| commit | 28dadd5768251fb25f20600beb13bb73b9cc76e4 (patch) | |
| tree | 93d6147d60a4923793d9b84f036ac74c51776555 | |
| parent | d9557a77c5af92590bf0215b16bf3caa3bc4dbb2 (diff) | |
| download | rt.equinox.p2-28dadd5768251fb25f20600beb13bb73b9cc76e4.tar.gz rt.equinox.p2-28dadd5768251fb25f20600beb13bb73b9cc76e4.tar.xz rt.equinox.p2-28dadd5768251fb25f20600beb13bb73b9cc76e4.zip | |
Bug 573159 - Tycho 2.4 makes p2's
org.eclipse.equinox.frameworkadmin.test fail
Change-Id: If871959490b365340220cdcde170469789a89a6e
Signed-off-by: Mickael Istria <mistria@redhat.com>
Reviewed-on: https://git.eclipse.org/r/c/equinox/rt.equinox.p2/+/179816
Tested-by: Equinox Bot <equinox-bot@eclipse.org>
3 files changed, 18 insertions, 7 deletions
diff --git a/bundles/org.eclipse.equinox.frameworkadmin.test/.classpath b/bundles/org.eclipse.equinox.frameworkadmin.test/.classpath index a42a828e0..e801ebfb4 100644 --- a/bundles/org.eclipse.equinox.frameworkadmin.test/.classpath +++ b/bundles/org.eclipse.equinox.frameworkadmin.test/.classpath @@ -2,10 +2,6 @@ <classpath> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src"> - <attributes> - <attribute name="test" value="true"/> - </attributes> - </classpathentry> + <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/bundles/org.eclipse.equinox.frameworkadmin.test/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.frameworkadmin.test/META-INF/MANIFEST.MF index f3a3d53ef..0cb1f4139 100644 --- a/bundles/org.eclipse.equinox.frameworkadmin.test/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.frameworkadmin.test/META-INF/MANIFEST.MF @@ -7,7 +7,8 @@ Bundle-Vendor: %Bundle-Vendor Require-Bundle: org.eclipse.core.runtime, org.eclipse.equinox.frameworkadmin, org.eclipse.equinox.frameworkadmin.equinox;bundle-version="1.0.100", - org.junit;bundle-version="3.8.0" + org.junit;bundle-version="3.8.0", + org.eclipse.equinox.simpleconfigurator.manipulator Bundle-Activator: org.eclipse.equinox.frameworkadmin.tests.Activator Import-Package: org.osgi.framework;version="1.4.0" Bundle-ActivationPolicy: lazy diff --git a/bundles/org.eclipse.equinox.frameworkadmin.test/pom.xml b/bundles/org.eclipse.equinox.frameworkadmin.test/pom.xml index ff1afda49..2c5063967 100644 --- a/bundles/org.eclipse.equinox.frameworkadmin.test/pom.xml +++ b/bundles/org.eclipse.equinox.frameworkadmin.test/pom.xml @@ -10,5 +10,19 @@ <groupId>org.eclipse.equinox</groupId> <artifactId>org.eclipse.equinox.frameworkadmin.test</artifactId> <version>1.3.0-SNAPSHOT</version> - <packaging>eclipse-plugin</packaging> + <packaging>eclipse-test-plugin</packaging> + + <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-surefire-plugin</artifactId> + <version>${tycho.version}</version> + <configuration> + <!-- Test execution not compatible with Tycho at the moment --> + <skipTests>true</skipTests> + </configuration> + </plugin> + </plugins> + </build> </project> |