db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kmars...@apache.org
Subject svn commit: r636820 - in /db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests: master/testProperties.out tests/derbynet/testProperties_sed.properties
Date Thu, 13 Mar 2008 18:24:39 GMT
Author: kmarsden
Date: Thu Mar 13 11:24:36 2008
New Revision: 636820

URL: http://svn.apache.org/viewvc?rev=636820&view=rev
Log:
DERBY-3443 With IBM 1.6 derbynet/testProperties fails with listing properties

For 10.3, testProperties is also an issue, since it has not been converted to 
JUnit. Added sed line.  Looked at porting conversion but decided against due to multiple checkins,
conflicts and trunk dependencies.


Modified:
    db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/master/testProperties.out
    db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testProperties_sed.properties

Modified: db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/master/testProperties.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/master/testProperties.out?rev=636820&r1=636819&r2=636820&view=diff
==============================================================================
--- db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/master/testProperties.out
(original)
+++ db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/master/testProperties.out
Thu Mar 13 11:24:36 2008
@@ -19,7 +19,6 @@
 org.apache.derby.drda.NetworkServerControl shutdown -p 1527 
 Apache Derby Network Server - 10.3.2.2 -(EXPECTED SUBVERSION INFO)  shutdown at xxxxxxFILTERED-TIMESTAMPxxxxxGMT
 -----Dderby.drda.logConnections -Dderby.drda.traceAll -Dderby.drda.traceDirectory -Dderby.drda.keepAlive
-Dderby.drda.timeSlice -Dderby.drda.host -Dderby.drda.portNumber -Dderby.drda.minThreads -Dderby.drda.maxThreads
-Dderby.drda.startNetworkServer -Dderby.drda.debug org.apache.derby.drda.NetworkServerControl
start -noSecurityManager 
------ listing properties --
 derby.drda.maxThreads=0
 derby.drda.sslMode=off
 derby.drda.keepAlive=true
@@ -35,7 +34,6 @@
 Trace turned on for all sessions.
 org.apache.derby.drda.NetworkServerControl logconnections on -p 1527 
 Log Connections changed to on.
------ listing properties --
 derby.drda.maxThreads=0
 derby.drda.sslMode=off
 derby.drda.keepAlive=true
@@ -49,7 +47,6 @@
 org.apache.derby.drda.NetworkServerControl trace off -p 1527 
 Trace turned off for all sessions.
 Trace turned off for all sessions.
------ listing properties --
 derby.drda.maxThreads=0
 derby.drda.sslMode=off
 derby.drda.keepAlive=true

Modified: db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testProperties_sed.properties
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testProperties_sed.properties?rev=636820&r1=636819&r2=636820&view=diff
==============================================================================
--- db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testProperties_sed.properties
(original)
+++ db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testProperties_sed.properties
Thu Mar 13 11:24:36 2008
@@ -22,3 +22,4 @@
 #   substitute=pattern1;substitute1,pattern2;substitute2,...,patternn;substituten
 # No commas or semicolons can be allowed in the patterns/subsitutes.
 substitute=- [(][0-9]+:?[0-9]*M?[)];-(EXPECTED SUBVERSION INFO) ,- [(]exported[)];-(EXPECTED
SUBVERSION INFO) 
+delete=listing properties
\ No newline at end of file



Mime
View raw message