Return-Path: Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: (qmail 24832 invoked from network); 22 Feb 2008 03:10:54 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 22 Feb 2008 03:10:54 -0000 Received: (qmail 60849 invoked by uid 500); 22 Feb 2008 03:10:49 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 60824 invoked by uid 500); 22 Feb 2008 03:10:49 -0000 Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "Derby Development" List-Id: Delivered-To: mailing list derby-commits@db.apache.org Received: (qmail 60813 invoked by uid 99); 22 Feb 2008 03:10:49 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 21 Feb 2008 19:10:49 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 22 Feb 2008 03:10:11 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 842A71A9832; Thu, 21 Feb 2008 19:10:31 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r630077 - /db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/BaseTestCase.java Date: Fri, 22 Feb 2008 03:10:30 -0000 To: derby-commits@db.apache.org From: myrnavl@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080222031031.842A71A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: myrnavl Date: Thu Feb 21 19:10:28 2008 New Revision: 630077 URL: http://svn.apache.org/viewvc?rev=630077&view=rev Log: DERBY-2667 - improve junit test runs - save off derby.log for failing fixtures. patch (DERBY-2667_diff_02_21.txt) contributed by Manjula Kutty. Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/BaseTestCase.java Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/BaseTestCase.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/BaseTestCase.java?rev=630077&r1=630076&r2=630077&view=diff ============================================================================== --- db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/BaseTestCase.java (original) +++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/BaseTestCase.java Thu Feb 21 19:10:28 2008 @@ -26,9 +26,11 @@ import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; +import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; +import java.io.OutputStream; import java.io.Reader; import java.io.PrintStream; import java.net.URL; @@ -97,6 +99,39 @@ try { super.runBare(); + } + //To save the derby.log of failed tests. + catch (Throwable running) { + try{ + AccessController.doPrivileged(new PrivilegedExceptionAction() { + public Object run() throws SQLException, FileNotFoundException, + IOException { + + File origLogDir = new File("system", "derby.log"); + if (origLogDir.exists()) { + File failDir = getFailureFolder(); + InputStream in = new FileInputStream(origLogDir); + OutputStream out = new FileOutputStream(new File(failDir, + "derby.log")); + byte[] buf = new byte[32 * 1024]; + + for (;;) { + int read = in.read(buf); + if (read == -1) + break; + out.write(buf, 0, read); + } + in.close(); + out.close(); + } + + return null; + } + }); + } + finally{ + throw running; + } } finally{ if ( trace )