[FIXED HUDSON-6893] integrated toward 1.373.

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@34029 71c3de6d-444a-0410-be80-ed276b4c234a

maven-plugin/src/main/java/hudson/maven/reporters/SurefireArchiver.java

@@ -158,6 +158,7 @@ public class SurefireArchiver extends MavenReporter {
 
     private boolean isSurefireTest(MojoInfo mojo) {
         if ((!mojo.is("com.sun.maven", "maven-junit-plugin", "test"))
+            && (!mojo.is("org.sonatype.flexmojos", "flexmojos-maven-plugin", "test-run"))
             && (!mojo.is("org.apache.maven.plugins", "maven-surefire-plugin", "test")))
             return false;
 
@@ -191,6 +192,13 @@ public class SurefireArchiver extends MavenReporter {
                     return false;
                 }
             }
+            else if (mojo.is("org.sonatype.flexmojos", "flexmojos-maven-plugin", "test-run")) {
+		Boolean skipTests = mojo.getConfigurationValue("skipTest", Boolean.class);
+		
+		if (((skipTests != null) && (skipTests))) {
+		    return false;
+		}
+	    }
 
         } catch (ComponentConfigurationException e) {
             return false;