Automated import from //branches/master/...@140443,140443
diff --git a/libcore/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/SystemTest.java b/libcore/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/SystemTest.java
index 2c65f52..f17c3d8 100644
--- a/libcore/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/SystemTest.java
+++ b/libcore/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 @@
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/libcore/luni/src/test/java/tests/api/java/net/SocketTest.java b/libcore/luni/src/test/java/tests/api/java/net/SocketTest.java
index 94e7d09..3d6fbeb 100644
--- a/libcore/luni/src/test/java/tests/api/java/net/SocketTest.java
+++ b/libcore/luni/src/test/java/tests/api/java/net/SocketTest.java
@@ -494,6 +494,8 @@
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/libcore/run-core-tests b/libcore/run-core-tests
index 25e53ee..62b3c51 100755
--- a/libcore/run-core-tests
+++ b/libcore/run-core-tests
@@ -27,4 +27,4 @@
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/libcore/sql/src/test/resources/connection.properties b/libcore/sql/src/test/resources/connection.properties
index 2e49346..d514e85 100644
--- a/libcore/sql/src/test/resources/connection.properties
+++ b/libcore/sql/src/test/resources/connection.properties
@@ -6,4 +6,4 @@
sqlPassword =
sqlUser =
sqlMaxConnections = 30
-sqlMaxTasks = 10000
+sqlMaxTasks = 1000
