test/hotspot/jtreg/serviceability/dcmd/framework/VMVersionTest.java

rev 52026 : 8205654: serviceability/dcmd/framework/HelpTest.java timed out
8218705: Test sun/tools/jcmd/TestJcmdDefaults.java fails on Linux
Reviewed-by: sspitsyn, dholmes

*** 1,7 ****
  /*
!  * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 25,41 ****
--- 25,44 ----
  import jdk.test.lib.dcmd.CommandExecutor;
  import jdk.test.lib.dcmd.PidJcmdExecutor;
  import jdk.test.lib.dcmd.MainClassJcmdExecutor;
  import jdk.test.lib.dcmd.FileJcmdExecutor;
  import jdk.test.lib.dcmd.JMXExecutor;
+ import nsk.share.jdi.ArgumentHandler;
  
  import org.testng.annotations.Test;
  
  /*
   * @test
   * @summary Test of diagnostic command VM.version (tests all DCMD executors)
   * @library /test/lib
+  *          /vmTestbase
+  * @build   TestJavaProcess
   * @modules java.base/jdk.internal.misc
   *          java.compiler
   *          java.management
   *          jdk.internal.jvmstat/sun.jvmstat.monitor
   * @run testng/othervm -XX:+UsePerfData VMVersionTest
*** 51,61 ****
          run(new PidJcmdExecutor());
      }
  
      @Test
      public void mainClass() {
!         run(new MainClassJcmdExecutor());
      }
  
      @Test
      public void file() {
          run(new FileJcmdExecutor());
--- 54,70 ----
          run(new PidJcmdExecutor());
      }
  
      @Test
      public void mainClass() {
!         TestProcessLauncher t = new TestProcessLauncher(Process.class.getName());
!         try {
!             t.launch();
!             run(new MainClassJcmdExecutor(Process.class.getName()));
!         } finally {
!             t.quit();
!         }
      }
  
      @Test
      public void file() {
          run(new FileJcmdExecutor());
*** 63,68 ****
--- 72,79 ----
  
      @Test
      public void jmx() {
          run(new JMXExecutor());
      }
+ 
+     private static class Process extends TestJavaProcess{}
  }