You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by km...@apache.org on 2011/08/31 18:23:48 UTC
svn commit: r1163684 - in /db/derby/code/branches/10.8: ./
java/testing/org/apache/derbyTesting/functionTests/tests/store/BootLockTest.java
java/testing/org/apache/derbyTesting/junit/BaseTestCase.java
Author: kmarsden
Date: Wed Aug 31 16:23:48 2011
New Revision: 1163684
URL: http://svn.apache.org/viewvc?rev=1163684&view=rev
Log:
DERBY-4647 BaseTestCase.execJavaCmd() does not work with weme 6.2
port revision 1161208 to 10.8 except for RecoveryTest changes which are not relevant to 10.8
Modified:
db/derby/code/branches/10.8/ (props changed)
db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/store/BootLockTest.java
db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/junit/BaseTestCase.java
Propchange: db/derby/code/branches/10.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 31 16:23:48 2011
@@ -1,2 +1,2 @@
/db/derby/code/branches/10.7:1061570,1061578,1082235
-/db/derby/code/trunk:1063809,1088633,1089795,1091000,1091221,1091285,1092067,1092795,1094315,1094572,1094728,1095247,1096741,1096890,1096991,1097247,1097249,1097460,1097469,1097471,1098033,1101059,1101839,1102620,1102826,1103681,1103718,1103742,1125305,1126358,1126468,1127825,1127883,1128243,1128942,1129136,1129764,1129797,1130077,1130084,1130632,1130895,1131030,1131272,1132546,1132664,1132747,1132860,1132928,1133304,1133317,1133741,1133752,1134139,1136363,1136371,1136397,1136844,1137213,1138201,1138341,1138444,1138787,1138795,1139449,1139451,1140222,1140744,1141924,1142583,1142635,1145057,1146644,1146915,1146962,1147219,1147242,1147335,1148344,1148354,1148429,1148658,1149054,1149090,1149270,1149482,1149662,1151101,1151612,1158108,1160593
+/db/derby/code/trunk:1063809,1088633,1089795,1091000,1091221,1091285,1092067,1092795,1094315,1094572,1094728,1095247,1096741,1096890,1096991,1097247,1097249,1097460,1097469,1097471,1098033,1101059,1101839,1102620,1102826,1103681,1103718,1103742,1125305,1126358,1126468,1127825,1127883,1128243,1128942,1129136,1129764,1129797,1130077,1130084,1130632,1130895,1131030,1131272,1132546,1132664,1132747,1132860,1132928,1133304,1133317,1133741,1133752,1134139,1136363,1136371,1136397,1136844,1137213,1138201,1138341,1138444,1138787,1138795,1139449,1139451,1140222,1140744,1141924,1142583,1142635,1145057,1146644,1146915,1146962,1147219,1147242,1147335,1148344,1148354,1148429,1148658,1149054,1149090,1149270,1149482,1149662,1151101,1151612,1158108,1160593,1161208
Modified: db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/store/BootLockTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/store/BootLockTest.java?rev=1163684&r1=1163683&r2=1163684&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/store/BootLockTest.java (original)
+++ db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/store/BootLockTest.java Wed Aug 31 16:23:48 2011
@@ -93,12 +93,6 @@ public class BootLockTest extends BaseJD
*/
public static Test suite() {
TestSuite suite = new TestSuite("BootLockTest");
-
- if (BaseTestCase.isJ9Platform()) {
- // forking currently not working, cf. DERBY-4179.
- return suite;
- }
-
suite.addTest(decorateTest());
return suite;
}
@@ -113,7 +107,8 @@ public class BootLockTest extends BaseJD
Test test = new TestSuite(BootLockTest.class);
- if (JDBC.vmSupportsJSR169()) {
+ if (JDBC.vmSupportsJSR169() && !isJ9Platform()) {
+ // PhoneME requires forceDatabaseLock
Properties props = new Properties();
props.setProperty("derby.database.forceDatabaseLock", "true");
test = new SystemPropertyTestSetup(test, props, true);
@@ -140,7 +135,8 @@ public class BootLockTest extends BaseJD
Connection c = getConnection();
fail("Dual boot not detected: check BootLockMinion.log");
} catch (SQLException e) {
- if (JDBC.vmSupportsJSR169()) {
+ if (JDBC.vmSupportsJSR169() && !isJ9Platform()) {
+ // For PhoneME force database lock required
assertSQLState(
"Dual boot not detected: check BootLockMinion.log",
DATA_MULTIPLE_JBMS_FORCE_LOCK,
Modified: db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/junit/BaseTestCase.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/junit/BaseTestCase.java?rev=1163684&r1=1163683&r2=1163684&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/junit/BaseTestCase.java (original)
+++ db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/junit/BaseTestCase.java Wed Aug 31 16:23:48 2011
@@ -46,6 +46,7 @@ import java.security.PrivilegedAction;
import java.security.PrivilegedExceptionAction;
import java.security.PrivilegedActionException;
+import java.util.ArrayList;
/**
@@ -534,15 +535,16 @@ public abstract class BaseTestCase
* @throws IOException
*/
public static Process execJavaCmd(String[] cmd) throws IOException {
- int totalSize = 3 + cmd.length;
- String[] tcmd = new String[totalSize];
- tcmd[0] = getJavaExecutableName();
- tcmd[1] = "-classpath";
- tcmd[2] = BaseTestCase.getSystemProperty("java.class.path");
-
- System.arraycopy(cmd, 0, tcmd, 3, cmd.length);
-
- final String[] command = tcmd;
+ ArrayList cmdlist = new ArrayList();
+ cmdlist.add(getJavaExecutableName());
+ if (isJ9Platform())
+ cmdlist.add("-jcl:foun11");
+ cmdlist.add("-classpath");
+ cmdlist.add(getSystemProperty("java.class.path"));
+ for (int i =0; i < cmd.length;i++) {
+ cmdlist.add(cmd[i]);
+ }
+ final String[] command = (String[]) cmdlist.toArray(cmd);
println("execute java command:");
for (int i = 0; i < command.length; i++) {
println("command[" + i + "]" + command[i]);