You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ti...@apache.org on 2016/12/31 05:27:16 UTC
maven-surefire git commit: [SUREFIRE-1322] Surefire and Failsafe
should dump critical errors in dump file and console
Repository: maven-surefire
Updated Branches:
refs/heads/master 9dd4074e8 -> df7e143c2
[SUREFIRE-1322] Surefire and Failsafe should dump critical errors in dump file and console
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/df7e143c
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/df7e143c
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/df7e143c
Branch: refs/heads/master
Commit: df7e143c26b09678a0e6885b7ffcc65070688eb9
Parents: 9dd4074
Author: Tibor17 <ti...@lycos.com>
Authored: Sat Dec 31 06:26:36 2016 +0100
Committer: Tibor17 <ti...@lycos.com>
Committed: Sat Dec 31 06:26:36 2016 +0100
----------------------------------------------------------------------
.../maven/plugin/surefire/booterclient/ForkStarter.java | 9 ++++++---
.../plugin/surefire/booterclient/output/ForkClient.java | 3 ---
.../booterclient/output/NativeStdErrStreamConsumer.java | 10 +++++++++-
3 files changed, 15 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/df7e143c/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
index 2d0ae38..05c4cc2 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
@@ -603,10 +603,13 @@ public class ForkStarter
SurefireBooterForkException booterForkException = null;
try
{
+ NativeStdErrStreamConsumer stdErrConsumer =
+ new NativeStdErrStreamConsumer( forkClient.getDefaultReporterFactory() );
+
CommandLineCallable future =
- executeCommandLineAsCallable( cli, testProvidingInputStream, threadedStreamConsumer,
- new NativeStdErrStreamConsumer(), 0, closer,
- Charset.forName( FORK_STREAM_CHARSET_NAME ) );
+ executeCommandLineAsCallable( cli, testProvidingInputStream, threadedStreamConsumer,
+ stdErrConsumer, 0, closer,
+ Charset.forName( FORK_STREAM_CHARSET_NAME ) );
currentForkClients.add( forkClient );
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/df7e143c/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClient.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClient.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClient.java
index 46c747b..d0aecf9 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClient.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClient.java
@@ -272,19 +272,16 @@ public class ForkClient
break;
default:
LostCommandsDumpSingleton.getSingleton().dumpText( s, defaultReporterFactory );
- log.warning( s );
}
}
catch ( NumberFormatException e )
{
// SUREFIRE-859
- log.warning( s );
LostCommandsDumpSingleton.getSingleton().dumpException( e, s, defaultReporterFactory );
}
catch ( NoSuchElementException e )
{
// SUREFIRE-859
- log.warning( s );
LostCommandsDumpSingleton.getSingleton().dumpException( e, s, defaultReporterFactory );
}
catch ( ReporterException e )
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/df7e143c/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/NativeStdErrStreamConsumer.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/NativeStdErrStreamConsumer.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/NativeStdErrStreamConsumer.java
index 84ca474..c92361d 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/NativeStdErrStreamConsumer.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/NativeStdErrStreamConsumer.java
@@ -19,6 +19,7 @@ package org.apache.maven.plugin.surefire.booterclient.output;
* under the License.
*/
+import org.apache.maven.plugin.surefire.report.DefaultReporterFactory;
import org.apache.maven.shared.utils.cli.StreamConsumer;
/**
@@ -31,8 +32,15 @@ import org.apache.maven.shared.utils.cli.StreamConsumer;
public final class NativeStdErrStreamConsumer
implements StreamConsumer
{
+ private final DefaultReporterFactory defaultReporterFactory;
+
+ public NativeStdErrStreamConsumer( DefaultReporterFactory defaultReporterFactory )
+ {
+ this.defaultReporterFactory = defaultReporterFactory;
+ }
+
public void consumeLine( String line )
{
- System.err.println( line );
+ LostCommandsDumpSingleton.getSingleton().dumpText( line, defaultReporterFactory );
}
}