Automated import from //branches/master/...@140443,140443

2 files changed, 4 insertions, 0 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();