8161132: JShell tests: jdk/jshell/KullaCompletenessStressTest.java should pass if jdk.shell sources are not provided
authorrfield
Thu, 14 Jul 2016 11:14:22 -0700
changeset 39675 20bd34eaf5de
parent 39674 de3b0e52ca17
child 39676 45b094192c2c
8161132: JShell tests: jdk/jshell/KullaCompletenessStressTest.java should pass if jdk.shell sources are not provided Reviewed-by: rfield Contributed-by: andrey.x.nazarov@oracle.com
langtools/test/jdk/jshell/KullaCompletenessStressTest.java
--- a/langtools/test/jdk/jshell/KullaCompletenessStressTest.java	Thu Jul 14 11:57:15 2016 -0600
+++ b/langtools/test/jdk/jshell/KullaCompletenessStressTest.java	Thu Jul 14 11:14:22 2016 -0700
@@ -37,10 +37,6 @@
 public class KullaCompletenessStressTest extends CompletenessStressTest {
     @Override
     public File[] getDirectoriesToTest() {
-        return new File[]{ getKullaSourceDirectory() };
-    }
-
-    public File getKullaSourceDirectory() {
         String src = System.getProperty("test.src");
         File file;
         if (src == null) {
@@ -48,6 +44,11 @@
         } else {
             file = new File(src, "../../../src/jdk.jshell/share/classes");
         }
-        return file;
+        if (!file.exists()) {
+            System.out.println("jdk.jshell sources are not exist. Test has been skipped. Path: " + file.toString());
+            return new File[]{};
+        }else {
+            return new File[]{file};
+        }
     }
 }