6899444: Fix demo/jvmti tests so they can run in jtreg samevm mode, cleanup problemlist
Reviewed-by: tbell
diff --git a/test/demo/jvmti/DemoRun.java b/test/demo/jvmti/DemoRun.java
index 1958a1e..7a1a42d 100644
--- a/test/demo/jvmti/DemoRun.java
+++ b/test/demo/jvmti/DemoRun.java
@@ -145,7 +145,7 @@
          */
         int nvm_options = 0;
         if ( vm_options != null ) nvm_options = vm_options.length;
-        String cmd[]     = new String[1 + (d64?1:0) + 5 + nvm_options];
+        String cmd[]     = new String[1 + (d64?1:0) + 7 + nvm_options];
         String cmdLine;
         int exitStatus;
         int i,j;
@@ -154,6 +154,10 @@
         cmdLine = "";
         cmdLine += (cmd[i++] = java);
         cmdLine += " ";
+        cmdLine += (cmd[i++] = "-cp");
+        cmdLine += " ";
+        cmdLine += (cmd[i++] = cdir);
+        cmdLine += " ";
         cmdLine += (cmd[i++] = "-Dtest.classes=" + cdir);
         if ( d64 ) {
             cmdLine += " ";