Update run-libjdwp-tests.sh to run more of the test suite

Also add new broken tests to the failure list.

Test: ./art/tools/run-libjdwp-tests.sh --mode=host
Change-Id: Id06609ee341107be1c16a45ec736d8cee80be9f6
diff --git a/tools/external_oj_libjdwp_art_failures.txt b/tools/external_oj_libjdwp_art_failures.txt
index 38e5a99..5783d92 100644
--- a/tools/external_oj_libjdwp_art_failures.txt
+++ b/tools/external_oj_libjdwp_art_failures.txt
@@ -31,6 +31,8 @@
            "org.apache.harmony.jpda.tests.jdwp.ClassType_SetValues002Test#testSetValues002",
            "org.apache.harmony.jpda.tests.jdwp.Events_ClassPrepare002Test#testClassPrepareCausedByDebugger",
            "org.apache.harmony.jpda.tests.jdwp.Events_ExceptionCaughtTest#testExceptionEvent_ThrowLocation_FromNative",
+           "org.apache.harmony.jpda.tests.jdwp.Events_MonitorWaitedTest#testMonitorWaitedForClassMatchFirst",
+           "org.apache.harmony.jpda.tests.jdwp.Events_MonitorWaitTest#testMonitorWaitForClassMatchFirst",
            "org.apache.harmony.jpda.tests.jdwp.ObjectReference_DisableCollectionTest#testDisableCollection_null",
            "org.apache.harmony.jpda.tests.jdwp.ObjectReference_EnableCollectionTest#testEnableCollection_invalid",
            "org.apache.harmony.jpda.tests.jdwp.ObjectReference_EnableCollectionTest#testEnableCollection_null",
diff --git a/tools/run-libjdwp-tests.sh b/tools/run-libjdwp-tests.sh
index d514c0c..c11dc84 100755
--- a/tools/run-libjdwp-tests.sh
+++ b/tools/run-libjdwp-tests.sh
@@ -125,4 +125,5 @@
             "${args[@]}"                  \
             --jdwp-path "libjdwp.so"      \
             --vm-arg -Djpda.settings.debuggeeAgentExtraOptions=coredump=y \
+            --vm-arg -Djpda.settings.testSuiteType=libjdwp \
             --expectations "$expect_path"