db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From o..@apache.org
Subject svn commit: r832349 - /db/derby/code/branches/10.5/java/testing/org/apache/derbyTesting/functionTests/tests/lang/_Suite.java
Date Tue, 03 Nov 2009 08:56:29 GMT
Author: ole
Date: Tue Nov  3 08:56:28 2009
New Revision: 832349

URL: http://svn.apache.org/viewvc?rev=832349&view=rev
Log:
DERBY-4290 - suites.All hangs on phoneME/cvm - caused by cvm/phoneME error
backport of revision 790489 from trunk:
svn merge -r 790488:790489 https://svn.apache.org/repos/asf/db/derby/code/trunk

Modified:
    db/derby/code/branches/10.5/java/testing/org/apache/derbyTesting/functionTests/tests/lang/_Suite.java

Modified: db/derby/code/branches/10.5/java/testing/org/apache/derbyTesting/functionTests/tests/lang/_Suite.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.5/java/testing/org/apache/derbyTesting/functionTests/tests/lang/_Suite.java?rev=832349&r1=832348&r2=832349&view=diff
==============================================================================
--- db/derby/code/branches/10.5/java/testing/org/apache/derbyTesting/functionTests/tests/lang/_Suite.java
(original)
+++ db/derby/code/branches/10.5/java/testing/org/apache/derbyTesting/functionTests/tests/lang/_Suite.java
Tue Nov  3 08:56:28 2009
@@ -156,7 +156,11 @@
         suite.addTest(LangHarnessJavaTest.suite());
         		
         suite.addTest(ResultSetsFromPreparedStatementTest.suite());
+        if (!( System.getProperty("java.vm.name").equals("CVM")
+            && System.getProperty("java.vm.version").startsWith("phoneme") ) )
+        { // Disable temporarily until CVM/phoneME is fixed.. See DERBY-4290)
         suite.addTest(OrderByAndSortAvoidance.suite());
+        }
 
         // tests that do not run with JSR169
         if (JDBC.vmSupportsJDBC3())  



Mime
View raw message