svn commit: r420522 - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness: NetServer.java RunTest.java

[an...@apache.org]

Author: andreask
Date: Mon Jul 10 06:46:15 2006
New Revision: 420522

URL: http://svn.apache.org/viewvc?rev=420522&view=rev
Log:
DERBY-1352 force locale to be en_US when running tests from harness. The fix sets the system properties user.language=en and user.country=US for the VM of the test and for the VM of the network server when started from test harness. This ensures that tests like derbynet/sysinfo.java can run without filtering out all output

Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/NetServer.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunTest.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/NetServer.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/NetServer.java?rev=420522&r1=420521&r2=420522&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/NetServer.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/NetServer.java Mon Jul 10 06:46:15 2006
@@ -183,6 +183,8 @@
         }
 
         jvmProps.addElement("derby.system.home=" + homeDirName);
+		jvmProps.addElement("user.language=en");
+		jvmProps.addElement("user.country=US");
 		jvm.setD(jvmProps);
 		jvm.setSecurityProps();
         // For some platforms (like Mac) the process exec command

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunTest.java?rev=420522&r1=420521&r2=420522&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunTest.java Mon Jul 10 06:46:15 2006
@@ -2212,6 +2212,8 @@
 			derbySystemHome = userDirName;
 		testJvmProps.addElement("derby.system.home=" + derbySystemHome);
 		testJvmProps.addElement("derby.infolog.append=true ");
+		testJvmProps.addElement("user.language=en");
+		testJvmProps.addElement("user.country=US");
 		// Why is this being done here
 		//if (jvm != null)
 		    //testJvmProps.addElement("jvm="+jvm.getName());