diff options
| author | 2016-05-02 13:39:39 -0700 | |
|---|---|---|
| committer | 2016-05-02 13:43:36 -0700 | |
| commit | 457bc24d2a6842ec43451387276629d1288eb195 (patch) | |
| tree | 925cdd6d1239bc2740f1b7d249815829c482fe9d | |
| parent | 39d68ef756ef82afbc78baedd0cad8789c732958 (diff) | |
Revert "Disable tests after latest nativeloader changes."
This reverts commit 7032e780836a464faf5901d9d8d7fedb97f3a739.
Bug: http://b/28449304
| -rw-r--r-- | compiler/jni/jni_compiler_test.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/compiler/jni/jni_compiler_test.cc b/compiler/jni/jni_compiler_test.cc index 5b7574a36c..cf836a9c9f 100644 --- a/compiler/jni/jni_compiler_test.cc +++ b/compiler/jni/jni_compiler_test.cc @@ -227,8 +227,7 @@ void JniCompilerTest::CompileAndRunIntMethodThroughStubImpl() { EXPECT_EQ(25, result); } -// Disabled due to NativeLoader b/28449304. -// JNI_TEST(CompileAndRunIntMethodThroughStub) +JNI_TEST(CompileAndRunIntMethodThroughStub) void JniCompilerTest::CompileAndRunStaticIntMethodThroughStubImpl() { SetUpForTest(true, "sbar", "(I)I", nullptr); @@ -243,8 +242,7 @@ void JniCompilerTest::CompileAndRunStaticIntMethodThroughStubImpl() { EXPECT_EQ(43, result); } -// Disabled due to NativeLoader b/28449304. -// JNI_TEST(CompileAndRunStaticIntMethodThroughStub) +JNI_TEST(CompileAndRunStaticIntMethodThroughStub) int gJava_MyClassNatives_fooI_calls = 0; jint Java_MyClassNatives_fooI(JNIEnv* env, jobject thisObj, jint x) { |