Merge pull request #230 from oldelvet/jenkins-10913

FIXES JENKINS-10913 Add support for maven-android-plugin integration test Originally-Committed-As: 62cbe7b3377819b5a7a60388f2307a6027c09201
jenkinsci · Sep 6, 2011 · 89971d5 · 89971d5
2 parents 2eb0a65 + 721b2b5
commit 89971d5
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/main/java/hudson/maven/reporters/SurefireArchiver.java b/src/main/java/hudson/maven/reporters/SurefireArchiver.java
@@ -230,6 +230,7 @@ private boolean isSurefireTest(MojoInfo mojo) {
             && (!mojo.is("org.eclipse.tycho", "tycho-surefire-plugin", "test"))
             && (!mojo.is("org.sonatype.tycho", "maven-osgi-test-plugin", "test"))
             && (!mojo.is("org.codehaus.mojo", "gwt-maven-plugin", "test"))
+            && (!mojo.is("com.jayway.maven.plugins.android.generation2", "maven-android-plugin", "internal-integration-test"))
             && (!mojo.is("org.apache.maven.plugins", "maven-surefire-plugin", "test"))
             && (!mojo.is("org.apache.maven.plugins", "maven-failsafe-plugin", "integration-test")))
             return false;
@@ -279,6 +280,11 @@ else if (mojo.is("org.sonatype.flexmojos", "flexmojos-maven-plugin", "test-run")
                 if (((skipTests != null) && (skipTests))) {
                     return false;
                 }
+            } else if (mojo.is("com.jayway.maven.plugins.android.generation2", "maven-android-plugin", "internal-integration-test")) {
+                Boolean skipTests = mojo.getConfigurationValue("skipTests", Boolean.class);
+                if (((skipTests != null) && (skipTests))) {
+                    return false;
+                }
             }
 
         } catch (ComponentConfigurationException e) {