diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2014-08-13 03:40:45 +0100 |
|---|---|---|
| committer | Nicolas Geoffray <ngeoffray@google.com> | 2014-08-14 17:18:53 +0100 |
| commit | 54accbca0b549b1b1ad3ef09655dad438bc1e104 (patch) | |
| tree | 6354bddae9e09476380b9351b6c1a84636ac8154 /runtime/common_runtime_test.h | |
| parent | e39a5e1ced3d2b87974c646678dd719c02a9a010 (diff) | |
| download | art-54accbca0b549b1b1ad3ef09655dad438bc1e104.tar.gz art-54accbca0b549b1b1ad3ef09655dad438bc1e104.tar.bz2 art-54accbca0b549b1b1ad3ef09655dad438bc1e104.zip | |
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
Change-Id: I439fcd710fb8bb408f3288ff8fb34fef23890adb
Diffstat (limited to 'runtime/common_runtime_test.h')
| -rw-r--r-- | runtime/common_runtime_test.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/runtime/common_runtime_test.h b/runtime/common_runtime_test.h index 12c1241270..ddb6c81712 100644 --- a/runtime/common_runtime_test.h +++ b/runtime/common_runtime_test.h @@ -161,6 +161,12 @@ class CheckJniAbortCatcher { return; \ } +#define TEST_DISABLED_FOR_MIPS() \ + if (kRuntimeISA == kMips || kRuntimeISA == kMips64) { \ + printf("WARNING: TEST DISABLED FOR MIPS\n"); \ + return; \ + } + } // namespace art namespace std { |