Return-Path: X-Original-To: apmail-db-derby-commits-archive@www.apache.org Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 62FF065E1 for ; Mon, 4 Jul 2011 04:33:04 +0000 (UTC) Received: (qmail 80122 invoked by uid 500); 4 Jul 2011 04:33:03 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 80074 invoked by uid 500); 4 Jul 2011 04:32:57 -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 79902 invoked by uid 99); 4 Jul 2011 04:32:52 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 Jul 2011 04:32:52 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 Jul 2011 04:32:49 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 744EC23889BB; Mon, 4 Jul 2011 04:32:28 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1142540 - in /db/derby/code/branches/10.7: ./ java/testing/org/apache/derbyTesting/functionTests/suites/ java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ java/testing/org/apache/derbyTesting/functionTests/tests/memory/ Date: Mon, 04 Jul 2011 04:32:28 -0000 To: derby-commits@db.apache.org From: kmarsden@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110704043228.744EC23889BB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kmarsden Date: Mon Jul 4 04:32:27 2011 New Revision: 1142540 URL: http://svn.apache.org/viewvc?rev=1142540&view=rev Log: DERBY-3337 convert jdbcapi/derbyStress.java to JUnit DERBY-4200 client side OutOfMemoryError running derbnetclientmats:jdbcapi/derbyStress Merged revision 1141924 from trunk. Convert test to JUnit and also run the finalizer periodically if freeMemory() falls below 500K. The converted tests is no longer called derbyStress. It is now memory.MemoryLeakFixes and runs with the junit-lowmem target or can be run directly with junit.textui.TestRunner with -Xmx16M. Added: db/derby/code/branches/10.7/java/testing/org/apache/derbyTesting/functionTests/tests/memory/MemoryLeakFixesTest.java - copied unchanged from r1141924, db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/memory/MemoryLeakFixesTest.java Removed: db/derby/code/branches/10.7/java/testing/org/apache/derbyTesting/functionTests/suites/jdbcapi.runall db/derby/code/branches/10.7/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/derbyStress.java db/derby/code/branches/10.7/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/derbyStress_app.properties Modified: db/derby/code/branches/10.7/ (props changed) db/derby/code/branches/10.7/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNet.exclude db/derby/code/branches/10.7/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetClientUseprocess.exclude db/derby/code/branches/10.7/java/testing/org/apache/derbyTesting/functionTests/suites/j9derbynetmats.properties db/derby/code/branches/10.7/java/testing/org/apache/derbyTesting/functionTests/tests/memory/_Suite.java Propchange: db/derby/code/branches/10.7/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jul 4 04:32:27 2011 @@ -1 +1 @@ -/db/derby/code/trunk:1035603,1036769,1038514,1038813,1039084,1039268,1040658,1041338,1043227,1043389,1044096,1051026,1053724,1055169,1059888,1060480,1062096,1063809,1065061,1066290,1067250,1067357,1069661,1071463,1071886,1076387,1078461,1078693,1081072,1081455,1081568,1085078,1091000,1097247,1103681,1103718,1129136,1130632,1130895,1131272,1132664,1139449 +/db/derby/code/trunk:1035603,1036769,1038514,1038813,1039084,1039268,1040658,1041338,1043227,1043389,1044096,1051026,1053724,1055169,1059888,1060480,1062096,1063809,1065061,1066290,1067250,1067357,1069661,1071463,1071886,1076387,1078461,1078693,1081072,1081455,1081568,1085078,1091000,1097247,1103681,1103718,1129136,1130632,1130895,1131272,1132664,1139449,1141924 Modified: db/derby/code/branches/10.7/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNet.exclude URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.7/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNet.exclude?rev=1142540&r1=1142539&r2=1142540&view=diff ============================================================================== --- db/derby/code/branches/10.7/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNet.exclude (original) +++ db/derby/code/branches/10.7/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNet.exclude Mon Jul 4 04:32:27 2011 @@ -4,6 +4,4 @@ # see DERBY-326 and DERBY-550 issues jdbcapi/rsgetXXXcolumnNames.java jdbcapi/SetQueryTimeoutTest.java -# excluding jdbcapi/derbyStress.java - jcc runs out of memory with this test -jdbcapi/derbyStress.java largedata/LobLimits.java Modified: db/derby/code/branches/10.7/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetClientUseprocess.exclude URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.7/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetClientUseprocess.exclude?rev=1142540&r1=1142539&r2=1142540&view=diff ============================================================================== --- db/derby/code/branches/10.7/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetClientUseprocess.exclude (original) +++ db/derby/code/branches/10.7/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetClientUseprocess.exclude Mon Jul 4 04:32:27 2011 @@ -9,7 +9,6 @@ # stress/stress.multi - exits suite # following fail for various reasons, many related to not being able to connect: # lang/wisconsin.java -# jdbcapi/derbyStress.java # jdbcapi/maxfieldsize.java # jdbcapi/HoldabilityTest.junit @@ -19,5 +18,4 @@ derbynet/dblook_test_net.java derbynet/dblook_test_net_territory.java stress/stress.multi lang/wisconsin.java -jdbcapi/derbyStress.java jdbcapi/maxfieldsize.java Modified: db/derby/code/branches/10.7/java/testing/org/apache/derbyTesting/functionTests/suites/j9derbynetmats.properties URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.7/java/testing/org/apache/derbyTesting/functionTests/suites/j9derbynetmats.properties?rev=1142540&r1=1142539&r2=1142540&view=diff ============================================================================== --- db/derby/code/branches/10.7/java/testing/org/apache/derbyTesting/functionTests/suites/j9derbynetmats.properties (original) +++ db/derby/code/branches/10.7/java/testing/org/apache/derbyTesting/functionTests/suites/j9derbynetmats.properties Mon Jul 4 04:32:27 2011 @@ -14,7 +14,7 @@ # limitations under the License. framework=DerbyNet -suites=j9derbynetmats jdbcapi jdbc20 +suites=j9derbynetmats jdbc20 jdk12test=true runwithj9=false runwithibm13=false Modified: db/derby/code/branches/10.7/java/testing/org/apache/derbyTesting/functionTests/tests/memory/_Suite.java URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.7/java/testing/org/apache/derbyTesting/functionTests/tests/memory/_Suite.java?rev=1142540&r1=1142539&r2=1142540&view=diff ============================================================================== --- db/derby/code/branches/10.7/java/testing/org/apache/derbyTesting/functionTests/tests/memory/_Suite.java (original) +++ db/derby/code/branches/10.7/java/testing/org/apache/derbyTesting/functionTests/tests/memory/_Suite.java Mon Jul 4 04:32:27 2011 @@ -40,6 +40,7 @@ public class _Suite extends BaseJDBCTest suite.addTest(ClobMemTest.suite()); suite.addTest(MultiByteClobTest.suite()); suite.addTest(RolesDependencyTest.suite()); + suite.addTest(MemoryLeakFixesTest.suite()); return suite; } }