diff options
| author | 2017-04-12 15:39:54 -0700 | |
|---|---|---|
| committer | 2017-04-12 15:43:45 -0700 | |
| commit | a1e036782a4154d5fa5481cc3fc17bc58a9b4520 (patch) | |
| tree | 8cf6731a2f6ad57eb5eb34303319a459f97e2e81 | |
| parent | 7f734d414abd28b7f874a19bf776f4e9eb1a3121 (diff) | |
Fix CHA test failures under some configurations.
Some checks in IsManaged() are outdated.
Bug: 36344221
Test: m -j20 test-art-host-run-test
Test: test-art-host-run-test-debug-no-dex2oat-jit-no-relocate-ntrace-cms-checkjni-picimage-npictest-ndebuggable-616-cha-abstract64
Change-Id: Iec248cddf08b0a4ebce5f8fbca75d8d280797640
| -rw-r--r-- | test/common/stack_inspect.cc | 13 | ||||
| -rw-r--r-- | test/knownfailures.json | 11 |
2 files changed, 3 insertions, 21 deletions
diff --git a/test/common/stack_inspect.cc b/test/common/stack_inspect.cc index df7fa20226..ceb4ba241b 100644 --- a/test/common/stack_inspect.cc +++ b/test/common/stack_inspect.cc @@ -144,22 +144,11 @@ extern "C" JNIEXPORT void JNICALL Java_Main_assertIsInterpreted(JNIEnv* env, jcl } } -static jboolean IsManaged(JNIEnv* env, jclass cls, size_t level) { +static jboolean IsManaged(JNIEnv* env, jclass, size_t level) { ScopedObjectAccess soa(env); - - ObjPtr<mirror::Class> klass = soa.Decode<mirror::Class>(cls); - const DexFile& dex_file = klass->GetDexFile(); - const OatFile::OatDexFile* oat_dex_file = dex_file.GetOatDexFile(); - if (oat_dex_file == nullptr) { - // No oat file, this must be a test configuration that doesn't compile at all. Ignore that the - // result will be that we're running the interpreter. - return JNI_FALSE; - } - NthCallerVisitor caller(soa.Self(), level, false); caller.WalkStack(); CHECK(caller.caller != nullptr); - return caller.GetCurrentShadowFrame() != nullptr ? JNI_FALSE : JNI_TRUE; } diff --git a/test/knownfailures.json b/test/knownfailures.json index 7891d4c19f..9f5c8093b4 100644 --- a/test/knownfailures.json +++ b/test/knownfailures.json @@ -220,7 +220,6 @@ "tests": ["604-hot-static-interface", "612-jit-dex-cache", "613-inlining-dex-cache", - "616-cha", "626-set-resolved-string"], "variant": "trace | stream", "description": ["These tests expect JIT compilation, which is", @@ -330,14 +329,8 @@ "variant": "interpreter | optimizing | regalloc_gc | jit" }, { - "tests": ["912-classes", - "616-cha", - "616-cha-abstract", - "616-cha-interface", - "616-cha-interface-default", - "616-cha-miranda", - "616-cha-proxy-method-inline"], - "bug": "http://b/36344364 http://b/36344221", + "tests": ["912-classes"], + "bug": "http://b/36344364", "variant": "no-dex2oat | relocate-npatchoat" }, { |