From 5668a06f37d3392af8232ceccdd83a9e7f4ec041 Mon Sep 17 00:00:00 2001 From: Richard Mortimer Date: Tue, 6 Sep 2011 23:13:35 +0100 Subject: [PATCH] FIXES JENKINS-10913 Add support for maven-android-plugin integration test reports. --- .../main/java/hudson/maven/reporters/SurefireArchiver.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maven-plugin/src/main/java/hudson/maven/reporters/SurefireArchiver.java b/maven-plugin/src/main/java/hudson/maven/reporters/SurefireArchiver.java index cc28c136a5..9ad107e493 100644 --- a/maven-plugin/src/main/java/hudson/maven/reporters/SurefireArchiver.java +++ b/maven-plugin/src/main/java/hudson/maven/reporters/SurefireArchiver.java @@ -230,6 +230,7 @@ public class SurefireArchiver extends MavenReporter { && (!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 @@ public class SurefireArchiver extends MavenReporter { 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) { -- GitLab