src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HsErrLogTest.java

rev 56282 : [mq]: graal

*** 1,7 ****
  /*
!  * Copyright (c) 2017, 2018, 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) 2017, 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.
*** 55,64 ****
--- 55,66 ----
      @Test
      public void test1() throws IOException, InterruptedException {
          List<String> args = new ArrayList<>();
          if (JavaVersionUtil.JAVA_SPEC <= 8) {
              args.add("-XX:-UseJVMCIClassLoader");
+         } else {
+             args.add("--add-exports=jdk.internal.vm.compiler/org.graalvm.compiler.api.directives=ALL-UNNAMED");
          }
          args.add("-XX:+UseJVMCICompiler");
          args.add("-XX:CompileOnly=" + Crasher.class.getName() + "::tryCrash");
          args.add(Crasher.class.getName());
          testHelper(args);
*** 88,98 ****
                  checkHsErr(path);
                  return;
              }
          }
  
!         Assert.fail("Could not find " + re.pattern());
      }
  
      private static void checkHsErr(File hsErrPath) {
          try (BufferedReader br = new BufferedReader(new FileReader(hsErrPath))) {
              String line = br.readLine();
--- 90,100 ----
                  checkHsErr(path);
                  return;
              }
          }
  
!         Assert.fail(String.format("Could not find %s%n%s", re.pattern(), proc));
      }
  
      private static void checkHsErr(File hsErrPath) {
          try (BufferedReader br = new BufferedReader(new FileReader(hsErrPath))) {
              String line = br.readLine();