commit ebee8de725d5fa83483642786b19ea453d865762
author Nicolas Geoffray <ngeoffray@google.com> Wed Aug 13 03:40:45 2014 +0100
committer Brian Carlstrom <bdc@google.com> Fri Aug 15 12:19:57 2014 -0700
tree 639f29920749d6aba992fa76c57a067a34b0830d
parent 9c290012b7f505ae1943ab87236f775b97a46e2d

Fix bugs in the x86 and arm versions of generic JNI.

Also fix the run script of 116-nodex2oat to use the non-prebuild
script for target.

Bug: 17000769

(cherry-picked from commit 54accbca0b549b1b1ad3ef09655dad438bc1e104)

Change-Id: I439fcd710fb8bb408f3288ff8fb34fef23890adb

runtime/common_runtime_test.h

diff --git a/runtime/common_runtime_test.h b/runtime/common_runtime_test.h
index 86b2de8..5b014b3 100644
--- a/runtime/common_runtime_test.h
+++ b/runtime/common_runtime_test.h
@@ -155,6 +155,12 @@
     return; \
   }
 
+#define TEST_DISABLED_FOR_MIPS() \
+  if (kRuntimeISA == kMips || kRuntimeISA == kMips64) { \
+    printf("WARNING: TEST DISABLED FOR MIPS\n"); \
+    return; \
+  }
+
 }  // namespace art
 
 namespace std {