4 files changed, 10 insertions, 7 deletions
diff --git a/test/151-OpenFileLimit/Android.bp b/test/151-OpenFileLimit/Android.bp
index 946be83539..6b2a8c928a 100644
--- a/test/151-OpenFileLimit/Android.bp
+++ b/test/151-OpenFileLimit/Android.bp
@@ -15,7 +15,7 @@ package {
 java_test {
     name: "art-run-test-151-OpenFileLimit",
     defaults: ["art-run-test-defaults"],
-    test_config_template: ":art-run-test-target-template",
+    test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
     data: [
         ":art-run-test-151-OpenFileLimit-expected-stdout",
diff --git a/test/151-OpenFileLimit/expected-stdout.txt b/test/151-OpenFileLimit/expected-stdout.txt
index 6bc45ef24d..18903be94e 100644
--- a/test/151-OpenFileLimit/expected-stdout.txt
+++ b/test/151-OpenFileLimit/expected-stdout.txt
@@ -1,3 +1,4 @@
+JNI_OnLoad called
 Message includes "Too many open files"
 thread run.
 done.
diff --git a/test/151-OpenFileLimit/run b/test/151-OpenFileLimit/run.py
index 6faeb0dbf9..65d34eddc8 100755..100644
--- a/test/151-OpenFileLimit/run
+++ b/test/151-OpenFileLimit/run.py
@@ -14,11 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Filter out expected error messages, which happen on device.
-export ANDROID_LOG_TAGS='*:f'
+import resource
 
-flags="$@"
 
-# Reduce the file descriptor limit so the test will reach the limit sooner.
-ulimit -n 512
-${RUN} --external-log-tags ${flags}
+def run(ctx, args):
+  ctx.default_run(args, android_log_tags="*:f")
diff --git a/test/151-OpenFileLimit/src/Main.java b/test/151-OpenFileLimit/src/Main.java
index 9b16090fbb..561c17ae1c 100644
--- a/test/151-OpenFileLimit/src/Main.java
+++ b/test/151-OpenFileLimit/src/Main.java
@@ -24,6 +24,9 @@ public class Main {
     private static final String TEMP_FILE_NAME_SUFFIX = ".txt";
 
     public static void main(String[] args) throws IOException {
+        System.loadLibrary(args[0]);
+
+        setRlimitNoFile(512);
 
         // Exhaust the number of open file descriptors.
         List<File> files = new ArrayList<File>();
@@ -79,4 +82,6 @@ public class Main {
             }
         }
     }
+
+    public static native void setRlimitNoFile(int value);
 }