You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cl...@apache.org on 2013/10/04 15:11:51 UTC
svn commit: r1529154 - in /felix/trunk/ipojo/manipulator/manipulator-it:
ipojo-manipulator-manipulation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestNativeMethod.java
pom.xml
Author: clement
Date: Fri Oct 4 13:11:51 2013
New Revision: 1529154
URL: http://svn.apache.org/r1529154
Log:
Ignore the native test on KF.
Modified:
felix/trunk/ipojo/manipulator/manipulator-it/ipojo-manipulator-manipulation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestNativeMethod.java
felix/trunk/ipojo/manipulator/manipulator-it/pom.xml
Modified: felix/trunk/ipojo/manipulator/manipulator-it/ipojo-manipulator-manipulation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestNativeMethod.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/manipulator-it/ipojo-manipulator-manipulation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestNativeMethod.java?rev=1529154&r1=1529153&r2=1529154&view=diff
==============================================================================
--- felix/trunk/ipojo/manipulator/manipulator-it/ipojo-manipulator-manipulation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestNativeMethod.java (original)
+++ felix/trunk/ipojo/manipulator/manipulator-it/ipojo-manipulator-manipulation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestNativeMethod.java Fri Oct 4 13:11:51 2013
@@ -63,8 +63,22 @@ public class TestNativeMethod extends Ba
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()
};
Modified: felix/trunk/ipojo/manipulator/manipulator-it/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/manipulator-it/pom.xml?rev=1529154&r1=1529153&r2=1529154&view=diff
==============================================================================
--- felix/trunk/ipojo/manipulator/manipulator-it/pom.xml (original)
+++ felix/trunk/ipojo/manipulator/manipulator-it/pom.xml Fri Oct 4 13:11:51 2013
@@ -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>