| commit | 7e9514659b3bb262c1d25497fe4116711310de1c | [log] [tgz] |
|---|---|---|
| author | Clement Escoffier <clement@apache.org> | Fri Oct 04 13:11:51 2013 +0000 |
| committer | Clement Escoffier <clement@apache.org> | Fri Oct 04 13:11:51 2013 +0000 |
| tree | eae242c984158159517bbc0bf89bea3500bb1ae9 | |
| parent | 96cf0ae6d0690707318cb6b31d76e823361d83dc [diff] |
Ignore the native test on KF. git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1529154 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/ipojo/manipulator/manipulator-it/ipojo-manipulator-manipulation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestNativeMethod.java b/ipojo/manipulator/manipulator-it/ipojo-manipulator-manipulation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestNativeMethod.java index 5c9fde2..6235c7b 100644 --- a/ipojo/manipulator/manipulator-it/ipojo-manipulator-manipulation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestNativeMethod.java +++ b/ipojo/manipulator/manipulator-it/ipojo-manipulator-manipulation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestNativeMethod.java
@@ -63,8 +63,22 @@ return false; } + public boolean isKnopflerfish() { + if (context != null) { + return isKnopflerfish(); + } else { + String pf = System.getProperty("pax.exam.framework"); + return pf != null && pf.equalsIgnoreCase("knopflerfish"); + } + } + @Override protected Option[] getCustomOptions() { + // The native bundle cannot be deployed on kf, + // just skip + if (isKnopflerfish()) { + return new Option[0]; + } return new Option[] { buildBundleWithNativeLibraries() };
diff --git a/ipojo/manipulator/manipulator-it/pom.xml b/ipojo/manipulator/manipulator-it/pom.xml index 1d0b570..c36f068 100644 --- a/ipojo/manipulator/manipulator-it/pom.xml +++ b/ipojo/manipulator/manipulator-it/pom.xml
@@ -117,6 +117,8 @@ <systemPropertyVariables> <!-- TIME_FACTOR can be set from the command line with -DTIME_FACTOR=9--> <TIME_FACTOR>${TIME_FACTOR}</TIME_FACTOR> + <!-- Defined by the profiles --> + <pax.exam.framework>${pax.exam.framework}</pax.exam.framework> </systemPropertyVariables> </configuration> </plugin> @@ -298,6 +300,9 @@ <activation> <activeByDefault>true</activeByDefault> </activation> + <properties> + <pax.exam.framework>none</pax.exam.framework> + </properties> <dependencies> <dependency> <groupId>org.osgi</groupId>