提交 5668a06f 编写于 作者: R Richard Mortimer

FIXES JENKINS-10913 Add support for maven-android-plugin integration test reports.

上级 15b2a8b6
...@@ -230,6 +230,7 @@ public class SurefireArchiver extends MavenReporter { ...@@ -230,6 +230,7 @@ public class SurefireArchiver extends MavenReporter {
&& (!mojo.is("org.eclipse.tycho", "tycho-surefire-plugin", "test")) && (!mojo.is("org.eclipse.tycho", "tycho-surefire-plugin", "test"))
&& (!mojo.is("org.sonatype.tycho", "maven-osgi-test-plugin", "test")) && (!mojo.is("org.sonatype.tycho", "maven-osgi-test-plugin", "test"))
&& (!mojo.is("org.codehaus.mojo", "gwt-maven-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-surefire-plugin", "test"))
&& (!mojo.is("org.apache.maven.plugins", "maven-failsafe-plugin", "integration-test"))) && (!mojo.is("org.apache.maven.plugins", "maven-failsafe-plugin", "integration-test")))
return false; return false;
...@@ -279,6 +280,11 @@ public class SurefireArchiver extends MavenReporter { ...@@ -279,6 +280,11 @@ public class SurefireArchiver extends MavenReporter {
if (((skipTests != null) && (skipTests))) { if (((skipTests != null) && (skipTests))) {
return false; 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) { } catch (ComponentConfigurationException e) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册