Return-Path: 
 <derby-commits-return-3069-apmail-db-derby-commits-archive=db.apache.org@db.apache.org>
Delivered-To: apmail-db-derby-commits-archive@www.apache.org
Received: (qmail 70707 invoked from network); 24 Apr 2006 22:40:11 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 24 Apr 2006 22:40:11 -0000
Received: (qmail 77224 invoked by uid 500); 24 Apr 2006 22:40:10 -0000
Delivered-To: apmail-db-derby-commits-archive@db.apache.org
Received: (qmail 77155 invoked by uid 500); 24 Apr 2006 22:40:09 -0000
Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:derby-commits-help@db.apache.org>
list-unsubscribe: <mailto:derby-commits-unsubscribe@db.apache.org>
List-Post: <mailto:derby-commits@db.apache.org>
Reply-To: "Derby Development" <derby-dev@db.apache.org>
List-Id: <derby-commits.db.apache.org>
Delivered-To: mailing list derby-commits@db.apache.org
Received: (qmail 77144 invoked by uid 99); 24 Apr 2006 22:40:09 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 24 Apr 2006 15:40:09 -0700
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Mon, 24 Apr 2006 15:40:08 -0700
Received: (qmail 70618 invoked by uid 65534); 24 Apr 2006 22:39:48 -0000
Message-ID: <20060424223948.70615.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r396705 - in /db/derby/code/trunk/java:
 testing/org/apache/derbyTesting/functionTests/harness/MultiTest.java
 tools/org/apache/derby/impl/tools/ij/mtTester.java
Date: Mon, 24 Apr 2006 22:39:46 -0000
To: derby-commits@db.apache.org
From: fuzzylogic@apache.org
X-Mailer: svnmailer-1.0.8
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: fuzzylogic
Date: Mon Apr 24 15:39:39 2006
New Revision: 396705

URL: http://svn.apache.org/viewcvs?rev=396705&view=rev
Log:
DERBY-1230: Remove Tester*.out log files from stress.multi test run if there
are no errors.

Committed for Ole Solberg <Ole Solberg@sun.com>

Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/MultiTest.java
    db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/mtTester.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/MultiTest.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/MultiTest.java?rev=396705&r1=396704&r2=396705&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/MultiTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/MultiTest.java Mon Apr 24 15:39:39 2006
@@ -21,6 +21,7 @@
 package org.apache.derbyTesting.functionTests.harness;
 
 import java.io.IOException;
+import java.io.File;
 import java.io.FileOutputStream;
 import java.io.FileNotFoundException;
 import java.io.InputStream;
@@ -157,6 +158,21 @@
 		log.println("test ran "+duration+" ms");
 		log.println("total memory is "+Runtime.getRuntime().totalMemory());
 		log.println("free memory  is "+Runtime.getRuntime().freeMemory());
+		// Delete the .out files for Testers that did not report errors.
+		for (i = 0; i < max; i++)
+		{
+			if ( testers[i].noFailure() )
+			{
+				log.println("Deleting " + "Tester" + (i+1) + ".out" + "(" + outputDir + ")");
+				File out = new File(outputDir, "Tester" + (i+1) + ".out");
+				out.delete();
+			}
+			else
+			{
+				log.println("Tester" + (i+1) + " failed.");
+			}
+		}
+        
 		System.exit(0);
 	}
 

Modified: db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/mtTester.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/mtTester.java?rev=396705&r1=396704&r2=396705&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/mtTester.java (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/mtTester.java Mon Apr 24 15:39:39 2006
@@ -40,6 +40,7 @@
 	private LocalizedOutput	log;
 	private LocalizedOutput	out;
 	private boolean		stop = false;
+	private boolean   testOK = false;
 							
 	public mtTester(String name, mtTestSuite suite, LocalizedOutput out, LocalizedOutput log)
 	{ 
@@ -109,11 +110,16 @@
 		{
 			log.println(name + ": stopping on request after " + numIterations +
 						" iterations");
+			testOK = true;
 		}
 	}
 
 	public void stop()
 	{
 		stop = true;
+	}
+	public boolean noFailure()
+	{
+		return testOK;
 	}
 }