diff options
| author | 2017-01-20 19:49:11 -0800 | |
|---|---|---|
| committer | 2017-01-20 20:32:20 -0800 | |
| commit | 9623ca6e05e14054d85ce73dfd7d6ed43555b84e (patch) | |
| tree | d5cc5b11edd3a7bc3ff1b7719b1a3bfa345803ea | |
| parent | a90b3dd3f22ce0674970365a5903571276a8fc01 (diff) | |
ART: Re-enable TI tests for target
Fix invalid null handle for dlsym on arm32. Fix missing cast in
dispatch.
Remove the test black-list.
Bug: 31681198
Test: m test-art-target-run-test (bullhead)
Change-Id: I3edc68421933330b4361fb9e49d4e5ff4966a4ff
| -rw-r--r-- | runtime/openjdkjvmti/events.cc | 2 | ||||
| -rw-r--r-- | test/Android.run-test.mk | 36 | ||||
| -rw-r--r-- | test/ti-agent/common_helper.cc | 2 |
3 files changed, 2 insertions, 38 deletions
diff --git a/runtime/openjdkjvmti/events.cc b/runtime/openjdkjvmti/events.cc index 7182055b7d..d3f8001d69 100644 --- a/runtime/openjdkjvmti/events.cc +++ b/runtime/openjdkjvmti/events.cc @@ -212,7 +212,7 @@ class JvmtiAllocationListener : public art::gc::AllocationListener { thread.get(), object.get(), klass.get(), - byte_count); + static_cast<jlong>(byte_count)); } } diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk index 639996ee7f..814f968bc9 100644 --- a/test/Android.run-test.mk +++ b/test/Android.run-test.mk @@ -277,42 +277,6 @@ TEST_ART_BROKEN_TARGET_TESTS := \ 147-stripped-dex-fallback \ 569-checker-pattern-replacement -# These 9** tests are not supported in current form due to linker -# restrictions. See b/31681198 -TEST_ART_BROKEN_TARGET_TESTS += \ - 901-hello-ti-agent \ - 902-hello-transformation \ - 903-hello-tagging \ - 904-object-allocation \ - 905-object-free \ - 906-iterate-heap \ - 907-get-loaded-classes \ - 908-gc-start-finish \ - 909-attach-agent \ - 910-methods \ - 911-get-stack-trace \ - 912-classes \ - 913-heaps \ - 914-hello-obsolescence \ - 915-obsolete-2 \ - 916-obsolete-jit \ - 917-fields-transformation \ - 918-fields \ - 919-obsolete-fields \ - 920-objects \ - 921-hello-failure \ - 922-properties \ - 923-monitors \ - 924-threads \ - 925-threadgroups \ - 926-multi-obsolescence \ - 927-timers \ - 928-jni-table \ - 929-search \ - 930-hello-retransform \ - 931-agent-thread \ - 932-transform-saves \ - ifneq (,$(filter target,$(TARGET_TYPES))) ART_TEST_KNOWN_BROKEN += $(call all-run-test-names,target,$(RUN_TYPES),$(PREBUILD_TYPES), \ $(COMPILER_TYPES),$(RELOCATE_TYPES),$(TRACE_TYPES),$(GC_TYPES),$(JNI_TYPES), \ diff --git a/test/ti-agent/common_helper.cc b/test/ti-agent/common_helper.cc index fd9fc38fb7..80e1797369 100644 --- a/test/ti-agent/common_helper.cc +++ b/test/ti-agent/common_helper.cc @@ -349,7 +349,7 @@ static void BindMethod(jvmtiEnv* jenv, names[1] = m->JniLongName(); } for (const std::string& mangled_name : names) { - void* sym = dlsym(nullptr, mangled_name.c_str()); + void* sym = dlsym(RTLD_DEFAULT, mangled_name.c_str()); if (sym == nullptr) { continue; } |