diff options
| author | Jorg Pleumann <> | 2009-03-24 17:40:32 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-03-24 17:40:32 -0700 |
| commit | d13fb830050fbf00144a12b9ce4666a35af3b8b5 (patch) | |
| tree | 2fb998e9f042ef38065aa407e848667e1706e52f | |
| parent | 9df2cf65fc382f906757645eaab49d04714e9404 (diff) | |
| download | libcore-d13fb830050fbf00144a12b9ce4666a35af3b8b5.zip libcore-d13fb830050fbf00144a12b9ce4666a35af3b8b5.tar.gz libcore-d13fb830050fbf00144a12b9ce4666a35af3b8b5.tar.bz2 | |
Automated import from //branches/donutburger/...@140440,140440
| -rw-r--r-- | luni/src/test/java/org/apache/harmony/luni/tests/java/lang/SystemTest.java | 2 | ||||
| -rw-r--r-- | luni/src/test/java/tests/api/java/net/SocketTest.java | 2 | ||||
| -rwxr-xr-x | run-core-tests | 2 | ||||
| -rw-r--r-- | sql/src/test/resources/connection.properties | 2 |
4 files changed, 6 insertions, 2 deletions
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/SystemTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/SystemTest.java index 2c65f52..f17c3d8 100644 --- a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/SystemTest.java +++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/SystemTest.java @@ -17,6 +17,7 @@ package org.apache.harmony.luni.tests.java.lang; +import dalvik.annotation.AndroidOnly; import dalvik.annotation.TestTargets; import dalvik.annotation.TestLevel; import dalvik.annotation.TestTargetNew; @@ -1079,6 +1080,7 @@ public class SystemTest extends junit.framework.TestCase { method = "load", args = {java.lang.String.class} ) + @AndroidOnly("No x86 version of this library") public void test_load() { try { new TestLibrary().checkString(); diff --git a/luni/src/test/java/tests/api/java/net/SocketTest.java b/luni/src/test/java/tests/api/java/net/SocketTest.java index 94e7d09..3d6fbeb 100644 --- a/luni/src/test/java/tests/api/java/net/SocketTest.java +++ b/luni/src/test/java/tests/api/java/net/SocketTest.java @@ -494,6 +494,8 @@ public class SocketTest extends SocketTestCase { args = {} ) public void test_getInputStream() throws IOException { + System.setSecurityManager(null); + // Test for method java.io.InputStream java.net.Socket.getInputStream() int sport = startServer("SServer getInputStream"); int portNumber = Support_PortManager.getNextPort(); diff --git a/run-core-tests b/run-core-tests index 25e53ee..62b3c51 100755 --- a/run-core-tests +++ b/run-core-tests @@ -27,4 +27,4 @@ chmod 777 $tmp exec dalvikvm -Duser.language=en -Duser.region=US -Djava.io.tmpdir=$tmp \ -Xbootclasspath:$BOOTCLASSPATH:/system/framework/core-tests.jar \ - com.google.coretests.Main "$@" + -Xmx64M com.google.coretests.Main "$@" diff --git a/sql/src/test/resources/connection.properties b/sql/src/test/resources/connection.properties index 2e49346..d514e85 100644 --- a/sql/src/test/resources/connection.properties +++ b/sql/src/test/resources/connection.properties @@ -6,4 +6,4 @@ sqlUrlPrefix = jdbc:sqlite: sqlPassword = sqlUser = sqlMaxConnections = 30 -sqlMaxTasks = 10000 +sqlMaxTasks = 1000 |