test/tools/launcher/MiscTests.java

*** 1,7 ****
  /*
!  * Copyright (c) 2010, 2015, 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) 2010, 2016, 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.
*** 21,41 ****
   * questions.
   */
  
  /*
   * @test
!  * @bug 6856415
   * @summary Miscellaneous tests, Exceptions
   * @compile -XDignore.symbol.file MiscTests.java
   * @run main MiscTests
   */
  
  
  import java.io.File;
  import java.io.IOException;
  import java.util.ArrayList;
  import java.util.List;
  
  public class MiscTests extends TestHelper {
  
      /**
       * Test with class path set on the command line via -Djava.class.path
--- 21,43 ----
   * questions.
   */
  
  /*
   * @test
!  * @bug 6856415 8154212
   * @summary Miscellaneous tests, Exceptions
   * @compile -XDignore.symbol.file MiscTests.java
   * @run main MiscTests
   */
  
  
  import java.io.File;
  import java.io.IOException;
  import java.util.ArrayList;
+ import java.util.HashMap;
  import java.util.List;
+ import java.util.Map;
  
  public class MiscTests extends TestHelper {
  
      /**
       * Test with class path set on the command line via -Djava.class.path
*** 101,113 ****
                  " \"accessClassInPackage.sun.security.pkcs11\")")) {
              System.out.println(tr.status);
          }
      }
  
      public static void main(String... args) throws IOException {
          testWithClassPathSetViaProperty();
          test6856415();
          if (testExitValue != 0) {
              throw new Error(testExitValue + " tests failed");
      }
! }
  }
--- 103,126 ----
                  " \"accessClassInPackage.sun.security.pkcs11\")")) {
              System.out.println(tr.status);
          }
      }
  
+     static void testJLDEnvWithTool() {
+         final Map<String, String> envMap = new HashMap<>();
+         envMap.put("_JAVA_LAUNCHER_DEBUG", "true");
+         TestResult tr = doExec(envMap, javacCmd, "-version");
+         tr.checkPositive();
+         if (!tr.isOK()) {
+            System.out.println(tr);
+         }
+     }
+ 
      public static void main(String... args) throws IOException {
          testWithClassPathSetViaProperty();
          test6856415();
+         testJLDEnvWithTool();
          if (testExitValue != 0) {
              throw new Error(testExitValue + " tests failed");
          }
!     }
  }