Add more cts tests

Adds cts versions of test 985 and 986

Bug: 32072923
Test: ./test.py --host -j40
Test: cts-tradefed run cts-dev --module CtsJvmtiRunTest985HostTestCases
Test: cts-tradefed run cts-dev --module CtsJvmtiRunTest986HostTestCases

Change-Id: Iaef9ce87aea435fa44e006d1cc5f183697008789
(cherry picked from commit ec0885ea570b93b563d04d337a11488e112693ec)
Merged-In: Iaeba26b9554dee5cba6ef04e91d4a2664c7e94d0

diff --git a/test/Android.run-test-jvmti-java-library.mk b/test/Android.run-test-jvmti-java-library.mk
index 70ee693..c480be5 100644 (file)
--- a/test/Android.run-test-jvmti-java-library.mk
+++ b/test/Android.run-test-jvmti-java-library.mk
@@ -74,6 +74,8 @@ LOCAL_SRC_FILES += \
   981-dedup-original-dex/src/art/Test981.java \
   982-ok-no-retransform/src/art/Test982.java \
   984-obsolete-invoke/src/art/Test984.java \
+  985-re-obsolete/src/art/Test985.java \
+  986-native-method-bind/src/art/Test986.java \
 
 JVMTI_RUN_TEST_GENERATED_NUMBERS := \
   901 \
@@ -114,6 +116,8 @@ JVMTI_RUN_TEST_GENERATED_NUMBERS := \
   981 \
   982 \
   984 \
+  985 \
+  986 \
 
 # Try to enforce that the directories correspond to the Java files we pull in.
 JVMTI_RUN_TEST_DIR_CHECK := $(sort $(foreach DIR,$(JVMTI_RUN_TEST_GENERATED_NUMBERS), \