test/jdk/javadoc/tool/6964914/TestStdDoclet.java

*** 45,69 ****
       * @throws DoesNotExist   oops, javadoc does not see this
       * @see DoesNotExist
       */
      void run() throws Exception {
          File javaHome = new File(System.getProperty("java.home"));
-         if (javaHome.getName().equals("jre"))
-             javaHome = javaHome.getParentFile();
          File javadoc = new File(new File(javaHome, "bin"), "javadoc");
          File testSrc = new File(System.getProperty("test.src"));
  
          // run javadoc in separate process to ensure doclet executed under
          // normal user conditions w.r.t. classloader
          String thisClassName = TestStdDoclet.class.getName();
          List<String> cmdArgs = new ArrayList<>();
          cmdArgs.add(javadoc.getPath());
-         int i = 0;
-         String prop;
-         while ((prop = System.getProperty("jdk.launcher.patch." + (i++))) != null) {
-             cmdArgs.add("-J-Xpatch:" + prop);
-         }
          cmdArgs.addAll(Arrays.asList(
                  "-classpath", ".", // insulates us from ambient classpath
                  "-Xdoclint:none",
                  "-package",
                  new File(testSrc, thisClassName + ".java").getPath()
--- 45,62 ----