You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ag...@apache.org on 2014/01/02 02:13:32 UTC
git commit: SUREFIRE-1031 delete temporary files created to buffer
large stdout/stderr on disk
Updated Branches:
refs/heads/master f3d1a9e53 -> 21737b868
SUREFIRE-1031 delete temporary files created to buffer large stdout/stderr on disk
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/21737b86
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/21737b86
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/21737b86
Branch: refs/heads/master
Commit: 21737b868ea65f33d28fa8f4499585397a0a966d
Parents: f3d1a9e
Author: Andreas Gudian <ag...@apache.org>
Authored: Thu Jan 2 02:13:15 2014 +0100
Committer: Andreas Gudian <ag...@apache.org>
Committed: Thu Jan 2 02:13:15 2014 +0100
----------------------------------------------------------------------
.../maven/plugin/surefire/report/TestSetRunListener.java | 3 +++
.../apache/maven/plugin/surefire/report/TestSetStats.java | 9 ++++++++-
.../report/Utf8RecodingDeferredFileOutputStream.java | 8 ++++++++
3 files changed, 19 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/21737b86/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java
index 276eaa9..c100aae 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java
@@ -151,6 +151,9 @@ public class TestSetRunListener
consoleReporter.reset();
}
+ wrap.getStdout().free();
+ wrap.getStdErr().free();
+
globalStatistics.add( detailsForThis );
detailsForThis.reset();
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/21737b86/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetStats.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetStats.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetStats.java
index ef253bf..b8078b6 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetStats.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetStats.java
@@ -124,6 +124,13 @@ public class TestSetStats
failures = 0;
skipped = 0;
elapsedForTestSet = 0;
+
+ for ( WrappedReportEntry entry : reportEntries )
+ {
+ entry.getStdout().free();
+ entry.getStdErr().free();
+ }
+
reportEntries.clear();
}
@@ -188,7 +195,7 @@ public class TestSetStats
{
buf.append( " <<< FAILURE!" );
}
-
+
buf.append( " - in " );
buf.append( reportEntry.getNameWithGroup() );
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/21737b86/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/Utf8RecodingDeferredFileOutputStream.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/Utf8RecodingDeferredFileOutputStream.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/Utf8RecodingDeferredFileOutputStream.java
index f36a4bd..a2632a2 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/Utf8RecodingDeferredFileOutputStream.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/Utf8RecodingDeferredFileOutputStream.java
@@ -88,4 +88,12 @@ class Utf8RecodingDeferredFileOutputStream
{
deferredFileOutputStream.writeTo( out );
}
+
+ public void free()
+ {
+ if ( null != deferredFileOutputStream && null != deferredFileOutputStream.getFile() )
+ {
+ deferredFileOutputStream.getFile().deleteOnExit();
+ }
+ }
}